More tinkering with org-mode generation.