Code review fixups for makePackageRestoreRobust