Make the temporary file cleanup code shared by all the appropriate code paths.  Coding style cleanup.