https://github.com/JonChesterfield approved this pull request. Test change is suspect for a patch claiming NFC but it looks like the change is harmless. Thanks for separating refactor from functional change https://github.com/llvm/llvm-project/pull/72544