[1.7.x] Ignore more blank throughs on swapped-out M2Ms