SocketConnector is now a Callable, all tests pass

Ongoing work with room for improvement. Nevertheless, the connector code is cut almost by half.