Tidy up and rename to make_SSLContext