Since we depend on the file format, might as well simplify the code.