More work on TcpPullHandler.