* lisp/org.el: Refactor single-branch `if' to `when' or `unless' as appropriate. Also apply other misc. refactorings of conditionals.