Applying latest iteration of dependency builder

...and it seems that now works as expected (well, it's still an
alpha/beta...).