Fix up count's parameters, fixing #2