Rework IPMAP processing to actually maintain the commented invariant of at most one ID per IP.