Fix computation of installed packages

This is a follow-on to Simon's patch yesterday, developed
with him.  It cleans up the computation of how packages
are installed, and installs the right ones.