Re #7159 First cut at subtraction algorithm