gen-introspect: Merge some lexer changes taken from g-i