The message split change (#174) added a new (owned) type for credentials, but without removing the pre-existing type, as the needed refactor would be too large. This issue aims at fixing that.