Change 'if' forms to 'cond' forms that use 'case'

In summary:

(if ((foo x) y)
    (else z))

Becomes:

(cond
    (case (foo x) y)
    (else z))

Reasoning: layout improves and 'if' is freed for use in the simple two-branch
form.