Last of the GUID->struct uuid changes.