First steps on converting to ANTLR4