Rework for Credential lib update
Minor adjustments
Minor fix
Land #3690, credential_collect refactor

@TomSellers strikes again!