Bug 958900 - Part 5: fix client count handling.