Lots more MTF parser refinements.