https://github.com/rj-jesus approved this pull request. Thank you for making these changes, it looks good now. As you say, I think there isn't a perfect solution here. This seems to be the best compromise. https://github.com/llvm/llvm-project/pull/125261