Rework wide-path copy logic; still missing cleanup work