Upgrade to antlr 3.5