Fix for `rename-file-and-buffer'.