Make use of CompactGeometryInstance fully now as it's supported for everything.