DavidSpickett wrote: I like the approach of splitting the ownership list from the current scope's types. I just need to understand the logic of the lookups into those containers. https://github.com/llvm/llvm-project/pull/216384