(if ... (progn ...)) => (when ... ) where appropriate.