Misc cleanup.
Handle worker failure more explicitly.