Registry server: Fixes up the patch with "type" != NULL (used in "EnumValue" and...