Minor cleaning with respect to popcount.