More improvements to lex.