Also, better naming of variables in @pnpm/resolve-dependencies. This is refactoring of supi to make it easier to do the performance improvements for #1366. PR #1399