Improve 'rename-file-and-buffer