Fix remove_duplicate_addrs2 to do exactly what it says. Previously it could leave...