Upgraded ANTLR to 3.5.2