Expand and Contract

Add the new shape, move the callers, then remove the old one. The middle phase is the long one, and for external clients it is measured in quarters.