Portability fixes.
Handle cleanup when we get an error before the message file is read.
Fix bug in multi-table delete