Removed dependency on FunctionalDependencies.