More cleanup of direct stageout error handling.