Fix to make object.and all-or-nothing - fixes #284

This was branched from the #284 failing test addition branch.