[PATCH] Redo rename/copy detection logic.