James Hawkins : msi: Store the number of types we queried. We were leaking these types because we didn't have the correct count.