https://github.com/gbossu approved this pull request. I feel the change is fine as it is. It's hard for me to gauge if it is completely NFC or not, but changes I see do make sense. Thanks a lot for doing this work :) https://github.com/llvm/llvm-project/pull/156674