Improving the ANTLR grammar generation, better whitespace management