Add if, and, or

And, or behave correctly with respect to short-circuiting.
Since we have no side-effects, this turns out to be difficult to test automatically.