Remove unneeded kPolygon conversions