Fix subprocess32 and vcs imports in that last commit.