Misc code cleanups accumulated while working on other changes (#34787)

Release Notes:

- N/A
137081f050Michael Sloan committed on 7/20/2025, 11:22:13 PM· committed by GitHubparent7c1040b
7 files changedLine totals unavailable