Simplify return values for lexer