Refactor ProviderCallbacks.