Cleaned up the lexer a bit.