Extract drive-by fixes from PR 12135 for easier reviewing #12240
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Helps with reviewing of #12135
Rationale for this change
These are just a few changes that make the code cleaner/easier to understand/etc that I added when filing #12135. It was pointed out to me, though, that these make the PR harder to review as there's a lot of changes not directly related to the PR. So I'm pulling those changes into this PR so that they are hidden from the diff once this is merged, thus making the PR easier to review.
What changes are included in this PR?
A few clean-ups that shouldn't change behavior at all.
Are these changes tested?
All tests pass just like they do on main.
Are there any user-facing changes?
Shouldn't be