r125: minor code cleanup in "count"