Calculate dependencies better

This will successfully install everything we need even when the drupal7
package is already installed, as I'm not depending on a refresh event.