Re: p2k11 changes

[Marc Espie]

... and with the just committed "prepare" change, which makes it about twice
as fast in the common case (already installed deps), this should be all
for now (of course, I'm just saying that to trick my brain into finding
more speed-ups).