Don't pass lexer; but leave extra context values