Installer fails when re-installing

During testing I found I was unable to uninstall then reinstall. This is because uninstall does not remove the custom fields (which I think is reasonably sensible); and then reinstalling gets in a tangle with that xml file trying to recreate stuff.