https://github.com/fhahn approved this pull request. LGTM thanks! One more potential suggestion inline to try to reduce some duplication, not sure if it is clearly worth it though https://github.com/llvm/llvm-project/pull/105649