https://github.com/artagnon commented: This is a good re-org and I was going to do it myself, and my opinion is that there is no need to extract an NFC from it, since the whole benefit comes from just the re-org. https://github.com/llvm/llvm-project/pull/126971