Yep. I stopped short of moving SSLServer into this because of backwards-compatibility reasons.