Changed Polygon to use PolygonGeometry.  This breaks some tests until PolygonGeometry is fixed.