A bunch of refactoring to clean up the FileToLoad class.