Fix `count`, refs #350: default count changed to COUNT(*)

Tests pass. Is there a strong reason to COUNT by primary keys rather than `COUNT(*)` ?