Cleanup lexer a bit.