That would tend to be my preference where appropriate. And fwiw - I’ve back-burnered this until River gets back and up to speed, since I know that the current modeling of types is pretty load bearing to things he was considering important and I would definitely want his mind on any extensions.