https://github.com/erichkeane approved this pull request. I don't see a reason to not do this, and if it makes the library simpler, even better. I think you fixed the pre-commit CI now, so LGTM. https://github.com/llvm/llvm-project/pull/145653