Agreed, logic needs to flip for it to work the same.  "Known knowns" are always better than "iffy if's" so I unrolled a few of them like this one.

Actually a side-effect of cherrypicking, in my final fully changed version this bug doesn't exist (the `if` is also flipped around, so I missed the subtle logic inversion while ignoring the flipped order)