Simplify lexer API a tiny bit