I prefer not to invent new variables when they aren't strictly necessary. org-directory is one such variable (although the other path variables are still necessary).
6693db48af