Fix regression in fadc4b3d; total_count is not the same as total_pages

Fixes #958. This is the expedient thing to revert, but maybe there's a better approach. @jcoyne?
Total count is the number of records on the page with one extra that indicates if we have a next page.  Given that, I'm not sure this makes sense.  With this refactor, total_pages will return `1` if there are no more pages and `2` if there are more pages.  In that case the refactor of last_page? would be incorrect, right?