More work on keeping cred_store functions optional