https://github.com/dwblaikie approved this pull request. *shrug* I'm not especially familiar with this code, but the resulting changes seem OK & doesn't seem too invasive... https://github.com/llvm/llvm-project/pull/157529