lex identifier, lex constant, some cleanup