Misc nitpicks, changes too small / unrelated to be in other PRs (#32768)

Release Notes:

- N/A
3810227759Michael Sloan committed on 6/15/2025, 7:51:04 PM· committed by GitHubparent02da466
8 files changedLine totals unavailable