-static uschar str_copy_c[]="copy";
-static const struct String str_copy={ str_copy_c, 4 };
-static uschar str_iascii_casemap_c[]="i;ascii-casemap";
-static const struct String str_iascii_casemap={ str_iascii_casemap_c, 15 };
-static uschar str_enascii_casemap_c[]="en;ascii-casemap";
-static const struct String str_enascii_casemap={ str_enascii_casemap_c, 16 };
-static uschar str_ioctet_c[]="i;octet";
-static const struct String str_ioctet={ str_ioctet_c, 7 };
-static uschar str_iascii_numeric_c[]="i;ascii-numeric";
-static const struct String str_iascii_numeric={ str_iascii_numeric_c, 15 };
-static uschar str_comparator_iascii_casemap_c[]="comparator-i;ascii-casemap";
-static const struct String str_comparator_iascii_casemap={ str_comparator_iascii_casemap_c, 26 };
-static uschar str_comparator_enascii_casemap_c[]="comparator-en;ascii-casemap";
-static const struct String str_comparator_enascii_casemap={ str_comparator_enascii_casemap_c, 27 };
-static uschar str_comparator_ioctet_c[]="comparator-i;octet";
-static const struct String str_comparator_ioctet={ str_comparator_ioctet_c, 18 };
-static uschar str_comparator_iascii_numeric_c[]="comparator-i;ascii-numeric";
-static const struct String str_comparator_iascii_numeric={ str_comparator_iascii_numeric_c, 26 };
+static uschar str_copy_c[] = "copy";
+static const gstring str_copy = { .s = str_copy_c, .ptr = 4, .size = 5 };
+static uschar str_iascii_casemap_c[] = "i;ascii-casemap";
+static const gstring str_iascii_casemap = { .s = str_iascii_casemap_c, .ptr = 15, .size = 16 };
+static uschar str_enascii_casemap_c[] = "en;ascii-casemap";
+static const gstring str_enascii_casemap = { .s = str_enascii_casemap_c, .ptr = 16, .size = 17 };
+static uschar str_ioctet_c[] = "i;octet";
+static const gstring str_ioctet = { .s = str_ioctet_c, .ptr = 7, .size = 8 };
+static uschar str_iascii_numeric_c[] = "i;ascii-numeric";
+static const gstring str_iascii_numeric = { .s = str_iascii_numeric_c, .ptr = 15, .size = 16 };
+static uschar str_comparator_iascii_casemap_c[] = "comparator-i;ascii-casemap";
+static const gstring str_comparator_iascii_casemap = { .s = str_comparator_iascii_casemap_c, .ptr = 26, .size = 27 };
+static uschar str_comparator_enascii_casemap_c[] = "comparator-en;ascii-casemap";
+static const gstring str_comparator_enascii_casemap = { .s = str_comparator_enascii_casemap_c, .ptr = 27, .size = 28 };
+static uschar str_comparator_ioctet_c[] = "comparator-i;octet";
+static const gstring str_comparator_ioctet = { .s = str_comparator_ioctet_c, .ptr = 18, .size = 19 };
+static uschar str_comparator_iascii_numeric_c[] = "comparator-i;ascii-numeric";
+static const gstring str_comparator_iascii_numeric = { .s = str_comparator_iascii_numeric_c, .ptr = 26, .size = 27 };