Shape refactoring in progress.