Move defvars out of eval-when-compile. Move code that was after the end of file. Use buffer-file-name variable. (org-timestamp-change): Use with-current-buffer. (org-todo-list): Don't unnecessarily define a new buffer-local var. (org-agenda-file-to-end, org-agenda-file-to-front): Remove unused arg `file'.