Modify to use ANTLR 3.4 instead of 3.5