Refactoring as preparation for vertical flip.