Add if, and, or

And, or behave correctly with respect to short-circuiting.
This is not testable, unfortuantely.
Keep `if`, but not and or or.