ANTLR code cleanup