Misc cleanup, track parser.rs again...