https://github.com/tblah approved this pull request. Really nice cleanup. LGTM. Do I understand correctly that this is not NFC because in some situations attributes were not forwarded previously but now they will be? https://github.com/llvm/llvm-project/pull/132009