Further efforts to make the contrib/Quasiequivalence.v work