Type registry refactorings