Further fine tuning of the new SASL API