changes as suggested by the antlr team