Remove Geometry::QUAD() usage from Adaptor