Improved support for @auto-otl and began support for @auto-org-mode.