Avoid unwrapping until failure to match geom

A little cleaner this way