https://github.com/inbelic approved this pull request. LGTM. As noted, they were introduced to make an enforced difference between the two types. But given it has created more confusion, I'm happy to merge them together. https://github.com/llvm/llvm-project/pull/153909