ENH: Intermediate step in the refactoring.