Less intrusive refactoring of SpatialTransform