Better support for FunctionProviders.