pkgIdMap should include adjustments made by -package flags (it used
to; I broke this yesterday).  Also add origPkgIdMap for keeping the
original package database - this might be needed in the future.