Fix regression from my last merge.

The PFI's pkgdata member is no more.  Now ._data holds all.