Altering the handling of count() so that in the single-column case, it
can be used to not count NULLs or to count distinct items only.