Clean up in preparation for --output-file.