Clean up lexer a bit

The main advantage to this is that it gets rid of the warning from `parser-tools/lex` due to the lexer accepting the empty string.