Replace (when (not ...)) to (unless ...)