Rollup merge of #36921 - nnethercote:two-lexer-tweaks, r=nrc

Two lexer tweaks

19 days later, I haven't received a review of my commits in #36470. In an attempt to make some progress, I'm going to split up the changes. Here are the ones that don't relate to renaming things.