Refactor AbstractClientHandle a bit

No match.