Some changes to get polygons and polylines working with new clustering code.