Simply by putting .nonzero before ||

@jpterry  Can you review? I realized in looking at your PR that I could have handled the `.nonzero?` special case on the outside in just one place, in front of `||`.