Fixed to ensure PackageHelper respects unique constructor and field mapping.