Revert r74286, r74287 -- broke parserTests completely; mixed lots of formatting and...