[antlr runtime] More fixes