Improved ANTLR parser grammar.