Don't require cl, and prefer "unless" to "(if (not ...) ...)"

In connection with https://github.com/milkypostman/melpa/pull/2113