A bit more cleanup of TLS discovery plus wording on operator override