Revamped modes to take an Env for stock depends.

As the comment says, this makes passing the stock depends to super constructors
a lot less painful, and it allows us to add new stock depends in the future
without breaking everyone.