https://github.com/davemgreen approved this pull request. Thanks for checking, thats good to hear. The changes LGTM, with a suggestion to common some code even if it doesn't end up in a header. https://github.com/llvm/llvm-project/pull/104929