The style guide (not that we really use it any more) suggests putting parentheses around the conditional to draw attention to the fact it’s doing something a bit weird: might that be a possibility?