Clean up logic around *creds* and *multi-creds*