Remove circular dependencies in Core.