This was previously checking whether *either* operator was
calculation-safe, when in fact it should check that *both* are.

Closes #2523