Made minor changes to the CntUniq... methods.