Upped ANTLR version to 4.2.2