Use new macro `org-with-gensyms'