Cleaning up some lexer code.