Update for upstream pkgid changes.