I'm not yet convinced this change is necessary; Proposal: I'll review the process of copy from above after mv is gone - if I find a good way to keep the code, I'll drop this specific change.