More changes to Uninstall-MSI. Work in Progress. Not tested.