Go back to popcount for undefended
Fix DistanceRingsBB, and minor tweak