q2c: Prefer lex_match_id() over lex_match_hyphenated_word() in emitted code.