more cleanups for cardinality aggs (we don't want to upset @nik9000 ;))