Fixing a few syntax problems, and changing to use a trait for the mockable file operations for easy re-use on converters that need them