- Remove debug-related includes - Add some trivial missing includes - Remove useless {} - Move the known-but-skipped-records are the end of the switch-cases - Always throw on unknown records