Improvements to the lexer.