r9772: Make credentials callbacks more consistant with the abstraction