Moving things around to implement a more sensible socket pooling strategy