More work to making the provider APIs uniform.