If at the end we change AreaPolygon -> Polygon and AreaCircle -> Circle, probably is better to change AreaNone -> NoArea also.