Starting to add better support for row-counting on unsharded tables