https://github.com/AaronBallman commented: I spotted some simplifications that can be applied. If precommit CI comes back green, then I think this is basically ready to go. https://github.com/llvm/llvm-project/pull/84014