cp(1)/mv(1): Bring back a number of cleanups we did previously.