Code cleanup.
Minor code clean-up.
Minor code clean-up.
Code clean-up.
It seems to be faster to just recompute popcount when needed.