Fix parsers using Antlr 3 and 4.
Update ParserTests.