Minor refactoring
Make IF branches take a single statement

This makes IF less COND-like and more like IF in CL, except that any
number of clauses are permitted before the (optional) unconditional
body.