Yet another try at resolving dependencies.