Fix ANTLR grammar to not produce empty tokens