Ok, nearing the end of the GUID->struct uuid changes.