init-yasnippet.el: Rename obsolete variables
init-org.el: Test new yasnippet workaround