Upgraded to Antlr 3.5.1