https://github.com/banach-space approved this pull request. I've left a couple of minor comments, but nothing major and approving as is - this is clearly an improvement. LGTM! Btw, this is a very nice clean-up! https://github.com/llvm/llvm-project/pull/138347