Full subtraction. Drastic simplifications all round based on new invariants.