Small shape refactoring before extracting base class.
Changes.