More cleanup; break out morphism-families stuff