Didn't realise there was all this merge-crap floating around. Removed it.
About to improve the inwards context floating code for fix-fact fusion.