Remove GADT refinements, part 3