https://github.com/banach-space approved this pull request. Thanks for tidying this up! I've left a few optional nits/nice-to-haves, but this already LGTM, hence approving as is. https://github.com/llvm/llvm-project/pull/133808