Fix #1950: no longer depend on mquery count() fn