James Hawkins : msi: Match the changes made by the hand-generated and API-generated transforms.