Client poll refactoring.