Some Morph refactorings.