Updated to Antlr 3.5, with some success