Use %T spec in find-temp-file
Use patched org-expiry