Fix org-mode workaround for yasnippet