More clean-up in parser test suite.