cleanup for tangling with current org-mode version