Continue reversion of heterogeneous (~)
More knock-on effects of homogeneous eqTyCon