- Improved the setting of cleanup_new_fname and cleanup_fname.