All shapes now work in their GeometryShape forms.