org-odt.el: Re-arrange code