Changed Johnson ASSP algorithm to use combine rather than + to do reweighting (did not change -, though); fixes #732