Refactor package 'shrinking' code.

[andrewchambers]

Currently when we marshal a package to build in the sandbox, we avoid marshalling any non direct dependencies, which is good. The bad thing is the logic to do so is split partially between the marshal function, and partially as a substitution marhalling map. I think we should use one or the other, not both.