SASL utilities cleanup and enhancements