Shape refactoring.