More changes to get packages to compile in newer Delphi versions.