Bunch of changes to support the latest changes to the next-gen stuff.  Trying to Godeps this guy, too.