Remove the raw dependency/dependency stuff in favor of a real object

Keep track of two sets of dependencies seemed silly.  This simplifies
the code by only have on real Dependencies object that we can add
functionality to and test independently.
Remove in favor of using add() directly on the dependencies property