You're right. For some reason, I was thinking that it couldn't be done for something like `PolygonGeomerty`, but I was wrong. It'll be a simple change and I'll do it for all the geometry types that have conflicting options.