When floating a case outwards we must be careful to clone
the binders, since their scope is widening.

Plus lots of tidying up.