Refactoring: shape constructors + default shape definitions moved into each shape base class.