Properly segregate SASL and STARTTLS into components.