Config changes and rework for new credential APIs.