Work around ANTLR 4.2 issue 461 (fixes #23)