Fix misuse of cond.  Move all conditions into the same form.