fix some weird errors introduced by antlr4 I forgot to remove