Rework new SASL API a bit