More Type refactorings