Continued phasing out of (WB_)SimplePolygon