0.13dev: First batch of `... and ... or ...` to `... if ... else ...` conversions.
Part of #9536.
Authored by: rblank 2011-02-21
Parent: [r10579]
Child: [r10581]