Remove GADT refinements, part 2