RF: start switch to explicit short-circuit && / ||

To silence warnings in Octave, for now.