Preparatory code re-org.