Fix instantiations for new geometry descriptions.