more cleanups of OpenSSLstream code