Improving `magit-rename-*` functions