More org-mode refinements.