Update to use 4.2.1 ANTLR