]> git.ipfire.org Git - thirdparty/knot-dns.git/commitdiff
projects / thirdparty / knot-dns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bbb887b)
libzscanner: add support for 'dohpath' and 'ohttp' SVCB parameters
authorDaniel Salzman <daniel.salzman@nic.cz>
Wed, 10 Jul 2024 20:21:49 +0000 (22:21 +0200)
committerDaniel Salzman <daniel.salzman@nic.cz>
Thu, 11 Jul 2024 07:21:46 +0000 (09:21 +0200)
src/libzscanner/scanner.c.g2 patch | blob | blame | history
src/libzscanner/scanner.c.t0 patch | blob | blame | history
src/libzscanner/scanner_body.rl patch | blob | blame | history
tests-extra/tests/records/load/data/svcb.zone patch | blob | blame | history
tests/libzscanner/data/57_SVCB.in patch | blob | blame | history
tests/libzscanner/data/57_SVCB.out patch | blob | blame | history

diff --git a/src/libzscanner/scanner.c.g2 b/src/libzscanner/scanner.c.g2
index f97c3ae8aaab6a868cd3804e39bfe3b81c322df4..8aa084d378ee06c0e4b8efdd95665baec267954b 100644 (file)
--- a/src/libzscanner/scanner.c.g2
+++ b/src/libzscanner/scanner.c.g2
@@ -109,7 +109,7 @@ int zs_init(
        memset(s, 0, sizeof(*s));
 
        // Nonzero initial scanner state.
-       s->cs = 1396;
+       s->cs = 1423;
 
        // Reset the file descriptor.
        s->file.descriptor = -1;
@@ -435,7 +435,7 @@ static void parse(
 
 _again:
        switch ( cs ) {
-               case 1396: goto st1396;
+               case 1423: goto st1423;
                case 0: goto st0;
                case 1: goto st1;
                case 2: goto st2;
@@ -450,7 +450,7 @@ _again:
                case 11: goto st11;
                case 12: goto st12;
                case 13: goto st13;
-               case 1397: goto st1397;
+               case 1424: goto st1424;
                case 14: goto st14;
                case 15: goto st15;
                case 16: goto st16;
@@ -611,7 +611,7 @@ _again:
                case 171: goto st171;
                case 172: goto st172;
                case 173: goto st173;
-               case 1398: goto st1398;
+               case 1425: goto st1425;
                case 174: goto st174;
                case 175: goto st175;
                case 176: goto st176;
@@ -622,7 +622,7 @@ _again:
                case 181: goto st181;
                case 182: goto st182;
                case 183: goto st183;
-               case 1399: goto st1399;
+               case 1426: goto st1426;
                case 184: goto st184;
                case 185: goto st185;
                case 186: goto st186;
@@ -631,11 +631,11 @@ _again:
                case 189: goto st189;
                case 190: goto st190;
                case 191: goto st191;
-               case 1400: goto st1400;
+               case 1427: goto st1427;
                case 192: goto st192;
                case 193: goto st193;
                case 194: goto st194;
-               case 1401: goto st1401;
+               case 1428: goto st1428;
                case 195: goto st195;
                case 196: goto st196;
                case 197: goto st197;
@@ -647,12 +647,12 @@ _again:
                case 203: goto st203;
                case 204: goto st204;
                case 205: goto st205;
-               case 1402: goto st1402;
+               case 1429: goto st1429;
                case 206: goto st206;
                case 207: goto st207;
                case 208: goto st208;
                case 209: goto st209;
-               case 1403: goto st1403;
+               case 1430: goto st1430;
                case 210: goto st210;
                case 211: goto st211;
                case 212: goto st212;
@@ -671,7 +671,7 @@ _again:
                case 225: goto st225;
                case 226: goto st226;
                case 227: goto st227;
-               case 1404: goto st1404;
+               case 1431: goto st1431;
                case 228: goto st228;
                case 229: goto st229;
                case 230: goto st230;
@@ -688,7 +688,7 @@ _again:
                case 241: goto st241;
                case 242: goto st242;
                case 243: goto st243;
-               case 1405: goto st1405;
+               case 1432: goto st1432;
                case 244: goto st244;
                case 245: goto st245;
                case 246: goto st246;
@@ -752,13 +752,13 @@ _again:
                case 304: goto st304;
                case 305: goto st305;
                case 306: goto st306;
-               case 1406: goto st1406;
+               case 1433: goto st1433;
                case 307: goto st307;
                case 308: goto st308;
-               case 1407: goto st1407;
+               case 1434: goto st1434;
                case 309: goto st309;
                case 310: goto st310;
-               case 1408: goto st1408;
+               case 1435: goto st1435;
                case 311: goto st311;
                case 312: goto st312;
                case 313: goto st313;
@@ -768,8 +768,8 @@ _again:
                case 317: goto st317;
                case 318: goto st318;
                case 319: goto st319;
-               case 1409: goto st1409;
-               case 1410: goto st1410;
+               case 1436: goto st1436;
+               case 1437: goto st1437;
                case 320: goto st320;
                case 321: goto st321;
                case 322: goto st322;
@@ -785,7 +785,7 @@ _again:
                case 332: goto st332;
                case 333: goto st333;
                case 334: goto st334;
-               case 1411: goto st1411;
+               case 1438: goto st1438;
                case 335: goto st335;
                case 336: goto st336;
                case 337: goto st337;
@@ -796,7 +796,7 @@ _again:
                case 342: goto st342;
                case 343: goto st343;
                case 344: goto st344;
-               case 1412: goto st1412;
+               case 1439: goto st1439;
                case 345: goto st345;
                case 346: goto st346;
                case 347: goto st347;
@@ -811,7 +811,7 @@ _again:
                case 356: goto st356;
                case 357: goto st357;
                case 358: goto st358;
-               case 1413: goto st1413;
+               case 1440: goto st1440;
                case 359: goto st359;
                case 360: goto st360;
                case 361: goto st361;
@@ -819,7 +819,7 @@ _again:
                case 363: goto st363;
                case 364: goto st364;
                case 365: goto st365;
-               case 1414: goto st1414;
+               case 1441: goto st1441;
                case 366: goto st366;
                case 367: goto st367;
                case 368: goto st368;
@@ -829,9 +829,9 @@ _again:
                case 372: goto st372;
                case 373: goto st373;
                case 374: goto st374;
-               case 1415: goto st1415;
-               case 1416: goto st1416;
-               case 1417: goto st1417;
+               case 1442: goto st1442;
+               case 1443: goto st1443;
+               case 1444: goto st1444;
                case 375: goto st375;
                case 376: goto st376;
                case 377: goto st377;
@@ -840,12 +840,12 @@ _again:
                case 380: goto st380;
                case 381: goto st381;
                case 382: goto st382;
-               case 1418: goto st1418;
-               case 1419: goto st1419;
+               case 1445: goto st1445;
+               case 1446: goto st1446;
                case 383: goto st383;
                case 384: goto st384;
                case 385: goto st385;
-               case 1420: goto st1420;
+               case 1447: goto st1447;
                case 386: goto st386;
                case 387: goto st387;
                case 388: goto st388;
@@ -1007,32 +1007,32 @@ _again:
                case 544: goto st544;
                case 545: goto st545;
                case 546: goto st546;
-               case 1421: goto st1421;
-               case 1422: goto st1422;
-               case 1423: goto st1423;
+               case 1448: goto st1448;
+               case 1449: goto st1449;
+               case 1450: goto st1450;
                case 547: goto st547;
                case 548: goto st548;
                case 549: goto st549;
                case 550: goto st550;
                case 551: goto st551;
-               case 1424: goto st1424;
+               case 1451: goto st1451;
                case 552: goto st552;
                case 553: goto st553;
                case 554: goto st554;
                case 555: goto st555;
-               case 1425: goto st1425;
-               case 1426: goto st1426;
-               case 1427: goto st1427;
+               case 1452: goto st1452;
+               case 1453: goto st1453;
+               case 1454: goto st1454;
                case 556: goto st556;
                case 557: goto st557;
-               case 1428: goto st1428;
+               case 1455: goto st1455;
                case 558: goto st558;
                case 559: goto st559;
                case 560: goto st560;
                case 561: goto st561;
                case 562: goto st562;
                case 563: goto st563;
-               case 1429: goto st1429;
+               case 1456: goto st1456;
                case 564: goto st564;
                case 565: goto st565;
                case 566: goto st566;
@@ -1081,8 +1081,6 @@ _again:
                case 609: goto st609;
                case 610: goto st610;
                case 611: goto st611;
-               case 1430: goto st1430;
-               case 1431: goto st1431;
                case 612: goto st612;
                case 613: goto st613;
                case 614: goto st614;
@@ -1093,9 +1091,10 @@ _again:
                case 619: goto st619;
                case 620: goto st620;
                case 621: goto st621;
-               case 1432: goto st1432;
                case 622: goto st622;
                case 623: goto st623;
+               case 1457: goto st1457;
+               case 1458: goto st1458;
                case 624: goto st624;
                case 625: goto st625;
                case 626: goto st626;
@@ -1105,6 +1104,7 @@ _again:
                case 630: goto st630;
                case 631: goto st631;
                case 632: goto st632;
+               case 1459: goto st1459;
                case 633: goto st633;
                case 634: goto st634;
                case 635: goto st635;
@@ -1173,7 +1173,6 @@ _again:
                case 698: goto st698;
                case 699: goto st699;
                case 700: goto st700;
-               case 1433: goto st1433;
                case 701: goto st701;
                case 702: goto st702;
                case 703: goto st703;
@@ -1201,6 +1200,7 @@ _again:
                case 725: goto st725;
                case 726: goto st726;
                case 727: goto st727;
+               case 1460: goto st1460;
                case 728: goto st728;
                case 729: goto st729;
                case 730: goto st730;
@@ -1278,7 +1278,6 @@ _again:
                case 802: goto st802;
                case 803: goto st803;
                case 804: goto st804;
-               case 1434: goto st1434;
                case 805: goto st805;
                case 806: goto st806;
                case 807: goto st807;
@@ -1306,6 +1305,7 @@ _again:
                case 829: goto st829;
                case 830: goto st830;
                case 831: goto st831;
+               case 1461: goto st1461;
                case 832: goto st832;
                case 833: goto st833;
                case 834: goto st834;
@@ -1320,10 +1320,8 @@ _again:
                case 843: goto st843;
                case 844: goto st844;
                case 845: goto st845;
-               case 1435: goto st1435;
                case 846: goto st846;
                case 847: goto st847;
-               case 1436: goto st1436;
                case 848: goto st848;
                case 849: goto st849;
                case 850: goto st850;
@@ -1338,7 +1336,6 @@ _again:
                case 859: goto st859;
                case 860: goto st860;
                case 861: goto st861;
-               case 1437: goto st1437;
                case 862: goto st862;
                case 863: goto st863;
                case 864: goto st864;
@@ -1350,8 +1347,10 @@ _again:
                case 870: goto st870;
                case 871: goto st871;
                case 872: goto st872;
+               case 1462: goto st1462;
                case 873: goto st873;
                case 874: goto st874;
+               case 1463: goto st1463;
                case 875: goto st875;
                case 876: goto st876;
                case 877: goto st877;
@@ -1361,30 +1360,24 @@ _again:
                case 881: goto st881;
                case 882: goto st882;
                case 883: goto st883;
-               case 1438: goto st1438;
                case 884: goto st884;
                case 885: goto st885;
                case 886: goto st886;
                case 887: goto st887;
                case 888: goto st888;
-               case 1439: goto st1439;
+               case 1464: goto st1464;
                case 889: goto st889;
                case 890: goto st890;
                case 891: goto st891;
                case 892: goto st892;
                case 893: goto st893;
-               case 1440: goto st1440;
                case 894: goto st894;
                case 895: goto st895;
                case 896: goto st896;
                case 897: goto st897;
                case 898: goto st898;
-               case 1441: goto st1441;
-               case 1442: goto st1442;
-               case 1443: goto st1443;
                case 899: goto st899;
                case 900: goto st900;
-               case 1444: goto st1444;
                case 901: goto st901;
                case 902: goto st902;
                case 903: goto st903;
@@ -1395,43 +1388,41 @@ _again:
                case 908: goto st908;
                case 909: goto st909;
                case 910: goto st910;
+               case 1465: goto st1465;
                case 911: goto st911;
                case 912: goto st912;
                case 913: goto st913;
                case 914: goto st914;
                case 915: goto st915;
+               case 1466: goto st1466;
                case 916: goto st916;
                case 917: goto st917;
                case 918: goto st918;
                case 919: goto st919;
                case 920: goto st920;
+               case 1467: goto st1467;
                case 921: goto st921;
                case 922: goto st922;
                case 923: goto st923;
                case 924: goto st924;
                case 925: goto st925;
+               case 1468: goto st1468;
+               case 1469: goto st1469;
+               case 1470: goto st1470;
                case 926: goto st926;
                case 927: goto st927;
-               case 1445: goto st1445;
-               case 1446: goto st1446;
-               case 1447: goto st1447;
+               case 1471: goto st1471;
                case 928: goto st928;
                case 929: goto st929;
                case 930: goto st930;
-               case 1448: goto st1448;
-               case 1449: goto st1449;
                case 931: goto st931;
                case 932: goto st932;
                case 933: goto st933;
                case 934: goto st934;
-               case 1450: goto st1450;
-               case 1451: goto st1451;
                case 935: goto st935;
                case 936: goto st936;
                case 937: goto st937;
                case 938: goto st938;
-               case 1452: goto st1452;
-               case 1453: goto st1453;
                case 939: goto st939;
                case 940: goto st940;
                case 941: goto st941;
@@ -1448,18 +1439,26 @@ _again:
                case 952: goto st952;
                case 953: goto st953;
                case 954: goto st954;
+               case 1472: goto st1472;
+               case 1473: goto st1473;
+               case 1474: goto st1474;
                case 955: goto st955;
                case 956: goto st956;
                case 957: goto st957;
+               case 1475: goto st1475;
+               case 1476: goto st1476;
                case 958: goto st958;
                case 959: goto st959;
                case 960: goto st960;
                case 961: goto st961;
+               case 1477: goto st1477;
+               case 1478: goto st1478;
                case 962: goto st962;
                case 963: goto st963;
-               case 1454: goto st1454;
                case 964: goto st964;
                case 965: goto st965;
+               case 1479: goto st1479;
+               case 1480: goto st1480;
                case 966: goto st966;
                case 967: goto st967;
                case 968: goto st968;
@@ -1473,7 +1472,6 @@ _again:
                case 976: goto st976;
                case 977: goto st977;
                case 978: goto st978;
-               case 1455: goto st1455;
                case 979: goto st979;
                case 980: goto st980;
                case 981: goto st981;
@@ -1486,8 +1484,8 @@ _again:
                case 988: goto st988;
                case 989: goto st989;
                case 990: goto st990;
+               case 1481: goto st1481;
                case 991: goto st991;
-               case 1456: goto st1456;
                case 992: goto st992;
                case 993: goto st993;
                case 994: goto st994;
@@ -1499,12 +1497,10 @@ _again:
                case 1000: goto st1000;
                case 1001: goto st1001;
                case 1002: goto st1002;
-               case 1457: goto st1457;
-               case 1458: goto st1458;
                case 1003: goto st1003;
                case 1004: goto st1004;
                case 1005: goto st1005;
-               case 1459: goto st1459;
+               case 1482: goto st1482;
                case 1006: goto st1006;
                case 1007: goto st1007;
                case 1008: goto st1008;
@@ -1515,12 +1511,10 @@ _again:
                case 1013: goto st1013;
                case 1014: goto st1014;
                case 1015: goto st1015;
-               case 1460: goto st1460;
-               case 1461: goto st1461;
-               case 1462: goto st1462;
                case 1016: goto st1016;
                case 1017: goto st1017;
                case 1018: goto st1018;
+               case 1483: goto st1483;
                case 1019: goto st1019;
                case 1020: goto st1020;
                case 1021: goto st1021;
@@ -1529,33 +1523,29 @@ _again:
                case 1024: goto st1024;
                case 1025: goto st1025;
                case 1026: goto st1026;
-               case 1463: goto st1463;
-               case 1464: goto st1464;
-               case 1465: goto st1465;
                case 1027: goto st1027;
                case 1028: goto st1028;
                case 1029: goto st1029;
+               case 1484: goto st1484;
+               case 1485: goto st1485;
                case 1030: goto st1030;
                case 1031: goto st1031;
                case 1032: goto st1032;
+               case 1486: goto st1486;
                case 1033: goto st1033;
                case 1034: goto st1034;
                case 1035: goto st1035;
                case 1036: goto st1036;
                case 1037: goto st1037;
                case 1038: goto st1038;
-               case 1466: goto st1466;
                case 1039: goto st1039;
                case 1040: goto st1040;
                case 1041: goto st1041;
-               case 1467: goto st1467;
-               case 1468: goto st1468;
                case 1042: goto st1042;
-               case 1469: goto st1469;
-               case 1470: goto st1470;
+               case 1487: goto st1487;
+               case 1488: goto st1488;
+               case 1489: goto st1489;
                case 1043: goto st1043;
-               case 1471: goto st1471;
-               case 1472: goto st1472;
                case 1044: goto st1044;
                case 1045: goto st1045;
                case 1046: goto st1046;
@@ -1566,6 +1556,9 @@ _again:
                case 1051: goto st1051;
                case 1052: goto st1052;
                case 1053: goto st1053;
+               case 1490: goto st1490;
+               case 1491: goto st1491;
+               case 1492: goto st1492;
                case 1054: goto st1054;
                case 1055: goto st1055;
                case 1056: goto st1056;
@@ -1578,11 +1571,18 @@ _again:
                case 1063: goto st1063;
                case 1064: goto st1064;
                case 1065: goto st1065;
+               case 1493: goto st1493;
                case 1066: goto st1066;
                case 1067: goto st1067;
                case 1068: goto st1068;
+               case 1494: goto st1494;
+               case 1495: goto st1495;
                case 1069: goto st1069;
+               case 1496: goto st1496;
+               case 1497: goto st1497;
                case 1070: goto st1070;
+               case 1498: goto st1498;
+               case 1499: goto st1499;
                case 1071: goto st1071;
                case 1072: goto st1072;
                case 1073: goto st1073;
@@ -1598,7 +1598,6 @@ _again:
                case 1083: goto st1083;
                case 1084: goto st1084;
                case 1085: goto st1085;
-               case 1473: goto st1473;
                case 1086: goto st1086;
                case 1087: goto st1087;
                case 1088: goto st1088;
@@ -1626,6 +1625,7 @@ _again:
                case 1110: goto st1110;
                case 1111: goto st1111;
                case 1112: goto st1112;
+               case 1500: goto st1500;
                case 1113: goto st1113;
                case 1114: goto st1114;
                case 1115: goto st1115;
@@ -1770,7 +1770,6 @@ _again:
                case 1254: goto st1254;
                case 1255: goto st1255;
                case 1256: goto st1256;
-               case 1474: goto st1474;
                case 1257: goto st1257;
                case 1258: goto st1258;
                case 1259: goto st1259;
@@ -1779,13 +1778,11 @@ _again:
                case 1262: goto st1262;
                case 1263: goto st1263;
                case 1264: goto st1264;
-               case 1475: goto st1475;
                case 1265: goto st1265;
                case 1266: goto st1266;
                case 1267: goto st1267;
                case 1268: goto st1268;
                case 1269: goto st1269;
-               case 1476: goto st1476;
                case 1270: goto st1270;
                case 1271: goto st1271;
                case 1272: goto st1272;
@@ -1800,20 +1797,22 @@ _again:
                case 1281: goto st1281;
                case 1282: goto st1282;
                case 1283: goto st1283;
+               case 1501: goto st1501;
                case 1284: goto st1284;
                case 1285: goto st1285;
                case 1286: goto st1286;
                case 1287: goto st1287;
-               case 1477: goto st1477;
                case 1288: goto st1288;
                case 1289: goto st1289;
                case 1290: goto st1290;
                case 1291: goto st1291;
+               case 1502: goto st1502;
                case 1292: goto st1292;
                case 1293: goto st1293;
                case 1294: goto st1294;
                case 1295: goto st1295;
                case 1296: goto st1296;
+               case 1503: goto st1503;
                case 1297: goto st1297;
                case 1298: goto st1298;
                case 1299: goto st1299;
@@ -1824,7 +1823,6 @@ _again:
                case 1304: goto st1304;
                case 1305: goto st1305;
                case 1306: goto st1306;
-               case 1478: goto st1478;
                case 1307: goto st1307;
                case 1308: goto st1308;
                case 1309: goto st1309;
@@ -1833,6 +1831,7 @@ _again:
                case 1312: goto st1312;
                case 1313: goto st1313;
                case 1314: goto st1314;
+               case 1504: goto st1504;
                case 1315: goto st1315;
                case 1316: goto st1316;
                case 1317: goto st1317;
@@ -1840,9 +1839,6 @@ _again:
                case 1319: goto st1319;
                case 1320: goto st1320;
                case 1321: goto st1321;
-               case 1479: goto st1479;
-               case 1480: goto st1480;
-               case 1481: goto st1481;
                case 1322: goto st1322;
                case 1323: goto st1323;
                case 1324: goto st1324;
@@ -1851,11 +1847,11 @@ _again:
                case 1327: goto st1327;
                case 1328: goto st1328;
                case 1329: goto st1329;
-               case 1482: goto st1482;
                case 1330: goto st1330;
                case 1331: goto st1331;
                case 1332: goto st1332;
                case 1333: goto st1333;
+               case 1505: goto st1505;
                case 1334: goto st1334;
                case 1335: goto st1335;
                case 1336: goto st1336;
@@ -1863,9 +1859,6 @@ _again:
                case 1338: goto st1338;
                case 1339: goto st1339;
                case 1340: goto st1340;
-               case 1483: goto st1483;
-               case 1484: goto st1484;
-               case 1485: goto st1485;
                case 1341: goto st1341;
                case 1342: goto st1342;
                case 1343: goto st1343;
@@ -1873,8 +1866,10 @@ _again:
                case 1345: goto st1345;
                case 1346: goto st1346;
                case 1347: goto st1347;
-               case 1486: goto st1486;
                case 1348: goto st1348;
+               case 1506: goto st1506;
+               case 1507: goto st1507;
+               case 1508: goto st1508;
                case 1349: goto st1349;
                case 1350: goto st1350;
                case 1351: goto st1351;
@@ -1883,11 +1878,11 @@ _again:
                case 1354: goto st1354;
                case 1355: goto st1355;
                case 1356: goto st1356;
+               case 1509: goto st1509;
                case 1357: goto st1357;
                case 1358: goto st1358;
                case 1359: goto st1359;
                case 1360: goto st1360;
-               case 1487: goto st1487;
                case 1361: goto st1361;
                case 1362: goto st1362;
                case 1363: goto st1363;
@@ -1895,21 +1890,22 @@ _again:
                case 1365: goto st1365;
                case 1366: goto st1366;
                case 1367: goto st1367;
-               case 1488: goto st1488;
+               case 1510: goto st1510;
+               case 1511: goto st1511;
+               case 1512: goto st1512;
                case 1368: goto st1368;
                case 1369: goto st1369;
                case 1370: goto st1370;
                case 1371: goto st1371;
                case 1372: goto st1372;
                case 1373: goto st1373;
-               case 1489: goto st1489;
                case 1374: goto st1374;
+               case 1513: goto st1513;
                case 1375: goto st1375;
                case 1376: goto st1376;
                case 1377: goto st1377;
                case 1378: goto st1378;
                case 1379: goto st1379;
-               case 1490: goto st1490;
                case 1380: goto st1380;
                case 1381: goto st1381;
                case 1382: goto st1382;
@@ -1918,7 +1914,7 @@ _again:
                case 1385: goto st1385;
                case 1386: goto st1386;
                case 1387: goto st1387;
-               case 1491: goto st1491;
+               case 1514: goto st1514;
                case 1388: goto st1388;
                case 1389: goto st1389;
                case 1390: goto st1390;
@@ -1926,8 +1922,39 @@ _again:
                case 1392: goto st1392;
                case 1393: goto st1393;
                case 1394: goto st1394;
-               case 1492: goto st1492;
+               case 1515: goto st1515;
                case 1395: goto st1395;
+               case 1396: goto st1396;
+               case 1397: goto st1397;
+               case 1398: goto st1398;
+               case 1399: goto st1399;
+               case 1400: goto st1400;
+               case 1516: goto st1516;
+               case 1401: goto st1401;
+               case 1402: goto st1402;
+               case 1403: goto st1403;
+               case 1404: goto st1404;
+               case 1405: goto st1405;
+               case 1406: goto st1406;
+               case 1517: goto st1517;
+               case 1407: goto st1407;
+               case 1408: goto st1408;
+               case 1409: goto st1409;
+               case 1410: goto st1410;
+               case 1411: goto st1411;
+               case 1412: goto st1412;
+               case 1413: goto st1413;
+               case 1414: goto st1414;
+               case 1518: goto st1518;
+               case 1415: goto st1415;
+               case 1416: goto st1416;
+               case 1417: goto st1417;
+               case 1418: goto st1418;
+               case 1419: goto st1419;
+               case 1420: goto st1420;
+               case 1421: goto st1421;
+               case 1519: goto st1519;
+               case 1422: goto st1422;
        default: break;
        }
 
@@ -1940,7 +1967,7 @@ tr22:
        {
                s->line_counter++;
        }
-       goto st1396;
+       goto st1423;
 tr87:
        {
                s->buffer[0] = 0;
@@ -1962,18 +1989,18 @@ tr87:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1396; goto _out;}
+                                       {p++; cs = 1423; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1396; goto _out;}
+                       p--; {p++; cs = 1423; goto _out;}
                }
        }
        {
                s->line_counter++;
        }
-       goto st1396;
+       goto st1423;
 tr93:
        {
                if (rdata_tail - s->r_data > UINT16_MAX) {
@@ -1991,18 +2018,18 @@ tr93:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1396; goto _out;}
+                                       {p++; cs = 1423; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1396; goto _out;}
+                       p--; {p++; cs = 1423; goto _out;}
                }
        }
        {
                s->line_counter++;
        }
-       goto st1396;
+       goto st1423;
 tr96:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -2013,7 +2040,7 @@ tr96:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1396; goto _out;}
+                               {p++; cs = 1423; goto _out;}
                        }
                }
        }
@@ -2033,18 +2060,18 @@ tr96:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1396; goto _out;}
+                                       {p++; cs = 1423; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1396; goto _out;}
+                       p--; {p++; cs = 1423; goto _out;}
                }
        }
        {
                s->line_counter++;
        }
-       goto st1396;
+       goto st1423;
 tr754:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -2055,14 +2082,14 @@ tr754:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1396; goto _out;}
+                               {p++; cs = 1423; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1396;
+       goto st1423;
 tr848:
        {
                s->buffer[0] = 0;
@@ -2077,7 +2104,7 @@ tr848:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1396; goto _out;}
+                               {p++; cs = 1423; goto _out;}
                        }
                }
        }
@@ -2097,18 +2124,18 @@ tr848:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1396; goto _out;}
+                                       {p++; cs = 1423; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1396; goto _out;}
+                       p--; {p++; cs = 1423; goto _out;}
                }
        }
        {
                s->line_counter++;
        }
-       goto st1396;
+       goto st1423;
 tr966:
        {
                s->buffer[0] = 0;
@@ -2130,12 +2157,12 @@ tr966:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1396; goto _out;}
+                                       {p++; cs = 1423; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1396; goto _out;}
+                       p--; {p++; cs = 1423; goto _out;}
                }
        }
        {
@@ -2150,11 +2177,11 @@ tr966:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1396; goto _out;}
+                               {p++; cs = 1423; goto _out;}
                        }
                }
        }
-       goto st1396;
+       goto st1423;
 tr970:
        {
                if (rdata_tail - s->r_data > UINT16_MAX) {
@@ -2172,12 +2199,12 @@ tr970:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1396; goto _out;}
+                                       {p++; cs = 1423; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1396; goto _out;}
+                       p--; {p++; cs = 1423; goto _out;}
                }
        }
        {
@@ -2192,12 +2219,12 @@ tr970:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1396; goto _out;}
+                               {p++; cs = 1423; goto _out;}
                        }
                }
        }
-       goto st1396;
-tr4211:
+       goto st1423;
+tr4248:
        {
                s->buffer[0] = 0;
                s->buffer_length = 0;
@@ -2205,8 +2232,8 @@ tr4211:
        {
                s->line_counter++;
        }
-       goto st1396;
-tr4275:
+       goto st1423;
+tr4312:
        {
                NOERR;
        }
@@ -2217,11 +2244,11 @@ tr4275:
        {
                s->line_counter++;
        }
-       goto st1396;
-st1396:
+       goto st1423;
+st1423:
        if ( ++p == pe )
-               goto _test_eof1396;
-case 1396:
+               goto _test_eof1423;
+case 1423:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -2235,28 +2262,28 @@ case 1396:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4206;
-               case 32: goto tr4206;
+               case 9: goto tr4243;
+               case 32: goto tr4243;
                case 36: goto st184;
-               case 40: goto tr4208;
-               case 41: goto tr4209;
-               case 42: goto tr4210;
-               case 92: goto tr4210;
-               case 95: goto tr4210;
-               case 1802: goto tr4211;
-               case 1851: goto tr4212;
-               case 2058: goto tr4213;
-               case 2107: goto tr4214;
+               case 40: goto tr4245;
+               case 41: goto tr4246;
+               case 42: goto tr4247;
+               case 92: goto tr4247;
+               case 95: goto tr4247;
+               case 1802: goto tr4248;
+               case 1851: goto tr4249;
+               case 2058: goto tr4250;
+               case 2107: goto tr4251;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr4210;
+                       goto tr4247;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr4210;
+                       goto tr4247;
        } else
-               goto tr4210;
-       goto tr4205;
+               goto tr4247;
+       goto tr4242;
 tr0:
        {
                WARN(ZS_BAD_NUMBER);
@@ -2775,7 +2802,7 @@ tr1868:
                p--; {goto st307;}
        }
        goto st0;
-tr1898:
+tr1907:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {goto st307;}
@@ -2785,13 +2812,13 @@ tr1898:
                p--; {goto st307;}
        }
        goto st0;
-tr1921:
+tr1935:
        {
                WARN(ZS_BAD_SVCB_PARAM);
                p--; {goto st307;}
        }
        goto st0;
-tr2005:
+tr2031:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {goto st307;}
@@ -2801,7 +2828,7 @@ tr2005:
                p--; {goto st307;}
        }
        goto st0;
-tr2049:
+tr2075:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {goto st307;}
@@ -2811,19 +2838,19 @@ tr2049:
                p--; {goto st307;}
        }
        goto st0;
-tr2129:
+tr2166:
        {
                WARN(ZS_BAD_ALGORITHM);
                p--; {goto st307;}
        }
        goto st0;
-tr2251:
+tr2288:
        {
                WARN(ZS_BAD_CERT_TYPE);
                p--; {goto st307;}
        }
        goto st0;
-tr2304:
+tr2341:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {goto st307;}
@@ -2833,7 +2860,7 @@ tr2304:
                p--; {goto st307;}
        }
        goto st0;
-tr2327:
+tr2364:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {goto st307;}
@@ -2843,7 +2870,7 @@ tr2327:
                p--; {goto st307;}
        }
        goto st0;
-tr2346:
+tr2383:
        {
                WARN(ZS_BAD_TIME_UNIT);
                p--; {goto st307;}
@@ -2857,7 +2884,7 @@ tr2346:
                p--; {goto st307;}
        }
        goto st0;
-tr2512:
+tr2549:
        {
                s->long_string = false;
        }
@@ -2866,7 +2893,7 @@ tr2512:
                p--; {goto st307;}
        }
        goto st0;
-tr2535:
+tr2572:
        {
                WARN(ZS_BAD_LOC_DATA);
                p--; {goto st307;}
@@ -2876,7 +2903,7 @@ tr2535:
                p--; {goto st307;}
        }
        goto st0;
-tr2938:
+tr2975:
        {
                WARN(ZS_BAD_APL);
                p--; {goto st307;}
@@ -2886,7 +2913,7 @@ tr2938:
                p--; {goto st307;}
        }
        goto st0;
-tr2953:
+tr2990:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {goto st307;}
@@ -2900,7 +2927,7 @@ tr2953:
                p--; {goto st307;}
        }
        goto st0;
-tr2998:
+tr3035:
        {
                WARN(ZS_BAD_HEX_CHAR);
                p--; {goto st307;}
@@ -2910,7 +2937,7 @@ tr2998:
                p--; {goto st307;}
        }
        goto st0;
-tr3069:
+tr3106:
        {
                WARN(ZS_BAD_GATEWAY);
                p--; {goto st307;}
@@ -2920,7 +2947,7 @@ tr3069:
                p--; {goto st307;}
        }
        goto st0;
-tr3084:
+tr3121:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {goto st307;}
@@ -2934,7 +2961,7 @@ tr3084:
                p--; {goto st307;}
        }
        goto st0;
-tr3098:
+tr3135:
        {
                WARN(ZS_BAD_GATEWAY);
                p--; {goto st307;}
@@ -2948,7 +2975,7 @@ tr3098:
                p--; {goto st307;}
        }
        goto st0;
-tr3121:
+tr3158:
        {
                WARN(ZS_BAD_GATEWAY_KEY);
                p--; {goto st307;}
@@ -2958,7 +2985,7 @@ tr3121:
                p--; {goto st307;}
        }
        goto st0;
-tr3145:
+tr3182:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {goto st307;}
@@ -2972,7 +2999,7 @@ tr3145:
                p--; {goto st307;}
        }
        goto st0;
-tr3152:
+tr3189:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {goto st307;}
@@ -2990,7 +3017,7 @@ tr3152:
                p--; {goto st307;}
        }
        goto st0;
-tr3271:
+tr3308:
        {
                WARN(ZS_UNSUPPORTED_TYPE);
                p--; {goto st307;}
@@ -3000,7 +3027,7 @@ tr3271:
                p--; {goto st307;}
        }
        goto st0;
-tr3327:
+tr3364:
        {
                WARN(ZS_BAD_TIMESTAMP_CHAR);
                p--; {goto st307;}
@@ -3010,7 +3037,7 @@ tr3327:
                p--; {goto st307;}
        }
        goto st0;
-tr3756:
+tr3793:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {goto st307;}
@@ -3024,7 +3051,7 @@ tr3756:
                p--; {goto st307;}
        }
        goto st0;
-tr3867:
+tr3904:
        {
                WARN(ZS_BAD_BASE32HEX_CHAR);
                p--; {goto st307;}
@@ -3034,7 +3061,7 @@ tr3867:
                p--; {goto st307;}
        }
        goto st0;
-tr4106:
+tr4143:
        {
                WARN(ZS_BAD_HEX_CHAR);
                p--; {goto st307;}
@@ -3048,7 +3075,7 @@ tr4106:
                p--; {goto st307;}
        }
        goto st0;
-tr4112:
+tr4149:
        {
                WARN(ZS_BAD_CHAR_COLON);
                p--; {goto st307;}
@@ -3062,7 +3089,7 @@ tr4112:
                p--; {goto st307;}
        }
        goto st0;
-tr4118:
+tr4155:
        {
                WARN(ZS_BAD_CHAR_DASH);
                p--; {goto st307;}
@@ -3076,7 +3103,7 @@ tr4118:
                p--; {goto st307;}
        }
        goto st0;
-tr4205:
+tr4242:
        {
                s->r_owner_length = 0;
                WARN(ZS_BAD_OWNER);
@@ -3087,7 +3114,7 @@ tr4205:
                p--; {goto st307;}
        }
        goto st0;
-tr4227:
+tr4264:
        {
                s->r_owner_length = 0;
                WARN(ZS_BAD_OWNER);
@@ -3102,7 +3129,7 @@ tr4227:
                p--; {goto st307;}
        }
        goto st0;
-tr4250:
+tr4287:
        {
                s->r_owner_length = 0;
                WARN(ZS_BAD_OWNER);
@@ -3121,7 +3148,7 @@ tr4250:
                p--; {goto st307;}
        }
        goto st0;
-tr4269:
+tr4306:
        {
                s->r_owner_length = 0;
                WARN(ZS_BAD_OWNER);
@@ -3136,7 +3163,7 @@ tr4269:
                p--; {goto st307;}
        }
        goto st0;
-tr4293:
+tr4330:
        {
                s->r_owner_length = 0;
                WARN(ZS_BAD_OWNER);
@@ -3180,7 +3207,7 @@ tr3:
                s->multiline = false;
        }
        goto st1;
-tr4206:
+tr4243:
        {
                if (s->r_owner_length == 0) {
                        WARN(ZS_BAD_PREVIOUS_OWNER);
@@ -3192,7 +3219,7 @@ tr4206:
                s->buffer_length = 0;
        }
        goto st1;
-tr4208:
+tr4245:
        {
                if (s->r_owner_length == 0) {
                        WARN(ZS_BAD_PREVIOUS_OWNER);
@@ -3211,7 +3238,7 @@ tr4208:
                s->buffer_length = 0;
        }
        goto st1;
-tr4209:
+tr4246:
        {
                if (s->r_owner_length == 0) {
                        WARN(ZS_BAD_PREVIOUS_OWNER);
@@ -3230,7 +3257,7 @@ tr4209:
                s->buffer_length = 0;
        }
        goto st1;
-tr4279:
+tr4316:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -3249,7 +3276,7 @@ tr4279:
                s->buffer_length = 0;
        }
        goto st1;
-tr4280:
+tr4317:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -3268,7 +3295,7 @@ tr4280:
                s->buffer_length = 0;
        }
        goto st1;
-tr4270:
+tr4307:
        {
                NOERR;
        }
@@ -3283,7 +3310,7 @@ tr4270:
                s->buffer_length = 0;
        }
        goto st1;
-tr4272:
+tr4309:
        {
                NOERR;
        }
@@ -3305,7 +3332,7 @@ tr4272:
                s->buffer_length = 0;
        }
        goto st1;
-tr4273:
+tr4310:
        {
                NOERR;
        }
@@ -5894,85 +5921,85 @@ tr70:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -5984,85 +6011,85 @@ tr73:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6079,85 +6106,85 @@ tr97:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6232,85 +6259,85 @@ tr168:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6326,85 +6353,85 @@ tr190:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6420,85 +6447,85 @@ tr198:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6514,85 +6541,85 @@ tr208:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6608,85 +6635,85 @@ tr219:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6702,85 +6729,85 @@ tr230:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6796,85 +6823,85 @@ tr244:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6890,85 +6917,85 @@ tr256:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -6984,85 +7011,85 @@ tr267:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7078,85 +7105,85 @@ tr275:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7172,85 +7199,85 @@ tr288:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7266,85 +7293,85 @@ tr297:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7360,85 +7387,85 @@ tr310:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7454,85 +7481,85 @@ tr321:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7548,85 +7575,85 @@ tr364:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7642,85 +7669,85 @@ tr375:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7736,85 +7763,85 @@ tr383:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7830,85 +7857,85 @@ tr396:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -7924,85 +7951,85 @@ tr405:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8018,85 +8045,85 @@ tr414:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8112,85 +8139,85 @@ tr422:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8206,85 +8233,85 @@ tr435:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8300,85 +8327,85 @@ tr443:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8394,85 +8421,85 @@ tr457:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8488,85 +8515,85 @@ tr466:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8582,85 +8609,85 @@ tr475:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8676,85 +8703,85 @@ tr485:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8770,85 +8797,85 @@ tr494:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8864,85 +8891,85 @@ tr506:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -8958,85 +8985,85 @@ tr523:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9052,85 +9079,85 @@ tr533:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9146,85 +9173,85 @@ tr544:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9240,85 +9267,85 @@ tr555:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9334,85 +9361,85 @@ tr563:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9428,85 +9455,85 @@ tr581:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9522,85 +9549,85 @@ tr590:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9616,85 +9643,85 @@ tr599:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9710,85 +9737,85 @@ tr608:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9804,85 +9831,85 @@ tr619:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9898,85 +9925,85 @@ tr629:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -9992,85 +10019,85 @@ tr642:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -10086,85 +10113,85 @@ tr651:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -10187,85 +10214,85 @@ tr665:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -10281,85 +10308,85 @@ tr675:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -10375,85 +10402,85 @@ tr688:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -10469,85 +10496,85 @@ tr938:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -10563,85 +10590,85 @@ tr949:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -10657,85 +10684,85 @@ tr958:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 6;goto st844;}
+                       {stack[top++] = 6;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 6;goto st846;}
+                       {stack[top++] = 6;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 6;goto st848;}
+                       {stack[top++] = 6;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 6;goto st880;}
+                       {stack[top++] = 6;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 6;goto st885;}
+                       {stack[top++] = 6;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 6;goto st890;}
+                       {stack[top++] = 6;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 6;goto st895;}
+                       {stack[top++] = 6;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 6;goto st899;}
+                       {stack[top++] = 6;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 6;goto st901;}
+                       {stack[top++] = 6;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 6;goto st956;}
+                       {stack[top++] = 6;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 6;goto st967;}
+                       {stack[top++] = 6;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 6;goto st984;}
+                       {stack[top++] = 6;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 6;goto st995;}
+                       {stack[top++] = 6;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 6;goto st1006;}
+                       {stack[top++] = 6;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 6;goto st1019;}
+                       {stack[top++] = 6;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 6;goto st1029;}
+                       {stack[top++] = 6;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 6;goto st1068;}
+                       {stack[top++] = 6;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 6;goto st1254;}
+                       {stack[top++] = 6;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 6;goto st1257;}
+                       {stack[top++] = 6;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 6;goto st1268;}
+                       {stack[top++] = 6;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 6;goto st1270;}
+                       {stack[top++] = 6;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 6;goto st1299;}
+                       {stack[top++] = 6;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 6;goto st1312;}
+                       {stack[top++] = 6;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 6;goto st1325;}
+                       {stack[top++] = 6;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 6;goto st1331;}
+                       {stack[top++] = 6;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 6;goto st1349;}
+                       {stack[top++] = 6;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 6;goto st1344;}
+                       {stack[top++] = 6;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 6;goto st1362;}
+                       {stack[top++] = 6;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 6;goto st1368;}
+                       {stack[top++] = 6;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 6;goto st1374;}
+                       {stack[top++] = 6;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 6;goto st1382;}
+                       {stack[top++] = 6;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 6;goto st1390;}
+                       {stack[top++] = 6;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -11411,85 +11438,85 @@ tr71:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -11504,85 +11531,85 @@ tr81:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -11601,85 +11628,85 @@ tr169:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -11698,85 +11725,85 @@ tr191:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -11795,85 +11822,85 @@ tr199:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -11892,85 +11919,85 @@ tr209:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -11989,85 +12016,85 @@ tr220:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12086,85 +12113,85 @@ tr231:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12183,85 +12210,85 @@ tr245:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12280,85 +12307,85 @@ tr257:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12377,85 +12404,85 @@ tr268:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12474,85 +12501,85 @@ tr276:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12571,85 +12598,85 @@ tr289:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12668,85 +12695,85 @@ tr298:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12765,85 +12792,85 @@ tr311:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12862,85 +12889,85 @@ tr322:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -12959,85 +12986,85 @@ tr365:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13056,85 +13083,85 @@ tr376:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13153,85 +13180,85 @@ tr384:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13250,85 +13277,85 @@ tr397:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13347,85 +13374,85 @@ tr406:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13444,85 +13471,85 @@ tr415:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13541,85 +13568,85 @@ tr423:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13638,85 +13665,85 @@ tr436:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13735,85 +13762,85 @@ tr444:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13832,85 +13859,85 @@ tr458:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -13929,85 +13956,85 @@ tr467:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14026,85 +14053,85 @@ tr476:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14123,85 +14150,85 @@ tr486:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14220,85 +14247,85 @@ tr495:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14317,85 +14344,85 @@ tr507:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14414,85 +14441,85 @@ tr524:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14511,85 +14538,85 @@ tr534:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14608,85 +14635,85 @@ tr545:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14705,85 +14732,85 @@ tr556:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14802,85 +14829,85 @@ tr564:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14899,85 +14926,85 @@ tr582:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -14996,85 +15023,85 @@ tr591:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15093,85 +15120,85 @@ tr600:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15190,85 +15217,85 @@ tr609:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15287,85 +15314,85 @@ tr620:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15384,85 +15411,85 @@ tr630:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15481,85 +15508,85 @@ tr643:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15578,85 +15605,85 @@ tr652:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15682,85 +15709,85 @@ tr666:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15779,85 +15806,85 @@ tr676:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15876,85 +15903,85 @@ tr689:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -15973,85 +16000,85 @@ tr939:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -16070,85 +16097,85 @@ tr950:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -16167,85 +16194,85 @@ tr959:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 11;goto st844;}
+                       {stack[top++] = 11;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 11;goto st846;}
+                       {stack[top++] = 11;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 11;goto st848;}
+                       {stack[top++] = 11;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 11;goto st880;}
+                       {stack[top++] = 11;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 11;goto st885;}
+                       {stack[top++] = 11;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 11;goto st890;}
+                       {stack[top++] = 11;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 11;goto st895;}
+                       {stack[top++] = 11;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 11;goto st899;}
+                       {stack[top++] = 11;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 11;goto st901;}
+                       {stack[top++] = 11;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 11;goto st956;}
+                       {stack[top++] = 11;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 11;goto st967;}
+                       {stack[top++] = 11;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 11;goto st984;}
+                       {stack[top++] = 11;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 11;goto st995;}
+                       {stack[top++] = 11;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 11;goto st1006;}
+                       {stack[top++] = 11;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 11;goto st1019;}
+                       {stack[top++] = 11;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 11;goto st1029;}
+                       {stack[top++] = 11;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 11;goto st1068;}
+                       {stack[top++] = 11;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 11;goto st1254;}
+                       {stack[top++] = 11;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 11;goto st1257;}
+                       {stack[top++] = 11;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 11;goto st1268;}
+                       {stack[top++] = 11;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 11;goto st1270;}
+                       {stack[top++] = 11;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 11;goto st1299;}
+                       {stack[top++] = 11;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 11;goto st1312;}
+                       {stack[top++] = 11;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 11;goto st1325;}
+                       {stack[top++] = 11;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 11;goto st1331;}
+                       {stack[top++] = 11;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 11;goto st1349;}
+                       {stack[top++] = 11;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 11;goto st1344;}
+                       {stack[top++] = 11;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 11;goto st1362;}
+                       {stack[top++] = 11;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 11;goto st1368;}
+                       {stack[top++] = 11;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 11;goto st1374;}
+                       {stack[top++] = 11;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 11;goto st1382;}
+                       {stack[top++] = 11;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 11;goto st1390;}
+                       {stack[top++] = 11;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -16490,7 +16517,7 @@ tr116:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1397; goto _out;}
+                               {p++; cs = 1424; goto _out;}
                        }
                }
        }
@@ -16513,15 +16540,15 @@ tr116:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1397; goto _out;}
+                                       {p++; cs = 1424; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1397; goto _out;}
+                       p--; {p++; cs = 1424; goto _out;}
                }
        }
-       goto st1397;
+       goto st1424;
 tr836:
        {
                s->line_counter++;
@@ -16542,15 +16569,15 @@ tr836:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1397; goto _out;}
+                                       {p++; cs = 1424; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1397; goto _out;}
+                       p--; {p++; cs = 1424; goto _out;}
                }
        }
-       goto st1397;
+       goto st1424;
 tr827:
        { s->r_type = KNOT_RRTYPE_A; }
        {
@@ -16579,19 +16606,19 @@ tr827:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1397; goto _out;}
+                                       {p++; cs = 1424; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1397; goto _out;}
+                       p--; {p++; cs = 1424; goto _out;}
                }
        }
-       goto st1397;
-st1397:
+       goto st1424;
+st1424:
        if ( ++p == pe )
-               goto _test_eof1397;
-case 1397:
+               goto _test_eof1424;
+case 1424:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -16609,23 +16636,23 @@ case 1397:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr4215;
-               case 32: goto tr4215;
-               case 36: goto tr4216;
-               case 40: goto tr4217;
-               case 41: goto tr4218;
-               case 42: goto tr4219;
+               case 9: goto tr4252;
+               case 32: goto tr4252;
+               case 36: goto tr4253;
+               case 40: goto tr4254;
+               case 41: goto tr4255;
+               case 42: goto tr4256;
                case 58: goto tr73;
-               case 92: goto tr4220;
-               case 95: goto tr4219;
-               case 2826: goto tr4211;
-               case 2875: goto tr4212;
-               case 3082: goto tr4221;
-               case 3131: goto tr4222;
-               case 3338: goto tr4223;
-               case 3387: goto tr4224;
-               case 3594: goto tr4225;
-               case 3643: goto tr4226;
+               case 92: goto tr4257;
+               case 95: goto tr4256;
+               case 2826: goto tr4248;
+               case 2875: goto tr4249;
+               case 3082: goto tr4258;
+               case 3131: goto tr4259;
+               case 3338: goto tr4260;
+               case 3387: goto tr4261;
+               case 3594: goto tr4262;
+               case 3643: goto tr4263;
        }
        if ( _widec < 60 ) {
                if ( _widec < 11 ) {
@@ -16633,19 +16660,19 @@ case 1397:
                                goto tr73;
                } else if ( _widec > 44 ) {
                        if ( 45 <= _widec && _widec <= 57 )
-                               goto tr4219;
+                               goto tr4256;
                } else
                        goto tr73;
        } else if ( _widec > 63 ) {
                if ( _widec < 91 ) {
                        if ( 64 <= _widec && _widec <= 90 )
-                               goto tr4219;
+                               goto tr4256;
                } else if ( _widec > 96 ) {
                        if ( _widec > 122 ) {
                                if ( 123 <= _widec )
                                        goto tr73;
                        } else if ( _widec >= 97 )
-                               goto tr4219;
+                               goto tr4256;
                } else
                        goto tr73;
        } else
@@ -16669,7 +16696,7 @@ tr120:
                s->multiline = false;
        }
        goto st14;
-tr4215:
+tr4252:
        {
                if (s->r_owner_length == 0) {
                        WARN(ZS_BAD_PREVIOUS_OWNER);
@@ -16681,7 +16708,7 @@ tr4215:
                s->buffer_length = 0;
        }
        goto st14;
-tr4217:
+tr4254:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -16700,7 +16727,7 @@ tr4217:
                s->buffer_length = 0;
        }
        goto st14;
-tr4218:
+tr4255:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -16823,85 +16850,85 @@ tr121:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 15;goto st844;}
+                       {stack[top++] = 15;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 15;goto st846;}
+                       {stack[top++] = 15;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 15;goto st848;}
+                       {stack[top++] = 15;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 15;goto st880;}
+                       {stack[top++] = 15;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 15;goto st885;}
+                       {stack[top++] = 15;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 15;goto st890;}
+                       {stack[top++] = 15;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 15;goto st895;}
+                       {stack[top++] = 15;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 15;goto st899;}
+                       {stack[top++] = 15;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 15;goto st901;}
+                       {stack[top++] = 15;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 15;goto st956;}
+                       {stack[top++] = 15;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 15;goto st967;}
+                       {stack[top++] = 15;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 15;goto st984;}
+                       {stack[top++] = 15;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 15;goto st995;}
+                       {stack[top++] = 15;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 15;goto st1006;}
+                       {stack[top++] = 15;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 15;goto st1019;}
+                       {stack[top++] = 15;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 15;goto st1029;}
+                       {stack[top++] = 15;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 15;goto st1068;}
+                       {stack[top++] = 15;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 15;goto st1254;}
+                       {stack[top++] = 15;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 15;goto st1257;}
+                       {stack[top++] = 15;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 15;goto st1268;}
+                       {stack[top++] = 15;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 15;goto st1270;}
+                       {stack[top++] = 15;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 15;goto st1299;}
+                       {stack[top++] = 15;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 15;goto st1312;}
+                       {stack[top++] = 15;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 15;goto st1325;}
+                       {stack[top++] = 15;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 15;goto st1331;}
+                       {stack[top++] = 15;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 15;goto st1349;}
+                       {stack[top++] = 15;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 15;goto st1344;}
+                       {stack[top++] = 15;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 15;goto st1362;}
+                       {stack[top++] = 15;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 15;goto st1368;}
+                       {stack[top++] = 15;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 15;goto st1374;}
+                       {stack[top++] = 15;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 15;goto st1382;}
+                       {stack[top++] = 15;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 15;goto st1390;}
+                       {stack[top++] = 15;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17171,85 +17198,85 @@ tr72:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17264,85 +17291,85 @@ tr82:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17361,85 +17388,85 @@ tr170:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17458,85 +17485,85 @@ tr192:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17555,85 +17582,85 @@ tr200:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17652,85 +17679,85 @@ tr210:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17749,85 +17776,85 @@ tr221:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17846,85 +17873,85 @@ tr232:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -17943,85 +17970,85 @@ tr246:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18040,85 +18067,85 @@ tr258:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18137,85 +18164,85 @@ tr269:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18234,85 +18261,85 @@ tr277:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18331,85 +18358,85 @@ tr290:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18428,85 +18455,85 @@ tr299:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18525,85 +18552,85 @@ tr312:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18622,85 +18649,85 @@ tr323:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18719,85 +18746,85 @@ tr366:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18816,85 +18843,85 @@ tr377:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -18913,85 +18940,85 @@ tr385:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19010,85 +19037,85 @@ tr398:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19107,85 +19134,85 @@ tr407:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19204,85 +19231,85 @@ tr416:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19301,85 +19328,85 @@ tr424:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19398,85 +19425,85 @@ tr437:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19495,85 +19522,85 @@ tr445:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19592,85 +19619,85 @@ tr459:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19689,85 +19716,85 @@ tr468:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19786,85 +19813,85 @@ tr477:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19883,85 +19910,85 @@ tr487:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -19980,85 +20007,85 @@ tr496:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20077,85 +20104,85 @@ tr508:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20174,85 +20201,85 @@ tr525:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20271,85 +20298,85 @@ tr535:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20368,85 +20395,85 @@ tr546:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20465,85 +20492,85 @@ tr557:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20562,85 +20589,85 @@ tr565:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20659,85 +20686,85 @@ tr583:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20756,85 +20783,85 @@ tr592:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20853,85 +20880,85 @@ tr601:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -20950,85 +20977,85 @@ tr610:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21047,85 +21074,85 @@ tr621:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21144,85 +21171,85 @@ tr631:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21241,85 +21268,85 @@ tr644:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21338,85 +21365,85 @@ tr653:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21442,85 +21469,85 @@ tr667:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21539,85 +21566,85 @@ tr677:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21636,85 +21663,85 @@ tr690:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21733,85 +21760,85 @@ tr940:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21830,85 +21857,85 @@ tr951:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -21927,85 +21954,85 @@ tr960:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 20;goto st844;}
+                       {stack[top++] = 20;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 20;goto st846;}
+                       {stack[top++] = 20;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 20;goto st848;}
+                       {stack[top++] = 20;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 20;goto st880;}
+                       {stack[top++] = 20;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 20;goto st885;}
+                       {stack[top++] = 20;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 20;goto st890;}
+                       {stack[top++] = 20;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 20;goto st895;}
+                       {stack[top++] = 20;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 20;goto st899;}
+                       {stack[top++] = 20;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 20;goto st901;}
+                       {stack[top++] = 20;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 20;goto st956;}
+                       {stack[top++] = 20;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 20;goto st967;}
+                       {stack[top++] = 20;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 20;goto st984;}
+                       {stack[top++] = 20;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 20;goto st995;}
+                       {stack[top++] = 20;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 20;goto st1006;}
+                       {stack[top++] = 20;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 20;goto st1019;}
+                       {stack[top++] = 20;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 20;goto st1029;}
+                       {stack[top++] = 20;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 20;goto st1068;}
+                       {stack[top++] = 20;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 20;goto st1254;}
+                       {stack[top++] = 20;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 20;goto st1257;}
+                       {stack[top++] = 20;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 20;goto st1268;}
+                       {stack[top++] = 20;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 20;goto st1270;}
+                       {stack[top++] = 20;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 20;goto st1299;}
+                       {stack[top++] = 20;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 20;goto st1312;}
+                       {stack[top++] = 20;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 20;goto st1325;}
+                       {stack[top++] = 20;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 20;goto st1331;}
+                       {stack[top++] = 20;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 20;goto st1349;}
+                       {stack[top++] = 20;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 20;goto st1344;}
+                       {stack[top++] = 20;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 20;goto st1362;}
+                       {stack[top++] = 20;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 20;goto st1368;}
+                       {stack[top++] = 20;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 20;goto st1374;}
+                       {stack[top++] = 20;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 20;goto st1382;}
+                       {stack[top++] = 20;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 20;goto st1390;}
+                       {stack[top++] = 20;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -25328,7 +25355,7 @@ tr1002:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1398; goto _out;}
+                               {p++; cs = 1425; goto _out;}
                        }
                }
        }
@@ -25351,15 +25378,15 @@ tr1002:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1398; goto _out;}
+                                       {p++; cs = 1425; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1398; goto _out;}
+                       p--; {p++; cs = 1425; goto _out;}
                }
        }
-       goto st1398;
+       goto st1425;
 tr149:
        {
                if (s->number64 <= UINT32_MAX) {
@@ -25392,15 +25419,15 @@ tr149:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1398; goto _out;}
+                                       {p++; cs = 1425; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1398; goto _out;}
+                       p--; {p++; cs = 1425; goto _out;}
                }
        }
-       goto st1398;
+       goto st1425;
 tr155:
        {
                s->line_counter++;
@@ -25421,19 +25448,19 @@ tr155:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1398; goto _out;}
+                                       {p++; cs = 1425; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1398; goto _out;}
+                       p--; {p++; cs = 1425; goto _out;}
                }
        }
-       goto st1398;
-st1398:
+       goto st1425;
+st1425:
        if ( ++p == pe )
-               goto _test_eof1398;
-case 1398:
+               goto _test_eof1425;
+case 1425:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -25447,62 +25474,62 @@ case 1398:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4228;
-               case 32: goto tr4228;
+               case 9: goto tr4265;
+               case 32: goto tr4265;
                case 36: goto st184;
-               case 40: goto tr4229;
-               case 41: goto tr4230;
-               case 42: goto tr4210;
-               case 65: goto tr4231;
-               case 67: goto tr4232;
-               case 68: goto tr4233;
-               case 69: goto tr4234;
-               case 72: goto tr4235;
-               case 73: goto tr4236;
-               case 75: goto tr4237;
-               case 76: goto tr4238;
-               case 77: goto tr4239;
-               case 78: goto tr4240;
-               case 79: goto tr4241;
-               case 80: goto tr4242;
-               case 82: goto tr4243;
-               case 83: goto tr4244;
-               case 84: goto tr4245;
-               case 85: goto tr4246;
-               case 90: goto tr4247;
-               case 92: goto tr4210;
-               case 95: goto tr4210;
-               case 97: goto tr4231;
-               case 99: goto tr4232;
-               case 100: goto tr4233;
-               case 101: goto tr4234;
-               case 104: goto tr4235;
-               case 105: goto tr4236;
-               case 107: goto tr4237;
-               case 108: goto tr4238;
-               case 109: goto tr4239;
-               case 110: goto tr4240;
-               case 111: goto tr4241;
-               case 112: goto tr4242;
-               case 114: goto tr4243;
-               case 115: goto tr4244;
-               case 116: goto tr4245;
-               case 117: goto tr4246;
-               case 122: goto tr4247;
-               case 1802: goto tr4211;
-               case 1851: goto tr4212;
-               case 2058: goto tr4248;
-               case 2107: goto tr4249;
+               case 40: goto tr4266;
+               case 41: goto tr4267;
+               case 42: goto tr4247;
+               case 65: goto tr4268;
+               case 67: goto tr4269;
+               case 68: goto tr4270;
+               case 69: goto tr4271;
+               case 72: goto tr4272;
+               case 73: goto tr4273;
+               case 75: goto tr4274;
+               case 76: goto tr4275;
+               case 77: goto tr4276;
+               case 78: goto tr4277;
+               case 79: goto tr4278;
+               case 80: goto tr4279;
+               case 82: goto tr4280;
+               case 83: goto tr4281;
+               case 84: goto tr4282;
+               case 85: goto tr4283;
+               case 90: goto tr4284;
+               case 92: goto tr4247;
+               case 95: goto tr4247;
+               case 97: goto tr4268;
+               case 99: goto tr4269;
+               case 100: goto tr4270;
+               case 101: goto tr4271;
+               case 104: goto tr4272;
+               case 105: goto tr4273;
+               case 107: goto tr4274;
+               case 108: goto tr4275;
+               case 109: goto tr4276;
+               case 110: goto tr4277;
+               case 111: goto tr4278;
+               case 112: goto tr4279;
+               case 114: goto tr4280;
+               case 115: goto tr4281;
+               case 116: goto tr4282;
+               case 117: goto tr4283;
+               case 122: goto tr4284;
+               case 1802: goto tr4248;
+               case 1851: goto tr4249;
+               case 2058: goto tr4285;
+               case 2107: goto tr4286;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr4210;
+                       goto tr4247;
        } else if ( _widec > 89 ) {
                if ( 98 <= _widec && _widec <= 121 )
-                       goto tr4210;
+                       goto tr4247;
        } else
-               goto tr4210;
-       goto tr4227;
+               goto tr4247;
+       goto tr4264;
 tr694:
        {
                if (s->multiline == true) {
@@ -25521,7 +25548,7 @@ tr695:
                s->multiline = false;
        }
        goto st174;
-tr4228:
+tr4265:
        {
                if (s->r_owner_length == 0) {
                        WARN(ZS_BAD_PREVIOUS_OWNER);
@@ -25533,7 +25560,7 @@ tr4228:
                s->buffer_length = 0;
        }
        goto st174;
-tr4229:
+tr4266:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -25552,7 +25579,7 @@ tr4229:
                s->buffer_length = 0;
        }
        goto st174;
-tr4230:
+tr4267:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -26154,7 +26181,7 @@ tr23:
                s->buffer_length = 0;
        }
        goto st183;
-tr4212:
+tr4249:
        {
                s->buffer[0] = 0;
                s->buffer_length = 0;
@@ -26170,7 +26197,7 @@ tr753:
                }
        }
        goto st183;
-tr4276:
+tr4313:
        {
                NOERR;
        }
@@ -26193,7 +26220,7 @@ tr696:
        {
                s->line_counter++;
        }
-       goto st1399;
+       goto st1426;
 tr1000:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -26204,14 +26231,14 @@ tr1000:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1399; goto _out;}
+                               {p++; cs = 1426; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1399;
+       goto st1426;
 tr889:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -26222,7 +26249,7 @@ tr889:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1399; goto _out;}
+                               {p++; cs = 1426; goto _out;}
                        }
                }
        }
@@ -26245,15 +26272,15 @@ tr889:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1399; goto _out;}
+                                       {p++; cs = 1426; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1399; goto _out;}
+                       p--; {p++; cs = 1426; goto _out;}
                }
        }
-       goto st1399;
+       goto st1426;
 tr886:
        {
                s->line_counter++;
@@ -26274,15 +26301,15 @@ tr886:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1399; goto _out;}
+                                       {p++; cs = 1426; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1399; goto _out;}
+                       p--; {p++; cs = 1426; goto _out;}
                }
        }
-       goto st1399;
+       goto st1426;
 tr881:
        {
                s->r_owner_length = s->dname_tmp_length;
@@ -26318,16 +26345,16 @@ tr881:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1399; goto _out;}
+                                       {p++; cs = 1426; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1399; goto _out;}
+                       p--; {p++; cs = 1426; goto _out;}
                }
        }
-       goto st1399;
-tr4248:
+       goto st1426;
+tr4285:
        {
                s->line_counter++;
        }
@@ -26341,11 +26368,11 @@ tr4248:
                s->buffer[0] = 0;
                s->buffer_length = 0;
        }
-       goto st1399;
-st1399:
+       goto st1426;
+st1426:
        if ( ++p == pe )
-               goto _test_eof1399;
-case 1399:
+               goto _test_eof1426;
+case 1426:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -26359,66 +26386,66 @@ case 1399:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4228;
-               case 32: goto tr4228;
+               case 9: goto tr4265;
+               case 32: goto tr4265;
                case 36: goto st184;
-               case 40: goto tr4229;
-               case 41: goto tr4230;
-               case 42: goto tr4210;
-               case 65: goto tr4252;
-               case 67: goto tr4253;
-               case 68: goto tr4254;
-               case 69: goto tr4255;
-               case 72: goto tr4256;
-               case 73: goto tr4257;
-               case 75: goto tr4258;
-               case 76: goto tr4259;
-               case 77: goto tr4260;
-               case 78: goto tr4261;
-               case 79: goto tr4262;
-               case 80: goto tr4263;
-               case 82: goto tr4264;
-               case 83: goto tr4265;
-               case 84: goto tr4266;
-               case 85: goto tr4267;
-               case 90: goto tr4268;
-               case 92: goto tr4210;
-               case 95: goto tr4210;
-               case 97: goto tr4252;
-               case 99: goto tr4253;
-               case 100: goto tr4254;
-               case 101: goto tr4255;
-               case 104: goto tr4256;
-               case 105: goto tr4257;
-               case 107: goto tr4258;
-               case 108: goto tr4259;
-               case 109: goto tr4260;
-               case 110: goto tr4261;
-               case 111: goto tr4262;
-               case 112: goto tr4263;
-               case 114: goto tr4264;
-               case 115: goto tr4265;
-               case 116: goto tr4266;
-               case 117: goto tr4267;
-               case 122: goto tr4268;
-               case 1802: goto tr4211;
-               case 1851: goto tr4212;
-               case 2058: goto tr4248;
-               case 2107: goto tr4249;
+               case 40: goto tr4266;
+               case 41: goto tr4267;
+               case 42: goto tr4247;
+               case 65: goto tr4289;
+               case 67: goto tr4290;
+               case 68: goto tr4291;
+               case 69: goto tr4292;
+               case 72: goto tr4293;
+               case 73: goto tr4294;
+               case 75: goto tr4295;
+               case 76: goto tr4296;
+               case 77: goto tr4297;
+               case 78: goto tr4298;
+               case 79: goto tr4299;
+               case 80: goto tr4300;
+               case 82: goto tr4301;
+               case 83: goto tr4302;
+               case 84: goto tr4303;
+               case 85: goto tr4304;
+               case 90: goto tr4305;
+               case 92: goto tr4247;
+               case 95: goto tr4247;
+               case 97: goto tr4289;
+               case 99: goto tr4290;
+               case 100: goto tr4291;
+               case 101: goto tr4292;
+               case 104: goto tr4293;
+               case 105: goto tr4294;
+               case 107: goto tr4295;
+               case 108: goto tr4296;
+               case 109: goto tr4297;
+               case 110: goto tr4298;
+               case 111: goto tr4299;
+               case 112: goto tr4300;
+               case 114: goto tr4301;
+               case 115: goto tr4302;
+               case 116: goto tr4303;
+               case 117: goto tr4304;
+               case 122: goto tr4305;
+               case 1802: goto tr4248;
+               case 1851: goto tr4249;
+               case 2058: goto tr4285;
+               case 2107: goto tr4286;
        }
        if ( _widec < 48 ) {
                if ( 45 <= _widec && _widec <= 47 )
-                       goto tr4210;
+                       goto tr4247;
        } else if ( _widec > 57 ) {
                if ( _widec > 89 ) {
                        if ( 98 <= _widec && _widec <= 121 )
-                               goto tr4210;
+                               goto tr4247;
                } else if ( _widec >= 64 )
-                       goto tr4210;
+                       goto tr4247;
        } else
-               goto tr4251;
-       goto tr4250;
-tr4271:
+               goto tr4288;
+       goto tr4287;
+tr4308:
        {
                NOERR;
        }
@@ -26510,18 +26537,18 @@ case 191:
                goto tr765;
        goto tr755;
 tr765:
-       { p--; {stack[top++] = 1400;goto st352;} }
-       goto st1400;
+       { p--; {stack[top++] = 1427;goto st352;} }
+       goto st1427;
 tr867:
-       { p--; {stack[top++] = 1400;goto st340;} }
-       goto st1400;
+       { p--; {stack[top++] = 1427;goto st340;} }
+       goto st1427;
 tr870:
-       { p--; {stack[top++] = 1400;goto st331;} }
-       goto st1400;
-st1400:
+       { p--; {stack[top++] = 1427;goto st331;} }
+       goto st1427;
+st1427:
        if ( ++p == pe )
-               goto _test_eof1400;
-case 1400:
+               goto _test_eof1427;
+case 1427:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -26535,36 +26562,36 @@ case 1400:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4270;
-               case 32: goto tr4270;
-               case 36: goto tr4271;
-               case 40: goto tr4272;
-               case 41: goto tr4273;
-               case 42: goto tr4274;
-               case 92: goto tr4274;
-               case 95: goto tr4274;
-               case 1802: goto tr4275;
-               case 1851: goto tr4276;
-               case 2058: goto tr4277;
-               case 2107: goto tr4278;
+               case 9: goto tr4307;
+               case 32: goto tr4307;
+               case 36: goto tr4308;
+               case 40: goto tr4309;
+               case 41: goto tr4310;
+               case 42: goto tr4311;
+               case 92: goto tr4311;
+               case 95: goto tr4311;
+               case 1802: goto tr4312;
+               case 1851: goto tr4313;
+               case 2058: goto tr4314;
+               case 2107: goto tr4315;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr4274;
+                       goto tr4311;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr4274;
+                       goto tr4311;
        } else
-               goto tr4274;
-       goto tr4269;
-tr4210:
+               goto tr4311;
+       goto tr4306;
+tr4247:
        {
                s->dname = s->r_owner;
                s->r_owner_length = 0;
        }
        { p--; {stack[top++] = 192;goto st309;} }
        goto st192;
-tr4274:
+tr4311:
        {
                NOERR;
        }
@@ -26789,7 +26816,7 @@ tr24:
        {
                s->line_counter++;
        }
-       goto st1401;
+       goto st1428;
 tr998:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -26800,14 +26827,14 @@ tr998:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1401; goto _out;}
+                               {p++; cs = 1428; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1401;
+       goto st1428;
 tr844:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -26818,7 +26845,7 @@ tr844:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1401; goto _out;}
+                               {p++; cs = 1428; goto _out;}
                        }
                }
        }
@@ -26841,15 +26868,15 @@ tr844:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1401; goto _out;}
+                                       {p++; cs = 1428; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1401; goto _out;}
+                       p--; {p++; cs = 1428; goto _out;}
                }
        }
-       goto st1401;
+       goto st1428;
 tr841:
        {
                s->line_counter++;
@@ -26870,15 +26897,15 @@ tr841:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1401; goto _out;}
+                                       {p++; cs = 1428; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1401; goto _out;}
+                       p--; {p++; cs = 1428; goto _out;}
                }
        }
-       goto st1401;
+       goto st1428;
 tr875:
        {
                s->r_owner_length = s->dname_tmp_length;
@@ -26906,15 +26933,15 @@ tr875:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1401; goto _out;}
+                                       {p++; cs = 1428; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1401; goto _out;}
+                       p--; {p++; cs = 1428; goto _out;}
                }
        }
-       goto st1401;
+       goto st1428;
 tr912:
        {
                s->line_counter++;
@@ -26939,15 +26966,15 @@ tr912:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1401; goto _out;}
+                                       {p++; cs = 1428; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1401; goto _out;}
+                       p--; {p++; cs = 1428; goto _out;}
                }
        }
-       goto st1401;
+       goto st1428;
 tr915:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -26958,7 +26985,7 @@ tr915:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1401; goto _out;}
+                               {p++; cs = 1428; goto _out;}
                        }
                }
        }
@@ -26985,16 +27012,16 @@ tr915:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1401; goto _out;}
+                                       {p++; cs = 1428; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1401; goto _out;}
+                       p--; {p++; cs = 1428; goto _out;}
                }
        }
-       goto st1401;
-tr4213:
+       goto st1428;
+tr4250:
        {
                if (s->r_owner_length == 0) {
                        WARN(ZS_BAD_PREVIOUS_OWNER);
@@ -27008,8 +27035,8 @@ tr4213:
                s->buffer[0] = 0;
                s->buffer_length = 0;
        }
-       goto st1401;
-tr4281:
+       goto st1428;
+tr4318:
        {
                s->line_counter++;
        }
@@ -27023,8 +27050,8 @@ tr4281:
                s->buffer[0] = 0;
                s->buffer_length = 0;
        }
-       goto st1401;
-tr4277:
+       goto st1428;
+tr4314:
        {
                NOERR;
        }
@@ -27041,8 +27068,8 @@ tr4277:
                s->buffer[0] = 0;
                s->buffer_length = 0;
        }
-       goto st1401;
-tr4286:
+       goto st1428;
+tr4323:
        {
                s->buffer[0] = 0;
                s->buffer_length = 0;
@@ -27063,12 +27090,12 @@ tr4286:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1401; goto _out;}
+                                       {p++; cs = 1428; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1401; goto _out;}
+                       p--; {p++; cs = 1428; goto _out;}
                }
        }
        {
@@ -27080,8 +27107,8 @@ tr4286:
                        p--; {goto st307;}
                }
        }
-       goto st1401;
-tr4312:
+       goto st1428;
+tr4349:
        {
                s->line_counter++;
        }
@@ -27105,12 +27132,12 @@ tr4312:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1401; goto _out;}
+                                       {p++; cs = 1428; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1401; goto _out;}
+                       p--; {p++; cs = 1428; goto _out;}
                }
        }
        {
@@ -27119,11 +27146,11 @@ tr4312:
                        p--; {goto st307;}
                }
        }
-       goto st1401;
-st1401:
+       goto st1428;
+st1428:
        if ( ++p == pe )
-               goto _test_eof1401;
-case 1401:
+               goto _test_eof1428;
+case 1428:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -27137,66 +27164,66 @@ case 1401:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4206;
-               case 32: goto tr4206;
+               case 9: goto tr4243;
+               case 32: goto tr4243;
                case 36: goto st184;
-               case 40: goto tr4279;
-               case 41: goto tr4280;
-               case 42: goto tr4210;
-               case 65: goto tr4252;
-               case 67: goto tr4253;
-               case 68: goto tr4254;
-               case 69: goto tr4255;
-               case 72: goto tr4256;
-               case 73: goto tr4257;
-               case 75: goto tr4258;
-               case 76: goto tr4259;
-               case 77: goto tr4260;
-               case 78: goto tr4261;
-               case 79: goto tr4262;
-               case 80: goto tr4263;
-               case 82: goto tr4264;
-               case 83: goto tr4265;
-               case 84: goto tr4266;
-               case 85: goto tr4267;
-               case 90: goto tr4268;
-               case 92: goto tr4210;
-               case 95: goto tr4210;
-               case 97: goto tr4252;
-               case 99: goto tr4253;
-               case 100: goto tr4254;
-               case 101: goto tr4255;
-               case 104: goto tr4256;
-               case 105: goto tr4257;
-               case 107: goto tr4258;
-               case 108: goto tr4259;
-               case 109: goto tr4260;
-               case 110: goto tr4261;
-               case 111: goto tr4262;
-               case 112: goto tr4263;
-               case 114: goto tr4264;
-               case 115: goto tr4265;
-               case 116: goto tr4266;
-               case 117: goto tr4267;
-               case 122: goto tr4268;
-               case 1802: goto tr4211;
-               case 1851: goto tr4212;
-               case 2058: goto tr4281;
-               case 2107: goto tr4282;
+               case 40: goto tr4316;
+               case 41: goto tr4317;
+               case 42: goto tr4247;
+               case 65: goto tr4289;
+               case 67: goto tr4290;
+               case 68: goto tr4291;
+               case 69: goto tr4292;
+               case 72: goto tr4293;
+               case 73: goto tr4294;
+               case 75: goto tr4295;
+               case 76: goto tr4296;
+               case 77: goto tr4297;
+               case 78: goto tr4298;
+               case 79: goto tr4299;
+               case 80: goto tr4300;
+               case 82: goto tr4301;
+               case 83: goto tr4302;
+               case 84: goto tr4303;
+               case 85: goto tr4304;
+               case 90: goto tr4305;
+               case 92: goto tr4247;
+               case 95: goto tr4247;
+               case 97: goto tr4289;
+               case 99: goto tr4290;
+               case 100: goto tr4291;
+               case 101: goto tr4292;
+               case 104: goto tr4293;
+               case 105: goto tr4294;
+               case 107: goto tr4295;
+               case 108: goto tr4296;
+               case 109: goto tr4297;
+               case 110: goto tr4298;
+               case 111: goto tr4299;
+               case 112: goto tr4300;
+               case 114: goto tr4301;
+               case 115: goto tr4302;
+               case 116: goto tr4303;
+               case 117: goto tr4304;
+               case 122: goto tr4305;
+               case 1802: goto tr4248;
+               case 1851: goto tr4249;
+               case 2058: goto tr4318;
+               case 2107: goto tr4319;
        }
        if ( _widec < 48 ) {
                if ( 45 <= _widec && _widec <= 47 )
-                       goto tr4210;
+                       goto tr4247;
        } else if ( _widec > 57 ) {
                if ( _widec > 89 ) {
                        if ( 98 <= _widec && _widec <= 121 )
-                               goto tr4210;
+                               goto tr4247;
                } else if ( _widec >= 64 )
-                       goto tr4210;
+                       goto tr4247;
        } else
-               goto tr4251;
-       goto tr4250;
-tr4251:
+               goto tr4288;
+       goto tr4287;
+tr4288:
        {
                s->number64 = 0;
        }
@@ -27769,7 +27796,7 @@ case 201:
        if ( 1920 <= _widec && _widec <= 2175 )
                goto tr806;
        goto tr38;
-tr4231:
+tr4268:
        {
                s->r_class = s->default_class;
        }
@@ -27779,7 +27806,7 @@ tr4231:
        }
        { p--; {stack[top++] = 202;goto st309;} }
        goto st202;
-tr4252:
+tr4289:
        {
                s->r_class = s->default_class;
        }
@@ -28016,85 +28043,85 @@ tr122:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 204;goto st844;}
+                       {stack[top++] = 204;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 204;goto st846;}
+                       {stack[top++] = 204;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 204;goto st848;}
+                       {stack[top++] = 204;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 204;goto st880;}
+                       {stack[top++] = 204;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 204;goto st885;}
+                       {stack[top++] = 204;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 204;goto st890;}
+                       {stack[top++] = 204;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 204;goto st895;}
+                       {stack[top++] = 204;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 204;goto st899;}
+                       {stack[top++] = 204;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 204;goto st901;}
+                       {stack[top++] = 204;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 204;goto st956;}
+                       {stack[top++] = 204;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 204;goto st967;}
+                       {stack[top++] = 204;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 204;goto st984;}
+                       {stack[top++] = 204;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 204;goto st995;}
+                       {stack[top++] = 204;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 204;goto st1006;}
+                       {stack[top++] = 204;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 204;goto st1019;}
+                       {stack[top++] = 204;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 204;goto st1029;}
+                       {stack[top++] = 204;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 204;goto st1068;}
+                       {stack[top++] = 204;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 204;goto st1254;}
+                       {stack[top++] = 204;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 204;goto st1257;}
+                       {stack[top++] = 204;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 204;goto st1268;}
+                       {stack[top++] = 204;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 204;goto st1270;}
+                       {stack[top++] = 204;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 204;goto st1299;}
+                       {stack[top++] = 204;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 204;goto st1312;}
+                       {stack[top++] = 204;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 204;goto st1325;}
+                       {stack[top++] = 204;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 204;goto st1331;}
+                       {stack[top++] = 204;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 204;goto st1349;}
+                       {stack[top++] = 204;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 204;goto st1344;}
+                       {stack[top++] = 204;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 204;goto st1362;}
+                       {stack[top++] = 204;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 204;goto st1368;}
+                       {stack[top++] = 204;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 204;goto st1374;}
+                       {stack[top++] = 204;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 204;goto st1382;}
+                       {stack[top++] = 204;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 204;goto st1390;}
+                       {stack[top++] = 204;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -28253,85 +28280,85 @@ tr105:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1402;goto st844;}
+                       {stack[top++] = 1429;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1402;goto st846;}
+                       {stack[top++] = 1429;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1402;goto st848;}
+                       {stack[top++] = 1429;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1402;goto st880;}
+                       {stack[top++] = 1429;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1402;goto st885;}
+                       {stack[top++] = 1429;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1402;goto st890;}
+                       {stack[top++] = 1429;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1402;goto st895;}
+                       {stack[top++] = 1429;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1402;goto st899;}
+                       {stack[top++] = 1429;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1402;goto st901;}
+                       {stack[top++] = 1429;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1402;goto st956;}
+                       {stack[top++] = 1429;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1402;goto st967;}
+                       {stack[top++] = 1429;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1402;goto st984;}
+                       {stack[top++] = 1429;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1402;goto st995;}
+                       {stack[top++] = 1429;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1402;goto st1006;}
+                       {stack[top++] = 1429;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1402;goto st1019;}
+                       {stack[top++] = 1429;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1402;goto st1029;}
+                       {stack[top++] = 1429;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1402;goto st1068;}
+                       {stack[top++] = 1429;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1402;goto st1254;}
+                       {stack[top++] = 1429;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1402;goto st1257;}
+                       {stack[top++] = 1429;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1402;goto st1268;}
+                       {stack[top++] = 1429;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1402;goto st1270;}
+                       {stack[top++] = 1429;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1402;goto st1299;}
+                       {stack[top++] = 1429;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1402;goto st1312;}
+                       {stack[top++] = 1429;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1402;goto st1325;}
+                       {stack[top++] = 1429;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1402;goto st1331;}
+                       {stack[top++] = 1429;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1402;goto st1349;}
+                       {stack[top++] = 1429;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1402;goto st1344;}
+                       {stack[top++] = 1429;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1402;goto st1362;}
+                       {stack[top++] = 1429;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1402;goto st1368;}
+                       {stack[top++] = 1429;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1402;goto st1374;}
+                       {stack[top++] = 1429;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1402;goto st1382;}
+                       {stack[top++] = 1429;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1402;goto st1390;}
+                       {stack[top++] = 1429;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -28357,102 +28384,102 @@ tr105:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1402; goto _out;}
+                                       {p++; cs = 1429; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1402; goto _out;}
+                       p--; {p++; cs = 1429; goto _out;}
                }
        }
        {
                s->line_counter++;
        }
-       goto st1402;
+       goto st1429;
 tr112:
        {
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1402;goto st844;}
+                       {stack[top++] = 1429;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1402;goto st846;}
+                       {stack[top++] = 1429;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1402;goto st848;}
+                       {stack[top++] = 1429;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1402;goto st880;}
+                       {stack[top++] = 1429;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1402;goto st885;}
+                       {stack[top++] = 1429;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1402;goto st890;}
+                       {stack[top++] = 1429;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1402;goto st895;}
+                       {stack[top++] = 1429;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1402;goto st899;}
+                       {stack[top++] = 1429;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1402;goto st901;}
+                       {stack[top++] = 1429;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1402;goto st956;}
+                       {stack[top++] = 1429;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1402;goto st967;}
+                       {stack[top++] = 1429;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1402;goto st984;}
+                       {stack[top++] = 1429;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1402;goto st995;}
+                       {stack[top++] = 1429;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1402;goto st1006;}
+                       {stack[top++] = 1429;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1402;goto st1019;}
+                       {stack[top++] = 1429;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1402;goto st1029;}
+                       {stack[top++] = 1429;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1402;goto st1068;}
+                       {stack[top++] = 1429;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1402;goto st1254;}
+                       {stack[top++] = 1429;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1402;goto st1257;}
+                       {stack[top++] = 1429;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1402;goto st1268;}
+                       {stack[top++] = 1429;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1402;goto st1270;}
+                       {stack[top++] = 1429;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1402;goto st1299;}
+                       {stack[top++] = 1429;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1402;goto st1312;}
+                       {stack[top++] = 1429;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1402;goto st1325;}
+                       {stack[top++] = 1429;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1402;goto st1331;}
+                       {stack[top++] = 1429;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1402;goto st1349;}
+                       {stack[top++] = 1429;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1402;goto st1344;}
+                       {stack[top++] = 1429;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1402;goto st1362;}
+                       {stack[top++] = 1429;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1402;goto st1368;}
+                       {stack[top++] = 1429;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1402;goto st1374;}
+                       {stack[top++] = 1429;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1402;goto st1382;}
+                       {stack[top++] = 1429;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1402;goto st1390;}
+                       {stack[top++] = 1429;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -28474,102 +28501,102 @@ tr112:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1402; goto _out;}
+                                       {p++; cs = 1429; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1402; goto _out;}
+                       p--; {p++; cs = 1429; goto _out;}
                }
        }
        {
                s->line_counter++;
        }
-       goto st1402;
+       goto st1429;
 tr141:
        {
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1402;goto st844;}
+                       {stack[top++] = 1429;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1402;goto st846;}
+                       {stack[top++] = 1429;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1402;goto st848;}
+                       {stack[top++] = 1429;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1402;goto st880;}
+                       {stack[top++] = 1429;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1402;goto st885;}
+                       {stack[top++] = 1429;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1402;goto st890;}
+                       {stack[top++] = 1429;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1402;goto st895;}
+                       {stack[top++] = 1429;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1402;goto st899;}
+                       {stack[top++] = 1429;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1402;goto st901;}
+                       {stack[top++] = 1429;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1402;goto st956;}
+                       {stack[top++] = 1429;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1402;goto st967;}
+                       {stack[top++] = 1429;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1402;goto st984;}
+                       {stack[top++] = 1429;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1402;goto st995;}
+                       {stack[top++] = 1429;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1402;goto st1006;}
+                       {stack[top++] = 1429;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1402;goto st1019;}
+                       {stack[top++] = 1429;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1402;goto st1029;}
+                       {stack[top++] = 1429;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1402;goto st1068;}
+                       {stack[top++] = 1429;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1402;goto st1254;}
+                       {stack[top++] = 1429;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1402;goto st1257;}
+                       {stack[top++] = 1429;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1402;goto st1268;}
+                       {stack[top++] = 1429;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1402;goto st1270;}
+                       {stack[top++] = 1429;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1402;goto st1299;}
+                       {stack[top++] = 1429;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1402;goto st1312;}
+                       {stack[top++] = 1429;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1402;goto st1325;}
+                       {stack[top++] = 1429;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1402;goto st1331;}
+                       {stack[top++] = 1429;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1402;goto st1349;}
+                       {stack[top++] = 1429;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1402;goto st1344;}
+                       {stack[top++] = 1429;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1402;goto st1362;}
+                       {stack[top++] = 1429;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1402;goto st1368;}
+                       {stack[top++] = 1429;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1402;goto st1374;}
+                       {stack[top++] = 1429;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1402;goto st1382;}
+                       {stack[top++] = 1429;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1402;goto st1390;}
+                       {stack[top++] = 1429;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -28578,7 +28605,7 @@ tr141:
        {
                s->line_counter++;
        }
-       goto st1402;
+       goto st1429;
 tr829:
        { s->r_type = KNOT_RRTYPE_A; }
        {
@@ -28588,85 +28615,85 @@ tr829:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1402;goto st844;}
+                       {stack[top++] = 1429;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1402;goto st846;}
+                       {stack[top++] = 1429;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1402;goto st848;}
+                       {stack[top++] = 1429;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1402;goto st880;}
+                       {stack[top++] = 1429;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1402;goto st885;}
+                       {stack[top++] = 1429;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1402;goto st890;}
+                       {stack[top++] = 1429;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1402;goto st895;}
+                       {stack[top++] = 1429;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1402;goto st899;}
+                       {stack[top++] = 1429;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1402;goto st901;}
+                       {stack[top++] = 1429;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1402;goto st956;}
+                       {stack[top++] = 1429;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1402;goto st967;}
+                       {stack[top++] = 1429;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1402;goto st984;}
+                       {stack[top++] = 1429;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1402;goto st995;}
+                       {stack[top++] = 1429;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1402;goto st1006;}
+                       {stack[top++] = 1429;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1402;goto st1019;}
+                       {stack[top++] = 1429;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1402;goto st1029;}
+                       {stack[top++] = 1429;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1402;goto st1068;}
+                       {stack[top++] = 1429;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1402;goto st1254;}
+                       {stack[top++] = 1429;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1402;goto st1257;}
+                       {stack[top++] = 1429;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1402;goto st1268;}
+                       {stack[top++] = 1429;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1402;goto st1270;}
+                       {stack[top++] = 1429;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1402;goto st1299;}
+                       {stack[top++] = 1429;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1402;goto st1312;}
+                       {stack[top++] = 1429;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1402;goto st1325;}
+                       {stack[top++] = 1429;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1402;goto st1331;}
+                       {stack[top++] = 1429;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1402;goto st1349;}
+                       {stack[top++] = 1429;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1402;goto st1344;}
+                       {stack[top++] = 1429;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1402;goto st1362;}
+                       {stack[top++] = 1429;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1402;goto st1368;}
+                       {stack[top++] = 1429;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1402;goto st1374;}
+                       {stack[top++] = 1429;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1402;goto st1382;}
+                       {stack[top++] = 1429;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1402;goto st1390;}
+                       {stack[top++] = 1429;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -28692,102 +28719,102 @@ tr829:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1402; goto _out;}
+                                       {p++; cs = 1429; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1402; goto _out;}
+                       p--; {p++; cs = 1429; goto _out;}
                }
        }
        {
                s->line_counter++;
        }
-       goto st1402;
-tr4223:
+       goto st1429;
+tr4260:
        {
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1402;goto st844;}
+                       {stack[top++] = 1429;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1402;goto st846;}
+                       {stack[top++] = 1429;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1402;goto st848;}
+                       {stack[top++] = 1429;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1402;goto st880;}
+                       {stack[top++] = 1429;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1402;goto st885;}
+                       {stack[top++] = 1429;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1402;goto st890;}
+                       {stack[top++] = 1429;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1402;goto st895;}
+                       {stack[top++] = 1429;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1402;goto st899;}
+                       {stack[top++] = 1429;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1402;goto st901;}
+                       {stack[top++] = 1429;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1402;goto st956;}
+                       {stack[top++] = 1429;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1402;goto st967;}
+                       {stack[top++] = 1429;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1402;goto st984;}
+                       {stack[top++] = 1429;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1402;goto st995;}
+                       {stack[top++] = 1429;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1402;goto st1006;}
+                       {stack[top++] = 1429;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1402;goto st1019;}
+                       {stack[top++] = 1429;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1402;goto st1029;}
+                       {stack[top++] = 1429;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1402;goto st1068;}
+                       {stack[top++] = 1429;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1402;goto st1254;}
+                       {stack[top++] = 1429;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1402;goto st1257;}
+                       {stack[top++] = 1429;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1402;goto st1268;}
+                       {stack[top++] = 1429;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1402;goto st1270;}
+                       {stack[top++] = 1429;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1402;goto st1299;}
+                       {stack[top++] = 1429;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1402;goto st1312;}
+                       {stack[top++] = 1429;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1402;goto st1325;}
+                       {stack[top++] = 1429;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1402;goto st1331;}
+                       {stack[top++] = 1429;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1402;goto st1349;}
+                       {stack[top++] = 1429;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1402;goto st1344;}
+                       {stack[top++] = 1429;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1402;goto st1362;}
+                       {stack[top++] = 1429;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1402;goto st1368;}
+                       {stack[top++] = 1429;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1402;goto st1374;}
+                       {stack[top++] = 1429;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1402;goto st1382;}
+                       {stack[top++] = 1429;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1402;goto st1390;}
+                       {stack[top++] = 1429;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -28800,11 +28827,11 @@ tr4223:
        {
                s->line_counter++;
        }
-       goto st1402;
-st1402:
+       goto st1429;
+st1429:
        if ( ++p == pe )
-               goto _test_eof1402;
-case 1402:
+               goto _test_eof1429;
+case 1429:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -28818,27 +28845,27 @@ case 1402:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4283;
-               case 32: goto tr4283;
+               case 9: goto tr4320;
+               case 32: goto tr4320;
                case 36: goto st184;
-               case 40: goto tr4284;
-               case 41: goto tr4285;
-               case 42: goto tr4210;
-               case 92: goto tr4210;
-               case 95: goto tr4210;
+               case 40: goto tr4321;
+               case 41: goto tr4322;
+               case 42: goto tr4247;
+               case 92: goto tr4247;
+               case 95: goto tr4247;
                case 1802: goto tr87;
                case 1851: goto tr88;
-               case 2058: goto tr4286;
-               case 2107: goto tr4287;
+               case 2058: goto tr4323;
+               case 2107: goto tr4324;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr4210;
+                       goto tr4247;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr4210;
+                       goto tr4247;
        } else
-               goto tr4210;
+               goto tr4247;
        goto tr871;
 tr839:
        {
@@ -28931,7 +28958,7 @@ tr874:
                s->buffer_length = 0;
        }
        goto st206;
-tr4283:
+tr4320:
        {
                s->buffer[0] = 0;
                s->buffer_length = 0;
@@ -28943,7 +28970,7 @@ tr4283:
                }
        }
        goto st206;
-tr4284:
+tr4321:
        {
                s->buffer[0] = 0;
                s->buffer_length = 0;
@@ -28962,7 +28989,7 @@ tr4284:
                }
        }
        goto st206;
-tr4285:
+tr4322:
        {
                s->buffer[0] = 0;
                s->buffer_length = 0;
@@ -29101,7 +29128,7 @@ tr876:
                s->buffer_length = 0;
        }
        goto st207;
-tr4287:
+tr4324:
        {
                s->buffer[0] = 0;
                s->buffer_length = 0;
@@ -29153,85 +29180,85 @@ tr106:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 208;goto st844;}
+                       {stack[top++] = 208;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 208;goto st846;}
+                       {stack[top++] = 208;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 208;goto st848;}
+                       {stack[top++] = 208;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 208;goto st880;}
+                       {stack[top++] = 208;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 208;goto st885;}
+                       {stack[top++] = 208;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 208;goto st890;}
+                       {stack[top++] = 208;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 208;goto st895;}
+                       {stack[top++] = 208;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 208;goto st899;}
+                       {stack[top++] = 208;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 208;goto st901;}
+                       {stack[top++] = 208;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 208;goto st956;}
+                       {stack[top++] = 208;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 208;goto st967;}
+                       {stack[top++] = 208;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 208;goto st984;}
+                       {stack[top++] = 208;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 208;goto st995;}
+                       {stack[top++] = 208;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 208;goto st1006;}
+                       {stack[top++] = 208;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 208;goto st1019;}
+                       {stack[top++] = 208;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 208;goto st1029;}
+                       {stack[top++] = 208;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 208;goto st1068;}
+                       {stack[top++] = 208;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 208;goto st1254;}
+                       {stack[top++] = 208;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 208;goto st1257;}
+                       {stack[top++] = 208;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 208;goto st1268;}
+                       {stack[top++] = 208;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 208;goto st1270;}
+                       {stack[top++] = 208;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 208;goto st1299;}
+                       {stack[top++] = 208;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 208;goto st1312;}
+                       {stack[top++] = 208;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 208;goto st1325;}
+                       {stack[top++] = 208;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 208;goto st1331;}
+                       {stack[top++] = 208;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 208;goto st1349;}
+                       {stack[top++] = 208;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 208;goto st1344;}
+                       {stack[top++] = 208;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 208;goto st1362;}
+                       {stack[top++] = 208;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 208;goto st1368;}
+                       {stack[top++] = 208;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 208;goto st1374;}
+                       {stack[top++] = 208;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 208;goto st1382;}
+                       {stack[top++] = 208;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 208;goto st1390;}
+                       {stack[top++] = 208;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -29250,85 +29277,85 @@ tr113:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 208;goto st844;}
+                       {stack[top++] = 208;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 208;goto st846;}
+                       {stack[top++] = 208;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 208;goto st848;}
+                       {stack[top++] = 208;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 208;goto st880;}
+                       {stack[top++] = 208;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 208;goto st885;}
+                       {stack[top++] = 208;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 208;goto st890;}
+                       {stack[top++] = 208;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 208;goto st895;}
+                       {stack[top++] = 208;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 208;goto st899;}
+                       {stack[top++] = 208;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 208;goto st901;}
+                       {stack[top++] = 208;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 208;goto st956;}
+                       {stack[top++] = 208;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 208;goto st967;}
+                       {stack[top++] = 208;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 208;goto st984;}
+                       {stack[top++] = 208;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 208;goto st995;}
+                       {stack[top++] = 208;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 208;goto st1006;}
+                       {stack[top++] = 208;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 208;goto st1019;}
+                       {stack[top++] = 208;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 208;goto st1029;}
+                       {stack[top++] = 208;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 208;goto st1068;}
+                       {stack[top++] = 208;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 208;goto st1254;}
+                       {stack[top++] = 208;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 208;goto st1257;}
+                       {stack[top++] = 208;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 208;goto st1268;}
+                       {stack[top++] = 208;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 208;goto st1270;}
+                       {stack[top++] = 208;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 208;goto st1299;}
+                       {stack[top++] = 208;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 208;goto st1312;}
+                       {stack[top++] = 208;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 208;goto st1325;}
+                       {stack[top++] = 208;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 208;goto st1331;}
+                       {stack[top++] = 208;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 208;goto st1349;}
+                       {stack[top++] = 208;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 208;goto st1344;}
+                       {stack[top++] = 208;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 208;goto st1362;}
+                       {stack[top++] = 208;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 208;goto st1368;}
+                       {stack[top++] = 208;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 208;goto st1374;}
+                       {stack[top++] = 208;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 208;goto st1382;}
+                       {stack[top++] = 208;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 208;goto st1390;}
+                       {stack[top++] = 208;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -29347,85 +29374,85 @@ tr830:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 208;goto st844;}
+                       {stack[top++] = 208;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 208;goto st846;}
+                       {stack[top++] = 208;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 208;goto st848;}
+                       {stack[top++] = 208;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 208;goto st880;}
+                       {stack[top++] = 208;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 208;goto st885;}
+                       {stack[top++] = 208;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 208;goto st890;}
+                       {stack[top++] = 208;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 208;goto st895;}
+                       {stack[top++] = 208;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 208;goto st899;}
+                       {stack[top++] = 208;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 208;goto st901;}
+                       {stack[top++] = 208;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 208;goto st956;}
+                       {stack[top++] = 208;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 208;goto st967;}
+                       {stack[top++] = 208;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 208;goto st984;}
+                       {stack[top++] = 208;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 208;goto st995;}
+                       {stack[top++] = 208;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 208;goto st1006;}
+                       {stack[top++] = 208;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 208;goto st1019;}
+                       {stack[top++] = 208;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 208;goto st1029;}
+                       {stack[top++] = 208;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 208;goto st1068;}
+                       {stack[top++] = 208;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 208;goto st1254;}
+                       {stack[top++] = 208;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 208;goto st1257;}
+                       {stack[top++] = 208;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 208;goto st1268;}
+                       {stack[top++] = 208;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 208;goto st1270;}
+                       {stack[top++] = 208;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 208;goto st1299;}
+                       {stack[top++] = 208;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 208;goto st1312;}
+                       {stack[top++] = 208;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 208;goto st1325;}
+                       {stack[top++] = 208;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 208;goto st1331;}
+                       {stack[top++] = 208;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 208;goto st1349;}
+                       {stack[top++] = 208;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 208;goto st1344;}
+                       {stack[top++] = 208;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 208;goto st1362;}
+                       {stack[top++] = 208;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 208;goto st1368;}
+                       {stack[top++] = 208;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 208;goto st1374;}
+                       {stack[top++] = 208;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 208;goto st1382;}
+                       {stack[top++] = 208;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 208;goto st1390;}
+                       {stack[top++] = 208;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -29603,85 +29630,85 @@ tr831:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1403;goto st844;}
+                       {stack[top++] = 1430;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1403;goto st846;}
+                       {stack[top++] = 1430;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1403;goto st848;}
+                       {stack[top++] = 1430;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1403;goto st880;}
+                       {stack[top++] = 1430;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1403;goto st885;}
+                       {stack[top++] = 1430;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1403;goto st890;}
+                       {stack[top++] = 1430;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1403;goto st895;}
+                       {stack[top++] = 1430;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1403;goto st899;}
+                       {stack[top++] = 1430;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1403;goto st901;}
+                       {stack[top++] = 1430;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1403;goto st956;}
+                       {stack[top++] = 1430;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1403;goto st967;}
+                       {stack[top++] = 1430;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1403;goto st984;}
+                       {stack[top++] = 1430;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1403;goto st995;}
+                       {stack[top++] = 1430;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1403;goto st1006;}
+                       {stack[top++] = 1430;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1403;goto st1019;}
+                       {stack[top++] = 1430;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1403;goto st1029;}
+                       {stack[top++] = 1430;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1403;goto st1068;}
+                       {stack[top++] = 1430;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1403;goto st1254;}
+                       {stack[top++] = 1430;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1403;goto st1257;}
+                       {stack[top++] = 1430;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1403;goto st1268;}
+                       {stack[top++] = 1430;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1403;goto st1270;}
+                       {stack[top++] = 1430;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1403;goto st1299;}
+                       {stack[top++] = 1430;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1403;goto st1312;}
+                       {stack[top++] = 1430;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1403;goto st1325;}
+                       {stack[top++] = 1430;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1403;goto st1331;}
+                       {stack[top++] = 1430;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1403;goto st1349;}
+                       {stack[top++] = 1430;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1403;goto st1344;}
+                       {stack[top++] = 1430;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1403;goto st1362;}
+                       {stack[top++] = 1430;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1403;goto st1368;}
+                       {stack[top++] = 1430;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1403;goto st1374;}
+                       {stack[top++] = 1430;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1403;goto st1382;}
+                       {stack[top++] = 1430;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1403;goto st1390;}
+                       {stack[top++] = 1430;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -29707,15 +29734,15 @@ tr831:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1403; goto _out;}
+                                       {p++; cs = 1430; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1403; goto _out;}
+                       p--; {p++; cs = 1430; goto _out;}
                }
        }
-       goto st1403;
+       goto st1430;
 tr837:
        {
                s->line_counter++;
@@ -29724,85 +29751,85 @@ tr837:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1403;goto st844;}
+                       {stack[top++] = 1430;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1403;goto st846;}
+                       {stack[top++] = 1430;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1403;goto st848;}
+                       {stack[top++] = 1430;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1403;goto st880;}
+                       {stack[top++] = 1430;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1403;goto st885;}
+                       {stack[top++] = 1430;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1403;goto st890;}
+                       {stack[top++] = 1430;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1403;goto st895;}
+                       {stack[top++] = 1430;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1403;goto st899;}
+                       {stack[top++] = 1430;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1403;goto st901;}
+                       {stack[top++] = 1430;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1403;goto st956;}
+                       {stack[top++] = 1430;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1403;goto st967;}
+                       {stack[top++] = 1430;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1403;goto st984;}
+                       {stack[top++] = 1430;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1403;goto st995;}
+                       {stack[top++] = 1430;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1403;goto st1006;}
+                       {stack[top++] = 1430;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1403;goto st1019;}
+                       {stack[top++] = 1430;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1403;goto st1029;}
+                       {stack[top++] = 1430;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1403;goto st1068;}
+                       {stack[top++] = 1430;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1403;goto st1254;}
+                       {stack[top++] = 1430;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1403;goto st1257;}
+                       {stack[top++] = 1430;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1403;goto st1268;}
+                       {stack[top++] = 1430;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1403;goto st1270;}
+                       {stack[top++] = 1430;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1403;goto st1299;}
+                       {stack[top++] = 1430;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1403;goto st1312;}
+                       {stack[top++] = 1430;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1403;goto st1325;}
+                       {stack[top++] = 1430;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1403;goto st1331;}
+                       {stack[top++] = 1430;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1403;goto st1349;}
+                       {stack[top++] = 1430;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1403;goto st1344;}
+                       {stack[top++] = 1430;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1403;goto st1362;}
+                       {stack[top++] = 1430;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1403;goto st1368;}
+                       {stack[top++] = 1430;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1403;goto st1374;}
+                       {stack[top++] = 1430;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1403;goto st1382;}
+                       {stack[top++] = 1430;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1403;goto st1390;}
+                       {stack[top++] = 1430;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -29824,19 +29851,19 @@ tr837:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1403; goto _out;}
+                                       {p++; cs = 1430; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1403; goto _out;}
+                       p--; {p++; cs = 1430; goto _out;}
                }
        }
-       goto st1403;
-st1403:
+       goto st1430;
+st1430:
        if ( ++p == pe )
-               goto _test_eof1403;
-case 1403:
+               goto _test_eof1430;
+case 1430:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -29854,23 +29881,23 @@ case 1403:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr4288;
-               case 32: goto tr4288;
-               case 36: goto tr4216;
-               case 40: goto tr4289;
-               case 41: goto tr4290;
-               case 42: goto tr4219;
+               case 9: goto tr4325;
+               case 32: goto tr4325;
+               case 36: goto tr4253;
+               case 40: goto tr4326;
+               case 41: goto tr4327;
+               case 42: goto tr4256;
                case 58: goto tr73;
-               case 92: goto tr4220;
-               case 95: goto tr4219;
+               case 92: goto tr4257;
+               case 95: goto tr4256;
                case 2826: goto tr87;
                case 2875: goto tr88;
-               case 3082: goto tr4286;
-               case 3131: goto tr4291;
+               case 3082: goto tr4323;
+               case 3131: goto tr4328;
                case 3338: goto tr105;
                case 3387: goto tr106;
-               case 3594: goto tr4286;
-               case 3643: goto tr4292;
+               case 3594: goto tr4323;
+               case 3643: goto tr4329;
        }
        if ( _widec < 60 ) {
                if ( _widec < 11 ) {
@@ -29878,19 +29905,19 @@ case 1403:
                                goto tr73;
                } else if ( _widec > 44 ) {
                        if ( 45 <= _widec && _widec <= 57 )
-                               goto tr4219;
+                               goto tr4256;
                } else
                        goto tr73;
        } else if ( _widec > 63 ) {
                if ( _widec < 91 ) {
                        if ( 64 <= _widec && _widec <= 90 )
-                               goto tr4219;
+                               goto tr4256;
                } else if ( _widec > 96 ) {
                        if ( _widec > 122 ) {
                                if ( 123 <= _widec )
                                        goto tr73;
                        } else if ( _widec >= 97 )
-                               goto tr4219;
+                               goto tr4256;
                } else
                        goto tr73;
        } else
@@ -29946,7 +29973,7 @@ tr987:
                s->buffer_length = 0;
        }
        goto st210;
-tr4288:
+tr4325:
        {
                s->buffer[0] = 0;
                s->buffer_length = 0;
@@ -29958,7 +29985,7 @@ tr4288:
                }
        }
        goto st210;
-tr4289:
+tr4326:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -29977,7 +30004,7 @@ tr4289:
                }
        }
        goto st210;
-tr4290:
+tr4327:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -30089,85 +30116,85 @@ tr123:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 211;goto st844;}
+                       {stack[top++] = 211;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 211;goto st846;}
+                       {stack[top++] = 211;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 211;goto st848;}
+                       {stack[top++] = 211;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 211;goto st880;}
+                       {stack[top++] = 211;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 211;goto st885;}
+                       {stack[top++] = 211;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 211;goto st890;}
+                       {stack[top++] = 211;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 211;goto st895;}
+                       {stack[top++] = 211;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 211;goto st899;}
+                       {stack[top++] = 211;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 211;goto st901;}
+                       {stack[top++] = 211;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 211;goto st956;}
+                       {stack[top++] = 211;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 211;goto st967;}
+                       {stack[top++] = 211;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 211;goto st984;}
+                       {stack[top++] = 211;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 211;goto st995;}
+                       {stack[top++] = 211;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 211;goto st1006;}
+                       {stack[top++] = 211;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 211;goto st1019;}
+                       {stack[top++] = 211;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 211;goto st1029;}
+                       {stack[top++] = 211;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 211;goto st1068;}
+                       {stack[top++] = 211;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 211;goto st1254;}
+                       {stack[top++] = 211;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 211;goto st1257;}
+                       {stack[top++] = 211;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 211;goto st1268;}
+                       {stack[top++] = 211;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 211;goto st1270;}
+                       {stack[top++] = 211;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 211;goto st1299;}
+                       {stack[top++] = 211;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 211;goto st1312;}
+                       {stack[top++] = 211;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 211;goto st1325;}
+                       {stack[top++] = 211;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 211;goto st1331;}
+                       {stack[top++] = 211;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 211;goto st1349;}
+                       {stack[top++] = 211;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 211;goto st1344;}
+                       {stack[top++] = 211;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 211;goto st1362;}
+                       {stack[top++] = 211;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 211;goto st1368;}
+                       {stack[top++] = 211;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 211;goto st1374;}
+                       {stack[top++] = 211;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 211;goto st1382;}
+                       {stack[top++] = 211;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 211;goto st1390;}
+                       {stack[top++] = 211;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -30222,85 +30249,85 @@ tr124:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 212;goto st844;}
+                       {stack[top++] = 212;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 212;goto st846;}
+                       {stack[top++] = 212;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 212;goto st848;}
+                       {stack[top++] = 212;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 212;goto st880;}
+                       {stack[top++] = 212;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 212;goto st885;}
+                       {stack[top++] = 212;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 212;goto st890;}
+                       {stack[top++] = 212;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 212;goto st895;}
+                       {stack[top++] = 212;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 212;goto st899;}
+                       {stack[top++] = 212;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 212;goto st901;}
+                       {stack[top++] = 212;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 212;goto st956;}
+                       {stack[top++] = 212;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 212;goto st967;}
+                       {stack[top++] = 212;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 212;goto st984;}
+                       {stack[top++] = 212;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 212;goto st995;}
+                       {stack[top++] = 212;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 212;goto st1006;}
+                       {stack[top++] = 212;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 212;goto st1019;}
+                       {stack[top++] = 212;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 212;goto st1029;}
+                       {stack[top++] = 212;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 212;goto st1068;}
+                       {stack[top++] = 212;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 212;goto st1254;}
+                       {stack[top++] = 212;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 212;goto st1257;}
+                       {stack[top++] = 212;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 212;goto st1268;}
+                       {stack[top++] = 212;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 212;goto st1270;}
+                       {stack[top++] = 212;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 212;goto st1299;}
+                       {stack[top++] = 212;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 212;goto st1312;}
+                       {stack[top++] = 212;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 212;goto st1325;}
+                       {stack[top++] = 212;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 212;goto st1331;}
+                       {stack[top++] = 212;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 212;goto st1349;}
+                       {stack[top++] = 212;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 212;goto st1344;}
+                       {stack[top++] = 212;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 212;goto st1362;}
+                       {stack[top++] = 212;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 212;goto st1368;}
+                       {stack[top++] = 212;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 212;goto st1374;}
+                       {stack[top++] = 212;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 212;goto st1382;}
+                       {stack[top++] = 212;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 212;goto st1390;}
+                       {stack[top++] = 212;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -30351,85 +30378,85 @@ tr125:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 213;goto st844;}
+                       {stack[top++] = 213;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 213;goto st846;}
+                       {stack[top++] = 213;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 213;goto st848;}
+                       {stack[top++] = 213;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 213;goto st880;}
+                       {stack[top++] = 213;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 213;goto st885;}
+                       {stack[top++] = 213;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 213;goto st890;}
+                       {stack[top++] = 213;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 213;goto st895;}
+                       {stack[top++] = 213;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 213;goto st899;}
+                       {stack[top++] = 213;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 213;goto st901;}
+                       {stack[top++] = 213;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 213;goto st956;}
+                       {stack[top++] = 213;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 213;goto st967;}
+                       {stack[top++] = 213;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 213;goto st984;}
+                       {stack[top++] = 213;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 213;goto st995;}
+                       {stack[top++] = 213;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 213;goto st1006;}
+                       {stack[top++] = 213;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 213;goto st1019;}
+                       {stack[top++] = 213;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 213;goto st1029;}
+                       {stack[top++] = 213;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 213;goto st1068;}
+                       {stack[top++] = 213;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 213;goto st1254;}
+                       {stack[top++] = 213;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 213;goto st1257;}
+                       {stack[top++] = 213;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 213;goto st1268;}
+                       {stack[top++] = 213;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 213;goto st1270;}
+                       {stack[top++] = 213;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 213;goto st1299;}
+                       {stack[top++] = 213;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 213;goto st1312;}
+                       {stack[top++] = 213;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 213;goto st1325;}
+                       {stack[top++] = 213;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 213;goto st1331;}
+                       {stack[top++] = 213;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 213;goto st1349;}
+                       {stack[top++] = 213;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 213;goto st1344;}
+                       {stack[top++] = 213;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 213;goto st1362;}
+                       {stack[top++] = 213;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 213;goto st1368;}
+                       {stack[top++] = 213;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 213;goto st1374;}
+                       {stack[top++] = 213;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 213;goto st1382;}
+                       {stack[top++] = 213;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 213;goto st1390;}
+                       {stack[top++] = 213;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -30476,85 +30503,85 @@ tr126:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 214;goto st844;}
+                       {stack[top++] = 214;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 214;goto st846;}
+                       {stack[top++] = 214;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 214;goto st848;}
+                       {stack[top++] = 214;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 214;goto st880;}
+                       {stack[top++] = 214;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 214;goto st885;}
+                       {stack[top++] = 214;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 214;goto st890;}
+                       {stack[top++] = 214;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 214;goto st895;}
+                       {stack[top++] = 214;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 214;goto st899;}
+                       {stack[top++] = 214;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 214;goto st901;}
+                       {stack[top++] = 214;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 214;goto st956;}
+                       {stack[top++] = 214;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 214;goto st967;}
+                       {stack[top++] = 214;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 214;goto st984;}
+                       {stack[top++] = 214;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 214;goto st995;}
+                       {stack[top++] = 214;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 214;goto st1006;}
+                       {stack[top++] = 214;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 214;goto st1019;}
+                       {stack[top++] = 214;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 214;goto st1029;}
+                       {stack[top++] = 214;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 214;goto st1068;}
+                       {stack[top++] = 214;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 214;goto st1254;}
+                       {stack[top++] = 214;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 214;goto st1257;}
+                       {stack[top++] = 214;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 214;goto st1268;}
+                       {stack[top++] = 214;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 214;goto st1270;}
+                       {stack[top++] = 214;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 214;goto st1299;}
+                       {stack[top++] = 214;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 214;goto st1312;}
+                       {stack[top++] = 214;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 214;goto st1325;}
+                       {stack[top++] = 214;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 214;goto st1331;}
+                       {stack[top++] = 214;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 214;goto st1349;}
+                       {stack[top++] = 214;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 214;goto st1344;}
+                       {stack[top++] = 214;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 214;goto st1362;}
+                       {stack[top++] = 214;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 214;goto st1368;}
+                       {stack[top++] = 214;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 214;goto st1374;}
+                       {stack[top++] = 214;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 214;goto st1382;}
+                       {stack[top++] = 214;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 214;goto st1390;}
+                       {stack[top++] = 214;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -30603,85 +30630,85 @@ tr127:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 215;goto st844;}
+                       {stack[top++] = 215;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 215;goto st846;}
+                       {stack[top++] = 215;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 215;goto st848;}
+                       {stack[top++] = 215;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 215;goto st880;}
+                       {stack[top++] = 215;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 215;goto st885;}
+                       {stack[top++] = 215;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 215;goto st890;}
+                       {stack[top++] = 215;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 215;goto st895;}
+                       {stack[top++] = 215;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 215;goto st899;}
+                       {stack[top++] = 215;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 215;goto st901;}
+                       {stack[top++] = 215;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 215;goto st956;}
+                       {stack[top++] = 215;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 215;goto st967;}
+                       {stack[top++] = 215;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 215;goto st984;}
+                       {stack[top++] = 215;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 215;goto st995;}
+                       {stack[top++] = 215;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 215;goto st1006;}
+                       {stack[top++] = 215;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 215;goto st1019;}
+                       {stack[top++] = 215;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 215;goto st1029;}
+                       {stack[top++] = 215;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 215;goto st1068;}
+                       {stack[top++] = 215;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 215;goto st1254;}
+                       {stack[top++] = 215;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 215;goto st1257;}
+                       {stack[top++] = 215;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 215;goto st1268;}
+                       {stack[top++] = 215;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 215;goto st1270;}
+                       {stack[top++] = 215;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 215;goto st1299;}
+                       {stack[top++] = 215;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 215;goto st1312;}
+                       {stack[top++] = 215;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 215;goto st1325;}
+                       {stack[top++] = 215;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 215;goto st1331;}
+                       {stack[top++] = 215;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 215;goto st1349;}
+                       {stack[top++] = 215;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 215;goto st1344;}
+                       {stack[top++] = 215;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 215;goto st1362;}
+                       {stack[top++] = 215;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 215;goto st1368;}
+                       {stack[top++] = 215;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 215;goto st1374;}
+                       {stack[top++] = 215;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 215;goto st1382;}
+                       {stack[top++] = 215;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 215;goto st1390;}
+                       {stack[top++] = 215;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -30730,85 +30757,85 @@ tr128:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 216;goto st844;}
+                       {stack[top++] = 216;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 216;goto st846;}
+                       {stack[top++] = 216;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 216;goto st848;}
+                       {stack[top++] = 216;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 216;goto st880;}
+                       {stack[top++] = 216;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 216;goto st885;}
+                       {stack[top++] = 216;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 216;goto st890;}
+                       {stack[top++] = 216;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 216;goto st895;}
+                       {stack[top++] = 216;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 216;goto st899;}
+                       {stack[top++] = 216;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 216;goto st901;}
+                       {stack[top++] = 216;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 216;goto st956;}
+                       {stack[top++] = 216;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 216;goto st967;}
+                       {stack[top++] = 216;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 216;goto st984;}
+                       {stack[top++] = 216;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 216;goto st995;}
+                       {stack[top++] = 216;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 216;goto st1006;}
+                       {stack[top++] = 216;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 216;goto st1019;}
+                       {stack[top++] = 216;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 216;goto st1029;}
+                       {stack[top++] = 216;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 216;goto st1068;}
+                       {stack[top++] = 216;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 216;goto st1254;}
+                       {stack[top++] = 216;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 216;goto st1257;}
+                       {stack[top++] = 216;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 216;goto st1268;}
+                       {stack[top++] = 216;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 216;goto st1270;}
+                       {stack[top++] = 216;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 216;goto st1299;}
+                       {stack[top++] = 216;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 216;goto st1312;}
+                       {stack[top++] = 216;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 216;goto st1325;}
+                       {stack[top++] = 216;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 216;goto st1331;}
+                       {stack[top++] = 216;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 216;goto st1349;}
+                       {stack[top++] = 216;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 216;goto st1344;}
+                       {stack[top++] = 216;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 216;goto st1362;}
+                       {stack[top++] = 216;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 216;goto st1368;}
+                       {stack[top++] = 216;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 216;goto st1374;}
+                       {stack[top++] = 216;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 216;goto st1382;}
+                       {stack[top++] = 216;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 216;goto st1390;}
+                       {stack[top++] = 216;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -30857,85 +30884,85 @@ tr129:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 217;goto st844;}
+                       {stack[top++] = 217;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 217;goto st846;}
+                       {stack[top++] = 217;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 217;goto st848;}
+                       {stack[top++] = 217;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 217;goto st880;}
+                       {stack[top++] = 217;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 217;goto st885;}
+                       {stack[top++] = 217;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 217;goto st890;}
+                       {stack[top++] = 217;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 217;goto st895;}
+                       {stack[top++] = 217;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 217;goto st899;}
+                       {stack[top++] = 217;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 217;goto st901;}
+                       {stack[top++] = 217;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 217;goto st956;}
+                       {stack[top++] = 217;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 217;goto st967;}
+                       {stack[top++] = 217;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 217;goto st984;}
+                       {stack[top++] = 217;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 217;goto st995;}
+                       {stack[top++] = 217;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 217;goto st1006;}
+                       {stack[top++] = 217;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 217;goto st1019;}
+                       {stack[top++] = 217;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 217;goto st1029;}
+                       {stack[top++] = 217;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 217;goto st1068;}
+                       {stack[top++] = 217;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 217;goto st1254;}
+                       {stack[top++] = 217;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 217;goto st1257;}
+                       {stack[top++] = 217;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 217;goto st1268;}
+                       {stack[top++] = 217;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 217;goto st1270;}
+                       {stack[top++] = 217;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 217;goto st1299;}
+                       {stack[top++] = 217;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 217;goto st1312;}
+                       {stack[top++] = 217;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 217;goto st1325;}
+                       {stack[top++] = 217;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 217;goto st1331;}
+                       {stack[top++] = 217;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 217;goto st1349;}
+                       {stack[top++] = 217;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 217;goto st1344;}
+                       {stack[top++] = 217;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 217;goto st1362;}
+                       {stack[top++] = 217;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 217;goto st1368;}
+                       {stack[top++] = 217;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 217;goto st1374;}
+                       {stack[top++] = 217;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 217;goto st1382;}
+                       {stack[top++] = 217;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 217;goto st1390;}
+                       {stack[top++] = 217;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -30986,85 +31013,85 @@ tr130:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 218;goto st844;}
+                       {stack[top++] = 218;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 218;goto st846;}
+                       {stack[top++] = 218;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 218;goto st848;}
+                       {stack[top++] = 218;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 218;goto st880;}
+                       {stack[top++] = 218;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 218;goto st885;}
+                       {stack[top++] = 218;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 218;goto st890;}
+                       {stack[top++] = 218;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 218;goto st895;}
+                       {stack[top++] = 218;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 218;goto st899;}
+                       {stack[top++] = 218;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 218;goto st901;}
+                       {stack[top++] = 218;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 218;goto st956;}
+                       {stack[top++] = 218;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 218;goto st967;}
+                       {stack[top++] = 218;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 218;goto st984;}
+                       {stack[top++] = 218;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 218;goto st995;}
+                       {stack[top++] = 218;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 218;goto st1006;}
+                       {stack[top++] = 218;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 218;goto st1019;}
+                       {stack[top++] = 218;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 218;goto st1029;}
+                       {stack[top++] = 218;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 218;goto st1068;}
+                       {stack[top++] = 218;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 218;goto st1254;}
+                       {stack[top++] = 218;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 218;goto st1257;}
+                       {stack[top++] = 218;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 218;goto st1268;}
+                       {stack[top++] = 218;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 218;goto st1270;}
+                       {stack[top++] = 218;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 218;goto st1299;}
+                       {stack[top++] = 218;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 218;goto st1312;}
+                       {stack[top++] = 218;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 218;goto st1325;}
+                       {stack[top++] = 218;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 218;goto st1331;}
+                       {stack[top++] = 218;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 218;goto st1349;}
+                       {stack[top++] = 218;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 218;goto st1344;}
+                       {stack[top++] = 218;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 218;goto st1362;}
+                       {stack[top++] = 218;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 218;goto st1368;}
+                       {stack[top++] = 218;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 218;goto st1374;}
+                       {stack[top++] = 218;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 218;goto st1382;}
+                       {stack[top++] = 218;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 218;goto st1390;}
+                       {stack[top++] = 218;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -31113,85 +31140,85 @@ tr131:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 219;goto st844;}
+                       {stack[top++] = 219;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 219;goto st846;}
+                       {stack[top++] = 219;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 219;goto st848;}
+                       {stack[top++] = 219;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 219;goto st880;}
+                       {stack[top++] = 219;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 219;goto st885;}
+                       {stack[top++] = 219;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 219;goto st890;}
+                       {stack[top++] = 219;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 219;goto st895;}
+                       {stack[top++] = 219;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 219;goto st899;}
+                       {stack[top++] = 219;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 219;goto st901;}
+                       {stack[top++] = 219;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 219;goto st956;}
+                       {stack[top++] = 219;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 219;goto st967;}
+                       {stack[top++] = 219;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 219;goto st984;}
+                       {stack[top++] = 219;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 219;goto st995;}
+                       {stack[top++] = 219;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 219;goto st1006;}
+                       {stack[top++] = 219;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 219;goto st1019;}
+                       {stack[top++] = 219;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 219;goto st1029;}
+                       {stack[top++] = 219;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 219;goto st1068;}
+                       {stack[top++] = 219;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 219;goto st1254;}
+                       {stack[top++] = 219;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 219;goto st1257;}
+                       {stack[top++] = 219;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 219;goto st1268;}
+                       {stack[top++] = 219;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 219;goto st1270;}
+                       {stack[top++] = 219;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 219;goto st1299;}
+                       {stack[top++] = 219;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 219;goto st1312;}
+                       {stack[top++] = 219;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 219;goto st1325;}
+                       {stack[top++] = 219;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 219;goto st1331;}
+                       {stack[top++] = 219;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 219;goto st1349;}
+                       {stack[top++] = 219;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 219;goto st1344;}
+                       {stack[top++] = 219;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 219;goto st1362;}
+                       {stack[top++] = 219;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 219;goto st1368;}
+                       {stack[top++] = 219;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 219;goto st1374;}
+                       {stack[top++] = 219;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 219;goto st1382;}
+                       {stack[top++] = 219;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 219;goto st1390;}
+                       {stack[top++] = 219;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -31242,85 +31269,85 @@ tr132:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 220;goto st844;}
+                       {stack[top++] = 220;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 220;goto st846;}
+                       {stack[top++] = 220;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 220;goto st848;}
+                       {stack[top++] = 220;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 220;goto st880;}
+                       {stack[top++] = 220;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 220;goto st885;}
+                       {stack[top++] = 220;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 220;goto st890;}
+                       {stack[top++] = 220;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 220;goto st895;}
+                       {stack[top++] = 220;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 220;goto st899;}
+                       {stack[top++] = 220;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 220;goto st901;}
+                       {stack[top++] = 220;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 220;goto st956;}
+                       {stack[top++] = 220;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 220;goto st967;}
+                       {stack[top++] = 220;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 220;goto st984;}
+                       {stack[top++] = 220;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 220;goto st995;}
+                       {stack[top++] = 220;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 220;goto st1006;}
+                       {stack[top++] = 220;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 220;goto st1019;}
+                       {stack[top++] = 220;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 220;goto st1029;}
+                       {stack[top++] = 220;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 220;goto st1068;}
+                       {stack[top++] = 220;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 220;goto st1254;}
+                       {stack[top++] = 220;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 220;goto st1257;}
+                       {stack[top++] = 220;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 220;goto st1268;}
+                       {stack[top++] = 220;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 220;goto st1270;}
+                       {stack[top++] = 220;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 220;goto st1299;}
+                       {stack[top++] = 220;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 220;goto st1312;}
+                       {stack[top++] = 220;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 220;goto st1325;}
+                       {stack[top++] = 220;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 220;goto st1331;}
+                       {stack[top++] = 220;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 220;goto st1349;}
+                       {stack[top++] = 220;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 220;goto st1344;}
+                       {stack[top++] = 220;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 220;goto st1362;}
+                       {stack[top++] = 220;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 220;goto st1368;}
+                       {stack[top++] = 220;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 220;goto st1374;}
+                       {stack[top++] = 220;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 220;goto st1382;}
+                       {stack[top++] = 220;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 220;goto st1390;}
+                       {stack[top++] = 220;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -31367,85 +31394,85 @@ tr133:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 221;goto st844;}
+                       {stack[top++] = 221;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 221;goto st846;}
+                       {stack[top++] = 221;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 221;goto st848;}
+                       {stack[top++] = 221;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 221;goto st880;}
+                       {stack[top++] = 221;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 221;goto st885;}
+                       {stack[top++] = 221;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 221;goto st890;}
+                       {stack[top++] = 221;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 221;goto st895;}
+                       {stack[top++] = 221;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 221;goto st899;}
+                       {stack[top++] = 221;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 221;goto st901;}
+                       {stack[top++] = 221;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 221;goto st956;}
+                       {stack[top++] = 221;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 221;goto st967;}
+                       {stack[top++] = 221;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 221;goto st984;}
+                       {stack[top++] = 221;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 221;goto st995;}
+                       {stack[top++] = 221;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 221;goto st1006;}
+                       {stack[top++] = 221;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 221;goto st1019;}
+                       {stack[top++] = 221;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 221;goto st1029;}
+                       {stack[top++] = 221;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 221;goto st1068;}
+                       {stack[top++] = 221;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 221;goto st1254;}
+                       {stack[top++] = 221;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 221;goto st1257;}
+                       {stack[top++] = 221;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 221;goto st1268;}
+                       {stack[top++] = 221;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 221;goto st1270;}
+                       {stack[top++] = 221;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 221;goto st1299;}
+                       {stack[top++] = 221;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 221;goto st1312;}
+                       {stack[top++] = 221;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 221;goto st1325;}
+                       {stack[top++] = 221;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 221;goto st1331;}
+                       {stack[top++] = 221;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 221;goto st1349;}
+                       {stack[top++] = 221;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 221;goto st1344;}
+                       {stack[top++] = 221;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 221;goto st1362;}
+                       {stack[top++] = 221;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 221;goto st1368;}
+                       {stack[top++] = 221;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 221;goto st1374;}
+                       {stack[top++] = 221;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 221;goto st1382;}
+                       {stack[top++] = 221;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 221;goto st1390;}
+                       {stack[top++] = 221;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -31492,85 +31519,85 @@ tr134:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 222;goto st844;}
+                       {stack[top++] = 222;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 222;goto st846;}
+                       {stack[top++] = 222;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 222;goto st848;}
+                       {stack[top++] = 222;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 222;goto st880;}
+                       {stack[top++] = 222;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 222;goto st885;}
+                       {stack[top++] = 222;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 222;goto st890;}
+                       {stack[top++] = 222;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 222;goto st895;}
+                       {stack[top++] = 222;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 222;goto st899;}
+                       {stack[top++] = 222;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 222;goto st901;}
+                       {stack[top++] = 222;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 222;goto st956;}
+                       {stack[top++] = 222;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 222;goto st967;}
+                       {stack[top++] = 222;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 222;goto st984;}
+                       {stack[top++] = 222;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 222;goto st995;}
+                       {stack[top++] = 222;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 222;goto st1006;}
+                       {stack[top++] = 222;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 222;goto st1019;}
+                       {stack[top++] = 222;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 222;goto st1029;}
+                       {stack[top++] = 222;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 222;goto st1068;}
+                       {stack[top++] = 222;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 222;goto st1254;}
+                       {stack[top++] = 222;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 222;goto st1257;}
+                       {stack[top++] = 222;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 222;goto st1268;}
+                       {stack[top++] = 222;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 222;goto st1270;}
+                       {stack[top++] = 222;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 222;goto st1299;}
+                       {stack[top++] = 222;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 222;goto st1312;}
+                       {stack[top++] = 222;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 222;goto st1325;}
+                       {stack[top++] = 222;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 222;goto st1331;}
+                       {stack[top++] = 222;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 222;goto st1349;}
+                       {stack[top++] = 222;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 222;goto st1344;}
+                       {stack[top++] = 222;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 222;goto st1362;}
+                       {stack[top++] = 222;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 222;goto st1368;}
+                       {stack[top++] = 222;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 222;goto st1374;}
+                       {stack[top++] = 222;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 222;goto st1382;}
+                       {stack[top++] = 222;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 222;goto st1390;}
+                       {stack[top++] = 222;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -31621,85 +31648,85 @@ tr135:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 223;goto st844;}
+                       {stack[top++] = 223;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 223;goto st846;}
+                       {stack[top++] = 223;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 223;goto st848;}
+                       {stack[top++] = 223;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 223;goto st880;}
+                       {stack[top++] = 223;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 223;goto st885;}
+                       {stack[top++] = 223;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 223;goto st890;}
+                       {stack[top++] = 223;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 223;goto st895;}
+                       {stack[top++] = 223;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 223;goto st899;}
+                       {stack[top++] = 223;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 223;goto st901;}
+                       {stack[top++] = 223;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 223;goto st956;}
+                       {stack[top++] = 223;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 223;goto st967;}
+                       {stack[top++] = 223;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 223;goto st984;}
+                       {stack[top++] = 223;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 223;goto st995;}
+                       {stack[top++] = 223;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 223;goto st1006;}
+                       {stack[top++] = 223;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 223;goto st1019;}
+                       {stack[top++] = 223;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 223;goto st1029;}
+                       {stack[top++] = 223;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 223;goto st1068;}
+                       {stack[top++] = 223;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 223;goto st1254;}
+                       {stack[top++] = 223;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 223;goto st1257;}
+                       {stack[top++] = 223;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 223;goto st1268;}
+                       {stack[top++] = 223;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 223;goto st1270;}
+                       {stack[top++] = 223;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 223;goto st1299;}
+                       {stack[top++] = 223;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 223;goto st1312;}
+                       {stack[top++] = 223;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 223;goto st1325;}
+                       {stack[top++] = 223;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 223;goto st1331;}
+                       {stack[top++] = 223;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 223;goto st1349;}
+                       {stack[top++] = 223;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 223;goto st1344;}
+                       {stack[top++] = 223;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 223;goto st1362;}
+                       {stack[top++] = 223;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 223;goto st1368;}
+                       {stack[top++] = 223;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 223;goto st1374;}
+                       {stack[top++] = 223;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 223;goto st1382;}
+                       {stack[top++] = 223;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 223;goto st1390;}
+                       {stack[top++] = 223;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -31756,85 +31783,85 @@ tr136:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 224;goto st844;}
+                       {stack[top++] = 224;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 224;goto st846;}
+                       {stack[top++] = 224;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 224;goto st848;}
+                       {stack[top++] = 224;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 224;goto st880;}
+                       {stack[top++] = 224;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 224;goto st885;}
+                       {stack[top++] = 224;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 224;goto st890;}
+                       {stack[top++] = 224;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 224;goto st895;}
+                       {stack[top++] = 224;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 224;goto st899;}
+                       {stack[top++] = 224;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 224;goto st901;}
+                       {stack[top++] = 224;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 224;goto st956;}
+                       {stack[top++] = 224;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 224;goto st967;}
+                       {stack[top++] = 224;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 224;goto st984;}
+                       {stack[top++] = 224;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 224;goto st995;}
+                       {stack[top++] = 224;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 224;goto st1006;}
+                       {stack[top++] = 224;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 224;goto st1019;}
+                       {stack[top++] = 224;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 224;goto st1029;}
+                       {stack[top++] = 224;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 224;goto st1068;}
+                       {stack[top++] = 224;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 224;goto st1254;}
+                       {stack[top++] = 224;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 224;goto st1257;}
+                       {stack[top++] = 224;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 224;goto st1268;}
+                       {stack[top++] = 224;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 224;goto st1270;}
+                       {stack[top++] = 224;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 224;goto st1299;}
+                       {stack[top++] = 224;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 224;goto st1312;}
+                       {stack[top++] = 224;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 224;goto st1325;}
+                       {stack[top++] = 224;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 224;goto st1331;}
+                       {stack[top++] = 224;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 224;goto st1349;}
+                       {stack[top++] = 224;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 224;goto st1344;}
+                       {stack[top++] = 224;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 224;goto st1362;}
+                       {stack[top++] = 224;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 224;goto st1368;}
+                       {stack[top++] = 224;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 224;goto st1374;}
+                       {stack[top++] = 224;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 224;goto st1382;}
+                       {stack[top++] = 224;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 224;goto st1390;}
+                       {stack[top++] = 224;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -31885,85 +31912,85 @@ tr137:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 225;goto st844;}
+                       {stack[top++] = 225;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 225;goto st846;}
+                       {stack[top++] = 225;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 225;goto st848;}
+                       {stack[top++] = 225;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 225;goto st880;}
+                       {stack[top++] = 225;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 225;goto st885;}
+                       {stack[top++] = 225;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 225;goto st890;}
+                       {stack[top++] = 225;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 225;goto st895;}
+                       {stack[top++] = 225;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 225;goto st899;}
+                       {stack[top++] = 225;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 225;goto st901;}
+                       {stack[top++] = 225;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 225;goto st956;}
+                       {stack[top++] = 225;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 225;goto st967;}
+                       {stack[top++] = 225;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 225;goto st984;}
+                       {stack[top++] = 225;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 225;goto st995;}
+                       {stack[top++] = 225;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 225;goto st1006;}
+                       {stack[top++] = 225;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 225;goto st1019;}
+                       {stack[top++] = 225;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 225;goto st1029;}
+                       {stack[top++] = 225;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 225;goto st1068;}
+                       {stack[top++] = 225;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 225;goto st1254;}
+                       {stack[top++] = 225;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 225;goto st1257;}
+                       {stack[top++] = 225;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 225;goto st1268;}
+                       {stack[top++] = 225;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 225;goto st1270;}
+                       {stack[top++] = 225;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 225;goto st1299;}
+                       {stack[top++] = 225;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 225;goto st1312;}
+                       {stack[top++] = 225;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 225;goto st1325;}
+                       {stack[top++] = 225;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 225;goto st1331;}
+                       {stack[top++] = 225;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 225;goto st1349;}
+                       {stack[top++] = 225;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 225;goto st1344;}
+                       {stack[top++] = 225;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 225;goto st1362;}
+                       {stack[top++] = 225;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 225;goto st1368;}
+                       {stack[top++] = 225;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 225;goto st1374;}
+                       {stack[top++] = 225;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 225;goto st1382;}
+                       {stack[top++] = 225;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 225;goto st1390;}
+                       {stack[top++] = 225;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -32010,85 +32037,85 @@ tr138:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 226;goto st844;}
+                       {stack[top++] = 226;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 226;goto st846;}
+                       {stack[top++] = 226;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 226;goto st848;}
+                       {stack[top++] = 226;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 226;goto st880;}
+                       {stack[top++] = 226;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 226;goto st885;}
+                       {stack[top++] = 226;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 226;goto st890;}
+                       {stack[top++] = 226;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 226;goto st895;}
+                       {stack[top++] = 226;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 226;goto st899;}
+                       {stack[top++] = 226;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 226;goto st901;}
+                       {stack[top++] = 226;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 226;goto st956;}
+                       {stack[top++] = 226;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 226;goto st967;}
+                       {stack[top++] = 226;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 226;goto st984;}
+                       {stack[top++] = 226;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 226;goto st995;}
+                       {stack[top++] = 226;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 226;goto st1006;}
+                       {stack[top++] = 226;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 226;goto st1019;}
+                       {stack[top++] = 226;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 226;goto st1029;}
+                       {stack[top++] = 226;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 226;goto st1068;}
+                       {stack[top++] = 226;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 226;goto st1254;}
+                       {stack[top++] = 226;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 226;goto st1257;}
+                       {stack[top++] = 226;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 226;goto st1268;}
+                       {stack[top++] = 226;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 226;goto st1270;}
+                       {stack[top++] = 226;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 226;goto st1299;}
+                       {stack[top++] = 226;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 226;goto st1312;}
+                       {stack[top++] = 226;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 226;goto st1325;}
+                       {stack[top++] = 226;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 226;goto st1331;}
+                       {stack[top++] = 226;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 226;goto st1349;}
+                       {stack[top++] = 226;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 226;goto st1344;}
+                       {stack[top++] = 226;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 226;goto st1362;}
+                       {stack[top++] = 226;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 226;goto st1368;}
+                       {stack[top++] = 226;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 226;goto st1374;}
+                       {stack[top++] = 226;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 226;goto st1382;}
+                       {stack[top++] = 226;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 226;goto st1390;}
+                       {stack[top++] = 226;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -32185,7 +32212,7 @@ tr895:
                s->buffer_length = 0;
        }
        goto st227;
-tr4291:
+tr4328:
        {
                s->buffer_length = 0;
        }
@@ -32236,7 +32263,7 @@ tr139:
        {
                s->line_counter++;
        }
-       goto st1404;
+       goto st1431;
 tr962:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -32247,14 +32274,14 @@ tr962:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1404; goto _out;}
+                               {p++; cs = 1431; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1404;
+       goto st1431;
 tr860:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -32265,7 +32292,7 @@ tr860:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1404; goto _out;}
+                               {p++; cs = 1431; goto _out;}
                        }
                }
        }
@@ -32288,15 +32315,15 @@ tr860:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1404; goto _out;}
+                                       {p++; cs = 1431; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1404; goto _out;}
+                       p--; {p++; cs = 1431; goto _out;}
                }
        }
-       goto st1404;
+       goto st1431;
 tr901:
        {
                s->line_counter++;
@@ -32317,15 +32344,15 @@ tr901:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1404; goto _out;}
+                                       {p++; cs = 1431; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1404; goto _out;}
+                       p--; {p++; cs = 1431; goto _out;}
                }
        }
-       goto st1404;
+       goto st1431;
 tr894:
        {
                s->r_owner_length = s->dname_tmp_length;
@@ -32357,16 +32384,16 @@ tr894:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1404; goto _out;}
+                                       {p++; cs = 1431; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1404; goto _out;}
+                       p--; {p++; cs = 1431; goto _out;}
                }
        }
-       goto st1404;
-tr4221:
+       goto st1431;
+tr4258:
        {
                s->line_counter++;
        }
@@ -32380,11 +32407,11 @@ tr4221:
                s->buffer[0] = 0;
                s->buffer_length = 0;
        }
-       goto st1404;
-st1404:
+       goto st1431;
+st1431:
        if ( ++p == pe )
-               goto _test_eof1404;
-case 1404:
+               goto _test_eof1431;
+case 1431:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -32402,57 +32429,57 @@ case 1404:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr4215;
-               case 32: goto tr4215;
-               case 36: goto tr4216;
-               case 40: goto tr4217;
-               case 41: goto tr4218;
-               case 42: goto tr4219;
+               case 9: goto tr4252;
+               case 32: goto tr4252;
+               case 36: goto tr4253;
+               case 40: goto tr4254;
+               case 41: goto tr4255;
+               case 42: goto tr4256;
                case 58: goto tr73;
-               case 65: goto tr4295;
-               case 67: goto tr4296;
-               case 68: goto tr4297;
-               case 69: goto tr4298;
-               case 72: goto tr4299;
-               case 73: goto tr4300;
-               case 75: goto tr4301;
-               case 76: goto tr4302;
-               case 77: goto tr4303;
-               case 78: goto tr4304;
-               case 79: goto tr4305;
-               case 80: goto tr4306;
-               case 82: goto tr4307;
-               case 83: goto tr4308;
-               case 84: goto tr4309;
-               case 85: goto tr4310;
-               case 90: goto tr4311;
-               case 92: goto tr4220;
-               case 95: goto tr4219;
-               case 97: goto tr4295;
-               case 99: goto tr4296;
-               case 100: goto tr4297;
-               case 101: goto tr4298;
-               case 104: goto tr4299;
-               case 105: goto tr4300;
-               case 107: goto tr4301;
-               case 108: goto tr4302;
-               case 109: goto tr4303;
-               case 110: goto tr4304;
-               case 111: goto tr4305;
-               case 112: goto tr4306;
-               case 114: goto tr4307;
-               case 115: goto tr4308;
-               case 116: goto tr4309;
-               case 117: goto tr4310;
-               case 122: goto tr4311;
-               case 2826: goto tr4211;
-               case 2875: goto tr4212;
-               case 3082: goto tr4221;
-               case 3131: goto tr4222;
-               case 3338: goto tr4223;
-               case 3387: goto tr4224;
-               case 3594: goto tr4225;
-               case 3643: goto tr4226;
+               case 65: goto tr4332;
+               case 67: goto tr4333;
+               case 68: goto tr4334;
+               case 69: goto tr4335;
+               case 72: goto tr4336;
+               case 73: goto tr4337;
+               case 75: goto tr4338;
+               case 76: goto tr4339;
+               case 77: goto tr4340;
+               case 78: goto tr4341;
+               case 79: goto tr4342;
+               case 80: goto tr4343;
+               case 82: goto tr4344;
+               case 83: goto tr4345;
+               case 84: goto tr4346;
+               case 85: goto tr4347;
+               case 90: goto tr4348;
+               case 92: goto tr4257;
+               case 95: goto tr4256;
+               case 97: goto tr4332;
+               case 99: goto tr4333;
+               case 100: goto tr4334;
+               case 101: goto tr4335;
+               case 104: goto tr4336;
+               case 105: goto tr4337;
+               case 107: goto tr4338;
+               case 108: goto tr4339;
+               case 109: goto tr4340;
+               case 110: goto tr4341;
+               case 111: goto tr4342;
+               case 112: goto tr4343;
+               case 114: goto tr4344;
+               case 115: goto tr4345;
+               case 116: goto tr4346;
+               case 117: goto tr4347;
+               case 122: goto tr4348;
+               case 2826: goto tr4248;
+               case 2875: goto tr4249;
+               case 3082: goto tr4258;
+               case 3131: goto tr4259;
+               case 3338: goto tr4260;
+               case 3387: goto tr4261;
+               case 3594: goto tr4262;
+               case 3643: goto tr4263;
        }
        if ( _widec < 60 ) {
                if ( _widec < 11 ) {
@@ -32461,110 +32488,110 @@ case 1404:
                } else if ( _widec > 44 ) {
                        if ( _widec > 47 ) {
                                if ( 48 <= _widec && _widec <= 57 )
-                                       goto tr4294;
+                                       goto tr4331;
                        } else if ( _widec >= 45 )
-                               goto tr4219;
+                               goto tr4256;
                } else
                        goto tr73;
        } else if ( _widec > 63 ) {
                if ( _widec < 91 ) {
                        if ( 64 <= _widec && _widec <= 89 )
-                               goto tr4219;
+                               goto tr4256;
                } else if ( _widec > 96 ) {
                        if ( _widec > 121 ) {
                                if ( 123 <= _widec )
                                        goto tr73;
                        } else if ( _widec >= 98 )
-                               goto tr4219;
+                               goto tr4256;
                } else
                        goto tr73;
        } else
                goto tr73;
-       goto tr4293;
-tr4216:
+       goto tr4330;
+tr4253:
        {
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 228;goto st844;}
+                       {stack[top++] = 228;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 228;goto st846;}
+                       {stack[top++] = 228;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 228;goto st848;}
+                       {stack[top++] = 228;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 228;goto st880;}
+                       {stack[top++] = 228;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 228;goto st885;}
+                       {stack[top++] = 228;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 228;goto st890;}
+                       {stack[top++] = 228;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 228;goto st895;}
+                       {stack[top++] = 228;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 228;goto st899;}
+                       {stack[top++] = 228;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 228;goto st901;}
+                       {stack[top++] = 228;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 228;goto st956;}
+                       {stack[top++] = 228;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 228;goto st967;}
+                       {stack[top++] = 228;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 228;goto st984;}
+                       {stack[top++] = 228;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 228;goto st995;}
+                       {stack[top++] = 228;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 228;goto st1006;}
+                       {stack[top++] = 228;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 228;goto st1019;}
+                       {stack[top++] = 228;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 228;goto st1029;}
+                       {stack[top++] = 228;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 228;goto st1068;}
+                       {stack[top++] = 228;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 228;goto st1254;}
+                       {stack[top++] = 228;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 228;goto st1257;}
+                       {stack[top++] = 228;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 228;goto st1268;}
+                       {stack[top++] = 228;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 228;goto st1270;}
+                       {stack[top++] = 228;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 228;goto st1299;}
+                       {stack[top++] = 228;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 228;goto st1312;}
+                       {stack[top++] = 228;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 228;goto st1325;}
+                       {stack[top++] = 228;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 228;goto st1331;}
+                       {stack[top++] = 228;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 228;goto st1349;}
+                       {stack[top++] = 228;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 228;goto st1344;}
+                       {stack[top++] = 228;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 228;goto st1362;}
+                       {stack[top++] = 228;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 228;goto st1368;}
+                       {stack[top++] = 228;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 228;goto st1374;}
+                       {stack[top++] = 228;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 228;goto st1382;}
+                       {stack[top++] = 228;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 228;goto st1390;}
+                       {stack[top++] = 228;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -32705,90 +32732,90 @@ case 237:
        } else if ( (*p) >= 9 )
                goto tr870;
        goto tr755;
-tr4219:
+tr4256:
        {
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 238;goto st844;}
+                       {stack[top++] = 238;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 238;goto st846;}
+                       {stack[top++] = 238;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 238;goto st848;}
+                       {stack[top++] = 238;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 238;goto st880;}
+                       {stack[top++] = 238;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 238;goto st885;}
+                       {stack[top++] = 238;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 238;goto st890;}
+                       {stack[top++] = 238;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 238;goto st895;}
+                       {stack[top++] = 238;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 238;goto st899;}
+                       {stack[top++] = 238;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 238;goto st901;}
+                       {stack[top++] = 238;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 238;goto st956;}
+                       {stack[top++] = 238;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 238;goto st967;}
+                       {stack[top++] = 238;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 238;goto st984;}
+                       {stack[top++] = 238;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 238;goto st995;}
+                       {stack[top++] = 238;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 238;goto st1006;}
+                       {stack[top++] = 238;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 238;goto st1019;}
+                       {stack[top++] = 238;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 238;goto st1029;}
+                       {stack[top++] = 238;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 238;goto st1068;}
+                       {stack[top++] = 238;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 238;goto st1254;}
+                       {stack[top++] = 238;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 238;goto st1257;}
+                       {stack[top++] = 238;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 238;goto st1268;}
+                       {stack[top++] = 238;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 238;goto st1270;}
+                       {stack[top++] = 238;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 238;goto st1299;}
+                       {stack[top++] = 238;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 238;goto st1312;}
+                       {stack[top++] = 238;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 238;goto st1325;}
+                       {stack[top++] = 238;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 238;goto st1331;}
+                       {stack[top++] = 238;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 238;goto st1349;}
+                       {stack[top++] = 238;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 238;goto st1344;}
+                       {stack[top++] = 238;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 238;goto st1362;}
+                       {stack[top++] = 238;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 238;goto st1368;}
+                       {stack[top++] = 238;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 238;goto st1374;}
+                       {stack[top++] = 238;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 238;goto st1382;}
+                       {stack[top++] = 238;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 238;goto st1390;}
+                       {stack[top++] = 238;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -32827,7 +32854,7 @@ case 238:
                case 2107: goto tr876;
        }
        goto tr871;
-tr4294:
+tr4331:
        {
                s->number64 = 0;
        }
@@ -32849,85 +32876,85 @@ tr4294:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 239;goto st844;}
+                       {stack[top++] = 239;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 239;goto st846;}
+                       {stack[top++] = 239;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 239;goto st848;}
+                       {stack[top++] = 239;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 239;goto st880;}
+                       {stack[top++] = 239;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 239;goto st885;}
+                       {stack[top++] = 239;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 239;goto st890;}
+                       {stack[top++] = 239;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 239;goto st895;}
+                       {stack[top++] = 239;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 239;goto st899;}
+                       {stack[top++] = 239;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 239;goto st901;}
+                       {stack[top++] = 239;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 239;goto st956;}
+                       {stack[top++] = 239;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 239;goto st967;}
+                       {stack[top++] = 239;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 239;goto st984;}
+                       {stack[top++] = 239;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 239;goto st995;}
+                       {stack[top++] = 239;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 239;goto st1006;}
+                       {stack[top++] = 239;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 239;goto st1019;}
+                       {stack[top++] = 239;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 239;goto st1029;}
+                       {stack[top++] = 239;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 239;goto st1068;}
+                       {stack[top++] = 239;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 239;goto st1254;}
+                       {stack[top++] = 239;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 239;goto st1257;}
+                       {stack[top++] = 239;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 239;goto st1268;}
+                       {stack[top++] = 239;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 239;goto st1270;}
+                       {stack[top++] = 239;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 239;goto st1299;}
+                       {stack[top++] = 239;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 239;goto st1312;}
+                       {stack[top++] = 239;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 239;goto st1325;}
+                       {stack[top++] = 239;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 239;goto st1331;}
+                       {stack[top++] = 239;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 239;goto st1349;}
+                       {stack[top++] = 239;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 239;goto st1344;}
+                       {stack[top++] = 239;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 239;goto st1362;}
+                       {stack[top++] = 239;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 239;goto st1368;}
+                       {stack[top++] = 239;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 239;goto st1374;}
+                       {stack[top++] = 239;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 239;goto st1382;}
+                       {stack[top++] = 239;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 239;goto st1390;}
+                       {stack[top++] = 239;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -33188,7 +33215,7 @@ case 241:
        } else if ( _widec >= 1664 )
                goto tr95;
        goto tr151;
-tr4295:
+tr4332:
        {
                s->r_class = s->default_class;
        }
@@ -33199,85 +33226,85 @@ tr4295:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 242;goto st844;}
+                       {stack[top++] = 242;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 242;goto st846;}
+                       {stack[top++] = 242;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 242;goto st848;}
+                       {stack[top++] = 242;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 242;goto st880;}
+                       {stack[top++] = 242;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 242;goto st885;}
+                       {stack[top++] = 242;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 242;goto st890;}
+                       {stack[top++] = 242;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 242;goto st895;}
+                       {stack[top++] = 242;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 242;goto st899;}
+                       {stack[top++] = 242;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 242;goto st901;}
+                       {stack[top++] = 242;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 242;goto st956;}
+                       {stack[top++] = 242;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 242;goto st967;}
+                       {stack[top++] = 242;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 242;goto st984;}
+                       {stack[top++] = 242;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 242;goto st995;}
+                       {stack[top++] = 242;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 242;goto st1006;}
+                       {stack[top++] = 242;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 242;goto st1019;}
+                       {stack[top++] = 242;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 242;goto st1029;}
+                       {stack[top++] = 242;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 242;goto st1068;}
+                       {stack[top++] = 242;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 242;goto st1254;}
+                       {stack[top++] = 242;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 242;goto st1257;}
+                       {stack[top++] = 242;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 242;goto st1268;}
+                       {stack[top++] = 242;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 242;goto st1270;}
+                       {stack[top++] = 242;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 242;goto st1299;}
+                       {stack[top++] = 242;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 242;goto st1312;}
+                       {stack[top++] = 242;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 242;goto st1325;}
+                       {stack[top++] = 242;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 242;goto st1331;}
+                       {stack[top++] = 242;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 242;goto st1349;}
+                       {stack[top++] = 242;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 242;goto st1344;}
+                       {stack[top++] = 242;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 242;goto st1362;}
+                       {stack[top++] = 242;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 242;goto st1368;}
+                       {stack[top++] = 242;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 242;goto st1374;}
+                       {stack[top++] = 242;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 242;goto st1382;}
+                       {stack[top++] = 242;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 242;goto st1390;}
+                       {stack[top++] = 242;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -33491,91 +33518,91 @@ tr143:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1405;goto st844;}
+                       {stack[top++] = 1432;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1405;goto st846;}
+                       {stack[top++] = 1432;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1405;goto st848;}
+                       {stack[top++] = 1432;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1405;goto st880;}
+                       {stack[top++] = 1432;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1405;goto st885;}
+                       {stack[top++] = 1432;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1405;goto st890;}
+                       {stack[top++] = 1432;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1405;goto st895;}
+                       {stack[top++] = 1432;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1405;goto st899;}
+                       {stack[top++] = 1432;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1405;goto st901;}
+                       {stack[top++] = 1432;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1405;goto st956;}
+                       {stack[top++] = 1432;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1405;goto st967;}
+                       {stack[top++] = 1432;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1405;goto st984;}
+                       {stack[top++] = 1432;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1405;goto st995;}
+                       {stack[top++] = 1432;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1405;goto st1006;}
+                       {stack[top++] = 1432;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1405;goto st1019;}
+                       {stack[top++] = 1432;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1405;goto st1029;}
+                       {stack[top++] = 1432;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1405;goto st1068;}
+                       {stack[top++] = 1432;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1405;goto st1254;}
+                       {stack[top++] = 1432;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1405;goto st1257;}
+                       {stack[top++] = 1432;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1405;goto st1268;}
+                       {stack[top++] = 1432;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1405;goto st1270;}
+                       {stack[top++] = 1432;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1405;goto st1299;}
+                       {stack[top++] = 1432;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1405;goto st1312;}
+                       {stack[top++] = 1432;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1405;goto st1325;}
+                       {stack[top++] = 1432;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1405;goto st1331;}
+                       {stack[top++] = 1432;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1405;goto st1349;}
+                       {stack[top++] = 1432;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1405;goto st1344;}
+                       {stack[top++] = 1432;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1405;goto st1362;}
+                       {stack[top++] = 1432;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1405;goto st1368;}
+                       {stack[top++] = 1432;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1405;goto st1374;}
+                       {stack[top++] = 1432;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1405;goto st1382;}
+                       {stack[top++] = 1432;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1405;goto st1390;}
+                       {stack[top++] = 1432;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
                }
        }
-       goto st1405;
+       goto st1432;
 tr902:
        {
                s->line_counter++;
@@ -33584,85 +33611,85 @@ tr902:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1405;goto st844;}
+                       {stack[top++] = 1432;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1405;goto st846;}
+                       {stack[top++] = 1432;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1405;goto st848;}
+                       {stack[top++] = 1432;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1405;goto st880;}
+                       {stack[top++] = 1432;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1405;goto st885;}
+                       {stack[top++] = 1432;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1405;goto st890;}
+                       {stack[top++] = 1432;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1405;goto st895;}
+                       {stack[top++] = 1432;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1405;goto st899;}
+                       {stack[top++] = 1432;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1405;goto st901;}
+                       {stack[top++] = 1432;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1405;goto st956;}
+                       {stack[top++] = 1432;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1405;goto st967;}
+                       {stack[top++] = 1432;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1405;goto st984;}
+                       {stack[top++] = 1432;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1405;goto st995;}
+                       {stack[top++] = 1432;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1405;goto st1006;}
+                       {stack[top++] = 1432;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1405;goto st1019;}
+                       {stack[top++] = 1432;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1405;goto st1029;}
+                       {stack[top++] = 1432;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1405;goto st1068;}
+                       {stack[top++] = 1432;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1405;goto st1254;}
+                       {stack[top++] = 1432;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1405;goto st1257;}
+                       {stack[top++] = 1432;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1405;goto st1268;}
+                       {stack[top++] = 1432;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1405;goto st1270;}
+                       {stack[top++] = 1432;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1405;goto st1299;}
+                       {stack[top++] = 1432;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1405;goto st1312;}
+                       {stack[top++] = 1432;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1405;goto st1325;}
+                       {stack[top++] = 1432;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1405;goto st1331;}
+                       {stack[top++] = 1432;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1405;goto st1349;}
+                       {stack[top++] = 1432;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1405;goto st1344;}
+                       {stack[top++] = 1432;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1405;goto st1362;}
+                       {stack[top++] = 1432;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1405;goto st1368;}
+                       {stack[top++] = 1432;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1405;goto st1374;}
+                       {stack[top++] = 1432;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1405;goto st1382;}
+                       {stack[top++] = 1432;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1405;goto st1390;}
+                       {stack[top++] = 1432;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -33684,15 +33711,15 @@ tr902:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1405; goto _out;}
+                                       {p++; cs = 1432; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1405; goto _out;}
+                       p--; {p++; cs = 1432; goto _out;}
                }
        }
-       goto st1405;
+       goto st1432;
 tr896:
        {
                s->r_owner_length = s->dname_tmp_length;
@@ -33708,85 +33735,85 @@ tr896:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1405;goto st844;}
+                       {stack[top++] = 1432;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1405;goto st846;}
+                       {stack[top++] = 1432;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1405;goto st848;}
+                       {stack[top++] = 1432;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1405;goto st880;}
+                       {stack[top++] = 1432;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1405;goto st885;}
+                       {stack[top++] = 1432;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1405;goto st890;}
+                       {stack[top++] = 1432;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1405;goto st895;}
+                       {stack[top++] = 1432;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1405;goto st899;}
+                       {stack[top++] = 1432;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1405;goto st901;}
+                       {stack[top++] = 1432;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1405;goto st956;}
+                       {stack[top++] = 1432;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1405;goto st967;}
+                       {stack[top++] = 1432;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1405;goto st984;}
+                       {stack[top++] = 1432;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1405;goto st995;}
+                       {stack[top++] = 1432;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1405;goto st1006;}
+                       {stack[top++] = 1432;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1405;goto st1019;}
+                       {stack[top++] = 1432;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1405;goto st1029;}
+                       {stack[top++] = 1432;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1405;goto st1068;}
+                       {stack[top++] = 1432;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1405;goto st1254;}
+                       {stack[top++] = 1432;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1405;goto st1257;}
+                       {stack[top++] = 1432;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1405;goto st1268;}
+                       {stack[top++] = 1432;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1405;goto st1270;}
+                       {stack[top++] = 1432;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1405;goto st1299;}
+                       {stack[top++] = 1432;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1405;goto st1312;}
+                       {stack[top++] = 1432;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1405;goto st1325;}
+                       {stack[top++] = 1432;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1405;goto st1331;}
+                       {stack[top++] = 1432;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1405;goto st1349;}
+                       {stack[top++] = 1432;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1405;goto st1344;}
+                       {stack[top++] = 1432;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1405;goto st1362;}
+                       {stack[top++] = 1432;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1405;goto st1368;}
+                       {stack[top++] = 1432;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1405;goto st1374;}
+                       {stack[top++] = 1432;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1405;goto st1382;}
+                       {stack[top++] = 1432;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1405;goto st1390;}
+                       {stack[top++] = 1432;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -33812,16 +33839,16 @@ tr896:
 
                                // Stop if required from the callback.
                                if (s->state == ZS_STATE_STOP) {
-                                       {p++; cs = 1405; goto _out;}
+                                       {p++; cs = 1432; goto _out;}
                                }
                        }
                } else {
                        // Return if external processing.
-                       p--; {p++; cs = 1405; goto _out;}
+                       p--; {p++; cs = 1432; goto _out;}
                }
        }
-       goto st1405;
-tr4225:
+       goto st1432;
+tr4262:
        {
                s->line_counter++;
        }
@@ -33829,85 +33856,85 @@ tr4225:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 1405;goto st844;}
+                       {stack[top++] = 1432;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 1405;goto st846;}
+                       {stack[top++] = 1432;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 1405;goto st848;}
+                       {stack[top++] = 1432;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 1405;goto st880;}
+                       {stack[top++] = 1432;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 1405;goto st885;}
+                       {stack[top++] = 1432;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 1405;goto st890;}
+                       {stack[top++] = 1432;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 1405;goto st895;}
+                       {stack[top++] = 1432;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 1405;goto st899;}
+                       {stack[top++] = 1432;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 1405;goto st901;}
+                       {stack[top++] = 1432;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 1405;goto st956;}
+                       {stack[top++] = 1432;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 1405;goto st967;}
+                       {stack[top++] = 1432;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 1405;goto st984;}
+                       {stack[top++] = 1432;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 1405;goto st995;}
+                       {stack[top++] = 1432;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 1405;goto st1006;}
+                       {stack[top++] = 1432;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 1405;goto st1019;}
+                       {stack[top++] = 1432;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 1405;goto st1029;}
+                       {stack[top++] = 1432;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 1405;goto st1068;}
+                       {stack[top++] = 1432;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 1405;goto st1254;}
+                       {stack[top++] = 1432;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 1405;goto st1257;}
+                       {stack[top++] = 1432;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 1405;goto st1268;}
+                       {stack[top++] = 1432;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 1405;goto st1270;}
+                       {stack[top++] = 1432;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 1405;goto st1299;}
+                       {stack[top++] = 1432;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 1405;goto st1312;}
+                       {stack[top++] = 1432;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 1405;goto st1325;}
+                       {stack[top++] = 1432;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 1405;goto st1331;}
+                       {stack[top++] = 1432;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 1405;goto st1349;}
+                       {stack[top++] = 1432;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 1405;goto st1344;}
+                       {stack[top++] = 1432;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 1405;goto st1362;}
+                       {stack[top++] = 1432;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 1405;goto st1368;}
+                       {stack[top++] = 1432;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 1405;goto st1374;}
+                       {stack[top++] = 1432;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 1405;goto st1382;}
+                       {stack[top++] = 1432;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 1405;goto st1390;}
+                       {stack[top++] = 1432;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -33923,11 +33950,11 @@ tr4225:
                s->buffer[0] = 0;
                s->buffer_length = 0;
        }
-       goto st1405;
-st1405:
+       goto st1432;
+st1432:
        if ( ++p == pe )
-               goto _test_eof1405;
-case 1405:
+               goto _test_eof1432;
+case 1432:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -33945,57 +33972,57 @@ case 1405:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr4288;
-               case 32: goto tr4288;
-               case 36: goto tr4216;
-               case 40: goto tr4289;
-               case 41: goto tr4290;
-               case 42: goto tr4219;
+               case 9: goto tr4325;
+               case 32: goto tr4325;
+               case 36: goto tr4253;
+               case 40: goto tr4326;
+               case 41: goto tr4327;
+               case 42: goto tr4256;
                case 58: goto tr73;
-               case 65: goto tr4295;
-               case 67: goto tr4296;
-               case 68: goto tr4297;
-               case 69: goto tr4298;
-               case 72: goto tr4299;
-               case 73: goto tr4300;
-               case 75: goto tr4301;
-               case 76: goto tr4302;
-               case 77: goto tr4303;
-               case 78: goto tr4304;
-               case 79: goto tr4305;
-               case 80: goto tr4306;
-               case 82: goto tr4307;
-               case 83: goto tr4308;
-               case 84: goto tr4309;
-               case 85: goto tr4310;
-               case 90: goto tr4311;
-               case 92: goto tr4220;
-               case 95: goto tr4219;
-               case 97: goto tr4295;
-               case 99: goto tr4296;
-               case 100: goto tr4297;
-               case 101: goto tr4298;
-               case 104: goto tr4299;
-               case 105: goto tr4300;
-               case 107: goto tr4301;
-               case 108: goto tr4302;
-               case 109: goto tr4303;
-               case 110: goto tr4304;
-               case 111: goto tr4305;
-               case 112: goto tr4306;
-               case 114: goto tr4307;
-               case 115: goto tr4308;
-               case 116: goto tr4309;
-               case 117: goto tr4310;
-               case 122: goto tr4311;
+               case 65: goto tr4332;
+               case 67: goto tr4333;
+               case 68: goto tr4334;
+               case 69: goto tr4335;
+               case 72: goto tr4336;
+               case 73: goto tr4337;
+               case 75: goto tr4338;
+               case 76: goto tr4339;
+               case 77: goto tr4340;
+               case 78: goto tr4341;
+               case 79: goto tr4342;
+               case 80: goto tr4343;
+               case 82: goto tr4344;
+               case 83: goto tr4345;
+               case 84: goto tr4346;
+               case 85: goto tr4347;
+               case 90: goto tr4348;
+               case 92: goto tr4257;
+               case 95: goto tr4256;
+               case 97: goto tr4332;
+               case 99: goto tr4333;
+               case 100: goto tr4334;
+               case 101: goto tr4335;
+               case 104: goto tr4336;
+               case 105: goto tr4337;
+               case 107: goto tr4338;
+               case 108: goto tr4339;
+               case 109: goto tr4340;
+               case 110: goto tr4341;
+               case 111: goto tr4342;
+               case 112: goto tr4343;
+               case 114: goto tr4344;
+               case 115: goto tr4345;
+               case 116: goto tr4346;
+               case 117: goto tr4347;
+               case 122: goto tr4348;
                case 2826: goto tr87;
                case 2875: goto tr88;
-               case 3082: goto tr4312;
-               case 3131: goto tr4291;
+               case 3082: goto tr4349;
+               case 3131: goto tr4328;
                case 3338: goto tr105;
                case 3387: goto tr106;
-               case 3594: goto tr4312;
-               case 3643: goto tr4292;
+               case 3594: goto tr4349;
+               case 3643: goto tr4329;
        }
        if ( _widec < 60 ) {
                if ( _widec < 11 ) {
@@ -34004,27 +34031,27 @@ case 1405:
                } else if ( _widec > 44 ) {
                        if ( _widec > 47 ) {
                                if ( 48 <= _widec && _widec <= 57 )
-                                       goto tr4294;
+                                       goto tr4331;
                        } else if ( _widec >= 45 )
-                               goto tr4219;
+                               goto tr4256;
                } else
                        goto tr73;
        } else if ( _widec > 63 ) {
                if ( _widec < 91 ) {
                        if ( 64 <= _widec && _widec <= 89 )
-                               goto tr4219;
+                               goto tr4256;
                } else if ( _widec > 96 ) {
                        if ( _widec > 121 ) {
                                if ( 123 <= _widec )
                                        goto tr73;
                        } else if ( _widec >= 98 )
-                               goto tr4219;
+                               goto tr4256;
                } else
                        goto tr73;
        } else
                goto tr73;
-       goto tr4293;
-tr4296:
+       goto tr4330;
+tr4333:
        {
                s->r_class = s->default_class;
        }
@@ -34035,85 +34062,85 @@ tr4296:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 244;goto st844;}
+                       {stack[top++] = 244;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 244;goto st846;}
+                       {stack[top++] = 244;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 244;goto st848;}
+                       {stack[top++] = 244;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 244;goto st880;}
+                       {stack[top++] = 244;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 244;goto st885;}
+                       {stack[top++] = 244;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 244;goto st890;}
+                       {stack[top++] = 244;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 244;goto st895;}
+                       {stack[top++] = 244;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 244;goto st899;}
+                       {stack[top++] = 244;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 244;goto st901;}
+                       {stack[top++] = 244;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 244;goto st956;}
+                       {stack[top++] = 244;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 244;goto st967;}
+                       {stack[top++] = 244;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 244;goto st984;}
+                       {stack[top++] = 244;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 244;goto st995;}
+                       {stack[top++] = 244;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 244;goto st1006;}
+                       {stack[top++] = 244;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 244;goto st1019;}
+                       {stack[top++] = 244;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 244;goto st1029;}
+                       {stack[top++] = 244;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 244;goto st1068;}
+                       {stack[top++] = 244;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 244;goto st1254;}
+                       {stack[top++] = 244;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 244;goto st1257;}
+                       {stack[top++] = 244;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 244;goto st1268;}
+                       {stack[top++] = 244;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 244;goto st1270;}
+                       {stack[top++] = 244;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 244;goto st1299;}
+                       {stack[top++] = 244;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 244;goto st1312;}
+                       {stack[top++] = 244;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 244;goto st1325;}
+                       {stack[top++] = 244;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 244;goto st1331;}
+                       {stack[top++] = 244;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 244;goto st1349;}
+                       {stack[top++] = 244;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 244;goto st1344;}
+                       {stack[top++] = 244;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 244;goto st1362;}
+                       {stack[top++] = 244;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 244;goto st1368;}
+                       {stack[top++] = 244;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 244;goto st1374;}
+                       {stack[top++] = 244;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 244;goto st1382;}
+                       {stack[top++] = 244;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 244;goto st1390;}
+                       {stack[top++] = 244;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -34162,7 +34189,7 @@ case 244:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4297:
+tr4334:
        {
                s->r_class = s->default_class;
        }
@@ -34173,85 +34200,85 @@ tr4297:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 245;goto st844;}
+                       {stack[top++] = 245;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 245;goto st846;}
+                       {stack[top++] = 245;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 245;goto st848;}
+                       {stack[top++] = 245;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 245;goto st880;}
+                       {stack[top++] = 245;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 245;goto st885;}
+                       {stack[top++] = 245;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 245;goto st890;}
+                       {stack[top++] = 245;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 245;goto st895;}
+                       {stack[top++] = 245;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 245;goto st899;}
+                       {stack[top++] = 245;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 245;goto st901;}
+                       {stack[top++] = 245;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 245;goto st956;}
+                       {stack[top++] = 245;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 245;goto st967;}
+                       {stack[top++] = 245;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 245;goto st984;}
+                       {stack[top++] = 245;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 245;goto st995;}
+                       {stack[top++] = 245;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 245;goto st1006;}
+                       {stack[top++] = 245;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 245;goto st1019;}
+                       {stack[top++] = 245;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 245;goto st1029;}
+                       {stack[top++] = 245;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 245;goto st1068;}
+                       {stack[top++] = 245;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 245;goto st1254;}
+                       {stack[top++] = 245;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 245;goto st1257;}
+                       {stack[top++] = 245;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 245;goto st1268;}
+                       {stack[top++] = 245;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 245;goto st1270;}
+                       {stack[top++] = 245;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 245;goto st1299;}
+                       {stack[top++] = 245;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 245;goto st1312;}
+                       {stack[top++] = 245;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 245;goto st1325;}
+                       {stack[top++] = 245;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 245;goto st1331;}
+                       {stack[top++] = 245;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 245;goto st1349;}
+                       {stack[top++] = 245;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 245;goto st1344;}
+                       {stack[top++] = 245;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 245;goto st1362;}
+                       {stack[top++] = 245;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 245;goto st1368;}
+                       {stack[top++] = 245;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 245;goto st1374;}
+                       {stack[top++] = 245;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 245;goto st1382;}
+                       {stack[top++] = 245;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 245;goto st1390;}
+                       {stack[top++] = 245;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -34296,7 +34323,7 @@ case 245:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4298:
+tr4335:
        {
                s->r_class = s->default_class;
        }
@@ -34307,85 +34334,85 @@ tr4298:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 246;goto st844;}
+                       {stack[top++] = 246;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 246;goto st846;}
+                       {stack[top++] = 246;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 246;goto st848;}
+                       {stack[top++] = 246;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 246;goto st880;}
+                       {stack[top++] = 246;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 246;goto st885;}
+                       {stack[top++] = 246;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 246;goto st890;}
+                       {stack[top++] = 246;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 246;goto st895;}
+                       {stack[top++] = 246;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 246;goto st899;}
+                       {stack[top++] = 246;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 246;goto st901;}
+                       {stack[top++] = 246;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 246;goto st956;}
+                       {stack[top++] = 246;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 246;goto st967;}
+                       {stack[top++] = 246;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 246;goto st984;}
+                       {stack[top++] = 246;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 246;goto st995;}
+                       {stack[top++] = 246;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 246;goto st1006;}
+                       {stack[top++] = 246;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 246;goto st1019;}
+                       {stack[top++] = 246;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 246;goto st1029;}
+                       {stack[top++] = 246;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 246;goto st1068;}
+                       {stack[top++] = 246;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 246;goto st1254;}
+                       {stack[top++] = 246;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 246;goto st1257;}
+                       {stack[top++] = 246;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 246;goto st1268;}
+                       {stack[top++] = 246;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 246;goto st1270;}
+                       {stack[top++] = 246;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 246;goto st1299;}
+                       {stack[top++] = 246;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 246;goto st1312;}
+                       {stack[top++] = 246;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 246;goto st1325;}
+                       {stack[top++] = 246;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 246;goto st1331;}
+                       {stack[top++] = 246;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 246;goto st1349;}
+                       {stack[top++] = 246;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 246;goto st1344;}
+                       {stack[top++] = 246;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 246;goto st1362;}
+                       {stack[top++] = 246;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 246;goto st1368;}
+                       {stack[top++] = 246;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 246;goto st1374;}
+                       {stack[top++] = 246;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 246;goto st1382;}
+                       {stack[top++] = 246;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 246;goto st1390;}
+                       {stack[top++] = 246;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -34426,7 +34453,7 @@ case 246:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4299:
+tr4336:
        {
                s->r_class = s->default_class;
        }
@@ -34437,85 +34464,85 @@ tr4299:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 247;goto st844;}
+                       {stack[top++] = 247;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 247;goto st846;}
+                       {stack[top++] = 247;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 247;goto st848;}
+                       {stack[top++] = 247;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 247;goto st880;}
+                       {stack[top++] = 247;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 247;goto st885;}
+                       {stack[top++] = 247;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 247;goto st890;}
+                       {stack[top++] = 247;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 247;goto st895;}
+                       {stack[top++] = 247;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 247;goto st899;}
+                       {stack[top++] = 247;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 247;goto st901;}
+                       {stack[top++] = 247;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 247;goto st956;}
+                       {stack[top++] = 247;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 247;goto st967;}
+                       {stack[top++] = 247;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 247;goto st984;}
+                       {stack[top++] = 247;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 247;goto st995;}
+                       {stack[top++] = 247;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 247;goto st1006;}
+                       {stack[top++] = 247;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 247;goto st1019;}
+                       {stack[top++] = 247;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 247;goto st1029;}
+                       {stack[top++] = 247;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 247;goto st1068;}
+                       {stack[top++] = 247;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 247;goto st1254;}
+                       {stack[top++] = 247;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 247;goto st1257;}
+                       {stack[top++] = 247;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 247;goto st1268;}
+                       {stack[top++] = 247;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 247;goto st1270;}
+                       {stack[top++] = 247;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 247;goto st1299;}
+                       {stack[top++] = 247;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 247;goto st1312;}
+                       {stack[top++] = 247;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 247;goto st1325;}
+                       {stack[top++] = 247;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 247;goto st1331;}
+                       {stack[top++] = 247;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 247;goto st1349;}
+                       {stack[top++] = 247;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 247;goto st1344;}
+                       {stack[top++] = 247;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 247;goto st1362;}
+                       {stack[top++] = 247;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 247;goto st1368;}
+                       {stack[top++] = 247;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 247;goto st1374;}
+                       {stack[top++] = 247;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 247;goto st1382;}
+                       {stack[top++] = 247;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 247;goto st1390;}
+                       {stack[top++] = 247;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -34558,7 +34585,7 @@ case 247:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4300:
+tr4337:
        {
                s->r_class = s->default_class;
        }
@@ -34569,85 +34596,85 @@ tr4300:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 248;goto st844;}
+                       {stack[top++] = 248;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 248;goto st846;}
+                       {stack[top++] = 248;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 248;goto st848;}
+                       {stack[top++] = 248;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 248;goto st880;}
+                       {stack[top++] = 248;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 248;goto st885;}
+                       {stack[top++] = 248;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 248;goto st890;}
+                       {stack[top++] = 248;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 248;goto st895;}
+                       {stack[top++] = 248;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 248;goto st899;}
+                       {stack[top++] = 248;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 248;goto st901;}
+                       {stack[top++] = 248;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 248;goto st956;}
+                       {stack[top++] = 248;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 248;goto st967;}
+                       {stack[top++] = 248;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 248;goto st984;}
+                       {stack[top++] = 248;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 248;goto st995;}
+                       {stack[top++] = 248;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 248;goto st1006;}
+                       {stack[top++] = 248;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 248;goto st1019;}
+                       {stack[top++] = 248;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 248;goto st1029;}
+                       {stack[top++] = 248;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 248;goto st1068;}
+                       {stack[top++] = 248;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 248;goto st1254;}
+                       {stack[top++] = 248;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 248;goto st1257;}
+                       {stack[top++] = 248;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 248;goto st1268;}
+                       {stack[top++] = 248;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 248;goto st1270;}
+                       {stack[top++] = 248;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 248;goto st1299;}
+                       {stack[top++] = 248;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 248;goto st1312;}
+                       {stack[top++] = 248;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 248;goto st1325;}
+                       {stack[top++] = 248;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 248;goto st1331;}
+                       {stack[top++] = 248;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 248;goto st1349;}
+                       {stack[top++] = 248;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 248;goto st1344;}
+                       {stack[top++] = 248;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 248;goto st1362;}
+                       {stack[top++] = 248;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 248;goto st1368;}
+                       {stack[top++] = 248;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 248;goto st1374;}
+                       {stack[top++] = 248;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 248;goto st1382;}
+                       {stack[top++] = 248;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 248;goto st1390;}
+                       {stack[top++] = 248;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -34690,7 +34717,7 @@ case 248:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4301:
+tr4338:
        {
                s->r_class = s->default_class;
        }
@@ -34701,85 +34728,85 @@ tr4301:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 249;goto st844;}
+                       {stack[top++] = 249;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 249;goto st846;}
+                       {stack[top++] = 249;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 249;goto st848;}
+                       {stack[top++] = 249;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 249;goto st880;}
+                       {stack[top++] = 249;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 249;goto st885;}
+                       {stack[top++] = 249;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 249;goto st890;}
+                       {stack[top++] = 249;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 249;goto st895;}
+                       {stack[top++] = 249;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 249;goto st899;}
+                       {stack[top++] = 249;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 249;goto st901;}
+                       {stack[top++] = 249;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 249;goto st956;}
+                       {stack[top++] = 249;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 249;goto st967;}
+                       {stack[top++] = 249;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 249;goto st984;}
+                       {stack[top++] = 249;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 249;goto st995;}
+                       {stack[top++] = 249;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 249;goto st1006;}
+                       {stack[top++] = 249;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 249;goto st1019;}
+                       {stack[top++] = 249;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 249;goto st1029;}
+                       {stack[top++] = 249;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 249;goto st1068;}
+                       {stack[top++] = 249;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 249;goto st1254;}
+                       {stack[top++] = 249;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 249;goto st1257;}
+                       {stack[top++] = 249;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 249;goto st1268;}
+                       {stack[top++] = 249;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 249;goto st1270;}
+                       {stack[top++] = 249;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 249;goto st1299;}
+                       {stack[top++] = 249;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 249;goto st1312;}
+                       {stack[top++] = 249;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 249;goto st1325;}
+                       {stack[top++] = 249;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 249;goto st1331;}
+                       {stack[top++] = 249;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 249;goto st1349;}
+                       {stack[top++] = 249;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 249;goto st1344;}
+                       {stack[top++] = 249;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 249;goto st1362;}
+                       {stack[top++] = 249;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 249;goto st1368;}
+                       {stack[top++] = 249;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 249;goto st1374;}
+                       {stack[top++] = 249;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 249;goto st1382;}
+                       {stack[top++] = 249;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 249;goto st1390;}
+                       {stack[top++] = 249;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -34822,7 +34849,7 @@ case 249:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4302:
+tr4339:
        {
                s->r_class = s->default_class;
        }
@@ -34833,85 +34860,85 @@ tr4302:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 250;goto st844;}
+                       {stack[top++] = 250;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 250;goto st846;}
+                       {stack[top++] = 250;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 250;goto st848;}
+                       {stack[top++] = 250;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 250;goto st880;}
+                       {stack[top++] = 250;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 250;goto st885;}
+                       {stack[top++] = 250;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 250;goto st890;}
+                       {stack[top++] = 250;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 250;goto st895;}
+                       {stack[top++] = 250;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 250;goto st899;}
+                       {stack[top++] = 250;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 250;goto st901;}
+                       {stack[top++] = 250;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 250;goto st956;}
+                       {stack[top++] = 250;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 250;goto st967;}
+                       {stack[top++] = 250;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 250;goto st984;}
+                       {stack[top++] = 250;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 250;goto st995;}
+                       {stack[top++] = 250;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 250;goto st1006;}
+                       {stack[top++] = 250;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 250;goto st1019;}
+                       {stack[top++] = 250;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 250;goto st1029;}
+                       {stack[top++] = 250;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 250;goto st1068;}
+                       {stack[top++] = 250;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 250;goto st1254;}
+                       {stack[top++] = 250;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 250;goto st1257;}
+                       {stack[top++] = 250;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 250;goto st1268;}
+                       {stack[top++] = 250;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 250;goto st1270;}
+                       {stack[top++] = 250;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 250;goto st1299;}
+                       {stack[top++] = 250;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 250;goto st1312;}
+                       {stack[top++] = 250;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 250;goto st1325;}
+                       {stack[top++] = 250;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 250;goto st1331;}
+                       {stack[top++] = 250;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 250;goto st1349;}
+                       {stack[top++] = 250;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 250;goto st1344;}
+                       {stack[top++] = 250;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 250;goto st1362;}
+                       {stack[top++] = 250;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 250;goto st1368;}
+                       {stack[top++] = 250;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 250;goto st1374;}
+                       {stack[top++] = 250;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 250;goto st1382;}
+                       {stack[top++] = 250;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 250;goto st1390;}
+                       {stack[top++] = 250;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -34956,7 +34983,7 @@ case 250:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4303:
+tr4340:
        {
                s->r_class = s->default_class;
        }
@@ -34967,85 +34994,85 @@ tr4303:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 251;goto st844;}
+                       {stack[top++] = 251;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 251;goto st846;}
+                       {stack[top++] = 251;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 251;goto st848;}
+                       {stack[top++] = 251;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 251;goto st880;}
+                       {stack[top++] = 251;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 251;goto st885;}
+                       {stack[top++] = 251;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 251;goto st890;}
+                       {stack[top++] = 251;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 251;goto st895;}
+                       {stack[top++] = 251;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 251;goto st899;}
+                       {stack[top++] = 251;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 251;goto st901;}
+                       {stack[top++] = 251;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 251;goto st956;}
+                       {stack[top++] = 251;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 251;goto st967;}
+                       {stack[top++] = 251;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 251;goto st984;}
+                       {stack[top++] = 251;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 251;goto st995;}
+                       {stack[top++] = 251;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 251;goto st1006;}
+                       {stack[top++] = 251;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 251;goto st1019;}
+                       {stack[top++] = 251;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 251;goto st1029;}
+                       {stack[top++] = 251;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 251;goto st1068;}
+                       {stack[top++] = 251;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 251;goto st1254;}
+                       {stack[top++] = 251;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 251;goto st1257;}
+                       {stack[top++] = 251;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 251;goto st1268;}
+                       {stack[top++] = 251;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 251;goto st1270;}
+                       {stack[top++] = 251;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 251;goto st1299;}
+                       {stack[top++] = 251;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 251;goto st1312;}
+                       {stack[top++] = 251;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 251;goto st1325;}
+                       {stack[top++] = 251;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 251;goto st1331;}
+                       {stack[top++] = 251;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 251;goto st1349;}
+                       {stack[top++] = 251;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 251;goto st1344;}
+                       {stack[top++] = 251;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 251;goto st1362;}
+                       {stack[top++] = 251;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 251;goto st1368;}
+                       {stack[top++] = 251;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 251;goto st1374;}
+                       {stack[top++] = 251;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 251;goto st1382;}
+                       {stack[top++] = 251;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 251;goto st1390;}
+                       {stack[top++] = 251;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -35088,7 +35115,7 @@ case 251:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4304:
+tr4341:
        {
                s->r_class = s->default_class;
        }
@@ -35099,85 +35126,85 @@ tr4304:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 252;goto st844;}
+                       {stack[top++] = 252;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 252;goto st846;}
+                       {stack[top++] = 252;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 252;goto st848;}
+                       {stack[top++] = 252;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 252;goto st880;}
+                       {stack[top++] = 252;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 252;goto st885;}
+                       {stack[top++] = 252;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 252;goto st890;}
+                       {stack[top++] = 252;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 252;goto st895;}
+                       {stack[top++] = 252;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 252;goto st899;}
+                       {stack[top++] = 252;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 252;goto st901;}
+                       {stack[top++] = 252;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 252;goto st956;}
+                       {stack[top++] = 252;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 252;goto st967;}
+                       {stack[top++] = 252;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 252;goto st984;}
+                       {stack[top++] = 252;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 252;goto st995;}
+                       {stack[top++] = 252;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 252;goto st1006;}
+                       {stack[top++] = 252;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 252;goto st1019;}
+                       {stack[top++] = 252;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 252;goto st1029;}
+                       {stack[top++] = 252;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 252;goto st1068;}
+                       {stack[top++] = 252;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 252;goto st1254;}
+                       {stack[top++] = 252;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 252;goto st1257;}
+                       {stack[top++] = 252;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 252;goto st1268;}
+                       {stack[top++] = 252;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 252;goto st1270;}
+                       {stack[top++] = 252;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 252;goto st1299;}
+                       {stack[top++] = 252;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 252;goto st1312;}
+                       {stack[top++] = 252;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 252;goto st1325;}
+                       {stack[top++] = 252;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 252;goto st1331;}
+                       {stack[top++] = 252;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 252;goto st1349;}
+                       {stack[top++] = 252;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 252;goto st1344;}
+                       {stack[top++] = 252;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 252;goto st1362;}
+                       {stack[top++] = 252;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 252;goto st1368;}
+                       {stack[top++] = 252;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 252;goto st1374;}
+                       {stack[top++] = 252;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 252;goto st1382;}
+                       {stack[top++] = 252;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 252;goto st1390;}
+                       {stack[top++] = 252;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -35222,7 +35249,7 @@ case 252:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4305:
+tr4342:
        {
                s->r_class = s->default_class;
        }
@@ -35233,85 +35260,85 @@ tr4305:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 253;goto st844;}
+                       {stack[top++] = 253;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 253;goto st846;}
+                       {stack[top++] = 253;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 253;goto st848;}
+                       {stack[top++] = 253;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 253;goto st880;}
+                       {stack[top++] = 253;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 253;goto st885;}
+                       {stack[top++] = 253;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 253;goto st890;}
+                       {stack[top++] = 253;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 253;goto st895;}
+                       {stack[top++] = 253;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 253;goto st899;}
+                       {stack[top++] = 253;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 253;goto st901;}
+                       {stack[top++] = 253;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 253;goto st956;}
+                       {stack[top++] = 253;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 253;goto st967;}
+                       {stack[top++] = 253;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 253;goto st984;}
+                       {stack[top++] = 253;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 253;goto st995;}
+                       {stack[top++] = 253;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 253;goto st1006;}
+                       {stack[top++] = 253;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 253;goto st1019;}
+                       {stack[top++] = 253;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 253;goto st1029;}
+                       {stack[top++] = 253;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 253;goto st1068;}
+                       {stack[top++] = 253;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 253;goto st1254;}
+                       {stack[top++] = 253;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 253;goto st1257;}
+                       {stack[top++] = 253;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 253;goto st1268;}
+                       {stack[top++] = 253;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 253;goto st1270;}
+                       {stack[top++] = 253;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 253;goto st1299;}
+                       {stack[top++] = 253;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 253;goto st1312;}
+                       {stack[top++] = 253;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 253;goto st1325;}
+                       {stack[top++] = 253;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 253;goto st1331;}
+                       {stack[top++] = 253;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 253;goto st1349;}
+                       {stack[top++] = 253;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 253;goto st1344;}
+                       {stack[top++] = 253;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 253;goto st1362;}
+                       {stack[top++] = 253;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 253;goto st1368;}
+                       {stack[top++] = 253;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 253;goto st1374;}
+                       {stack[top++] = 253;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 253;goto st1382;}
+                       {stack[top++] = 253;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 253;goto st1390;}
+                       {stack[top++] = 253;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -35352,7 +35379,7 @@ case 253:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4306:
+tr4343:
        {
                s->r_class = s->default_class;
        }
@@ -35363,85 +35390,85 @@ tr4306:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 254;goto st844;}
+                       {stack[top++] = 254;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 254;goto st846;}
+                       {stack[top++] = 254;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 254;goto st848;}
+                       {stack[top++] = 254;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 254;goto st880;}
+                       {stack[top++] = 254;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 254;goto st885;}
+                       {stack[top++] = 254;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 254;goto st890;}
+                       {stack[top++] = 254;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 254;goto st895;}
+                       {stack[top++] = 254;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 254;goto st899;}
+                       {stack[top++] = 254;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 254;goto st901;}
+                       {stack[top++] = 254;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 254;goto st956;}
+                       {stack[top++] = 254;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 254;goto st967;}
+                       {stack[top++] = 254;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 254;goto st984;}
+                       {stack[top++] = 254;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 254;goto st995;}
+                       {stack[top++] = 254;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 254;goto st1006;}
+                       {stack[top++] = 254;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 254;goto st1019;}
+                       {stack[top++] = 254;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 254;goto st1029;}
+                       {stack[top++] = 254;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 254;goto st1068;}
+                       {stack[top++] = 254;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 254;goto st1254;}
+                       {stack[top++] = 254;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 254;goto st1257;}
+                       {stack[top++] = 254;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 254;goto st1268;}
+                       {stack[top++] = 254;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 254;goto st1270;}
+                       {stack[top++] = 254;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 254;goto st1299;}
+                       {stack[top++] = 254;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 254;goto st1312;}
+                       {stack[top++] = 254;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 254;goto st1325;}
+                       {stack[top++] = 254;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 254;goto st1331;}
+                       {stack[top++] = 254;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 254;goto st1349;}
+                       {stack[top++] = 254;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 254;goto st1344;}
+                       {stack[top++] = 254;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 254;goto st1362;}
+                       {stack[top++] = 254;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 254;goto st1368;}
+                       {stack[top++] = 254;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 254;goto st1374;}
+                       {stack[top++] = 254;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 254;goto st1382;}
+                       {stack[top++] = 254;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 254;goto st1390;}
+                       {stack[top++] = 254;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -35482,7 +35509,7 @@ case 254:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4307:
+tr4344:
        {
                s->r_class = s->default_class;
        }
@@ -35493,85 +35520,85 @@ tr4307:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 255;goto st844;}
+                       {stack[top++] = 255;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 255;goto st846;}
+                       {stack[top++] = 255;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 255;goto st848;}
+                       {stack[top++] = 255;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 255;goto st880;}
+                       {stack[top++] = 255;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 255;goto st885;}
+                       {stack[top++] = 255;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 255;goto st890;}
+                       {stack[top++] = 255;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 255;goto st895;}
+                       {stack[top++] = 255;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 255;goto st899;}
+                       {stack[top++] = 255;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 255;goto st901;}
+                       {stack[top++] = 255;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 255;goto st956;}
+                       {stack[top++] = 255;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 255;goto st967;}
+                       {stack[top++] = 255;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 255;goto st984;}
+                       {stack[top++] = 255;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 255;goto st995;}
+                       {stack[top++] = 255;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 255;goto st1006;}
+                       {stack[top++] = 255;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 255;goto st1019;}
+                       {stack[top++] = 255;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 255;goto st1029;}
+                       {stack[top++] = 255;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 255;goto st1068;}
+                       {stack[top++] = 255;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 255;goto st1254;}
+                       {stack[top++] = 255;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 255;goto st1257;}
+                       {stack[top++] = 255;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 255;goto st1268;}
+                       {stack[top++] = 255;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 255;goto st1270;}
+                       {stack[top++] = 255;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 255;goto st1299;}
+                       {stack[top++] = 255;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 255;goto st1312;}
+                       {stack[top++] = 255;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 255;goto st1325;}
+                       {stack[top++] = 255;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 255;goto st1331;}
+                       {stack[top++] = 255;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 255;goto st1349;}
+                       {stack[top++] = 255;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 255;goto st1344;}
+                       {stack[top++] = 255;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 255;goto st1362;}
+                       {stack[top++] = 255;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 255;goto st1368;}
+                       {stack[top++] = 255;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 255;goto st1374;}
+                       {stack[top++] = 255;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 255;goto st1382;}
+                       {stack[top++] = 255;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 255;goto st1390;}
+                       {stack[top++] = 255;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -35616,7 +35643,7 @@ case 255:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4308:
+tr4345:
        {
                s->r_class = s->default_class;
        }
@@ -35627,85 +35654,85 @@ tr4308:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 256;goto st844;}
+                       {stack[top++] = 256;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 256;goto st846;}
+                       {stack[top++] = 256;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 256;goto st848;}
+                       {stack[top++] = 256;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 256;goto st880;}
+                       {stack[top++] = 256;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 256;goto st885;}
+                       {stack[top++] = 256;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 256;goto st890;}
+                       {stack[top++] = 256;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 256;goto st895;}
+                       {stack[top++] = 256;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 256;goto st899;}
+                       {stack[top++] = 256;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 256;goto st901;}
+                       {stack[top++] = 256;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 256;goto st956;}
+                       {stack[top++] = 256;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 256;goto st967;}
+                       {stack[top++] = 256;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 256;goto st984;}
+                       {stack[top++] = 256;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 256;goto st995;}
+                       {stack[top++] = 256;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 256;goto st1006;}
+                       {stack[top++] = 256;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 256;goto st1019;}
+                       {stack[top++] = 256;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 256;goto st1029;}
+                       {stack[top++] = 256;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 256;goto st1068;}
+                       {stack[top++] = 256;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 256;goto st1254;}
+                       {stack[top++] = 256;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 256;goto st1257;}
+                       {stack[top++] = 256;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 256;goto st1268;}
+                       {stack[top++] = 256;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 256;goto st1270;}
+                       {stack[top++] = 256;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 256;goto st1299;}
+                       {stack[top++] = 256;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 256;goto st1312;}
+                       {stack[top++] = 256;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 256;goto st1325;}
+                       {stack[top++] = 256;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 256;goto st1331;}
+                       {stack[top++] = 256;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 256;goto st1349;}
+                       {stack[top++] = 256;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 256;goto st1344;}
+                       {stack[top++] = 256;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 256;goto st1362;}
+                       {stack[top++] = 256;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 256;goto st1368;}
+                       {stack[top++] = 256;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 256;goto st1374;}
+                       {stack[top++] = 256;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 256;goto st1382;}
+                       {stack[top++] = 256;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 256;goto st1390;}
+                       {stack[top++] = 256;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -35756,7 +35783,7 @@ case 256:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4309:
+tr4346:
        {
                s->r_class = s->default_class;
        }
@@ -35767,85 +35794,85 @@ tr4309:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 257;goto st844;}
+                       {stack[top++] = 257;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 257;goto st846;}
+                       {stack[top++] = 257;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 257;goto st848;}
+                       {stack[top++] = 257;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 257;goto st880;}
+                       {stack[top++] = 257;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 257;goto st885;}
+                       {stack[top++] = 257;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 257;goto st890;}
+                       {stack[top++] = 257;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 257;goto st895;}
+                       {stack[top++] = 257;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 257;goto st899;}
+                       {stack[top++] = 257;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 257;goto st901;}
+                       {stack[top++] = 257;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 257;goto st956;}
+                       {stack[top++] = 257;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 257;goto st967;}
+                       {stack[top++] = 257;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 257;goto st984;}
+                       {stack[top++] = 257;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 257;goto st995;}
+                       {stack[top++] = 257;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 257;goto st1006;}
+                       {stack[top++] = 257;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 257;goto st1019;}
+                       {stack[top++] = 257;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 257;goto st1029;}
+                       {stack[top++] = 257;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 257;goto st1068;}
+                       {stack[top++] = 257;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 257;goto st1254;}
+                       {stack[top++] = 257;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 257;goto st1257;}
+                       {stack[top++] = 257;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 257;goto st1268;}
+                       {stack[top++] = 257;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 257;goto st1270;}
+                       {stack[top++] = 257;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 257;goto st1299;}
+                       {stack[top++] = 257;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 257;goto st1312;}
+                       {stack[top++] = 257;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 257;goto st1325;}
+                       {stack[top++] = 257;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 257;goto st1331;}
+                       {stack[top++] = 257;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 257;goto st1349;}
+                       {stack[top++] = 257;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 257;goto st1344;}
+                       {stack[top++] = 257;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 257;goto st1362;}
+                       {stack[top++] = 257;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 257;goto st1368;}
+                       {stack[top++] = 257;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 257;goto st1374;}
+                       {stack[top++] = 257;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 257;goto st1382;}
+                       {stack[top++] = 257;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 257;goto st1390;}
+                       {stack[top++] = 257;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -35890,7 +35917,7 @@ case 257:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4310:
+tr4347:
        {
                s->r_class = s->default_class;
        }
@@ -35901,85 +35928,85 @@ tr4310:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 258;goto st844;}
+                       {stack[top++] = 258;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 258;goto st846;}
+                       {stack[top++] = 258;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 258;goto st848;}
+                       {stack[top++] = 258;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 258;goto st880;}
+                       {stack[top++] = 258;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 258;goto st885;}
+                       {stack[top++] = 258;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 258;goto st890;}
+                       {stack[top++] = 258;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 258;goto st895;}
+                       {stack[top++] = 258;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 258;goto st899;}
+                       {stack[top++] = 258;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 258;goto st901;}
+                       {stack[top++] = 258;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 258;goto st956;}
+                       {stack[top++] = 258;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 258;goto st967;}
+                       {stack[top++] = 258;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 258;goto st984;}
+                       {stack[top++] = 258;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 258;goto st995;}
+                       {stack[top++] = 258;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 258;goto st1006;}
+                       {stack[top++] = 258;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 258;goto st1019;}
+                       {stack[top++] = 258;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 258;goto st1029;}
+                       {stack[top++] = 258;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 258;goto st1068;}
+                       {stack[top++] = 258;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 258;goto st1254;}
+                       {stack[top++] = 258;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 258;goto st1257;}
+                       {stack[top++] = 258;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 258;goto st1268;}
+                       {stack[top++] = 258;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 258;goto st1270;}
+                       {stack[top++] = 258;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 258;goto st1299;}
+                       {stack[top++] = 258;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 258;goto st1312;}
+                       {stack[top++] = 258;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 258;goto st1325;}
+                       {stack[top++] = 258;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 258;goto st1331;}
+                       {stack[top++] = 258;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 258;goto st1349;}
+                       {stack[top++] = 258;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 258;goto st1344;}
+                       {stack[top++] = 258;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 258;goto st1362;}
+                       {stack[top++] = 258;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 258;goto st1368;}
+                       {stack[top++] = 258;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 258;goto st1374;}
+                       {stack[top++] = 258;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 258;goto st1382;}
+                       {stack[top++] = 258;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 258;goto st1390;}
+                       {stack[top++] = 258;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -36020,7 +36047,7 @@ case 258:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4311:
+tr4348:
        {
                s->r_class = s->default_class;
        }
@@ -36031,85 +36058,85 @@ tr4311:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 259;goto st844;}
+                       {stack[top++] = 259;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 259;goto st846;}
+                       {stack[top++] = 259;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 259;goto st848;}
+                       {stack[top++] = 259;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 259;goto st880;}
+                       {stack[top++] = 259;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 259;goto st885;}
+                       {stack[top++] = 259;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 259;goto st890;}
+                       {stack[top++] = 259;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 259;goto st895;}
+                       {stack[top++] = 259;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 259;goto st899;}
+                       {stack[top++] = 259;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 259;goto st901;}
+                       {stack[top++] = 259;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 259;goto st956;}
+                       {stack[top++] = 259;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 259;goto st967;}
+                       {stack[top++] = 259;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 259;goto st984;}
+                       {stack[top++] = 259;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 259;goto st995;}
+                       {stack[top++] = 259;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 259;goto st1006;}
+                       {stack[top++] = 259;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 259;goto st1019;}
+                       {stack[top++] = 259;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 259;goto st1029;}
+                       {stack[top++] = 259;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 259;goto st1068;}
+                       {stack[top++] = 259;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 259;goto st1254;}
+                       {stack[top++] = 259;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 259;goto st1257;}
+                       {stack[top++] = 259;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 259;goto st1268;}
+                       {stack[top++] = 259;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 259;goto st1270;}
+                       {stack[top++] = 259;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 259;goto st1299;}
+                       {stack[top++] = 259;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 259;goto st1312;}
+                       {stack[top++] = 259;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 259;goto st1325;}
+                       {stack[top++] = 259;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 259;goto st1331;}
+                       {stack[top++] = 259;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 259;goto st1349;}
+                       {stack[top++] = 259;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 259;goto st1344;}
+                       {stack[top++] = 259;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 259;goto st1362;}
+                       {stack[top++] = 259;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 259;goto st1368;}
+                       {stack[top++] = 259;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 259;goto st1374;}
+                       {stack[top++] = 259;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 259;goto st1382;}
+                       {stack[top++] = 259;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 259;goto st1390;}
+                       {stack[top++] = 259;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -36150,7 +36177,7 @@ case 259:
                case 2107: goto tr876;
        }
        goto tr890;
-tr4220:
+tr4257:
        {
                if (pe - p == 1) {
                        *wrap = WRAP_DETECTED;
@@ -36211,85 +36238,85 @@ tr903:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 261;goto st844;}
+                       {stack[top++] = 261;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 261;goto st846;}
+                       {stack[top++] = 261;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 261;goto st848;}
+                       {stack[top++] = 261;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 261;goto st880;}
+                       {stack[top++] = 261;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 261;goto st885;}
+                       {stack[top++] = 261;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 261;goto st890;}
+                       {stack[top++] = 261;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 261;goto st895;}
+                       {stack[top++] = 261;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 261;goto st899;}
+                       {stack[top++] = 261;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 261;goto st901;}
+                       {stack[top++] = 261;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 261;goto st956;}
+                       {stack[top++] = 261;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 261;goto st967;}
+                       {stack[top++] = 261;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 261;goto st984;}
+                       {stack[top++] = 261;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 261;goto st995;}
+                       {stack[top++] = 261;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 261;goto st1006;}
+                       {stack[top++] = 261;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 261;goto st1019;}
+                       {stack[top++] = 261;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 261;goto st1029;}
+                       {stack[top++] = 261;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 261;goto st1068;}
+                       {stack[top++] = 261;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 261;goto st1254;}
+                       {stack[top++] = 261;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 261;goto st1257;}
+                       {stack[top++] = 261;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 261;goto st1268;}
+                       {stack[top++] = 261;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 261;goto st1270;}
+                       {stack[top++] = 261;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 261;goto st1299;}
+                       {stack[top++] = 261;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 261;goto st1312;}
+                       {stack[top++] = 261;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 261;goto st1325;}
+                       {stack[top++] = 261;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 261;goto st1331;}
+                       {stack[top++] = 261;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 261;goto st1349;}
+                       {stack[top++] = 261;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 261;goto st1344;}
+                       {stack[top++] = 261;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 261;goto st1362;}
+                       {stack[top++] = 261;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 261;goto st1368;}
+                       {stack[top++] = 261;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 261;goto st1374;}
+                       {stack[top++] = 261;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 261;goto st1382;}
+                       {stack[top++] = 261;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 261;goto st1390;}
+                       {stack[top++] = 261;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -36316,85 +36343,85 @@ tr905:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 261;goto st844;}
+                       {stack[top++] = 261;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 261;goto st846;}
+                       {stack[top++] = 261;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 261;goto st848;}
+                       {stack[top++] = 261;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 261;goto st880;}
+                       {stack[top++] = 261;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 261;goto st885;}
+                       {stack[top++] = 261;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 261;goto st890;}
+                       {stack[top++] = 261;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 261;goto st895;}
+                       {stack[top++] = 261;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 261;goto st899;}
+                       {stack[top++] = 261;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 261;goto st901;}
+                       {stack[top++] = 261;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 261;goto st956;}
+                       {stack[top++] = 261;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 261;goto st967;}
+                       {stack[top++] = 261;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 261;goto st984;}
+                       {stack[top++] = 261;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 261;goto st995;}
+                       {stack[top++] = 261;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 261;goto st1006;}
+                       {stack[top++] = 261;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 261;goto st1019;}
+                       {stack[top++] = 261;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 261;goto st1029;}
+                       {stack[top++] = 261;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 261;goto st1068;}
+                       {stack[top++] = 261;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 261;goto st1254;}
+                       {stack[top++] = 261;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 261;goto st1257;}
+                       {stack[top++] = 261;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 261;goto st1268;}
+                       {stack[top++] = 261;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 261;goto st1270;}
+                       {stack[top++] = 261;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 261;goto st1299;}
+                       {stack[top++] = 261;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 261;goto st1312;}
+                       {stack[top++] = 261;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 261;goto st1325;}
+                       {stack[top++] = 261;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 261;goto st1331;}
+                       {stack[top++] = 261;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 261;goto st1349;}
+                       {stack[top++] = 261;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 261;goto st1344;}
+                       {stack[top++] = 261;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 261;goto st1362;}
+                       {stack[top++] = 261;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 261;goto st1368;}
+                       {stack[top++] = 261;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 261;goto st1374;}
+                       {stack[top++] = 261;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 261;goto st1382;}
+                       {stack[top++] = 261;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 261;goto st1390;}
+                       {stack[top++] = 261;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -36421,85 +36448,85 @@ tr906:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 261;goto st844;}
+                       {stack[top++] = 261;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 261;goto st846;}
+                       {stack[top++] = 261;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 261;goto st848;}
+                       {stack[top++] = 261;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 261;goto st880;}
+                       {stack[top++] = 261;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 261;goto st885;}
+                       {stack[top++] = 261;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 261;goto st890;}
+                       {stack[top++] = 261;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 261;goto st895;}
+                       {stack[top++] = 261;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 261;goto st899;}
+                       {stack[top++] = 261;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 261;goto st901;}
+                       {stack[top++] = 261;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 261;goto st956;}
+                       {stack[top++] = 261;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 261;goto st967;}
+                       {stack[top++] = 261;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 261;goto st984;}
+                       {stack[top++] = 261;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 261;goto st995;}
+                       {stack[top++] = 261;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 261;goto st1006;}
+                       {stack[top++] = 261;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 261;goto st1019;}
+                       {stack[top++] = 261;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 261;goto st1029;}
+                       {stack[top++] = 261;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 261;goto st1068;}
+                       {stack[top++] = 261;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 261;goto st1254;}
+                       {stack[top++] = 261;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 261;goto st1257;}
+                       {stack[top++] = 261;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 261;goto st1268;}
+                       {stack[top++] = 261;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 261;goto st1270;}
+                       {stack[top++] = 261;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 261;goto st1299;}
+                       {stack[top++] = 261;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 261;goto st1312;}
+                       {stack[top++] = 261;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 261;goto st1325;}
+                       {stack[top++] = 261;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 261;goto st1331;}
+                       {stack[top++] = 261;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 261;goto st1349;}
+                       {stack[top++] = 261;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 261;goto st1344;}
+                       {stack[top++] = 261;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 261;goto st1362;}
+                       {stack[top++] = 261;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 261;goto st1368;}
+                       {stack[top++] = 261;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 261;goto st1374;}
+                       {stack[top++] = 261;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 261;goto st1382;}
+                       {stack[top++] = 261;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 261;goto st1390;}
+                       {stack[top++] = 261;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -36522,85 +36549,85 @@ tr907:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 261;goto st844;}
+                       {stack[top++] = 261;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 261;goto st846;}
+                       {stack[top++] = 261;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 261;goto st848;}
+                       {stack[top++] = 261;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 261;goto st880;}
+                       {stack[top++] = 261;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 261;goto st885;}
+                       {stack[top++] = 261;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 261;goto st890;}
+                       {stack[top++] = 261;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 261;goto st895;}
+                       {stack[top++] = 261;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 261;goto st899;}
+                       {stack[top++] = 261;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 261;goto st901;}
+                       {stack[top++] = 261;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 261;goto st956;}
+                       {stack[top++] = 261;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 261;goto st967;}
+                       {stack[top++] = 261;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 261;goto st984;}
+                       {stack[top++] = 261;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 261;goto st995;}
+                       {stack[top++] = 261;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 261;goto st1006;}
+                       {stack[top++] = 261;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 261;goto st1019;}
+                       {stack[top++] = 261;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 261;goto st1029;}
+                       {stack[top++] = 261;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 261;goto st1068;}
+                       {stack[top++] = 261;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 261;goto st1254;}
+                       {stack[top++] = 261;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 261;goto st1257;}
+                       {stack[top++] = 261;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 261;goto st1268;}
+                       {stack[top++] = 261;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 261;goto st1270;}
+                       {stack[top++] = 261;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 261;goto st1299;}
+                       {stack[top++] = 261;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 261;goto st1312;}
+                       {stack[top++] = 261;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 261;goto st1325;}
+                       {stack[top++] = 261;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 261;goto st1331;}
+                       {stack[top++] = 261;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 261;goto st1349;}
+                       {stack[top++] = 261;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 261;goto st1344;}
+                       {stack[top++] = 261;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 261;goto st1362;}
+                       {stack[top++] = 261;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 261;goto st1368;}
+                       {stack[top++] = 261;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 261;goto st1374;}
+                       {stack[top++] = 261;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 261;goto st1382;}
+                       {stack[top++] = 261;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 261;goto st1390;}
+                       {stack[top++] = 261;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -36686,85 +36713,85 @@ tr908:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 262;goto st844;}
+                       {stack[top++] = 262;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 262;goto st846;}
+                       {stack[top++] = 262;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 262;goto st848;}
+                       {stack[top++] = 262;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 262;goto st880;}
+                       {stack[top++] = 262;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 262;goto st885;}
+                       {stack[top++] = 262;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 262;goto st890;}
+                       {stack[top++] = 262;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 262;goto st895;}
+                       {stack[top++] = 262;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 262;goto st899;}
+                       {stack[top++] = 262;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 262;goto st901;}
+                       {stack[top++] = 262;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 262;goto st956;}
+                       {stack[top++] = 262;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 262;goto st967;}
+                       {stack[top++] = 262;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 262;goto st984;}
+                       {stack[top++] = 262;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 262;goto st995;}
+                       {stack[top++] = 262;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 262;goto st1006;}
+                       {stack[top++] = 262;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 262;goto st1019;}
+                       {stack[top++] = 262;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 262;goto st1029;}
+                       {stack[top++] = 262;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 262;goto st1068;}
+                       {stack[top++] = 262;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 262;goto st1254;}
+                       {stack[top++] = 262;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 262;goto st1257;}
+                       {stack[top++] = 262;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 262;goto st1268;}
+                       {stack[top++] = 262;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 262;goto st1270;}
+                       {stack[top++] = 262;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 262;goto st1299;}
+                       {stack[top++] = 262;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 262;goto st1312;}
+                       {stack[top++] = 262;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 262;goto st1325;}
+                       {stack[top++] = 262;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 262;goto st1331;}
+                       {stack[top++] = 262;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 262;goto st1349;}
+                       {stack[top++] = 262;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 262;goto st1344;}
+                       {stack[top++] = 262;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 262;goto st1362;}
+                       {stack[top++] = 262;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 262;goto st1368;}
+                       {stack[top++] = 262;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 262;goto st1374;}
+                       {stack[top++] = 262;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 262;goto st1382;}
+                       {stack[top++] = 262;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 262;goto st1390;}
+                       {stack[top++] = 262;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -36963,85 +36990,85 @@ tr858:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 264;goto st844;}
+                       {stack[top++] = 264;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 264;goto st846;}
+                       {stack[top++] = 264;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 264;goto st848;}
+                       {stack[top++] = 264;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 264;goto st880;}
+                       {stack[top++] = 264;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 264;goto st885;}
+                       {stack[top++] = 264;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 264;goto st890;}
+                       {stack[top++] = 264;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 264;goto st895;}
+                       {stack[top++] = 264;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 264;goto st899;}
+                       {stack[top++] = 264;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 264;goto st901;}
+                       {stack[top++] = 264;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 264;goto st956;}
+                       {stack[top++] = 264;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 264;goto st967;}
+                       {stack[top++] = 264;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 264;goto st984;}
+                       {stack[top++] = 264;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 264;goto st995;}
+                       {stack[top++] = 264;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 264;goto st1006;}
+                       {stack[top++] = 264;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 264;goto st1019;}
+                       {stack[top++] = 264;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 264;goto st1029;}
+                       {stack[top++] = 264;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 264;goto st1068;}
+                       {stack[top++] = 264;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 264;goto st1254;}
+                       {stack[top++] = 264;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 264;goto st1257;}
+                       {stack[top++] = 264;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 264;goto st1268;}
+                       {stack[top++] = 264;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 264;goto st1270;}
+                       {stack[top++] = 264;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 264;goto st1299;}
+                       {stack[top++] = 264;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 264;goto st1312;}
+                       {stack[top++] = 264;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 264;goto st1325;}
+                       {stack[top++] = 264;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 264;goto st1331;}
+                       {stack[top++] = 264;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 264;goto st1349;}
+                       {stack[top++] = 264;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 264;goto st1344;}
+                       {stack[top++] = 264;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 264;goto st1362;}
+                       {stack[top++] = 264;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 264;goto st1368;}
+                       {stack[top++] = 264;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 264;goto st1374;}
+                       {stack[top++] = 264;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 264;goto st1382;}
+                       {stack[top++] = 264;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 264;goto st1390;}
+                       {stack[top++] = 264;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -37056,85 +37083,85 @@ tr989:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 264;goto st844;}
+                       {stack[top++] = 264;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 264;goto st846;}
+                       {stack[top++] = 264;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 264;goto st848;}
+                       {stack[top++] = 264;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 264;goto st880;}
+                       {stack[top++] = 264;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 264;goto st885;}
+                       {stack[top++] = 264;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 264;goto st890;}
+                       {stack[top++] = 264;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 264;goto st895;}
+                       {stack[top++] = 264;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 264;goto st899;}
+                       {stack[top++] = 264;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 264;goto st901;}
+                       {stack[top++] = 264;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 264;goto st956;}
+                       {stack[top++] = 264;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 264;goto st967;}
+                       {stack[top++] = 264;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 264;goto st984;}
+                       {stack[top++] = 264;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 264;goto st995;}
+                       {stack[top++] = 264;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 264;goto st1006;}
+                       {stack[top++] = 264;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 264;goto st1019;}
+                       {stack[top++] = 264;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 264;goto st1029;}
+                       {stack[top++] = 264;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 264;goto st1068;}
+                       {stack[top++] = 264;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 264;goto st1254;}
+                       {stack[top++] = 264;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 264;goto st1257;}
+                       {stack[top++] = 264;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 264;goto st1268;}
+                       {stack[top++] = 264;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 264;goto st1270;}
+                       {stack[top++] = 264;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 264;goto st1299;}
+                       {stack[top++] = 264;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 264;goto st1312;}
+                       {stack[top++] = 264;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 264;goto st1325;}
+                       {stack[top++] = 264;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 264;goto st1331;}
+                       {stack[top++] = 264;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 264;goto st1349;}
+                       {stack[top++] = 264;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 264;goto st1344;}
+                       {stack[top++] = 264;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 264;goto st1362;}
+                       {stack[top++] = 264;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 264;goto st1368;}
+                       {stack[top++] = 264;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 264;goto st1374;}
+                       {stack[top++] = 264;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 264;goto st1382;}
+                       {stack[top++] = 264;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 264;goto st1390;}
+                       {stack[top++] = 264;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -37160,85 +37187,85 @@ tr897:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 264;goto st844;}
+                       {stack[top++] = 264;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 264;goto st846;}
+                       {stack[top++] = 264;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 264;goto st848;}
+                       {stack[top++] = 264;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 264;goto st880;}
+                       {stack[top++] = 264;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 264;goto st885;}
+                       {stack[top++] = 264;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 264;goto st890;}
+                       {stack[top++] = 264;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 264;goto st895;}
+                       {stack[top++] = 264;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 264;goto st899;}
+                       {stack[top++] = 264;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 264;goto st901;}
+                       {stack[top++] = 264;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 264;goto st956;}
+                       {stack[top++] = 264;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 264;goto st967;}
+                       {stack[top++] = 264;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 264;goto st984;}
+                       {stack[top++] = 264;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 264;goto st995;}
+                       {stack[top++] = 264;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 264;goto st1006;}
+                       {stack[top++] = 264;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 264;goto st1019;}
+                       {stack[top++] = 264;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 264;goto st1029;}
+                       {stack[top++] = 264;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 264;goto st1068;}
+                       {stack[top++] = 264;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 264;goto st1254;}
+                       {stack[top++] = 264;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 264;goto st1257;}
+                       {stack[top++] = 264;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 264;goto st1268;}
+                       {stack[top++] = 264;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 264;goto st1270;}
+                       {stack[top++] = 264;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 264;goto st1299;}
+                       {stack[top++] = 264;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 264;goto st1312;}
+                       {stack[top++] = 264;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 264;goto st1325;}
+                       {stack[top++] = 264;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 264;goto st1331;}
+                       {stack[top++] = 264;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 264;goto st1349;}
+                       {stack[top++] = 264;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 264;goto st1344;}
+                       {stack[top++] = 264;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 264;goto st1362;}
+                       {stack[top++] = 264;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 264;goto st1368;}
+                       {stack[top++] = 264;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 264;goto st1374;}
+                       {stack[top++] = 264;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 264;goto st1382;}
+                       {stack[top++] = 264;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 264;goto st1390;}
+                       {stack[top++] = 264;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -37249,7 +37276,7 @@ tr897:
                s->buffer_length = 0;
        }
        goto st264;
-tr4292:
+tr4329:
        {
                s->buffer_length = 0;
        }
@@ -37257,85 +37284,85 @@ tr4292:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 264;goto st844;}
+                       {stack[top++] = 264;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 264;goto st846;}
+                       {stack[top++] = 264;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 264;goto st848;}
+                       {stack[top++] = 264;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 264;goto st880;}
+                       {stack[top++] = 264;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 264;goto st885;}
+                       {stack[top++] = 264;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 264;goto st890;}
+                       {stack[top++] = 264;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 264;goto st895;}
+                       {stack[top++] = 264;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 264;goto st899;}
+                       {stack[top++] = 264;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 264;goto st901;}
+                       {stack[top++] = 264;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 264;goto st956;}
+                       {stack[top++] = 264;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 264;goto st967;}
+                       {stack[top++] = 264;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 264;goto st984;}
+                       {stack[top++] = 264;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 264;goto st995;}
+                       {stack[top++] = 264;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 264;goto st1006;}
+                       {stack[top++] = 264;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 264;goto st1019;}
+                       {stack[top++] = 264;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 264;goto st1029;}
+                       {stack[top++] = 264;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 264;goto st1068;}
+                       {stack[top++] = 264;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 264;goto st1254;}
+                       {stack[top++] = 264;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 264;goto st1257;}
+                       {stack[top++] = 264;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 264;goto st1268;}
+                       {stack[top++] = 264;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 264;goto st1270;}
+                       {stack[top++] = 264;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 264;goto st1299;}
+                       {stack[top++] = 264;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 264;goto st1312;}
+                       {stack[top++] = 264;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 264;goto st1325;}
+                       {stack[top++] = 264;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 264;goto st1331;}
+                       {stack[top++] = 264;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 264;goto st1349;}
+                       {stack[top++] = 264;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 264;goto st1344;}
+                       {stack[top++] = 264;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 264;goto st1362;}
+                       {stack[top++] = 264;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 264;goto st1368;}
+                       {stack[top++] = 264;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 264;goto st1374;}
+                       {stack[top++] = 264;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 264;goto st1382;}
+                       {stack[top++] = 264;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 264;goto st1390;}
+                       {stack[top++] = 264;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -37707,7 +37734,7 @@ tr961:
                }
        }
        goto st275;
-tr4222:
+tr4259:
        {
                s->buffer_length = 0;
        }
@@ -37754,90 +37781,90 @@ case 275:
        } else if ( _widec >= 1664 )
                goto tr753;
        goto tr83;
-tr4224:
+tr4261:
        {
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 276;goto st844;}
+                       {stack[top++] = 276;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 276;goto st846;}
+                       {stack[top++] = 276;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 276;goto st848;}
+                       {stack[top++] = 276;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 276;goto st880;}
+                       {stack[top++] = 276;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 276;goto st885;}
+                       {stack[top++] = 276;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 276;goto st890;}
+                       {stack[top++] = 276;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 276;goto st895;}
+                       {stack[top++] = 276;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 276;goto st899;}
+                       {stack[top++] = 276;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 276;goto st901;}
+                       {stack[top++] = 276;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 276;goto st956;}
+                       {stack[top++] = 276;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 276;goto st967;}
+                       {stack[top++] = 276;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 276;goto st984;}
+                       {stack[top++] = 276;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 276;goto st995;}
+                       {stack[top++] = 276;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 276;goto st1006;}
+                       {stack[top++] = 276;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 276;goto st1019;}
+                       {stack[top++] = 276;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 276;goto st1029;}
+                       {stack[top++] = 276;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 276;goto st1068;}
+                       {stack[top++] = 276;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 276;goto st1254;}
+                       {stack[top++] = 276;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 276;goto st1257;}
+                       {stack[top++] = 276;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 276;goto st1268;}
+                       {stack[top++] = 276;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 276;goto st1270;}
+                       {stack[top++] = 276;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 276;goto st1299;}
+                       {stack[top++] = 276;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 276;goto st1312;}
+                       {stack[top++] = 276;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 276;goto st1325;}
+                       {stack[top++] = 276;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 276;goto st1331;}
+                       {stack[top++] = 276;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 276;goto st1349;}
+                       {stack[top++] = 276;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 276;goto st1344;}
+                       {stack[top++] = 276;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 276;goto st1362;}
+                       {stack[top++] = 276;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 276;goto st1368;}
+                       {stack[top++] = 276;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 276;goto st1374;}
+                       {stack[top++] = 276;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 276;goto st1382;}
+                       {stack[top++] = 276;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 276;goto st1390;}
+                       {stack[top++] = 276;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -37856,85 +37883,85 @@ tr142:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 276;goto st844;}
+                       {stack[top++] = 276;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 276;goto st846;}
+                       {stack[top++] = 276;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 276;goto st848;}
+                       {stack[top++] = 276;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 276;goto st880;}
+                       {stack[top++] = 276;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 276;goto st885;}
+                       {stack[top++] = 276;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 276;goto st890;}
+                       {stack[top++] = 276;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 276;goto st895;}
+                       {stack[top++] = 276;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 276;goto st899;}
+                       {stack[top++] = 276;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 276;goto st901;}
+                       {stack[top++] = 276;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 276;goto st956;}
+                       {stack[top++] = 276;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 276;goto st967;}
+                       {stack[top++] = 276;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 276;goto st984;}
+                       {stack[top++] = 276;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 276;goto st995;}
+                       {stack[top++] = 276;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 276;goto st1006;}
+                       {stack[top++] = 276;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 276;goto st1019;}
+                       {stack[top++] = 276;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 276;goto st1029;}
+                       {stack[top++] = 276;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 276;goto st1068;}
+                       {stack[top++] = 276;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 276;goto st1254;}
+                       {stack[top++] = 276;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 276;goto st1257;}
+                       {stack[top++] = 276;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 276;goto st1268;}
+                       {stack[top++] = 276;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 276;goto st1270;}
+                       {stack[top++] = 276;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 276;goto st1299;}
+                       {stack[top++] = 276;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 276;goto st1312;}
+                       {stack[top++] = 276;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 276;goto st1325;}
+                       {stack[top++] = 276;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 276;goto st1331;}
+                       {stack[top++] = 276;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 276;goto st1349;}
+                       {stack[top++] = 276;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 276;goto st1344;}
+                       {stack[top++] = 276;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 276;goto st1362;}
+                       {stack[top++] = 276;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 276;goto st1368;}
+                       {stack[top++] = 276;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 276;goto st1374;}
+                       {stack[top++] = 276;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 276;goto st1382;}
+                       {stack[top++] = 276;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 276;goto st1390;}
+                       {stack[top++] = 276;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -38104,92 +38131,92 @@ tr144:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 278;goto st844;}
+                       {stack[top++] = 278;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 278;goto st846;}
+                       {stack[top++] = 278;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 278;goto st848;}
+                       {stack[top++] = 278;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 278;goto st880;}
+                       {stack[top++] = 278;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 278;goto st885;}
+                       {stack[top++] = 278;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 278;goto st890;}
+                       {stack[top++] = 278;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 278;goto st895;}
+                       {stack[top++] = 278;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 278;goto st899;}
+                       {stack[top++] = 278;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 278;goto st901;}
+                       {stack[top++] = 278;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 278;goto st956;}
+                       {stack[top++] = 278;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 278;goto st967;}
+                       {stack[top++] = 278;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 278;goto st984;}
+                       {stack[top++] = 278;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 278;goto st995;}
+                       {stack[top++] = 278;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 278;goto st1006;}
+                       {stack[top++] = 278;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 278;goto st1019;}
+                       {stack[top++] = 278;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 278;goto st1029;}
+                       {stack[top++] = 278;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 278;goto st1068;}
+                       {stack[top++] = 278;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 278;goto st1254;}
+                       {stack[top++] = 278;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 278;goto st1257;}
+                       {stack[top++] = 278;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 278;goto st1268;}
+                       {stack[top++] = 278;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 278;goto st1270;}
+                       {stack[top++] = 278;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 278;goto st1299;}
+                       {stack[top++] = 278;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 278;goto st1312;}
+                       {stack[top++] = 278;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 278;goto st1325;}
+                       {stack[top++] = 278;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 278;goto st1331;}
+                       {stack[top++] = 278;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 278;goto st1349;}
+                       {stack[top++] = 278;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 278;goto st1344;}
+                       {stack[top++] = 278;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 278;goto st1362;}
+                       {stack[top++] = 278;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 278;goto st1368;}
+                       {stack[top++] = 278;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 278;goto st1374;}
+                       {stack[top++] = 278;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 278;goto st1382;}
+                       {stack[top++] = 278;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 278;goto st1390;}
+                       {stack[top++] = 278;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
                }
        }
        goto st278;
-tr4226:
+tr4263:
        {
                s->buffer_length = 0;
        }
@@ -38197,85 +38224,85 @@ tr4226:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 278;goto st844;}
+                       {stack[top++] = 278;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 278;goto st846;}
+                       {stack[top++] = 278;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 278;goto st848;}
+                       {stack[top++] = 278;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 278;goto st880;}
+                       {stack[top++] = 278;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 278;goto st885;}
+                       {stack[top++] = 278;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 278;goto st890;}
+                       {stack[top++] = 278;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 278;goto st895;}
+                       {stack[top++] = 278;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 278;goto st899;}
+                       {stack[top++] = 278;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 278;goto st901;}
+                       {stack[top++] = 278;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 278;goto st956;}
+                       {stack[top++] = 278;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 278;goto st967;}
+                       {stack[top++] = 278;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 278;goto st984;}
+                       {stack[top++] = 278;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 278;goto st995;}
+                       {stack[top++] = 278;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 278;goto st1006;}
+                       {stack[top++] = 278;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 278;goto st1019;}
+                       {stack[top++] = 278;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 278;goto st1029;}
+                       {stack[top++] = 278;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 278;goto st1068;}
+                       {stack[top++] = 278;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 278;goto st1254;}
+                       {stack[top++] = 278;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 278;goto st1257;}
+                       {stack[top++] = 278;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 278;goto st1268;}
+                       {stack[top++] = 278;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 278;goto st1270;}
+                       {stack[top++] = 278;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 278;goto st1299;}
+                       {stack[top++] = 278;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 278;goto st1312;}
+                       {stack[top++] = 278;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 278;goto st1325;}
+                       {stack[top++] = 278;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 278;goto st1331;}
+                       {stack[top++] = 278;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 278;goto st1349;}
+                       {stack[top++] = 278;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 278;goto st1344;}
+                       {stack[top++] = 278;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 278;goto st1362;}
+                       {stack[top++] = 278;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 278;goto st1368;}
+                       {stack[top++] = 278;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 278;goto st1374;}
+                       {stack[top++] = 278;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 278;goto st1382;}
+                       {stack[top++] = 278;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 278;goto st1390;}
+                       {stack[top++] = 278;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -38490,85 +38517,85 @@ tr114:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 280;goto st844;}
+                       {stack[top++] = 280;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 280;goto st846;}
+                       {stack[top++] = 280;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 280;goto st848;}
+                       {stack[top++] = 280;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 280;goto st880;}
+                       {stack[top++] = 280;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 280;goto st885;}
+                       {stack[top++] = 280;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 280;goto st890;}
+                       {stack[top++] = 280;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 280;goto st895;}
+                       {stack[top++] = 280;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 280;goto st899;}
+                       {stack[top++] = 280;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 280;goto st901;}
+                       {stack[top++] = 280;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 280;goto st956;}
+                       {stack[top++] = 280;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 280;goto st967;}
+                       {stack[top++] = 280;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 280;goto st984;}
+                       {stack[top++] = 280;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 280;goto st995;}
+                       {stack[top++] = 280;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 280;goto st1006;}
+                       {stack[top++] = 280;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 280;goto st1019;}
+                       {stack[top++] = 280;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 280;goto st1029;}
+                       {stack[top++] = 280;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 280;goto st1068;}
+                       {stack[top++] = 280;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 280;goto st1254;}
+                       {stack[top++] = 280;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 280;goto st1257;}
+                       {stack[top++] = 280;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 280;goto st1268;}
+                       {stack[top++] = 280;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 280;goto st1270;}
+                       {stack[top++] = 280;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 280;goto st1299;}
+                       {stack[top++] = 280;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 280;goto st1312;}
+                       {stack[top++] = 280;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 280;goto st1325;}
+                       {stack[top++] = 280;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 280;goto st1331;}
+                       {stack[top++] = 280;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 280;goto st1349;}
+                       {stack[top++] = 280;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 280;goto st1344;}
+                       {stack[top++] = 280;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 280;goto st1362;}
+                       {stack[top++] = 280;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 280;goto st1368;}
+                       {stack[top++] = 280;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 280;goto st1374;}
+                       {stack[top++] = 280;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 280;goto st1382;}
+                       {stack[top++] = 280;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 280;goto st1390;}
+                       {stack[top++] = 280;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -38583,85 +38610,85 @@ tr107:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 280;goto st844;}
+                       {stack[top++] = 280;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 280;goto st846;}
+                       {stack[top++] = 280;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 280;goto st848;}
+                       {stack[top++] = 280;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 280;goto st880;}
+                       {stack[top++] = 280;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 280;goto st885;}
+                       {stack[top++] = 280;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 280;goto st890;}
+                       {stack[top++] = 280;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 280;goto st895;}
+                       {stack[top++] = 280;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 280;goto st899;}
+                       {stack[top++] = 280;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 280;goto st901;}
+                       {stack[top++] = 280;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 280;goto st956;}
+                       {stack[top++] = 280;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 280;goto st967;}
+                       {stack[top++] = 280;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 280;goto st984;}
+                       {stack[top++] = 280;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 280;goto st995;}
+                       {stack[top++] = 280;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 280;goto st1006;}
+                       {stack[top++] = 280;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 280;goto st1019;}
+                       {stack[top++] = 280;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 280;goto st1029;}
+                       {stack[top++] = 280;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 280;goto st1068;}
+                       {stack[top++] = 280;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 280;goto st1254;}
+                       {stack[top++] = 280;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 280;goto st1257;}
+                       {stack[top++] = 280;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 280;goto st1268;}
+                       {stack[top++] = 280;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 280;goto st1270;}
+                       {stack[top++] = 280;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 280;goto st1299;}
+                       {stack[top++] = 280;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 280;goto st1312;}
+                       {stack[top++] = 280;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 280;goto st1325;}
+                       {stack[top++] = 280;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 280;goto st1331;}
+                       {stack[top++] = 280;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 280;goto st1349;}
+                       {stack[top++] = 280;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 280;goto st1344;}
+                       {stack[top++] = 280;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 280;goto st1362;}
+                       {stack[top++] = 280;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 280;goto st1368;}
+                       {stack[top++] = 280;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 280;goto st1374;}
+                       {stack[top++] = 280;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 280;goto st1382;}
+                       {stack[top++] = 280;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 280;goto st1390;}
+                       {stack[top++] = 280;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -38684,85 +38711,85 @@ tr832:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 280;goto st844;}
+                       {stack[top++] = 280;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 280;goto st846;}
+                       {stack[top++] = 280;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 280;goto st848;}
+                       {stack[top++] = 280;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 280;goto st880;}
+                       {stack[top++] = 280;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 280;goto st885;}
+                       {stack[top++] = 280;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 280;goto st890;}
+                       {stack[top++] = 280;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 280;goto st895;}
+                       {stack[top++] = 280;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 280;goto st899;}
+                       {stack[top++] = 280;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 280;goto st901;}
+                       {stack[top++] = 280;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 280;goto st956;}
+                       {stack[top++] = 280;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 280;goto st967;}
+                       {stack[top++] = 280;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 280;goto st984;}
+                       {stack[top++] = 280;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 280;goto st995;}
+                       {stack[top++] = 280;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 280;goto st1006;}
+                       {stack[top++] = 280;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 280;goto st1019;}
+                       {stack[top++] = 280;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 280;goto st1029;}
+                       {stack[top++] = 280;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 280;goto st1068;}
+                       {stack[top++] = 280;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 280;goto st1254;}
+                       {stack[top++] = 280;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 280;goto st1257;}
+                       {stack[top++] = 280;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 280;goto st1268;}
+                       {stack[top++] = 280;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 280;goto st1270;}
+                       {stack[top++] = 280;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 280;goto st1299;}
+                       {stack[top++] = 280;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 280;goto st1312;}
+                       {stack[top++] = 280;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 280;goto st1325;}
+                       {stack[top++] = 280;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 280;goto st1331;}
+                       {stack[top++] = 280;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 280;goto st1349;}
+                       {stack[top++] = 280;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 280;goto st1344;}
+                       {stack[top++] = 280;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 280;goto st1362;}
+                       {stack[top++] = 280;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 280;goto st1368;}
+                       {stack[top++] = 280;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 280;goto st1374;}
+                       {stack[top++] = 280;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 280;goto st1382;}
+                       {stack[top++] = 280;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 280;goto st1390;}
+                       {stack[top++] = 280;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -39022,85 +39049,85 @@ tr821:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 283;goto st844;}
+                       {stack[top++] = 283;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 283;goto st846;}
+                       {stack[top++] = 283;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 283;goto st848;}
+                       {stack[top++] = 283;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 283;goto st880;}
+                       {stack[top++] = 283;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 283;goto st885;}
+                       {stack[top++] = 283;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 283;goto st890;}
+                       {stack[top++] = 283;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 283;goto st895;}
+                       {stack[top++] = 283;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 283;goto st899;}
+                       {stack[top++] = 283;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 283;goto st901;}
+                       {stack[top++] = 283;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 283;goto st956;}
+                       {stack[top++] = 283;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 283;goto st967;}
+                       {stack[top++] = 283;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 283;goto st984;}
+                       {stack[top++] = 283;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 283;goto st995;}
+                       {stack[top++] = 283;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 283;goto st1006;}
+                       {stack[top++] = 283;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 283;goto st1019;}
+                       {stack[top++] = 283;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 283;goto st1029;}
+                       {stack[top++] = 283;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 283;goto st1068;}
+                       {stack[top++] = 283;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 283;goto st1254;}
+                       {stack[top++] = 283;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 283;goto st1257;}
+                       {stack[top++] = 283;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 283;goto st1268;}
+                       {stack[top++] = 283;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 283;goto st1270;}
+                       {stack[top++] = 283;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 283;goto st1299;}
+                       {stack[top++] = 283;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 283;goto st1312;}
+                       {stack[top++] = 283;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 283;goto st1325;}
+                       {stack[top++] = 283;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 283;goto st1331;}
+                       {stack[top++] = 283;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 283;goto st1349;}
+                       {stack[top++] = 283;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 283;goto st1344;}
+                       {stack[top++] = 283;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 283;goto st1362;}
+                       {stack[top++] = 283;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 283;goto st1368;}
+                       {stack[top++] = 283;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 283;goto st1374;}
+                       {stack[top++] = 283;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 283;goto st1382;}
+                       {stack[top++] = 283;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 283;goto st1390;}
+                       {stack[top++] = 283;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -39122,85 +39149,85 @@ tr814:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 283;goto st844;}
+                       {stack[top++] = 283;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 283;goto st846;}
+                       {stack[top++] = 283;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 283;goto st848;}
+                       {stack[top++] = 283;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 283;goto st880;}
+                       {stack[top++] = 283;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 283;goto st885;}
+                       {stack[top++] = 283;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 283;goto st890;}
+                       {stack[top++] = 283;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 283;goto st895;}
+                       {stack[top++] = 283;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 283;goto st899;}
+                       {stack[top++] = 283;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 283;goto st901;}
+                       {stack[top++] = 283;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 283;goto st956;}
+                       {stack[top++] = 283;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 283;goto st967;}
+                       {stack[top++] = 283;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 283;goto st984;}
+                       {stack[top++] = 283;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 283;goto st995;}
+                       {stack[top++] = 283;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 283;goto st1006;}
+                       {stack[top++] = 283;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 283;goto st1019;}
+                       {stack[top++] = 283;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 283;goto st1029;}
+                       {stack[top++] = 283;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 283;goto st1068;}
+                       {stack[top++] = 283;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 283;goto st1254;}
+                       {stack[top++] = 283;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 283;goto st1257;}
+                       {stack[top++] = 283;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 283;goto st1268;}
+                       {stack[top++] = 283;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 283;goto st1270;}
+                       {stack[top++] = 283;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 283;goto st1299;}
+                       {stack[top++] = 283;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 283;goto st1312;}
+                       {stack[top++] = 283;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 283;goto st1325;}
+                       {stack[top++] = 283;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 283;goto st1331;}
+                       {stack[top++] = 283;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 283;goto st1349;}
+                       {stack[top++] = 283;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 283;goto st1344;}
+                       {stack[top++] = 283;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 283;goto st1362;}
+                       {stack[top++] = 283;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 283;goto st1368;}
+                       {stack[top++] = 283;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 283;goto st1374;}
+                       {stack[top++] = 283;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 283;goto st1382;}
+                       {stack[top++] = 283;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 283;goto st1390;}
+                       {stack[top++] = 283;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -39297,85 +39324,85 @@ tr822:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 284;goto st844;}
+                       {stack[top++] = 284;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 284;goto st846;}
+                       {stack[top++] = 284;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 284;goto st848;}
+                       {stack[top++] = 284;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 284;goto st880;}
+                       {stack[top++] = 284;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 284;goto st885;}
+                       {stack[top++] = 284;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 284;goto st890;}
+                       {stack[top++] = 284;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 284;goto st895;}
+                       {stack[top++] = 284;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 284;goto st899;}
+                       {stack[top++] = 284;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 284;goto st901;}
+                       {stack[top++] = 284;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 284;goto st956;}
+                       {stack[top++] = 284;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 284;goto st967;}
+                       {stack[top++] = 284;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 284;goto st984;}
+                       {stack[top++] = 284;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 284;goto st995;}
+                       {stack[top++] = 284;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 284;goto st1006;}
+                       {stack[top++] = 284;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 284;goto st1019;}
+                       {stack[top++] = 284;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 284;goto st1029;}
+                       {stack[top++] = 284;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 284;goto st1068;}
+                       {stack[top++] = 284;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 284;goto st1254;}
+                       {stack[top++] = 284;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 284;goto st1257;}
+                       {stack[top++] = 284;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 284;goto st1268;}
+                       {stack[top++] = 284;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 284;goto st1270;}
+                       {stack[top++] = 284;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 284;goto st1299;}
+                       {stack[top++] = 284;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 284;goto st1312;}
+                       {stack[top++] = 284;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 284;goto st1325;}
+                       {stack[top++] = 284;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 284;goto st1331;}
+                       {stack[top++] = 284;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 284;goto st1349;}
+                       {stack[top++] = 284;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 284;goto st1344;}
+                       {stack[top++] = 284;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 284;goto st1362;}
+                       {stack[top++] = 284;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 284;goto st1368;}
+                       {stack[top++] = 284;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 284;goto st1374;}
+                       {stack[top++] = 284;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 284;goto st1382;}
+                       {stack[top++] = 284;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 284;goto st1390;}
+                       {stack[top++] = 284;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -39397,85 +39424,85 @@ tr815:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = 284;goto st844;}
+                       {stack[top++] = 284;goto st871;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = 284;goto st846;}
+                       {stack[top++] = 284;goto st873;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = 284;goto st848;}
+                       {stack[top++] = 284;goto st875;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = 284;goto st880;}
+                       {stack[top++] = 284;goto st907;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = 284;goto st885;}
+                       {stack[top++] = 284;goto st912;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = 284;goto st890;}
+                       {stack[top++] = 284;goto st917;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = 284;goto st895;}
+                       {stack[top++] = 284;goto st922;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = 284;goto st899;}
+                       {stack[top++] = 284;goto st926;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = 284;goto st901;}
+                       {stack[top++] = 284;goto st928;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = 284;goto st956;}
+                       {stack[top++] = 284;goto st983;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = 284;goto st967;}
+                       {stack[top++] = 284;goto st994;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = 284;goto st984;}
+                       {stack[top++] = 284;goto st1011;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = 284;goto st995;}
+                       {stack[top++] = 284;goto st1022;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = 284;goto st1006;}
+                       {stack[top++] = 284;goto st1033;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = 284;goto st1019;}
+                       {stack[top++] = 284;goto st1046;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = 284;goto st1029;}
+                       {stack[top++] = 284;goto st1056;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = 284;goto st1068;}
+                       {stack[top++] = 284;goto st1095;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = 284;goto st1254;}
+                       {stack[top++] = 284;goto st1281;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = 284;goto st1257;}
+                       {stack[top++] = 284;goto st1284;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = 284;goto st1268;}
+                       {stack[top++] = 284;goto st1295;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = 284;goto st1270;}
+                       {stack[top++] = 284;goto st1297;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = 284;goto st1299;}
+                       {stack[top++] = 284;goto st1326;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = 284;goto st1312;}
+                       {stack[top++] = 284;goto st1339;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = 284;goto st1325;}
+                       {stack[top++] = 284;goto st1352;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = 284;goto st1331;}
+                       {stack[top++] = 284;goto st1358;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = 284;goto st1349;}
+                       {stack[top++] = 284;goto st1376;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = 284;goto st1344;}
+                       {stack[top++] = 284;goto st1371;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = 284;goto st1362;}
+                       {stack[top++] = 284;goto st1389;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = 284;goto st1368;}
+                       {stack[top++] = 284;goto st1395;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = 284;goto st1374;}
+                       {stack[top++] = 284;goto st1401;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = 284;goto st1382;}
+                       {stack[top++] = 284;goto st1409;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = 284;goto st1390;}
+                       {stack[top++] = 284;goto st1417;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {goto st307;}
@@ -39666,7 +39693,7 @@ case 285:
        if ( 1920 <= _widec && _widec <= 2175 )
                goto tr983;
        goto tr83;
-tr4232:
+tr4269:
        {
                s->r_class = s->default_class;
        }
@@ -39676,7 +39703,7 @@ tr4232:
        }
        { p--; {stack[top++] = 286;goto st309;} }
        goto st286;
-tr4253:
+tr4290:
        {
                s->r_class = s->default_class;
        }
@@ -39724,7 +39751,7 @@ case 286:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4233:
+tr4270:
        {
                s->r_class = s->default_class;
        }
@@ -39734,7 +39761,7 @@ tr4233:
        }
        { p--; {stack[top++] = 287;goto st309;} }
        goto st287;
-tr4254:
+tr4291:
        {
                s->r_class = s->default_class;
        }
@@ -39778,7 +39805,7 @@ case 287:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4234:
+tr4271:
        {
                s->r_class = s->default_class;
        }
@@ -39788,7 +39815,7 @@ tr4234:
        }
        { p--; {stack[top++] = 288;goto st309;} }
        goto st288;
-tr4255:
+tr4292:
        {
                s->r_class = s->default_class;
        }
@@ -39828,7 +39855,7 @@ case 288:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4235:
+tr4272:
        {
                s->r_class = s->default_class;
        }
@@ -39838,7 +39865,7 @@ tr4235:
        }
        { p--; {stack[top++] = 289;goto st309;} }
        goto st289;
-tr4256:
+tr4293:
        {
                s->r_class = s->default_class;
        }
@@ -39880,7 +39907,7 @@ case 289:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4257:
+tr4294:
        {
                s->r_class = s->default_class;
        }
@@ -39922,7 +39949,7 @@ case 290:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4237:
+tr4274:
        {
                s->r_class = s->default_class;
        }
@@ -39932,7 +39959,7 @@ tr4237:
        }
        { p--; {stack[top++] = 291;goto st309;} }
        goto st291;
-tr4258:
+tr4295:
        {
                s->r_class = s->default_class;
        }
@@ -39974,7 +40001,7 @@ case 291:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4238:
+tr4275:
        {
                s->r_class = s->default_class;
        }
@@ -39984,7 +40011,7 @@ tr4238:
        }
        { p--; {stack[top++] = 292;goto st309;} }
        goto st292;
-tr4259:
+tr4296:
        {
                s->r_class = s->default_class;
        }
@@ -40028,7 +40055,7 @@ case 292:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4239:
+tr4276:
        {
                s->r_class = s->default_class;
        }
@@ -40038,7 +40065,7 @@ tr4239:
        }
        { p--; {stack[top++] = 293;goto st309;} }
        goto st293;
-tr4260:
+tr4297:
        {
                s->r_class = s->default_class;
        }
@@ -40080,7 +40107,7 @@ case 293:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4240:
+tr4277:
        {
                s->r_class = s->default_class;
        }
@@ -40090,7 +40117,7 @@ tr4240:
        }
        { p--; {stack[top++] = 294;goto st309;} }
        goto st294;
-tr4261:
+tr4298:
        {
                s->r_class = s->default_class;
        }
@@ -40134,7 +40161,7 @@ case 294:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4241:
+tr4278:
        {
                s->r_class = s->default_class;
        }
@@ -40144,7 +40171,7 @@ tr4241:
        }
        { p--; {stack[top++] = 295;goto st309;} }
        goto st295;
-tr4262:
+tr4299:
        {
                s->r_class = s->default_class;
        }
@@ -40184,7 +40211,7 @@ case 295:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4242:
+tr4279:
        {
                s->r_class = s->default_class;
        }
@@ -40194,7 +40221,7 @@ tr4242:
        }
        { p--; {stack[top++] = 296;goto st309;} }
        goto st296;
-tr4263:
+tr4300:
        {
                s->r_class = s->default_class;
        }
@@ -40234,7 +40261,7 @@ case 296:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4243:
+tr4280:
        {
                s->r_class = s->default_class;
        }
@@ -40244,7 +40271,7 @@ tr4243:
        }
        { p--; {stack[top++] = 297;goto st309;} }
        goto st297;
-tr4264:
+tr4301:
        {
                s->r_class = s->default_class;
        }
@@ -40288,7 +40315,7 @@ case 297:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4244:
+tr4281:
        {
                s->r_class = s->default_class;
        }
@@ -40298,7 +40325,7 @@ tr4244:
        }
        { p--; {stack[top++] = 298;goto st309;} }
        goto st298;
-tr4265:
+tr4302:
        {
                s->r_class = s->default_class;
        }
@@ -40348,7 +40375,7 @@ case 298:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4245:
+tr4282:
        {
                s->r_class = s->default_class;
        }
@@ -40358,7 +40385,7 @@ tr4245:
        }
        { p--; {stack[top++] = 299;goto st309;} }
        goto st299;
-tr4266:
+tr4303:
        {
                s->r_class = s->default_class;
        }
@@ -40402,7 +40429,7 @@ case 299:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4246:
+tr4283:
        {
                s->r_class = s->default_class;
        }
@@ -40412,7 +40439,7 @@ tr4246:
        }
        { p--; {stack[top++] = 300;goto st309;} }
        goto st300;
-tr4267:
+tr4304:
        {
                s->r_class = s->default_class;
        }
@@ -40452,7 +40479,7 @@ case 300:
                case 2107: goto tr771;
        }
        goto tr996;
-tr4247:
+tr4284:
        {
                s->r_class = s->default_class;
        }
@@ -40462,7 +40489,7 @@ tr4247:
        }
        { p--; {stack[top++] = 301;goto st309;} }
        goto st301;
-tr4268:
+tr4305:
        {
                s->r_class = s->default_class;
        }
@@ -40514,7 +40541,7 @@ tr997:
                }
        }
        goto st302;
-tr4214:
+tr4251:
        {
                if (s->r_owner_length == 0) {
                        WARN(ZS_BAD_PREVIOUS_OWNER);
@@ -40529,7 +40556,7 @@ tr4214:
                s->buffer_length = 0;
        }
        goto st302;
-tr4282:
+tr4319:
        {
                s->buffer_length = 0;
        }
@@ -40544,7 +40571,7 @@ tr4282:
                s->buffer_length = 0;
        }
        goto st302;
-tr4278:
+tr4315:
        {
                NOERR;
        }
@@ -40606,7 +40633,7 @@ tr999:
                }
        }
        goto st303;
-tr4249:
+tr4286:
        {
                s->buffer_length = 0;
        }
@@ -40653,7 +40680,7 @@ case 303:
        } else if ( _widec >= 1664 )
                goto tr753;
        goto tr151;
-tr4236:
+tr4273:
        {
                s->r_class = s->default_class;
        }
@@ -40798,15 +40825,15 @@ case 306:
                goto st306;
        goto st0;
 tr1004:
-       { p--; {stack[top++] = 1406;goto st1396;} }
+       { p--; {stack[top++] = 1433;goto st1423;} }
        {
                s->line_counter++;
        }
-       goto st1406;
-st1406:
+       goto st1433;
+st1433:
        if ( ++p == pe )
-               goto _test_eof1406;
-case 1406:
+               goto _test_eof1433;
+case 1433:
        goto st0;
 st307:
        if ( ++p == pe )
@@ -40848,7 +40875,7 @@ case 308:
                goto tr1010;
        goto tr1009;
 tr1008:
-       cs = 1407;
+       cs = 1434;
        {
                s->buffer_length = 0;
        }
@@ -40896,7 +40923,7 @@ tr1008:
        }
        goto _again;
 tr1010:
-       cs = 1407;
+       cs = 1434;
        {
                // Terminate the error context string.
                s->buffer[s->buffer_length++] = 0;
@@ -40940,10 +40967,10 @@ tr1010:
                s->line_counter++;
        }
        goto _again;
-st1407:
+st1434:
        if ( ++p == pe )
-               goto _test_eof1407;
-case 1407:
+               goto _test_eof1434;
+case 1434:
        goto st0;
 st309:
        if ( ++p == pe )
@@ -41083,7 +41110,7 @@ tr1016:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1408;
+       goto st1435;
 tr1020:
        {
                // Enough room for the terminal label is guaranteed (_label_exit).
@@ -41092,7 +41119,7 @@ tr1020:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1408;
+       goto st1435;
 tr1027:
        {
                s->dname_tmp_length++;
@@ -41124,7 +41151,7 @@ tr1027:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1408;
+       goto st1435;
 tr1031:
        {
                // Copy already verified zone origin.
@@ -41137,11 +41164,11 @@ tr1031:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1408;
-st1408:
+       goto st1435;
+st1435:
        if ( ++p == pe )
-               goto _test_eof1408;
-case 1408:
+               goto _test_eof1435;
+case 1435:
        goto st0;
 tr1018:
        {
@@ -41531,7 +41558,7 @@ tr1036:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1409;
+       goto st1436;
 tr1044:
        {
                rdata_tail++;
@@ -41568,16 +41595,16 @@ tr1044:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1409;
+       goto st1436;
 tr1057:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1409;
-st1409:
+       goto st1436;
+st1436:
        if ( ++p == pe )
-               goto _test_eof1409;
-case 1409:
+               goto _test_eof1436;
+case 1436:
        goto st0;
 tr1038:
        {
@@ -41634,7 +41661,7 @@ tr1038:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1410;
+       goto st1437;
 tr1046:
        {
                rdata_tail++;
@@ -41693,11 +41720,11 @@ tr1046:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1410;
-st1410:
+       goto st1437;
+st1437:
        if ( ++p == pe )
-               goto _test_eof1410;
-case 1410:
+               goto _test_eof1437;
+case 1437:
        switch( (*p) ) {
                case 32: goto tr1036;
                case 33: goto tr1037;
@@ -42785,7 +42812,7 @@ tr1083:
        {
                s->line_counter++;
        }
-       goto st1411;
+       goto st1438;
 tr1089:
        {
                if (s->number64 <= UINT32_MAX) {
@@ -42801,7 +42828,7 @@ tr1089:
        {
                s->line_counter++;
        }
-       goto st1411;
+       goto st1438;
 tr1092:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -42812,7 +42839,7 @@ tr1092:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1411; goto _out;}
+                               {p++; cs = 1438; goto _out;}
                        }
                }
        }
@@ -42830,7 +42857,7 @@ tr1092:
        {
                s->line_counter++;
        }
-       goto st1411;
+       goto st1438;
 tr1105:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
@@ -42858,11 +42885,11 @@ tr1105:
        {
                s->line_counter++;
        }
-       goto st1411;
-st1411:
+       goto st1438;
+st1438:
        if ( ++p == pe )
-               goto _test_eof1411;
-case 1411:
+               goto _test_eof1438;
+case 1438:
        goto st0;
 tr1090:
        {
@@ -43528,7 +43555,7 @@ tr1127:
        {
                s->line_counter++;
        }
-       goto st1412;
+       goto st1439;
 tr1132:
        {
                s->zone_origin_length = s->dname_tmp_length;
@@ -43539,7 +43566,7 @@ tr1132:
        {
                s->line_counter++;
        }
-       goto st1412;
+       goto st1439;
 tr1135:
        {
                s->buffer[s->buffer_length++] = 0;
@@ -43550,7 +43577,7 @@ tr1135:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1412; goto _out;}
+                               {p++; cs = 1439; goto _out;}
                        }
                }
        }
@@ -43563,11 +43590,11 @@ tr1135:
        {
                s->line_counter++;
        }
-       goto st1412;
-st1412:
+       goto st1439;
+st1439:
        if ( ++p == pe )
-               goto _test_eof1412;
-case 1412:
+               goto _test_eof1439;
+case 1439:
        goto st0;
 tr1133:
        {
@@ -44282,7 +44309,7 @@ case 358:
        }
        goto tr89;
 tr1156:
-       cs = 1413;
+       cs = 1440;
        {
                size_t len = rdata_tail - s->r_data;
                if (len >= sizeof(s->include_filename)) {
@@ -44356,7 +44383,7 @@ tr1156:
                        free(ss);
                } else {
                        s->state = ZS_STATE_INCLUDE;
-                       p--; cs = 1396; {p++; goto _out;}
+                       p--; cs = 1423; {p++; goto _out;}
                }
        }
        {
@@ -44367,7 +44394,7 @@ tr1156:
        }
        goto _again;
 tr1166:
-       cs = 1413;
+       cs = 1440;
        {
                // Extend relative file path.
                if (s->include_filename[0] != '/') {
@@ -44423,7 +44450,7 @@ tr1166:
                        free(ss);
                } else {
                        s->state = ZS_STATE_INCLUDE;
-                       p--; cs = 1396; {p++; goto _out;}
+                       p--; cs = 1423; {p++; goto _out;}
                }
        }
        {
@@ -44434,7 +44461,7 @@ tr1166:
        }
        goto _again;
 tr1178:
-       cs = 1413;
+       cs = 1440;
        {
                // Enough room for the terminal label is guaranteed (_label_exit).
                (s->dname)[s->dname_tmp_length++] = 0;
@@ -44501,7 +44528,7 @@ tr1178:
                        free(ss);
                } else {
                        s->state = ZS_STATE_INCLUDE;
-                       p--; cs = 1396; {p++; goto _out;}
+                       p--; cs = 1423; {p++; goto _out;}
                }
        }
        {
@@ -44512,7 +44539,7 @@ tr1178:
        }
        goto _again;
 tr1184:
-       cs = 1413;
+       cs = 1440;
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -44581,7 +44608,7 @@ tr1184:
                        free(ss);
                } else {
                        s->state = ZS_STATE_INCLUDE;
-                       p--; cs = 1396; {p++; goto _out;}
+                       p--; cs = 1423; {p++; goto _out;}
                }
        }
        {
@@ -44591,10 +44618,10 @@ tr1184:
                s->line_counter++;
        }
        goto _again;
-st1413:
+st1440:
        if ( ++p == pe )
-               goto _test_eof1413;
-case 1413:
+               goto _test_eof1440;
+case 1440:
        goto st0;
 tr1167:
        {
@@ -44849,7 +44876,7 @@ case 365:
                goto tr1183;
        goto tr89;
 tr1193:
-       cs = 1414;
+       cs = 1441;
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -44921,17 +44948,17 @@ tr1193:
                        free(ss);
                } else {
                        s->state = ZS_STATE_INCLUDE;
-                       p--; cs = 1396; {p++; goto _out;}
+                       p--; cs = 1423; {p++; goto _out;}
                }
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
        goto _again;
-st1414:
+st1441:
        if ( ++p == pe )
-               goto _test_eof1414;
-case 1414:
+               goto _test_eof1441;
+case 1441:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -45350,11 +45377,11 @@ tr1214:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1415;
-st1415:
+       goto st1442;
+st1442:
        if ( ++p == pe )
-               goto _test_eof1415;
-case 1415:
+               goto _test_eof1442;
+case 1442:
        goto st0;
 tr1215:
        {
@@ -45363,11 +45390,11 @@ tr1215:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1416;
-st1416:
+       goto st1443;
+st1443:
        if ( ++p == pe )
-               goto _test_eof1416;
-case 1416:
+               goto _test_eof1443;
+case 1443:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -45413,11 +45440,11 @@ tr1216:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1417;
-st1417:
+       goto st1444;
+st1444:
        if ( ++p == pe )
-               goto _test_eof1417;
-case 1417:
+               goto _test_eof1444;
+case 1444:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -47549,7 +47576,7 @@ tr1225:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1250:
        {
                for (uint16_t window = 0; window <= s->last_window; window++) {
@@ -47577,7 +47604,7 @@ tr1250:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1261:
        { window_add_bit(KNOT_RRTYPE_A, s); }
        {
@@ -47606,7 +47633,7 @@ tr1261:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1271:
        { window_add_bit(KNOT_RRTYPE_AAAA, s); }
        {
@@ -47635,7 +47662,7 @@ tr1271:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1287:
        { window_add_bit(KNOT_RRTYPE_CAA, s); }
        {
@@ -47664,7 +47691,7 @@ tr1287:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1301:
        { window_add_bit(KNOT_RRTYPE_CDNSKEY, s); }
        {
@@ -47693,7 +47720,7 @@ tr1301:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1309:
        { window_add_bit(KNOT_RRTYPE_CDS, s); }
        {
@@ -47722,7 +47749,7 @@ tr1309:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1319:
        { window_add_bit(KNOT_RRTYPE_CERT, s); }
        {
@@ -47751,7 +47778,7 @@ tr1319:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1330:
        { window_add_bit(KNOT_RRTYPE_CNAME, s); }
        {
@@ -47780,7 +47807,7 @@ tr1330:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1341:
        { window_add_bit(KNOT_RRTYPE_CSYNC, s); }
        {
@@ -47809,7 +47836,7 @@ tr1341:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1355:
        { window_add_bit(KNOT_RRTYPE_DHCID, s); }
        {
@@ -47838,7 +47865,7 @@ tr1355:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1367:
        { window_add_bit(KNOT_RRTYPE_DNAME, s); }
        {
@@ -47867,7 +47894,7 @@ tr1367:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1378:
        { window_add_bit(KNOT_RRTYPE_DNSKEY, s); }
        {
@@ -47896,7 +47923,7 @@ tr1378:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1386:
        { window_add_bit(KNOT_RRTYPE_DS, s); }
        {
@@ -47925,7 +47952,7 @@ tr1386:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1399:
        { window_add_bit(KNOT_RRTYPE_EUI48, s); }
        {
@@ -47954,7 +47981,7 @@ tr1399:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1408:
        { window_add_bit(KNOT_RRTYPE_EUI64, s); }
        {
@@ -47983,7 +48010,7 @@ tr1408:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1421:
        { window_add_bit(KNOT_RRTYPE_HINFO, s); }
        {
@@ -48012,7 +48039,7 @@ tr1421:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1432:
        { window_add_bit(KNOT_RRTYPE_HTTPS, s); }
        {
@@ -48041,7 +48068,7 @@ tr1432:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1447:
        { window_add_bit(KNOT_RRTYPE_IPSECKEY, s); }
        {
@@ -48070,7 +48097,7 @@ tr1447:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1458:
        { window_add_bit(KNOT_RRTYPE_KEY, s); }
        {
@@ -48099,7 +48126,7 @@ tr1458:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1466:
        { window_add_bit(KNOT_RRTYPE_KX, s); }
        {
@@ -48128,7 +48155,7 @@ tr1466:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1479:
        { window_add_bit(KNOT_RRTYPE_L32, s); }
        {
@@ -48157,7 +48184,7 @@ tr1479:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1488:
        { window_add_bit(KNOT_RRTYPE_L64, s); }
        {
@@ -48186,7 +48213,7 @@ tr1488:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1497:
        { window_add_bit(KNOT_RRTYPE_LOC, s); }
        {
@@ -48215,7 +48242,7 @@ tr1497:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1505:
        { window_add_bit(KNOT_RRTYPE_LP, s); }
        {
@@ -48244,7 +48271,7 @@ tr1505:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1518:
        { window_add_bit(KNOT_RRTYPE_MINFO, s); }
        {
@@ -48273,7 +48300,7 @@ tr1518:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1526:
        { window_add_bit(KNOT_RRTYPE_MX, s); }
        {
@@ -48302,7 +48329,7 @@ tr1526:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1540:
        { window_add_bit(KNOT_RRTYPE_NAPTR, s); }
        {
@@ -48331,7 +48358,7 @@ tr1540:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1549:
        { window_add_bit(KNOT_RRTYPE_NID, s); }
        {
@@ -48360,7 +48387,7 @@ tr1549:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1558:
        { window_add_bit(KNOT_RRTYPE_NS, s); }
        {
@@ -48389,7 +48416,7 @@ tr1558:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1568:
        { window_add_bit(KNOT_RRTYPE_NSEC, s); }
        {
@@ -48418,7 +48445,7 @@ tr1568:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1577:
        { window_add_bit(KNOT_RRTYPE_NSEC3, s); }
        {
@@ -48447,7 +48474,7 @@ tr1577:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1589:
        { window_add_bit(KNOT_RRTYPE_NSEC3PARAM, s); }
        {
@@ -48476,7 +48503,7 @@ tr1589:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1606:
        { window_add_bit(KNOT_RRTYPE_OPENPGPKEY, s); }
        {
@@ -48505,7 +48532,7 @@ tr1606:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1616:
        { window_add_bit(KNOT_RRTYPE_PTR, s); }
        {
@@ -48534,7 +48561,7 @@ tr1616:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1627:
        { window_add_bit(KNOT_RRTYPE_RP, s); }
        {
@@ -48563,7 +48590,7 @@ tr1627:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1638:
        { window_add_bit(KNOT_RRTYPE_RRSIG, s); }
        {
@@ -48592,7 +48619,7 @@ tr1638:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1646:
        { window_add_bit(KNOT_RRTYPE_RT, s); }
        {
@@ -48621,7 +48648,7 @@ tr1646:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1664:
        { window_add_bit(KNOT_RRTYPE_SMIMEA, s); }
        {
@@ -48650,7 +48677,7 @@ tr1664:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1673:
        { window_add_bit(KNOT_RRTYPE_SOA, s); }
        {
@@ -48679,7 +48706,7 @@ tr1673:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1682:
        { window_add_bit(KNOT_RRTYPE_SPF, s); }
        {
@@ -48708,7 +48735,7 @@ tr1682:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1691:
        { window_add_bit(KNOT_RRTYPE_SRV, s); }
        {
@@ -48737,7 +48764,7 @@ tr1691:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1702:
        { window_add_bit(KNOT_RRTYPE_SSHFP, s); }
        {
@@ -48766,7 +48793,7 @@ tr1702:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1712:
        { window_add_bit(KNOT_RRTYPE_SVCB, s); }
        {
@@ -48795,7 +48822,7 @@ tr1712:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1725:
        { window_add_bit(KNOT_RRTYPE_TLSA, s); }
        {
@@ -48824,7 +48851,7 @@ tr1725:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1734:
        { window_add_bit(KNOT_RRTYPE_TXT, s); }
        {
@@ -48853,7 +48880,7 @@ tr1734:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1746:
        {
                if (s->number64 <= UINT16_MAX) {
@@ -48889,7 +48916,7 @@ tr1746:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1756:
        { window_add_bit(KNOT_RRTYPE_URI, s); }
        {
@@ -48918,7 +48945,7 @@ tr1756:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1769:
        { window_add_bit(KNOT_RRTYPE_ZONEMD, s); }
        {
@@ -48947,7 +48974,7 @@ tr1769:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1780:
        { window_add_bit(KNOT_RRTYPE_AFSDB, s); }
        {
@@ -48976,7 +49003,7 @@ tr1780:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
+       goto st1445;
 tr1789:
        { window_add_bit(KNOT_RRTYPE_APL, s); }
        {
@@ -49005,11 +49032,11 @@ tr1789:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1418;
-st1418:
+       goto st1445;
+st1445:
        if ( ++p == pe )
-               goto _test_eof1418;
-case 1418:
+               goto _test_eof1445;
+case 1445:
        goto st0;
 tr1226:
        {
@@ -49045,7 +49072,7 @@ tr1226:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1251:
        {
                s->line_counter++;
@@ -49076,7 +49103,7 @@ tr1251:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1262:
        { window_add_bit(KNOT_RRTYPE_A, s); }
        {
@@ -49108,7 +49135,7 @@ tr1262:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1272:
        { window_add_bit(KNOT_RRTYPE_AAAA, s); }
        {
@@ -49140,7 +49167,7 @@ tr1272:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1288:
        { window_add_bit(KNOT_RRTYPE_CAA, s); }
        {
@@ -49172,7 +49199,7 @@ tr1288:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1302:
        { window_add_bit(KNOT_RRTYPE_CDNSKEY, s); }
        {
@@ -49204,7 +49231,7 @@ tr1302:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1310:
        { window_add_bit(KNOT_RRTYPE_CDS, s); }
        {
@@ -49236,7 +49263,7 @@ tr1310:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1320:
        { window_add_bit(KNOT_RRTYPE_CERT, s); }
        {
@@ -49268,7 +49295,7 @@ tr1320:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1331:
        { window_add_bit(KNOT_RRTYPE_CNAME, s); }
        {
@@ -49300,7 +49327,7 @@ tr1331:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1342:
        { window_add_bit(KNOT_RRTYPE_CSYNC, s); }
        {
@@ -49332,7 +49359,7 @@ tr1342:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1356:
        { window_add_bit(KNOT_RRTYPE_DHCID, s); }
        {
@@ -49364,7 +49391,7 @@ tr1356:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1368:
        { window_add_bit(KNOT_RRTYPE_DNAME, s); }
        {
@@ -49396,7 +49423,7 @@ tr1368:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1379:
        { window_add_bit(KNOT_RRTYPE_DNSKEY, s); }
        {
@@ -49428,7 +49455,7 @@ tr1379:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1387:
        { window_add_bit(KNOT_RRTYPE_DS, s); }
        {
@@ -49460,7 +49487,7 @@ tr1387:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1400:
        { window_add_bit(KNOT_RRTYPE_EUI48, s); }
        {
@@ -49492,7 +49519,7 @@ tr1400:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1409:
        { window_add_bit(KNOT_RRTYPE_EUI64, s); }
        {
@@ -49524,7 +49551,7 @@ tr1409:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1422:
        { window_add_bit(KNOT_RRTYPE_HINFO, s); }
        {
@@ -49556,7 +49583,7 @@ tr1422:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1433:
        { window_add_bit(KNOT_RRTYPE_HTTPS, s); }
        {
@@ -49588,7 +49615,7 @@ tr1433:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1448:
        { window_add_bit(KNOT_RRTYPE_IPSECKEY, s); }
        {
@@ -49620,7 +49647,7 @@ tr1448:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1459:
        { window_add_bit(KNOT_RRTYPE_KEY, s); }
        {
@@ -49652,7 +49679,7 @@ tr1459:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1467:
        { window_add_bit(KNOT_RRTYPE_KX, s); }
        {
@@ -49684,7 +49711,7 @@ tr1467:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1480:
        { window_add_bit(KNOT_RRTYPE_L32, s); }
        {
@@ -49716,7 +49743,7 @@ tr1480:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1489:
        { window_add_bit(KNOT_RRTYPE_L64, s); }
        {
@@ -49748,7 +49775,7 @@ tr1489:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1498:
        { window_add_bit(KNOT_RRTYPE_LOC, s); }
        {
@@ -49780,7 +49807,7 @@ tr1498:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1506:
        { window_add_bit(KNOT_RRTYPE_LP, s); }
        {
@@ -49812,7 +49839,7 @@ tr1506:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1519:
        { window_add_bit(KNOT_RRTYPE_MINFO, s); }
        {
@@ -49844,7 +49871,7 @@ tr1519:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1527:
        { window_add_bit(KNOT_RRTYPE_MX, s); }
        {
@@ -49876,7 +49903,7 @@ tr1527:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1541:
        { window_add_bit(KNOT_RRTYPE_NAPTR, s); }
        {
@@ -49908,7 +49935,7 @@ tr1541:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1550:
        { window_add_bit(KNOT_RRTYPE_NID, s); }
        {
@@ -49940,7 +49967,7 @@ tr1550:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1559:
        { window_add_bit(KNOT_RRTYPE_NS, s); }
        {
@@ -49972,7 +49999,7 @@ tr1559:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1569:
        { window_add_bit(KNOT_RRTYPE_NSEC, s); }
        {
@@ -50004,7 +50031,7 @@ tr1569:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1578:
        { window_add_bit(KNOT_RRTYPE_NSEC3, s); }
        {
@@ -50036,7 +50063,7 @@ tr1578:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1590:
        { window_add_bit(KNOT_RRTYPE_NSEC3PARAM, s); }
        {
@@ -50068,7 +50095,7 @@ tr1590:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1607:
        { window_add_bit(KNOT_RRTYPE_OPENPGPKEY, s); }
        {
@@ -50100,7 +50127,7 @@ tr1607:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1617:
        { window_add_bit(KNOT_RRTYPE_PTR, s); }
        {
@@ -50132,7 +50159,7 @@ tr1617:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1628:
        { window_add_bit(KNOT_RRTYPE_RP, s); }
        {
@@ -50164,7 +50191,7 @@ tr1628:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1639:
        { window_add_bit(KNOT_RRTYPE_RRSIG, s); }
        {
@@ -50196,7 +50223,7 @@ tr1639:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1647:
        { window_add_bit(KNOT_RRTYPE_RT, s); }
        {
@@ -50228,7 +50255,7 @@ tr1647:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1665:
        { window_add_bit(KNOT_RRTYPE_SMIMEA, s); }
        {
@@ -50260,7 +50287,7 @@ tr1665:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1674:
        { window_add_bit(KNOT_RRTYPE_SOA, s); }
        {
@@ -50292,7 +50319,7 @@ tr1674:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1683:
        { window_add_bit(KNOT_RRTYPE_SPF, s); }
        {
@@ -50324,7 +50351,7 @@ tr1683:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1692:
        { window_add_bit(KNOT_RRTYPE_SRV, s); }
        {
@@ -50356,7 +50383,7 @@ tr1692:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1703:
        { window_add_bit(KNOT_RRTYPE_SSHFP, s); }
        {
@@ -50388,7 +50415,7 @@ tr1703:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1713:
        { window_add_bit(KNOT_RRTYPE_SVCB, s); }
        {
@@ -50420,7 +50447,7 @@ tr1713:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1726:
        { window_add_bit(KNOT_RRTYPE_TLSA, s); }
        {
@@ -50452,7 +50479,7 @@ tr1726:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1735:
        { window_add_bit(KNOT_RRTYPE_TXT, s); }
        {
@@ -50484,7 +50511,7 @@ tr1735:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1747:
        {
                if (s->number64 <= UINT16_MAX) {
@@ -50523,7 +50550,7 @@ tr1747:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1757:
        { window_add_bit(KNOT_RRTYPE_URI, s); }
        {
@@ -50555,7 +50582,7 @@ tr1757:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1770:
        { window_add_bit(KNOT_RRTYPE_ZONEMD, s); }
        {
@@ -50587,7 +50614,7 @@ tr1770:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1781:
        { window_add_bit(KNOT_RRTYPE_AFSDB, s); }
        {
@@ -50619,7 +50646,7 @@ tr1781:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
+       goto st1446;
 tr1790:
        { window_add_bit(KNOT_RRTYPE_APL, s); }
        {
@@ -50651,11 +50678,11 @@ tr1790:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1419;
-st1419:
+       goto st1446;
+st1446:
        if ( ++p == pe )
-               goto _test_eof1419;
-case 1419:
+               goto _test_eof1446;
+case 1446:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -50812,7 +50839,7 @@ tr1227:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1252:
        {
                s->buffer_length = 0;
@@ -50843,7 +50870,7 @@ tr1252:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1263:
        { window_add_bit(KNOT_RRTYPE_A, s); }
        {
@@ -50875,7 +50902,7 @@ tr1263:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1273:
        { window_add_bit(KNOT_RRTYPE_AAAA, s); }
        {
@@ -50907,7 +50934,7 @@ tr1273:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1289:
        { window_add_bit(KNOT_RRTYPE_CAA, s); }
        {
@@ -50939,7 +50966,7 @@ tr1289:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1303:
        { window_add_bit(KNOT_RRTYPE_CDNSKEY, s); }
        {
@@ -50971,7 +50998,7 @@ tr1303:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1311:
        { window_add_bit(KNOT_RRTYPE_CDS, s); }
        {
@@ -51003,7 +51030,7 @@ tr1311:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1321:
        { window_add_bit(KNOT_RRTYPE_CERT, s); }
        {
@@ -51035,7 +51062,7 @@ tr1321:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1332:
        { window_add_bit(KNOT_RRTYPE_CNAME, s); }
        {
@@ -51067,7 +51094,7 @@ tr1332:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1343:
        { window_add_bit(KNOT_RRTYPE_CSYNC, s); }
        {
@@ -51099,7 +51126,7 @@ tr1343:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1357:
        { window_add_bit(KNOT_RRTYPE_DHCID, s); }
        {
@@ -51131,7 +51158,7 @@ tr1357:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1369:
        { window_add_bit(KNOT_RRTYPE_DNAME, s); }
        {
@@ -51163,7 +51190,7 @@ tr1369:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1380:
        { window_add_bit(KNOT_RRTYPE_DNSKEY, s); }
        {
@@ -51195,7 +51222,7 @@ tr1380:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1388:
        { window_add_bit(KNOT_RRTYPE_DS, s); }
        {
@@ -51227,7 +51254,7 @@ tr1388:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1401:
        { window_add_bit(KNOT_RRTYPE_EUI48, s); }
        {
@@ -51259,7 +51286,7 @@ tr1401:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1410:
        { window_add_bit(KNOT_RRTYPE_EUI64, s); }
        {
@@ -51291,7 +51318,7 @@ tr1410:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1423:
        { window_add_bit(KNOT_RRTYPE_HINFO, s); }
        {
@@ -51323,7 +51350,7 @@ tr1423:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1434:
        { window_add_bit(KNOT_RRTYPE_HTTPS, s); }
        {
@@ -51355,7 +51382,7 @@ tr1434:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1449:
        { window_add_bit(KNOT_RRTYPE_IPSECKEY, s); }
        {
@@ -51387,7 +51414,7 @@ tr1449:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1460:
        { window_add_bit(KNOT_RRTYPE_KEY, s); }
        {
@@ -51419,7 +51446,7 @@ tr1460:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1468:
        { window_add_bit(KNOT_RRTYPE_KX, s); }
        {
@@ -51451,7 +51478,7 @@ tr1468:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1481:
        { window_add_bit(KNOT_RRTYPE_L32, s); }
        {
@@ -51483,7 +51510,7 @@ tr1481:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1490:
        { window_add_bit(KNOT_RRTYPE_L64, s); }
        {
@@ -51515,7 +51542,7 @@ tr1490:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1499:
        { window_add_bit(KNOT_RRTYPE_LOC, s); }
        {
@@ -51547,7 +51574,7 @@ tr1499:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1507:
        { window_add_bit(KNOT_RRTYPE_LP, s); }
        {
@@ -51579,7 +51606,7 @@ tr1507:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1520:
        { window_add_bit(KNOT_RRTYPE_MINFO, s); }
        {
@@ -51611,7 +51638,7 @@ tr1520:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1528:
        { window_add_bit(KNOT_RRTYPE_MX, s); }
        {
@@ -51643,7 +51670,7 @@ tr1528:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1542:
        { window_add_bit(KNOT_RRTYPE_NAPTR, s); }
        {
@@ -51675,7 +51702,7 @@ tr1542:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1551:
        { window_add_bit(KNOT_RRTYPE_NID, s); }
        {
@@ -51707,7 +51734,7 @@ tr1551:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1560:
        { window_add_bit(KNOT_RRTYPE_NS, s); }
        {
@@ -51739,7 +51766,7 @@ tr1560:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1570:
        { window_add_bit(KNOT_RRTYPE_NSEC, s); }
        {
@@ -51771,7 +51798,7 @@ tr1570:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1579:
        { window_add_bit(KNOT_RRTYPE_NSEC3, s); }
        {
@@ -51803,7 +51830,7 @@ tr1579:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1591:
        { window_add_bit(KNOT_RRTYPE_NSEC3PARAM, s); }
        {
@@ -51835,7 +51862,7 @@ tr1591:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1608:
        { window_add_bit(KNOT_RRTYPE_OPENPGPKEY, s); }
        {
@@ -51867,7 +51894,7 @@ tr1608:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1618:
        { window_add_bit(KNOT_RRTYPE_PTR, s); }
        {
@@ -51899,7 +51926,7 @@ tr1618:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1629:
        { window_add_bit(KNOT_RRTYPE_RP, s); }
        {
@@ -51931,7 +51958,7 @@ tr1629:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1640:
        { window_add_bit(KNOT_RRTYPE_RRSIG, s); }
        {
@@ -51963,7 +51990,7 @@ tr1640:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1648:
        { window_add_bit(KNOT_RRTYPE_RT, s); }
        {
@@ -51995,7 +52022,7 @@ tr1648:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1666:
        { window_add_bit(KNOT_RRTYPE_SMIMEA, s); }
        {
@@ -52027,7 +52054,7 @@ tr1666:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1675:
        { window_add_bit(KNOT_RRTYPE_SOA, s); }
        {
@@ -52059,7 +52086,7 @@ tr1675:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1684:
        { window_add_bit(KNOT_RRTYPE_SPF, s); }
        {
@@ -52091,7 +52118,7 @@ tr1684:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1693:
        { window_add_bit(KNOT_RRTYPE_SRV, s); }
        {
@@ -52123,7 +52150,7 @@ tr1693:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1704:
        { window_add_bit(KNOT_RRTYPE_SSHFP, s); }
        {
@@ -52155,7 +52182,7 @@ tr1704:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1714:
        { window_add_bit(KNOT_RRTYPE_SVCB, s); }
        {
@@ -52187,7 +52214,7 @@ tr1714:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1727:
        { window_add_bit(KNOT_RRTYPE_TLSA, s); }
        {
@@ -52219,7 +52246,7 @@ tr1727:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1736:
        { window_add_bit(KNOT_RRTYPE_TXT, s); }
        {
@@ -52251,7 +52278,7 @@ tr1736:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1748:
        {
                if (s->number64 <= UINT16_MAX) {
@@ -52290,7 +52317,7 @@ tr1748:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1758:
        { window_add_bit(KNOT_RRTYPE_URI, s); }
        {
@@ -52322,7 +52349,7 @@ tr1758:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1771:
        { window_add_bit(KNOT_RRTYPE_ZONEMD, s); }
        {
@@ -52354,7 +52381,7 @@ tr1771:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1782:
        { window_add_bit(KNOT_RRTYPE_AFSDB, s); }
        {
@@ -52386,7 +52413,7 @@ tr1782:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
+       goto st1447;
 tr1791:
        { window_add_bit(KNOT_RRTYPE_APL, s); }
        {
@@ -52418,11 +52445,11 @@ tr1791:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1420;
-st1420:
+       goto st1447;
+st1447:
        if ( ++p == pe )
-               goto _test_eof1420;
-case 1420:
+               goto _test_eof1447;
+case 1447:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -55454,11 +55481,11 @@ tr1819:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1421;
-st1421:
+       goto st1448;
+st1448:
        if ( ++p == pe )
-               goto _test_eof1421;
-case 1421:
+               goto _test_eof1448;
+case 1448:
        goto st0;
 tr1820:
        {
@@ -55473,11 +55500,11 @@ tr1820:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1422;
-st1422:
+       goto st1449;
+st1449:
        if ( ++p == pe )
-               goto _test_eof1422;
-case 1422:
+               goto _test_eof1449;
+case 1449:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -55528,11 +55555,11 @@ tr1821:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1423;
-st1423:
+       goto st1450;
+st1450:
        if ( ++p == pe )
-               goto _test_eof1423;
-case 1423:
+               goto _test_eof1450;
+case 1450:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -55801,7 +55828,7 @@ tr1835:
                        p--; {goto st307;}
                }
        }
-       goto st1424;
+       goto st1451;
 tr1836:
        {
                p--; {cs = stack[--top];goto _again;}
@@ -55821,7 +55848,7 @@ tr1836:
                }
                s->multiline = true;
        }
-       goto st1424;
+       goto st1451;
 tr1837:
        {
                p--; {cs = stack[--top];goto _again;}
@@ -55841,7 +55868,7 @@ tr1837:
                }
                s->multiline = false;
        }
-       goto st1424;
+       goto st1451;
 tr1840:
        {
                p--; {cs = stack[--top];goto _again;}
@@ -55857,11 +55884,11 @@ tr1840:
        {
                s->line_counter++;
        }
-       goto st1424;
-st1424:
+       goto st1451;
+st1451:
        if ( ++p == pe )
-               goto _test_eof1424;
-case 1424:
+               goto _test_eof1451;
+case 1451:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -56176,7 +56203,7 @@ tr1839:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1425;
+       goto st1452;
 tr1854:
        {
                if ((rdata_tail - s->r_data) != s->r_data_length) {
@@ -56187,11 +56214,11 @@ tr1854:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1425;
-st1425:
+       goto st1452;
+st1452:
        if ( ++p == pe )
-               goto _test_eof1425;
-case 1425:
+               goto _test_eof1452;
+case 1452:
        goto tr1792;
 tr1855:
        {
@@ -56206,11 +56233,11 @@ tr1855:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1426;
-st1426:
+       goto st1453;
+st1453:
        if ( ++p == pe )
-               goto _test_eof1426;
-case 1426:
+               goto _test_eof1453;
+case 1453:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -56261,11 +56288,11 @@ tr1856:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1427;
-st1427:
+       goto st1454;
+st1454:
        if ( ++p == pe )
-               goto _test_eof1427;
-case 1427:
+               goto _test_eof1454;
+case 1454:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -56418,11 +56445,11 @@ tr1841:
        {
                s->buffer_length = 0;
        }
-       goto st1428;
-st1428:
+       goto st1455;
+st1455:
        if ( ++p == pe )
-               goto _test_eof1428;
-case 1428:
+               goto _test_eof1455;
+case 1455:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -56491,11 +56518,13 @@ st559:
 case 559:
        switch( (*p) ) {
                case 97: goto tr1869;
-               case 101: goto tr1870;
-               case 105: goto tr1871;
-               case 107: goto tr1872;
-               case 110: goto tr1873;
-               case 112: goto tr1874;
+               case 100: goto tr1870;
+               case 101: goto tr1871;
+               case 105: goto tr1872;
+               case 107: goto tr1873;
+               case 110: goto tr1874;
+               case 111: goto tr1875;
+               case 112: goto tr1876;
        }
        goto tr1868;
 tr1869:
@@ -56532,18 +56561,18 @@ st563:
                goto _test_eof563;
 case 563:
        switch( (*p) ) {
-               case 32: goto tr1878;
-               case 34: goto tr1878;
-               case 44: goto tr1878;
-               case 59: goto tr1878;
+               case 32: goto tr1880;
+               case 34: goto tr1880;
+               case 44: goto tr1880;
+               case 59: goto tr1880;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr1878;
+                       goto tr1880;
        } else if ( (*p) >= 9 )
-               goto tr1878;
+               goto tr1880;
        goto tr1868;
-tr1878:
+tr1880:
        {
                uint16_t val = htons(1);
                memcpy(rdata_tail, &val, 2);
@@ -56552,18 +56581,28 @@ tr1878:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1429;
-tr1881:
+       goto st1456;
+tr1887:
        {
-               uint16_t val = htons(5);
+               uint16_t val = htons(7);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1429;
+       goto st1456;
 tr1890:
+       {
+               uint16_t val = htons(5);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               p--; {cs = stack[--top];goto _again;}
+       }
+       goto st1456;
+tr1899:
        {
                uint16_t val = htons(4);
                memcpy(rdata_tail, &val, 2);
@@ -56572,8 +56611,8 @@ tr1890:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1429;
-tr1895:
+       goto st1456;
+tr1904:
        {
                uint16_t val = htons(6);
                memcpy(rdata_tail, &val, 2);
@@ -56582,8 +56621,8 @@ tr1895:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1429;
-tr1900:
+       goto st1456;
+tr1909:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -56597,8 +56636,8 @@ tr1900:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1429;
-tr1916:
+       goto st1456;
+tr1925:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -56607,8 +56646,18 @@ tr1916:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1429;
-tr1920:
+       goto st1456;
+tr1930:
+       {
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               p--; {cs = stack[--top];goto _again;}
+       }
+       goto st1456;
+tr1934:
        {
                uint16_t val = htons(3);
                memcpy(rdata_tail, &val, 2);
@@ -56617,11 +56666,11 @@ tr1920:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1429;
-st1429:
+       goto st1456;
+st1456:
        if ( ++p == pe )
-               goto _test_eof1429;
-case 1429:
+               goto _test_eof1456;
+case 1456:
        goto st0;
 tr1870:
        {
@@ -56635,7 +56684,7 @@ st564:
        if ( ++p == pe )
                goto _test_eof564;
 case 564:
-       if ( (*p) == 99 )
+       if ( (*p) == 111 )
                goto st565;
        goto tr1868;
 st565:
@@ -56649,81 +56698,72 @@ st566:
        if ( ++p == pe )
                goto _test_eof566;
 case 566:
-       switch( (*p) ) {
-               case 32: goto tr1881;
-               case 34: goto tr1881;
-               case 44: goto tr1881;
-               case 59: goto tr1881;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr1881;
-       } else if ( (*p) >= 9 )
-               goto tr1881;
+       if ( (*p) == 112 )
+               goto st567;
        goto tr1868;
-tr1871:
-       {
-               if (rdata_tail + 2 > rdata_stop + 1) {
-                       WARN(ZS_RDATA_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
-       goto st567;
 st567:
        if ( ++p == pe )
                goto _test_eof567;
 case 567:
-       if ( (*p) == 112 )
+       if ( (*p) == 97 )
                goto st568;
        goto tr1868;
 st568:
        if ( ++p == pe )
                goto _test_eof568;
 case 568:
-       if ( (*p) == 118 )
+       if ( (*p) == 116 )
                goto st569;
        goto tr1868;
 st569:
        if ( ++p == pe )
                goto _test_eof569;
 case 569:
-       switch( (*p) ) {
-               case 52: goto st570;
-               case 54: goto st575;
-       }
+       if ( (*p) == 104 )
+               goto st570;
        goto tr1868;
 st570:
        if ( ++p == pe )
                goto _test_eof570;
 case 570:
-       if ( (*p) == 104 )
-               goto st571;
+       switch( (*p) ) {
+               case 32: goto tr1887;
+               case 34: goto tr1887;
+               case 44: goto tr1887;
+               case 59: goto tr1887;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr1887;
+       } else if ( (*p) >= 9 )
+               goto tr1887;
        goto tr1868;
+tr1871:
+       {
+               if (rdata_tail + 2 > rdata_stop + 1) {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st571;
 st571:
        if ( ++p == pe )
                goto _test_eof571;
 case 571:
-       if ( (*p) == 105 )
+       if ( (*p) == 99 )
                goto st572;
        goto tr1868;
 st572:
        if ( ++p == pe )
                goto _test_eof572;
 case 572:
-       if ( (*p) == 110 )
+       if ( (*p) == 104 )
                goto st573;
        goto tr1868;
 st573:
        if ( ++p == pe )
                goto _test_eof573;
 case 573:
-       if ( (*p) == 116 )
-               goto st574;
-       goto tr1868;
-st574:
-       if ( ++p == pe )
-               goto _test_eof574;
-case 574:
        switch( (*p) ) {
                case 32: goto tr1890;
                case 34: goto tr1890;
@@ -56736,80 +56776,155 @@ case 574:
        } else if ( (*p) >= 9 )
                goto tr1890;
        goto tr1868;
+tr1872:
+       {
+               if (rdata_tail + 2 > rdata_stop + 1) {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st574;
+st574:
+       if ( ++p == pe )
+               goto _test_eof574;
+case 574:
+       if ( (*p) == 112 )
+               goto st575;
+       goto tr1868;
 st575:
        if ( ++p == pe )
                goto _test_eof575;
 case 575:
-       if ( (*p) == 104 )
+       if ( (*p) == 118 )
                goto st576;
        goto tr1868;
 st576:
        if ( ++p == pe )
                goto _test_eof576;
 case 576:
-       if ( (*p) == 105 )
-               goto st577;
+       switch( (*p) ) {
+               case 52: goto st577;
+               case 54: goto st582;
+       }
        goto tr1868;
 st577:
        if ( ++p == pe )
                goto _test_eof577;
 case 577:
-       if ( (*p) == 110 )
+       if ( (*p) == 104 )
                goto st578;
        goto tr1868;
 st578:
        if ( ++p == pe )
                goto _test_eof578;
 case 578:
-       if ( (*p) == 116 )
+       if ( (*p) == 105 )
                goto st579;
        goto tr1868;
 st579:
        if ( ++p == pe )
                goto _test_eof579;
 case 579:
+       if ( (*p) == 110 )
+               goto st580;
+       goto tr1868;
+st580:
+       if ( ++p == pe )
+               goto _test_eof580;
+case 580:
+       if ( (*p) == 116 )
+               goto st581;
+       goto tr1868;
+st581:
+       if ( ++p == pe )
+               goto _test_eof581;
+case 581:
        switch( (*p) ) {
-               case 32: goto tr1895;
-               case 34: goto tr1895;
-               case 44: goto tr1895;
-               case 59: goto tr1895;
+               case 32: goto tr1899;
+               case 34: goto tr1899;
+               case 44: goto tr1899;
+               case 59: goto tr1899;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr1895;
+                       goto tr1899;
        } else if ( (*p) >= 9 )
-               goto tr1895;
+               goto tr1899;
        goto tr1868;
-tr1872:
+st582:
+       if ( ++p == pe )
+               goto _test_eof582;
+case 582:
+       if ( (*p) == 104 )
+               goto st583;
+       goto tr1868;
+st583:
+       if ( ++p == pe )
+               goto _test_eof583;
+case 583:
+       if ( (*p) == 105 )
+               goto st584;
+       goto tr1868;
+st584:
+       if ( ++p == pe )
+               goto _test_eof584;
+case 584:
+       if ( (*p) == 110 )
+               goto st585;
+       goto tr1868;
+st585:
+       if ( ++p == pe )
+               goto _test_eof585;
+case 585:
+       if ( (*p) == 116 )
+               goto st586;
+       goto tr1868;
+st586:
+       if ( ++p == pe )
+               goto _test_eof586;
+case 586:
+       switch( (*p) ) {
+               case 32: goto tr1904;
+               case 34: goto tr1904;
+               case 44: goto tr1904;
+               case 59: goto tr1904;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr1904;
+       } else if ( (*p) >= 9 )
+               goto tr1904;
+       goto tr1868;
+tr1873:
        {
                if (rdata_tail + 2 > rdata_stop + 1) {
                        WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
        }
-       goto st580;
-st580:
+       goto st587;
+st587:
        if ( ++p == pe )
-               goto _test_eof580;
-case 580:
+               goto _test_eof587;
+case 587:
        if ( (*p) == 101 )
-               goto st581;
+               goto st588;
        goto tr1868;
-st581:
+st588:
        if ( ++p == pe )
-               goto _test_eof581;
-case 581:
+               goto _test_eof588;
+case 588:
        if ( (*p) == 121 )
-               goto st582;
+               goto st589;
        goto tr1868;
-st582:
+st589:
        if ( ++p == pe )
-               goto _test_eof582;
-case 582:
+               goto _test_eof589;
+case 589:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr1899;
-       goto tr1898;
-tr1899:
+               goto tr1908;
+       goto tr1907;
+tr1908:
        {
                s->number64 = 0;
        }
@@ -56827,8 +56942,8 @@ tr1899:
                        p--; {goto st307;}
                }
        }
-       goto st583;
-tr1901:
+       goto st590;
+tr1910:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -56843,197 +56958,249 @@ tr1901:
                        p--; {goto st307;}
                }
        }
-       goto st583;
-st583:
+       goto st590;
+st590:
        if ( ++p == pe )
-               goto _test_eof583;
-case 583:
+               goto _test_eof590;
+case 590:
        switch( (*p) ) {
-               case 32: goto tr1900;
-               case 34: goto tr1900;
-               case 44: goto tr1900;
-               case 59: goto tr1900;
+               case 32: goto tr1909;
+               case 34: goto tr1909;
+               case 44: goto tr1909;
+               case 59: goto tr1909;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr1900;
+                       goto tr1909;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr1901;
+                       goto tr1910;
        } else
-               goto tr1900;
-       goto tr1898;
-tr1873:
+               goto tr1909;
+       goto tr1907;
+tr1874:
        {
                if (rdata_tail + 2 > rdata_stop + 1) {
                        WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
        }
-       goto st584;
-st584:
-       if ( ++p == pe )
-               goto _test_eof584;
-case 584:
-       if ( (*p) == 111 )
-               goto st585;
-       goto tr1868;
-st585:
-       if ( ++p == pe )
-               goto _test_eof585;
-case 585:
-       if ( (*p) == 45 )
-               goto st586;
-       goto tr1868;
-st586:
-       if ( ++p == pe )
-               goto _test_eof586;
-case 586:
-       if ( (*p) == 100 )
-               goto st587;
-       goto tr1868;
-st587:
-       if ( ++p == pe )
-               goto _test_eof587;
-case 587:
-       if ( (*p) == 101 )
-               goto st588;
-       goto tr1868;
-st588:
-       if ( ++p == pe )
-               goto _test_eof588;
-case 588:
-       if ( (*p) == 102 )
-               goto st589;
-       goto tr1868;
-st589:
-       if ( ++p == pe )
-               goto _test_eof589;
-case 589:
-       if ( (*p) == 97 )
-               goto st590;
-       goto tr1868;
-st590:
-       if ( ++p == pe )
-               goto _test_eof590;
-case 590:
-       if ( (*p) == 117 )
-               goto st591;
-       goto tr1868;
+       goto st591;
 st591:
        if ( ++p == pe )
                goto _test_eof591;
 case 591:
-       if ( (*p) == 108 )
+       if ( (*p) == 111 )
                goto st592;
        goto tr1868;
 st592:
        if ( ++p == pe )
                goto _test_eof592;
 case 592:
-       if ( (*p) == 116 )
+       if ( (*p) == 45 )
                goto st593;
        goto tr1868;
 st593:
        if ( ++p == pe )
                goto _test_eof593;
 case 593:
-       if ( (*p) == 45 )
+       if ( (*p) == 100 )
                goto st594;
        goto tr1868;
 st594:
        if ( ++p == pe )
                goto _test_eof594;
 case 594:
-       if ( (*p) == 97 )
+       if ( (*p) == 101 )
                goto st595;
        goto tr1868;
 st595:
        if ( ++p == pe )
                goto _test_eof595;
 case 595:
-       if ( (*p) == 108 )
+       if ( (*p) == 102 )
                goto st596;
        goto tr1868;
 st596:
        if ( ++p == pe )
                goto _test_eof596;
 case 596:
-       if ( (*p) == 112 )
+       if ( (*p) == 97 )
                goto st597;
        goto tr1868;
 st597:
        if ( ++p == pe )
                goto _test_eof597;
 case 597:
-       if ( (*p) == 110 )
+       if ( (*p) == 117 )
                goto st598;
        goto tr1868;
 st598:
        if ( ++p == pe )
                goto _test_eof598;
 case 598:
-       switch( (*p) ) {
-               case 32: goto tr1916;
-               case 34: goto tr1916;
-               case 44: goto tr1916;
-               case 59: goto tr1916;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr1916;
-       } else if ( (*p) >= 9 )
-               goto tr1916;
+       if ( (*p) == 108 )
+               goto st599;
        goto tr1868;
-tr1874:
-       {
-               if (rdata_tail + 2 > rdata_stop + 1) {
-                       WARN(ZS_RDATA_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
-       goto st599;
 st599:
        if ( ++p == pe )
                goto _test_eof599;
 case 599:
-       if ( (*p) == 111 )
+       if ( (*p) == 116 )
                goto st600;
        goto tr1868;
 st600:
        if ( ++p == pe )
                goto _test_eof600;
 case 600:
-       if ( (*p) == 114 )
+       if ( (*p) == 45 )
                goto st601;
        goto tr1868;
 st601:
        if ( ++p == pe )
                goto _test_eof601;
 case 601:
-       if ( (*p) == 116 )
+       if ( (*p) == 97 )
                goto st602;
        goto tr1868;
 st602:
        if ( ++p == pe )
                goto _test_eof602;
 case 602:
+       if ( (*p) == 108 )
+               goto st603;
+       goto tr1868;
+st603:
+       if ( ++p == pe )
+               goto _test_eof603;
+case 603:
+       if ( (*p) == 112 )
+               goto st604;
+       goto tr1868;
+st604:
+       if ( ++p == pe )
+               goto _test_eof604;
+case 604:
+       if ( (*p) == 110 )
+               goto st605;
+       goto tr1868;
+st605:
+       if ( ++p == pe )
+               goto _test_eof605;
+case 605:
        switch( (*p) ) {
-               case 32: goto tr1920;
-               case 34: goto tr1920;
-               case 44: goto tr1920;
-               case 59: goto tr1920;
+               case 32: goto tr1925;
+               case 34: goto tr1925;
+               case 44: goto tr1925;
+               case 59: goto tr1925;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr1920;
+                       goto tr1925;
        } else if ( (*p) >= 9 )
-               goto tr1920;
+               goto tr1925;
        goto tr1868;
-st603:
+tr1875:
+       {
+               if (rdata_tail + 2 > rdata_stop + 1) {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st606;
+st606:
        if ( ++p == pe )
-               goto _test_eof603;
-case 603:
+               goto _test_eof606;
+case 606:
+       if ( (*p) == 104 )
+               goto st607;
+       goto tr1868;
+st607:
+       if ( ++p == pe )
+               goto _test_eof607;
+case 607:
+       if ( (*p) == 116 )
+               goto st608;
+       goto tr1868;
+st608:
+       if ( ++p == pe )
+               goto _test_eof608;
+case 608:
+       if ( (*p) == 116 )
+               goto st609;
+       goto tr1868;
+st609:
+       if ( ++p == pe )
+               goto _test_eof609;
+case 609:
+       if ( (*p) == 112 )
+               goto st610;
+       goto tr1868;
+st610:
+       if ( ++p == pe )
+               goto _test_eof610;
+case 610:
+       switch( (*p) ) {
+               case 32: goto tr1930;
+               case 34: goto tr1930;
+               case 44: goto tr1930;
+               case 59: goto tr1930;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr1930;
+       } else if ( (*p) >= 9 )
+               goto tr1930;
+       goto tr1868;
+tr1876:
+       {
+               if (rdata_tail + 2 > rdata_stop + 1) {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st611;
+st611:
+       if ( ++p == pe )
+               goto _test_eof611;
+case 611:
+       if ( (*p) == 111 )
+               goto st612;
+       goto tr1868;
+st612:
+       if ( ++p == pe )
+               goto _test_eof612;
+case 612:
+       if ( (*p) == 114 )
+               goto st613;
+       goto tr1868;
+st613:
+       if ( ++p == pe )
+               goto _test_eof613;
+case 613:
+       if ( (*p) == 116 )
+               goto st614;
+       goto tr1868;
+st614:
+       if ( ++p == pe )
+               goto _test_eof614;
+case 614:
+       switch( (*p) ) {
+               case 32: goto tr1934;
+               case 34: goto tr1934;
+               case 44: goto tr1934;
+               case 59: goto tr1934;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr1934;
+       } else if ( (*p) >= 9 )
+               goto tr1934;
+       goto tr1868;
+st615:
+       if ( ++p == pe )
+               goto _test_eof615;
+case 615:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -57051,19 +57218,19 @@ case 603:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr1922;
-               case 32: goto tr1922;
-               case 40: goto tr1923;
-               case 41: goto tr1924;
-               case 3082: goto tr1925;
-               case 3131: goto tr1926;
-               case 3338: goto tr1927;
-               case 3387: goto tr1927;
-               case 3594: goto tr1928;
-               case 3643: goto tr1929;
+               case 9: goto tr1936;
+               case 32: goto tr1936;
+               case 40: goto tr1937;
+               case 41: goto tr1938;
+               case 3082: goto tr1939;
+               case 3131: goto tr1940;
+               case 3338: goto tr1941;
+               case 3387: goto tr1941;
+               case 3594: goto tr1942;
+               case 3643: goto tr1943;
        }
-       goto tr1921;
-tr1931:
+       goto tr1935;
+tr1945:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -57071,8 +57238,8 @@ tr1931:
                }
                s->multiline = true;
        }
-       goto st604;
-tr1932:
+       goto st616;
+tr1946:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -57080,13 +57247,13 @@ tr1932:
                }
                s->multiline = false;
        }
-       goto st604;
-tr1940:
+       goto st616;
+tr1956:
        {
                s->line_counter++;
        }
-       goto st604;
-tr1960:
+       goto st616;
+tr1976:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -57096,21 +57263,21 @@ tr1960:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 604; goto _out;}
+                               {p++; cs = 616; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st604;
-tr1922:
+       goto st616;
+tr1936:
        {
                s->svcb.params_position = rdata_tail;
                s->svcb.last_key = -1;
        }
-       goto st604;
-tr1923:
+       goto st616;
+tr1937:
        {
                s->svcb.params_position = rdata_tail;
                s->svcb.last_key = -1;
@@ -57122,8 +57289,8 @@ tr1923:
                }
                s->multiline = true;
        }
-       goto st604;
-tr1924:
+       goto st616;
+tr1938:
        {
                s->svcb.params_position = rdata_tail;
                s->svcb.last_key = -1;
@@ -57135,8 +57302,8 @@ tr1924:
                }
                s->multiline = false;
        }
-       goto st604;
-tr1925:
+       goto st616;
+tr1939:
        {
                s->svcb.params_position = rdata_tail;
                s->svcb.last_key = -1;
@@ -57144,8 +57311,8 @@ tr1925:
        {
                s->line_counter++;
        }
-       goto st604;
-tr1951:
+       goto st616;
+tr1967:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -57184,8 +57351,8 @@ tr1951:
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr1952:
+       goto st616;
+tr1968:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -57231,8 +57398,8 @@ tr1952:
                }
                s->multiline = true;
        }
-       goto st604;
-tr1953:
+       goto st616;
+tr1969:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -57278,8 +57445,8 @@ tr1953:
                }
                s->multiline = false;
        }
-       goto st604;
-tr1954:
+       goto st616;
+tr1970:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -57321,17 +57488,19 @@ tr1954:
        {
                s->line_counter++;
        }
-       goto st604;
-tr1974:
+       goto st616;
+tr1986:
        {
-               int ret = svcb_sort(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr1975:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -57339,15 +57508,19 @@ tr1975:
                        p--; {goto st307;}
                }
        }
+       goto st616;
+tr1987:
        {
-               if (s->multiline == true) {
-                       ERR(ZS_LEFT_PARENTHESIS);
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
                        p--; {goto st307;}
                }
-               s->multiline = true;
        }
-       goto st604;
-tr1976:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -57356,14 +57529,25 @@ tr1976:
                }
        }
        {
-               if (s->multiline == false) {
-                       ERR(ZS_RIGHT_PARENTHESIS);
+               if (s->multiline == true) {
+                       ERR(ZS_LEFT_PARENTHESIS);
+                       p--; {goto st307;}
+               }
+               s->multiline = true;
+       }
+       goto st616;
+tr1988:
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
                        p--; {goto st307;}
                }
-               s->multiline = false;
        }
-       goto st604;
-tr1977:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -57372,10 +57556,14 @@ tr1977:
                }
        }
        {
-               s->line_counter++;
+               if (s->multiline == false) {
+                       ERR(ZS_RIGHT_PARENTHESIS);
+                       p--; {goto st307;}
+               }
+               s->multiline = false;
        }
-       goto st604;
-tr1987:
+       goto st616;
+tr1989:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -57394,19 +57582,20 @@ tr1987:
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr1988:
        {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
+               s->line_counter++;
+       }
+       goto st616;
+tr1996:
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
        }
+       goto st616;
+tr1997:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -57421,19 +57610,8 @@ tr1988:
                }
                s->multiline = true;
        }
-       goto st604;
-tr1989:
-       {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
+       goto st616;
+tr1998:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -57448,19 +57626,8 @@ tr1989:
                }
                s->multiline = false;
        }
-       goto st604;
-tr1991:
-       {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
+       goto st616;
+tr1999:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -57471,8 +57638,8 @@ tr1991:
        {
                s->line_counter++;
        }
-       goto st604;
-tr2013:
+       goto st616;
+tr2039:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -57507,8 +57674,8 @@ tr2013:
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr2014:
+       goto st616;
+tr2040:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -57550,8 +57717,8 @@ tr2014:
                }
                s->multiline = true;
        }
-       goto st604;
-tr2015:
+       goto st616;
+tr2041:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -57593,8 +57760,8 @@ tr2015:
                }
                s->multiline = false;
        }
-       goto st604;
-tr2018:
+       goto st616;
+tr2044:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -57632,8 +57799,8 @@ tr2018:
        {
                s->line_counter++;
        }
-       goto st604;
-tr2036:
+       goto st616;
+tr2062:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -57668,8 +57835,8 @@ tr2036:
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr2037:
+       goto st616;
+tr2063:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -57711,8 +57878,8 @@ tr2037:
                }
                s->multiline = true;
        }
-       goto st604;
-tr2038:
+       goto st616;
+tr2064:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -57754,8 +57921,8 @@ tr2038:
                }
                s->multiline = false;
        }
-       goto st604;
-tr2041:
+       goto st616;
+tr2067:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -57793,8 +57960,8 @@ tr2041:
        {
                s->line_counter++;
        }
-       goto st604;
-tr2051:
+       goto st616;
+tr2077:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -57817,8 +57984,8 @@ tr2051:
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr2052:
+       goto st616;
+tr2078:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -57848,8 +58015,8 @@ tr2052:
                }
                s->multiline = true;
        }
-       goto st604;
-tr2053:
+       goto st616;
+tr2079:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -57879,8 +58046,8 @@ tr2053:
                }
                s->multiline = false;
        }
-       goto st604;
-tr2056:
+       goto st616;
+tr2082:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -57906,8 +58073,8 @@ tr2056:
        {
                s->line_counter++;
        }
-       goto st604;
-tr2077:
+       goto st616;
+tr2102:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -57929,8 +58096,8 @@ tr2077:
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr2078:
+       goto st616;
+tr2103:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -57959,8 +58126,8 @@ tr2078:
                }
                s->multiline = true;
        }
-       goto st604;
-tr2079:
+       goto st616;
+tr2104:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -57989,8 +58156,8 @@ tr2079:
                }
                s->multiline = false;
        }
-       goto st604;
-tr2081:
+       goto st616;
+tr2106:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -58015,8 +58182,8 @@ tr2081:
        {
                s->line_counter++;
        }
-       goto st604;
-tr2101:
+       goto st616;
+tr2126:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -58034,8 +58201,8 @@ tr2101:
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr2102:
+       goto st616;
+tr2127:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -58060,8 +58227,8 @@ tr2102:
                }
                s->multiline = true;
        }
-       goto st604;
-tr2103:
+       goto st616;
+tr2128:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -58086,8 +58253,8 @@ tr2103:
                }
                s->multiline = false;
        }
-       goto st604;
-tr2104:
+       goto st616;
+tr2129:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -58108,8 +58275,101 @@ tr2104:
        {
                s->line_counter++;
        }
-       goto st604;
-tr2118:
+       goto st616;
+tr2138:
+       {
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       goto st616;
+tr2139:
+       {
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               if (s->multiline == true) {
+                       ERR(ZS_LEFT_PARENTHESIS);
+                       p--; {goto st307;}
+               }
+               s->multiline = true;
+       }
+       goto st616;
+tr2140:
+       {
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               if (s->multiline == false) {
+                       ERR(ZS_RIGHT_PARENTHESIS);
+                       p--; {goto st307;}
+               }
+               s->multiline = false;
+       }
+       goto st616;
+tr2141:
+       {
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->line_counter++;
+       }
+       goto st616;
+tr2155:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -58127,8 +58387,8 @@ tr2118:
                        p--; {goto st307;}
                }
        }
-       goto st604;
-tr2119:
+       goto st616;
+tr2156:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -58153,8 +58413,8 @@ tr2119:
                }
                s->multiline = true;
        }
-       goto st604;
-tr2120:
+       goto st616;
+tr2157:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -58179,8 +58439,8 @@ tr2120:
                }
                s->multiline = false;
        }
-       goto st604;
-tr2122:
+       goto st616;
+tr2159:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -58201,11 +58461,11 @@ tr2122:
        {
                s->line_counter++;
        }
-       goto st604;
-st604:
+       goto st616;
+st616:
        if ( ++p == pe )
-               goto _test_eof604;
-case 604:
+               goto _test_eof616;
+case 616:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -58223,26 +58483,28 @@ case 604:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st604;
-               case 32: goto st604;
-               case 40: goto tr1931;
-               case 41: goto tr1932;
-               case 97: goto tr1933;
-               case 101: goto tr1934;
-               case 105: goto tr1935;
-               case 107: goto tr1936;
-               case 109: goto tr1937;
-               case 110: goto tr1938;
-               case 112: goto tr1939;
-               case 3082: goto tr1940;
-               case 3131: goto tr1941;
-               case 3338: goto tr1942;
-               case 3387: goto tr1942;
-               case 3594: goto tr1943;
-               case 3643: goto tr1944;
-       }
-       goto tr1921;
-tr1933:
+               case 9: goto st616;
+               case 32: goto st616;
+               case 40: goto tr1945;
+               case 41: goto tr1946;
+               case 97: goto tr1947;
+               case 100: goto tr1948;
+               case 101: goto tr1949;
+               case 105: goto tr1950;
+               case 107: goto tr1951;
+               case 109: goto tr1952;
+               case 110: goto tr1953;
+               case 111: goto tr1954;
+               case 112: goto tr1955;
+               case 3082: goto tr1956;
+               case 3131: goto tr1957;
+               case 3338: goto tr1958;
+               case 3387: goto tr1958;
+               case 3594: goto tr1959;
+               case 3643: goto tr1960;
+       }
+       goto tr1935;
+tr1947:
        {
                if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
                        WARN(ZS_RDATA_OVERFLOW);
@@ -58250,58 +58512,58 @@ tr1933:
                }
                s->svcb.param_position = rdata_tail;
        }
-       goto st605;
-st605:
+       goto st617;
+st617:
        if ( ++p == pe )
-               goto _test_eof605;
-case 605:
+               goto _test_eof617;
+case 617:
        if ( (*p) == 108 )
-               goto st606;
-       goto tr1921;
-st606:
+               goto st618;
+       goto tr1935;
+st618:
        if ( ++p == pe )
-               goto _test_eof606;
-case 606:
+               goto _test_eof618;
+case 618:
        if ( (*p) == 112 )
-               goto st607;
-       goto tr1921;
-st607:
+               goto st619;
+       goto tr1935;
+st619:
        if ( ++p == pe )
-               goto _test_eof607;
-case 607:
+               goto _test_eof619;
+case 619:
        if ( (*p) == 110 )
-               goto st608;
-       goto tr1921;
-st608:
+               goto st620;
+       goto tr1935;
+st620:
        if ( ++p == pe )
-               goto _test_eof608;
-case 608:
+               goto _test_eof620;
+case 620:
        if ( (*p) == 61 )
-               goto tr1948;
-       goto tr1921;
-tr1948:
+               goto tr1964;
+       goto tr1935;
+tr1964:
        {
                uint16_t val = htons(1);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
-       goto st609;
-st609:
+       goto st621;
+st621:
        if ( ++p == pe )
-               goto _test_eof609;
-case 609:
+               goto _test_eof621;
+case 621:
        switch( (*p) ) {
-               case 32: goto tr1921;
-               case 34: goto tr1950;
-               case 59: goto tr1921;
+               case 32: goto tr1935;
+               case 34: goto tr1966;
+               case 59: goto tr1935;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr1921;
+                       goto tr1935;
        } else if ( (*p) >= 9 )
-               goto tr1921;
-       goto tr1949;
-tr1949:
+               goto tr1935;
+       goto tr1965;
+tr1965:
        {
                s->comma_list = true;
                s->pending_backslash = false;
@@ -58323,12 +58585,12 @@ tr1949:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 610;goto st318;} }
-       goto st610;
-st610:
+       { p--; {stack[top++] = 622;goto st318;} }
+       goto st622;
+st622:
        if ( ++p == pe )
-               goto _test_eof610;
-case 610:
+               goto _test_eof622;
+case 622:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -58346,31 +58608,31 @@ case 610:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr1951;
-               case 32: goto tr1951;
-               case 40: goto tr1952;
-               case 41: goto tr1953;
-               case 3082: goto tr1954;
-               case 3131: goto tr1955;
-               case 3338: goto tr1956;
-               case 3387: goto tr1956;
-               case 3594: goto tr1957;
-               case 3643: goto tr1958;
+               case 9: goto tr1967;
+               case 32: goto tr1967;
+               case 40: goto tr1968;
+               case 41: goto tr1969;
+               case 3082: goto tr1970;
+               case 3131: goto tr1971;
+               case 3338: goto tr1972;
+               case 3387: goto tr1972;
+               case 3594: goto tr1973;
+               case 3643: goto tr1974;
        }
-       goto tr1921;
-tr1941:
+       goto tr1935;
+tr1957:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr1959:
+       goto st623;
+tr1975:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st611;
-tr1926:
+       goto st623;
+tr1940:
        {
                s->svcb.params_position = rdata_tail;
                s->svcb.last_key = -1;
@@ -58378,8 +58640,8 @@ tr1926:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr1955:
+       goto st623;
+tr1971:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -58421,20 +58683,8 @@ tr1955:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr1978:
-       {
-               int ret = svcb_sort(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               s->buffer_length = 0;
-       }
-       goto st611;
-tr1992:
+       goto st623;
+tr1990:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -58456,8 +58706,20 @@ tr1992:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr2019:
+       goto st623;
+tr2000:
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->buffer_length = 0;
+       }
+       goto st623;
+tr2045:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -58495,8 +58757,8 @@ tr2019:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr2042:
+       goto st623;
+tr2068:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -58534,8 +58796,8 @@ tr2042:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr2057:
+       goto st623;
+tr2083:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -58561,8 +58823,8 @@ tr2057:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr2082:
+       goto st623;
+tr2107:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -58587,8 +58849,8 @@ tr2082:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr2105:
+       goto st623;
+tr2130:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -58609,8 +58871,30 @@ tr2105:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-tr2123:
+       goto st623;
+tr2142:
+       {
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->buffer_length = 0;
+       }
+       goto st623;
+tr2160:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -58631,11 +58915,11 @@ tr2123:
        {
                s->buffer_length = 0;
        }
-       goto st611;
-st611:
+       goto st623;
+st623:
        if ( ++p == pe )
-               goto _test_eof611;
-case 611:
+               goto _test_eof623;
+case 623:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -58655,11 +58939,11 @@ case 611:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr1960;
+               goto tr1976;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr1959;
-       goto tr1921;
-tr1927:
+               goto tr1975;
+       goto tr1935;
+tr1941:
        {
                s->svcb.params_position = rdata_tail;
                s->svcb.last_key = -1;
@@ -58674,8 +58958,8 @@ tr1927:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr1942:
+       goto st1457;
+tr1958:
        {
                int ret = svcb_check(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -58686,8 +58970,8 @@ tr1942:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr1956:
+       goto st1457;
+tr1972:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -58736,8 +59020,19 @@ tr1956:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr1979:
+       goto st1457;
+tr1991:
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -58755,19 +59050,8 @@ tr1979:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr1993:
-       {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
+       goto st1457;
+tr2001:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -58785,8 +59069,8 @@ tr1993:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr2020:
+       goto st1457;
+tr2046:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -58831,8 +59115,8 @@ tr2020:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr2043:
+       goto st1457;
+tr2069:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -58877,8 +59161,8 @@ tr2043:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr2058:
+       goto st1457;
+tr2084:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -58911,8 +59195,8 @@ tr2058:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr2083:
+       goto st1457;
+tr2108:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -58944,8 +59228,8 @@ tr2083:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr2106:
+       goto st1457;
+tr2131:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -58973,64 +59257,25 @@ tr2106:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1430;
-tr2124:
-       {
-               if (s->number64 <= UINT16_MAX) {
-                       uint16_t num16 = htons((uint16_t)s->number64);
-                       memcpy(rdata_tail, &num16, 2);
-                       rdata_tail += 2;
-               } else {
-                       WARN(ZS_NUMBER16_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               int ret = svcb_sort(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               int ret = svcb_check(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1430;
-st1430:
-       if ( ++p == pe )
-               goto _test_eof1430;
-case 1430:
-       goto st0;
-tr1928:
+       goto st1457;
+tr2143:
        {
-               s->svcb.params_position = rdata_tail;
-               s->svcb.last_key = -1;
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
        }
        {
-               s->line_counter++;
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
        }
        {
-               int ret = svcb_check(s, rdata_tail);
+               int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
                        WARN(ret);
                        p--; {goto st307;}
                }
        }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1431;
-tr1943:
-       {
-               s->line_counter++;
-       }
        {
                int ret = svcb_check(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -59041,36 +59286,15 @@ tr1943:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-tr1957:
-       {
-               s->item_length = rdata_tail - s->item_length_location - 1;
-               if (s->comma_list && s->item_length == 0) {
-                       WARN(ZS_EMPTY_LIST_ITEM);
-                       p--; {goto st307;}
-               }
-               if (s->item_length <= MAX_ITEM_LENGTH) {
-                       *(s->item_length_location) = (uint8_t)(s->item_length);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               s->comma_list = false;
-               if (s->pending_backslash) {
-                       WARN(ZS_BAD_ALPN_BACKSLASH);
-                       p--; {goto st307;}
-               }
-       }
+       goto st1457;
+tr2161:
        {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
+               if (s->number64 <= UINT16_MAX) {
+                       uint16_t num16 = htons((uint16_t)s->number64);
+                       memcpy(rdata_tail, &num16, 2);
+                       rdata_tail += 2;
                } else {
-                       WARN(ZS_ITEM_OVERFLOW);
+                       WARN(ZS_NUMBER16_OVERFLOW);
                        p--; {goto st307;}
                }
        }
@@ -59081,9 +59305,6 @@ tr1957:
                        p--; {goto st307;}
                }
        }
-       {
-               s->line_counter++;
-       }
        {
                int ret = svcb_check(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -59094,14 +59315,16 @@ tr1957:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-tr1980:
+       goto st1457;
+st1457:
+       if ( ++p == pe )
+               goto _test_eof1457;
+case 1457:
+       goto st0;
+tr1942:
        {
-               int ret = svcb_sort(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
-                       p--; {goto st307;}
-               }
+               s->svcb.params_position = rdata_tail;
+               s->svcb.last_key = -1;
        }
        {
                s->line_counter++;
@@ -59116,26 +59339,8 @@ tr1980:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-tr1994:
-       {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               int ret = svcb_sort(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
-                       p--; {goto st307;}
-               }
-       }
+       goto st1458;
+tr1959:
        {
                s->line_counter++;
        }
@@ -59149,72 +59354,27 @@ tr1994:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-tr2021:
-       {
-               s->buffer[s->buffer_length] = 0;
-
-               if (inet_pton(AF_INET, (char *)s->buffer, s->addr) <= 0) {
-                       WARN(ZS_BAD_IPV4);
-                       p--; {goto st307;}
-               }
-       }
+       goto st1458;
+tr1973:
        {
-               if (rdata_tail + ZS_INET4_ADDR_LENGTH > rdata_stop + 1) {
-                       WARN(ZS_RDATA_OVERFLOW);
+               s->item_length = rdata_tail - s->item_length_location - 1;
+               if (s->comma_list && s->item_length == 0) {
+                       WARN(ZS_EMPTY_LIST_ITEM);
                        p--; {goto st307;}
                }
-               memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
-               rdata_tail += ZS_INET4_ADDR_LENGTH;
-       }
-       {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
+               if (s->item_length <= MAX_ITEM_LENGTH) {
+                       *(s->item_length_location) = (uint8_t)(s->item_length);
                } else {
                        WARN(ZS_ITEM_OVERFLOW);
                        p--; {goto st307;}
                }
        }
        {
-               int ret = svcb_sort(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               s->line_counter++;
-       }
-       {
-               int ret = svcb_check(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1431;
-tr2044:
-       {
-               s->buffer[s->buffer_length] = 0;
-
-               if (inet_pton(AF_INET6, (char *)s->buffer, s->addr) <= 0) {
-                       WARN(ZS_BAD_IPV6);
-                       p--; {goto st307;}
-               }
-       }
-       {
-               if (rdata_tail + ZS_INET6_ADDR_LENGTH > rdata_stop + 1) {
-                       WARN(ZS_RDATA_OVERFLOW);
+               s->comma_list = false;
+               if (s->pending_backslash) {
+                       WARN(ZS_BAD_ALPN_BACKSLASH);
                        p--; {goto st307;}
                }
-               memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
-               rdata_tail += ZS_INET6_ADDR_LENGTH;
        }
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
@@ -59247,23 +59407,41 @@ tr2044:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-tr2059:
+       goto st1458;
+tr1992:
        {
-               if (s->number64 <= UINT16_MAX) {
-                       uint16_t num16 = htons((uint16_t)s->number64);
-                       memcpy(rdata_tail, &num16, 2);
-                       rdata_tail += 2;
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
                } else {
-                       WARN(ZS_NUMBER16_OVERFLOW);
+                       WARN(ZS_ITEM_OVERFLOW);
                        p--; {goto st307;}
                }
        }
        {
-               uint16_t val = htons(0);
-               memcpy(rdata_tail, &val, 2);
-               rdata_tail += 2;
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->line_counter++;
+       }
+       {
+               int ret = svcb_check(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
+       goto st1458;
+tr2002:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -59284,8 +59462,24 @@ tr2059:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-tr2084:
+       goto st1458;
+tr2047:
+       {
+               s->buffer[s->buffer_length] = 0;
+
+               if (inet_pton(AF_INET, (char *)s->buffer, s->addr) <= 0) {
+                       WARN(ZS_BAD_IPV4);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               if (rdata_tail + ZS_INET4_ADDR_LENGTH > rdata_stop + 1) {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+               memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
+               rdata_tail += ZS_INET4_ADDR_LENGTH;
+       }
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -59297,9 +59491,6 @@ tr2084:
                        p--; {goto st307;}
                }
        }
-       {
-               svcb_mandatory_sort(s->svcb.mandatory_position, rdata_tail);
-       }
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -59320,17 +59511,34 @@ tr2084:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-tr2107:
+       goto st1458;
+tr2070:
        {
-               uint16_t val = htons(2);
-               memcpy(rdata_tail, &val, 2);
-               rdata_tail += 2;
+               s->buffer[s->buffer_length] = 0;
+
+               if (inet_pton(AF_INET6, (char *)s->buffer, s->addr) <= 0) {
+                       WARN(ZS_BAD_IPV6);
+                       p--; {goto st307;}
+               }
        }
        {
-               uint16_t val = htons(0);
-               memcpy(rdata_tail, &val, 2);
-               rdata_tail += 2;
+               if (rdata_tail + ZS_INET6_ADDR_LENGTH > rdata_stop + 1) {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+               memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
+               rdata_tail += ZS_INET6_ADDR_LENGTH;
+       }
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
        }
        {
                int ret = svcb_sort(s, rdata_tail);
@@ -59352,8 +59560,8 @@ tr2107:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-tr2125:
+       goto st1458;
+tr2085:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -59364,6 +59572,11 @@ tr2125:
                        p--; {goto st307;}
                }
        }
+       {
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -59384,312 +59597,108 @@ tr2125:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1431;
-st1431:
-       if ( ++p == pe )
-               goto _test_eof1431;
-case 1431:
-       _widec = (*p);
-       if ( (*p) > 10 ) {
-               if ( 59 <= (*p) && (*p) <= 59 ) {
-                       _widec = (short)(2688 + ((*p) - -128));
-                       if (
- s->multiline  ) _widec += 256;
-                       if (
- !s->multiline  ) _widec += 512;
-               }
-       } else if ( (*p) >= 10 ) {
-               _widec = (short)(2688 + ((*p) - -128));
-               if (
- s->multiline  ) _widec += 256;
-               if (
- !s->multiline  ) _widec += 512;
-       }
-       switch( _widec ) {
-               case 9: goto st604;
-               case 32: goto st604;
-               case 40: goto tr1931;
-               case 41: goto tr1932;
-               case 97: goto tr1933;
-               case 101: goto tr1934;
-               case 105: goto tr1935;
-               case 107: goto tr1936;
-               case 109: goto tr1937;
-               case 110: goto tr1938;
-               case 112: goto tr1939;
-               case 3082: goto tr1940;
-               case 3131: goto tr1941;
-               case 3338: goto tr1942;
-               case 3387: goto tr1942;
-               case 3594: goto tr1943;
-               case 3643: goto tr1944;
-       }
-       goto tr1921;
-tr1934:
+       goto st1458;
+tr2109:
        {
-               if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
-                       WARN(ZS_RDATA_OVERFLOW);
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
                        p--; {goto st307;}
                }
-               s->svcb.param_position = rdata_tail;
        }
-       goto st612;
-st612:
-       if ( ++p == pe )
-               goto _test_eof612;
-case 612:
-       if ( (*p) == 99 )
-               goto st613;
-       goto tr1921;
-st613:
-       if ( ++p == pe )
-               goto _test_eof613;
-case 613:
-       if ( (*p) == 104 )
-               goto st614;
-       goto tr1921;
-st614:
-       if ( ++p == pe )
-               goto _test_eof614;
-case 614:
-       if ( (*p) == 61 )
-               goto tr1963;
-       goto tr1921;
-tr1963:
        {
-               uint16_t val = htons(5);
-               memcpy(rdata_tail, &val, 2);
-               rdata_tail += 2;
-       }
-       goto st615;
-st615:
-       if ( ++p == pe )
-               goto _test_eof615;
-case 615:
-       switch( (*p) ) {
-               case 34: goto st616;
-               case 43: goto tr1965;
+               svcb_mandatory_sort(s->svcb.mandatory_position, rdata_tail);
        }
-       if ( (*p) < 65 ) {
-               if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1965;
-       } else if ( (*p) > 90 ) {
-               if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1965;
-       } else
-               goto tr1965;
-       goto tr1921;
-st616:
-       if ( ++p == pe )
-               goto _test_eof616;
-case 616:
-       if ( (*p) == 43 )
-               goto tr1966;
-       if ( (*p) < 65 ) {
-               if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1966;
-       } else if ( (*p) > 90 ) {
-               if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1966;
-       } else
-               goto tr1966;
-       goto tr1921;
-tr1973:
        {
-               if (rdata_tail <= rdata_stop) {
-                       *rdata_tail = first_base64_to_num[(uint8_t)(*p)];
-               } else {
-                       WARN(ZS_RDATA_OVERFLOW);
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
        }
-       goto st617;
-tr1966:
        {
-               if (rdata_tail < rdata_stop) {
-                       s->item_length2_location = rdata_tail;
-                       rdata_tail += 2;
-               } else {
-                       WARN(ZS_RDATA_OVERFLOW);
-                       p--; {goto st307;}
-               }
+               s->line_counter++;
        }
        {
-               if (rdata_tail <= rdata_stop) {
-                       *rdata_tail = first_base64_to_num[(uint8_t)(*p)];
-               } else {
-                       WARN(ZS_RDATA_OVERFLOW);
+               int ret = svcb_check(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
        }
-       goto st617;
-st617:
-       if ( ++p == pe )
-               goto _test_eof617;
-case 617:
-       if ( (*p) == 43 )
-               goto tr1967;
-       if ( (*p) < 65 ) {
-               if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1967;
-       } else if ( (*p) > 90 ) {
-               if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1967;
-       } else
-               goto tr1967;
-       goto tr1921;
-tr1967:
        {
-               *(rdata_tail++) += second_left_base64_to_num[(uint8_t)(*p)];
-
-               if (rdata_tail <= rdata_stop) {
-                       *rdata_tail = second_right_base64_to_num[(uint8_t)(*p)];
-               } else {
-                       WARN(ZS_RDATA_OVERFLOW);
-                       p--; {goto st307;}
-               }
+               p--; {cs = stack[--top];goto _again;}
        }
-       goto st618;
-st618:
-       if ( ++p == pe )
-               goto _test_eof618;
-case 618:
-       switch( (*p) ) {
-               case 43: goto tr1968;
-               case 61: goto st622;
+       goto st1458;
+tr2132:
+       {
+               uint16_t val = htons(2);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
        }
-       if ( (*p) < 65 ) {
-               if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1968;
-       } else if ( (*p) > 90 ) {
-               if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1968;
-       } else
-               goto tr1968;
-       goto tr1921;
-tr1968:
        {
-               *(rdata_tail++) += third_left_base64_to_num[(uint8_t)(*p)];
-
-               if (rdata_tail <= rdata_stop) {
-                       *rdata_tail = third_right_base64_to_num[(uint8_t)(*p)];
-               } else {
-                       WARN(ZS_RDATA_OVERFLOW);
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
        }
-       goto st619;
-st619:
-       if ( ++p == pe )
-               goto _test_eof619;
-case 619:
-       switch( (*p) ) {
-               case 43: goto tr1970;
-               case 61: goto st620;
-       }
-       if ( (*p) < 65 ) {
-               if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1970;
-       } else if ( (*p) > 90 ) {
-               if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1970;
-       } else
-               goto tr1970;
-       goto tr1921;
-tr1970:
        {
-               *(rdata_tail++) += fourth_base64_to_num[(uint8_t)(*p)];
-       }
-       goto st620;
-st620:
-       if ( ++p == pe )
-               goto _test_eof620;
-case 620:
-       switch( (*p) ) {
-               case 34: goto tr1972;
-               case 43: goto tr1973;
+               s->line_counter++;
        }
-       if ( (*p) < 65 ) {
-               if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1973;
-       } else if ( (*p) > 90 ) {
-               if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1973;
-       } else
-               goto tr1973;
-       goto tr1921;
-tr1972:
        {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
+               int ret = svcb_check(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
        }
-       goto st621;
-tr2009:
        {
-               s->buffer[s->buffer_length] = 0;
-
-               if (inet_pton(AF_INET, (char *)s->buffer, s->addr) <= 0) {
-                       WARN(ZS_BAD_IPV4);
-                       p--; {goto st307;}
-               }
+               p--; {cs = stack[--top];goto _again;}
        }
+       goto st1458;
+tr2144:
        {
-               if (rdata_tail + ZS_INET4_ADDR_LENGTH > rdata_stop + 1) {
-                       WARN(ZS_RDATA_OVERFLOW);
-                       p--; {goto st307;}
-               }
-               memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
-               rdata_tail += ZS_INET4_ADDR_LENGTH;
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
        }
        {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
-                       p--; {goto st307;}
-               }
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
        }
-       goto st621;
-tr2032:
        {
-               s->buffer[s->buffer_length] = 0;
-
-               if (inet_pton(AF_INET6, (char *)s->buffer, s->addr) <= 0) {
-                       WARN(ZS_BAD_IPV6);
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
        }
        {
-               if (rdata_tail + ZS_INET6_ADDR_LENGTH > rdata_stop + 1) {
-                       WARN(ZS_RDATA_OVERFLOW);
-                       p--; {goto st307;}
-               }
-               memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
-               rdata_tail += ZS_INET6_ADDR_LENGTH;
+               s->line_counter++;
        }
        {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
+               int ret = svcb_check(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
        }
-       goto st621;
-tr2116:
+       {
+               p--; {cs = stack[--top];goto _again;}
+       }
+       goto st1458;
+tr2162:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -59700,60 +59709,165 @@ tr2116:
                        p--; {goto st307;}
                }
        }
-       goto st621;
-tr2074:
        {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
        }
        {
-               svcb_mandatory_sort(s->svcb.mandatory_position, rdata_tail);
+               s->line_counter++;
        }
-       goto st621;
-tr2128:
        {
-               s->item_length = rdata_tail - s->item_length_location - 1;
-               if (s->comma_list && s->item_length == 0) {
-                       WARN(ZS_EMPTY_LIST_ITEM);
+               int ret = svcb_check(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
                        p--; {goto st307;}
                }
-               if (s->item_length <= MAX_ITEM_LENGTH) {
-                       *(s->item_length_location) = (uint8_t)(s->item_length);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
-                       p--; {goto st307;}
+       }
+       {
+               p--; {cs = stack[--top];goto _again;}
+       }
+       goto st1458;
+st1458:
+       if ( ++p == pe )
+               goto _test_eof1458;
+case 1458:
+       _widec = (*p);
+       if ( (*p) > 10 ) {
+               if ( 59 <= (*p) && (*p) <= 59 ) {
+                       _widec = (short)(2688 + ((*p) - -128));
+                       if (
+ s->multiline  ) _widec += 256;
+                       if (
+ !s->multiline  ) _widec += 512;
                }
+       } else if ( (*p) >= 10 ) {
+               _widec = (short)(2688 + ((*p) - -128));
+               if (
+ s->multiline  ) _widec += 256;
+               if (
+ !s->multiline  ) _widec += 512;
        }
+       switch( _widec ) {
+               case 9: goto st616;
+               case 32: goto st616;
+               case 40: goto tr1945;
+               case 41: goto tr1946;
+               case 97: goto tr1947;
+               case 100: goto tr1948;
+               case 101: goto tr1949;
+               case 105: goto tr1950;
+               case 107: goto tr1951;
+               case 109: goto tr1952;
+               case 110: goto tr1953;
+               case 111: goto tr1954;
+               case 112: goto tr1955;
+               case 3082: goto tr1956;
+               case 3131: goto tr1957;
+               case 3338: goto tr1958;
+               case 3387: goto tr1958;
+               case 3594: goto tr1959;
+               case 3643: goto tr1960;
+       }
+       goto tr1935;
+tr1948:
        {
-               s->comma_list = false;
-               if (s->pending_backslash) {
-                       WARN(ZS_BAD_ALPN_BACKSLASH);
+               if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
+                       WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
+               s->svcb.param_position = rdata_tail;
        }
+       goto st624;
+st624:
+       if ( ++p == pe )
+               goto _test_eof624;
+case 624:
+       if ( (*p) == 111 )
+               goto st625;
+       goto tr1935;
+st625:
+       if ( ++p == pe )
+               goto _test_eof625;
+case 625:
+       if ( (*p) == 104 )
+               goto st626;
+       goto tr1935;
+st626:
+       if ( ++p == pe )
+               goto _test_eof626;
+case 626:
+       if ( (*p) == 112 )
+               goto st627;
+       goto tr1935;
+st627:
+       if ( ++p == pe )
+               goto _test_eof627;
+case 627:
+       if ( (*p) == 97 )
+               goto st628;
+       goto tr1935;
+st628:
+       if ( ++p == pe )
+               goto _test_eof628;
+case 628:
+       if ( (*p) == 116 )
+               goto st629;
+       goto tr1935;
+st629:
+       if ( ++p == pe )
+               goto _test_eof629;
+case 629:
+       if ( (*p) == 104 )
+               goto st630;
+       goto tr1935;
+st630:
+       if ( ++p == pe )
+               goto _test_eof630;
+case 630:
+       if ( (*p) == 61 )
+               goto tr1983;
+       goto tr1935;
+tr1983:
        {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
+               uint16_t val = htons(7);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       goto st631;
+st631:
+       if ( ++p == pe )
+               goto _test_eof631;
+case 631:
+       switch( (*p) ) {
+               case 32: goto tr1935;
+               case 34: goto tr1985;
+               case 59: goto tr1935;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr1935;
+       } else if ( (*p) >= 9 )
+               goto tr1935;
+       goto tr1984;
+tr1984:
+       {
+               if (rdata_tail < rdata_stop) {
+                       s->item_length2_location = rdata_tail;
+                       rdata_tail += 2;
                } else {
-                       WARN(ZS_ITEM_OVERFLOW);
+                       WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
        }
-       goto st621;
-st621:
+       { p--; {stack[top++] = 632;goto st318;} }
+       goto st632;
+st632:
        if ( ++p == pe )
-               goto _test_eof621;
-case 621:
+               goto _test_eof632;
+case 632:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -59771,19 +59885,19 @@ case 621:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr1974;
-               case 32: goto tr1974;
-               case 40: goto tr1975;
-               case 41: goto tr1976;
-               case 3082: goto tr1977;
-               case 3131: goto tr1978;
-               case 3338: goto tr1979;
-               case 3387: goto tr1979;
-               case 3594: goto tr1980;
-               case 3643: goto tr1981;
+               case 9: goto tr1986;
+               case 32: goto tr1986;
+               case 40: goto tr1987;
+               case 41: goto tr1988;
+               case 3082: goto tr1989;
+               case 3131: goto tr1990;
+               case 3338: goto tr1991;
+               case 3387: goto tr1991;
+               case 3594: goto tr1992;
+               case 3643: goto tr1993;
        }
-       goto tr1921;
-tr1929:
+       goto tr1935;
+tr1943:
        {
                s->svcb.params_position = rdata_tail;
                s->svcb.last_key = -1;
@@ -59801,8 +59915,8 @@ tr1929:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr1944:
+       goto st1459;
+tr1960:
        {
                s->buffer_length = 0;
        }
@@ -59816,8 +59930,8 @@ tr1944:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr1958:
+       goto st1459;
+tr1974:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -59869,8 +59983,19 @@ tr1958:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr1981:
+       goto st1459;
+tr1993:
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -59891,19 +60016,8 @@ tr1981:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr1995:
-       {
-               s->item_length = rdata_tail - s->item_length2_location - 2;
-
-               if (s->item_length <= MAX_ITEM_LENGTH2) {
-                       uint16_t val = htons((uint16_t)(s->item_length));
-                       memcpy(s->item_length2_location, &val, 2);
-               } else {
-                       WARN(ZS_ITEM_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
+       goto st1459;
+tr2003:
        {
                int ret = svcb_sort(s, rdata_tail);
                if (ret != ZS_OK) {
@@ -59924,8 +60038,8 @@ tr1995:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr2022:
+       goto st1459;
+tr2048:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -59973,8 +60087,8 @@ tr2022:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr2045:
+       goto st1459;
+tr2071:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -60022,8 +60136,8 @@ tr2045:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr2060:
+       goto st1459;
+tr2086:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -60059,8 +60173,8 @@ tr2060:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr2085:
+       goto st1459;
+tr2110:
        {
                s->item_length = rdata_tail - s->item_length2_location - 2;
 
@@ -60095,106 +60209,568 @@ tr2085:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1432;
-tr2108:
+       goto st1459;
+tr2133:
+       {
+               uint16_t val = htons(2);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->buffer_length = 0;
+       }
+       {
+               int ret = svcb_check(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               p--; {cs = stack[--top];goto _again;}
+       }
+       goto st1459;
+tr2145:
+       {
+               uint16_t val = htons(8);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               uint16_t val = htons(0);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->buffer_length = 0;
+       }
+       {
+               int ret = svcb_check(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               p--; {cs = stack[--top];goto _again;}
+       }
+       goto st1459;
+tr2163:
+       {
+               if (s->number64 <= UINT16_MAX) {
+                       uint16_t num16 = htons((uint16_t)s->number64);
+                       memcpy(rdata_tail, &num16, 2);
+                       rdata_tail += 2;
+               } else {
+                       WARN(ZS_NUMBER16_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               int ret = svcb_sort(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->buffer_length = 0;
+       }
+       {
+               int ret = svcb_check(s, rdata_tail);
+               if (ret != ZS_OK) {
+                       WARN(ret);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               p--; {cs = stack[--top];goto _again;}
+       }
+       goto st1459;
+st1459:
+       if ( ++p == pe )
+               goto _test_eof1459;
+case 1459:
+       _widec = (*p);
+       if ( (*p) < 10 ) {
+               if ( (*p) <= 9 ) {
+                       _widec = (short)(1664 + ((*p) - -128));
+                       if (
+ s->multiline  ) _widec += 256;
+               }
+       } else if ( (*p) > 10 ) {
+               if ( 11 <= (*p) )
+ {                     _widec = (short)(1664 + ((*p) - -128));
+                       if (
+ s->multiline  ) _widec += 256;
+               }
+       } else {
+               _widec = (short)(1664 + ((*p) - -128));
+               if (
+ s->multiline  ) _widec += 256;
+       }
+       if ( _widec == 2058 )
+               goto tr1976;
+       if ( 1920 <= _widec && _widec <= 2175 )
+               goto tr1975;
+       goto tr1935;
+tr1985:
+       {
+               if (rdata_tail < rdata_stop) {
+                       s->item_length2_location = rdata_tail;
+                       rdata_tail += 2;
+               } else {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       { p--; {stack[top++] = 633;goto st318;} }
+       goto st633;
+st633:
+       if ( ++p == pe )
+               goto _test_eof633;
+case 633:
+       _widec = (*p);
+       if ( (*p) > 10 ) {
+               if ( 59 <= (*p) && (*p) <= 59 ) {
+                       _widec = (short)(2688 + ((*p) - -128));
+                       if (
+ s->multiline  ) _widec += 256;
+                       if (
+ !s->multiline  ) _widec += 512;
+               }
+       } else if ( (*p) >= 10 ) {
+               _widec = (short)(2688 + ((*p) - -128));
+               if (
+ s->multiline  ) _widec += 256;
+               if (
+ !s->multiline  ) _widec += 512;
+       }
+       switch( _widec ) {
+               case 9: goto tr1986;
+               case 32: goto tr1986;
+               case 40: goto tr1987;
+               case 41: goto tr1988;
+               case 3082: goto tr1989;
+               case 3131: goto tr1990;
+               case 3338: goto tr1991;
+               case 3387: goto tr1991;
+               case 3594: goto tr1992;
+               case 3643: goto tr1993;
+       }
+       if ( _widec < 11 ) {
+               if ( _widec <= 8 )
+                       goto tr1994;
+       } else if ( _widec > 58 ) {
+               if ( 60 <= _widec )
+                       goto tr1994;
+       } else
+               goto tr1994;
+       goto tr1935;
+tr1994:
+       {
+               if (rdata_tail < rdata_stop) {
+                       s->item_length2_location = rdata_tail;
+                       rdata_tail += 2;
+               } else {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       { p--; {stack[top++] = 634;goto st318;} }
+       goto st634;
+st634:
+       if ( ++p == pe )
+               goto _test_eof634;
+case 634:
+       if ( (*p) == 34 )
+               goto tr1995;
+       goto tr1935;
+tr1995:
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st635;
+tr2035:
+       {
+               s->buffer[s->buffer_length] = 0;
+
+               if (inet_pton(AF_INET, (char *)s->buffer, s->addr) <= 0) {
+                       WARN(ZS_BAD_IPV4);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               if (rdata_tail + ZS_INET4_ADDR_LENGTH > rdata_stop + 1) {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+               memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
+               rdata_tail += ZS_INET4_ADDR_LENGTH;
+       }
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st635;
+tr2058:
+       {
+               s->buffer[s->buffer_length] = 0;
+
+               if (inet_pton(AF_INET6, (char *)s->buffer, s->addr) <= 0) {
+                       WARN(ZS_BAD_IPV6);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               if (rdata_tail + ZS_INET6_ADDR_LENGTH > rdata_stop + 1) {
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+               memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
+               rdata_tail += ZS_INET6_ADDR_LENGTH;
+       }
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st635;
+tr2153:
+       {
+               if (s->number64 <= UINT16_MAX) {
+                       uint16_t num16 = htons((uint16_t)s->number64);
+                       memcpy(rdata_tail, &num16, 2);
+                       rdata_tail += 2;
+               } else {
+                       WARN(ZS_NUMBER16_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st635;
+tr2099:
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               svcb_mandatory_sort(s->svcb.mandatory_position, rdata_tail);
+       }
+       goto st635;
+tr2165:
+       {
+               s->item_length = rdata_tail - s->item_length_location - 1;
+               if (s->comma_list && s->item_length == 0) {
+                       WARN(ZS_EMPTY_LIST_ITEM);
+                       p--; {goto st307;}
+               }
+               if (s->item_length <= MAX_ITEM_LENGTH) {
+                       *(s->item_length_location) = (uint8_t)(s->item_length);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->comma_list = false;
+               if (s->pending_backslash) {
+                       WARN(ZS_BAD_ALPN_BACKSLASH);
+                       p--; {goto st307;}
+               }
+       }
+       {
+               s->item_length = rdata_tail - s->item_length2_location - 2;
+
+               if (s->item_length <= MAX_ITEM_LENGTH2) {
+                       uint16_t val = htons((uint16_t)(s->item_length));
+                       memcpy(s->item_length2_location, &val, 2);
+               } else {
+                       WARN(ZS_ITEM_OVERFLOW);
+                       p--; {goto st307;}
+               }
+       }
+       goto st635;
+st635:
+       if ( ++p == pe )
+               goto _test_eof635;
+case 635:
+       _widec = (*p);
+       if ( (*p) > 10 ) {
+               if ( 59 <= (*p) && (*p) <= 59 ) {
+                       _widec = (short)(2688 + ((*p) - -128));
+                       if (
+ s->multiline  ) _widec += 256;
+                       if (
+ !s->multiline  ) _widec += 512;
+               }
+       } else if ( (*p) >= 10 ) {
+               _widec = (short)(2688 + ((*p) - -128));
+               if (
+ s->multiline  ) _widec += 256;
+               if (
+ !s->multiline  ) _widec += 512;
+       }
+       switch( _widec ) {
+               case 9: goto tr1996;
+               case 32: goto tr1996;
+               case 40: goto tr1997;
+               case 41: goto tr1998;
+               case 3082: goto tr1999;
+               case 3131: goto tr2000;
+               case 3338: goto tr2001;
+               case 3387: goto tr2001;
+               case 3594: goto tr2002;
+               case 3643: goto tr2003;
+       }
+       goto tr1935;
+tr1949:
+       {
+               if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+               s->svcb.param_position = rdata_tail;
+       }
+       goto st636;
+st636:
+       if ( ++p == pe )
+               goto _test_eof636;
+case 636:
+       if ( (*p) == 99 )
+               goto st637;
+       goto tr1935;
+st637:
+       if ( ++p == pe )
+               goto _test_eof637;
+case 637:
+       if ( (*p) == 104 )
+               goto st638;
+       goto tr1935;
+st638:
+       if ( ++p == pe )
+               goto _test_eof638;
+case 638:
+       if ( (*p) == 61 )
+               goto tr2006;
+       goto tr1935;
+tr2006:
        {
-               uint16_t val = htons(2);
+               uint16_t val = htons(5);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
-       {
-               uint16_t val = htons(0);
-               memcpy(rdata_tail, &val, 2);
-               rdata_tail += 2;
+       goto st639;
+st639:
+       if ( ++p == pe )
+               goto _test_eof639;
+case 639:
+       switch( (*p) ) {
+               case 34: goto st640;
+               case 43: goto tr2008;
        }
+       if ( (*p) < 65 ) {
+               if ( 47 <= (*p) && (*p) <= 57 )
+                       goto tr2008;
+       } else if ( (*p) > 90 ) {
+               if ( 97 <= (*p) && (*p) <= 122 )
+                       goto tr2008;
+       } else
+               goto tr2008;
+       goto tr1935;
+st640:
+       if ( ++p == pe )
+               goto _test_eof640;
+case 640:
+       if ( (*p) == 43 )
+               goto tr2009;
+       if ( (*p) < 65 ) {
+               if ( 47 <= (*p) && (*p) <= 57 )
+                       goto tr2009;
+       } else if ( (*p) > 90 ) {
+               if ( 97 <= (*p) && (*p) <= 122 )
+                       goto tr2009;
+       } else
+               goto tr2009;
+       goto tr1935;
+tr2015:
        {
-               int ret = svcb_sort(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
+               if (rdata_tail <= rdata_stop) {
+                       *rdata_tail = first_base64_to_num[(uint8_t)(*p)];
+               } else {
+                       WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
        }
+       goto st641;
+tr2009:
        {
-               s->buffer_length = 0;
-       }
-       {
-               int ret = svcb_check(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
+               if (rdata_tail < rdata_stop) {
+                       s->item_length2_location = rdata_tail;
+                       rdata_tail += 2;
+               } else {
+                       WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
        }
        {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1432;
-tr2126:
-       {
-               if (s->number64 <= UINT16_MAX) {
-                       uint16_t num16 = htons((uint16_t)s->number64);
-                       memcpy(rdata_tail, &num16, 2);
-                       rdata_tail += 2;
+               if (rdata_tail <= rdata_stop) {
+                       *rdata_tail = first_base64_to_num[(uint8_t)(*p)];
                } else {
-                       WARN(ZS_NUMBER16_OVERFLOW);
+                       WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
        }
+       goto st641;
+st641:
+       if ( ++p == pe )
+               goto _test_eof641;
+case 641:
+       if ( (*p) == 43 )
+               goto tr2010;
+       if ( (*p) < 65 ) {
+               if ( 47 <= (*p) && (*p) <= 57 )
+                       goto tr2010;
+       } else if ( (*p) > 90 ) {
+               if ( 97 <= (*p) && (*p) <= 122 )
+                       goto tr2010;
+       } else
+               goto tr2010;
+       goto tr1935;
+tr2010:
        {
-               int ret = svcb_sort(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
+               *(rdata_tail++) += second_left_base64_to_num[(uint8_t)(*p)];
+
+               if (rdata_tail <= rdata_stop) {
+                       *rdata_tail = second_right_base64_to_num[(uint8_t)(*p)];
+               } else {
+                       WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
        }
-       {
-               s->buffer_length = 0;
+       goto st642;
+st642:
+       if ( ++p == pe )
+               goto _test_eof642;
+case 642:
+       switch( (*p) ) {
+               case 43: goto tr2011;
+               case 61: goto st645;
        }
+       if ( (*p) < 65 ) {
+               if ( 47 <= (*p) && (*p) <= 57 )
+                       goto tr2011;
+       } else if ( (*p) > 90 ) {
+               if ( 97 <= (*p) && (*p) <= 122 )
+                       goto tr2011;
+       } else
+               goto tr2011;
+       goto tr1935;
+tr2011:
        {
-               int ret = svcb_check(s, rdata_tail);
-               if (ret != ZS_OK) {
-                       WARN(ret);
+               *(rdata_tail++) += third_left_base64_to_num[(uint8_t)(*p)];
+
+               if (rdata_tail <= rdata_stop) {
+                       *rdata_tail = third_right_base64_to_num[(uint8_t)(*p)];
+               } else {
+                       WARN(ZS_RDATA_OVERFLOW);
                        p--; {goto st307;}
                }
        }
+       goto st643;
+st643:
+       if ( ++p == pe )
+               goto _test_eof643;
+case 643:
+       switch( (*p) ) {
+               case 43: goto tr2013;
+               case 61: goto st644;
+       }
+       if ( (*p) < 65 ) {
+               if ( 47 <= (*p) && (*p) <= 57 )
+                       goto tr2013;
+       } else if ( (*p) > 90 ) {
+               if ( 97 <= (*p) && (*p) <= 122 )
+                       goto tr2013;
+       } else
+               goto tr2013;
+       goto tr1935;
+tr2013:
        {
-               p--; {cs = stack[--top];goto _again;}
+               *(rdata_tail++) += fourth_base64_to_num[(uint8_t)(*p)];
        }
-       goto st1432;
-st1432:
+       goto st644;
+st644:
        if ( ++p == pe )
-               goto _test_eof1432;
-case 1432:
-       _widec = (*p);
-       if ( (*p) < 10 ) {
-               if ( (*p) <= 9 ) {
-                       _widec = (short)(1664 + ((*p) - -128));
-                       if (
- s->multiline  ) _widec += 256;
-               }
-       } else if ( (*p) > 10 ) {
-               if ( 11 <= (*p) )
- {                     _widec = (short)(1664 + ((*p) - -128));
-                       if (
- s->multiline  ) _widec += 256;
-               }
-       } else {
-               _widec = (short)(1664 + ((*p) - -128));
-               if (
- s->multiline  ) _widec += 256;
+               goto _test_eof644;
+case 644:
+       switch( (*p) ) {
+               case 34: goto tr1995;
+               case 43: goto tr2015;
        }
-       if ( _widec == 2058 )
-               goto tr1960;
-       if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr1959;
-       goto tr1921;
-st622:
+       if ( (*p) < 65 ) {
+               if ( 47 <= (*p) && (*p) <= 57 )
+                       goto tr2015;
+       } else if ( (*p) > 90 ) {
+               if ( 97 <= (*p) && (*p) <= 122 )
+                       goto tr2015;
+       } else
+               goto tr2015;
+       goto tr1935;
+st645:
        if ( ++p == pe )
-               goto _test_eof622;
-case 622:
+               goto _test_eof645;
+case 645:
        if ( (*p) == 61 )
-               goto st620;
-       goto tr1921;
-tr1990:
+               goto st644;
+       goto tr1935;
+tr2021:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_base64_to_num[(uint8_t)(*p)];
@@ -60203,8 +60779,8 @@ tr1990:
                        p--; {goto st307;}
                }
        }
-       goto st623;
-tr1965:
+       goto st646;
+tr2008:
        {
                if (rdata_tail < rdata_stop) {
                        s->item_length2_location = rdata_tail;
@@ -60222,23 +60798,23 @@ tr1965:
                        p--; {goto st307;}
                }
        }
-       goto st623;
-st623:
+       goto st646;
+st646:
        if ( ++p == pe )
-               goto _test_eof623;
-case 623:
+               goto _test_eof646;
+case 646:
        if ( (*p) == 43 )
-               goto tr1982;
+               goto tr2016;
        if ( (*p) < 65 ) {
                if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1982;
+                       goto tr2016;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1982;
+                       goto tr2016;
        } else
-               goto tr1982;
-       goto tr1921;
-tr1982:
+               goto tr2016;
+       goto tr1935;
+tr2016:
        {
                *(rdata_tail++) += second_left_base64_to_num[(uint8_t)(*p)];
 
@@ -60249,25 +60825,25 @@ tr1982:
                        p--; {goto st307;}
                }
        }
-       goto st624;
-st624:
+       goto st647;
+st647:
        if ( ++p == pe )
-               goto _test_eof624;
-case 624:
+               goto _test_eof647;
+case 647:
        switch( (*p) ) {
-               case 43: goto tr1983;
-               case 61: goto st627;
+               case 43: goto tr2017;
+               case 61: goto st650;
        }
        if ( (*p) < 65 ) {
                if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1983;
+                       goto tr2017;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1983;
+                       goto tr2017;
        } else
-               goto tr1983;
-       goto tr1921;
-tr1983:
+               goto tr2017;
+       goto tr1935;
+tr2017:
        {
                *(rdata_tail++) += third_left_base64_to_num[(uint8_t)(*p)];
 
@@ -60278,33 +60854,33 @@ tr1983:
                        p--; {goto st307;}
                }
        }
-       goto st625;
-st625:
+       goto st648;
+st648:
        if ( ++p == pe )
-               goto _test_eof625;
-case 625:
+               goto _test_eof648;
+case 648:
        switch( (*p) ) {
-               case 43: goto tr1985;
-               case 61: goto st626;
+               case 43: goto tr2019;
+               case 61: goto st649;
        }
        if ( (*p) < 65 ) {
                if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr1985;
+                       goto tr2019;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr1985;
+                       goto tr2019;
        } else
-               goto tr1985;
-       goto tr1921;
-tr1985:
+               goto tr2019;
+       goto tr1935;
+tr2019:
        {
                *(rdata_tail++) += fourth_base64_to_num[(uint8_t)(*p)];
        }
-       goto st626;
-st626:
+       goto st649;
+st649:
        if ( ++p == pe )
-               goto _test_eof626;
-case 626:
+               goto _test_eof649;
+case 649:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -60322,35 +60898,35 @@ case 626:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr1987;
-               case 32: goto tr1987;
-               case 40: goto tr1988;
-               case 41: goto tr1989;
-               case 43: goto tr1990;
-               case 3082: goto tr1991;
-               case 3131: goto tr1992;
-               case 3338: goto tr1993;
-               case 3387: goto tr1993;
-               case 3594: goto tr1994;
-               case 3643: goto tr1995;
+               case 9: goto tr1986;
+               case 32: goto tr1986;
+               case 40: goto tr1987;
+               case 41: goto tr1988;
+               case 43: goto tr2021;
+               case 3082: goto tr1989;
+               case 3131: goto tr1990;
+               case 3338: goto tr1991;
+               case 3387: goto tr1991;
+               case 3594: goto tr1992;
+               case 3643: goto tr1993;
        }
        if ( _widec < 65 ) {
                if ( 47 <= _widec && _widec <= 57 )
-                       goto tr1990;
+                       goto tr2021;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr1990;
+                       goto tr2021;
        } else
-               goto tr1990;
-       goto tr1921;
-st627:
+               goto tr2021;
+       goto tr1935;
+st650:
        if ( ++p == pe )
-               goto _test_eof627;
-case 627:
+               goto _test_eof650;
+case 650:
        if ( (*p) == 61 )
-               goto st626;
-       goto tr1921;
-tr1935:
+               goto st649;
+       goto tr1935;
+tr1950:
        {
                if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
                        WARN(ZS_RDATA_OVERFLOW);
@@ -60358,93 +60934,93 @@ tr1935:
                }
                s->svcb.param_position = rdata_tail;
        }
-       goto st628;
-st628:
+       goto st651;
+st651:
        if ( ++p == pe )
-               goto _test_eof628;
-case 628:
+               goto _test_eof651;
+case 651:
        if ( (*p) == 112 )
-               goto st629;
-       goto tr1921;
-st629:
+               goto st652;
+       goto tr1935;
+st652:
        if ( ++p == pe )
-               goto _test_eof629;
-case 629:
+               goto _test_eof652;
+case 652:
        if ( (*p) == 118 )
-               goto st630;
-       goto tr1921;
-st630:
+               goto st653;
+       goto tr1935;
+st653:
        if ( ++p == pe )
-               goto _test_eof630;
-case 630:
+               goto _test_eof653;
+case 653:
        switch( (*p) ) {
-               case 52: goto st631;
-               case 54: goto st642;
+               case 52: goto st654;
+               case 54: goto st665;
        }
-       goto tr1921;
-st631:
+       goto tr1935;
+st654:
        if ( ++p == pe )
-               goto _test_eof631;
-case 631:
+               goto _test_eof654;
+case 654:
        if ( (*p) == 104 )
-               goto st632;
-       goto tr1921;
-st632:
+               goto st655;
+       goto tr1935;
+st655:
        if ( ++p == pe )
-               goto _test_eof632;
-case 632:
+               goto _test_eof655;
+case 655:
        if ( (*p) == 105 )
-               goto st633;
-       goto tr1921;
-st633:
+               goto st656;
+       goto tr1935;
+st656:
        if ( ++p == pe )
-               goto _test_eof633;
-case 633:
+               goto _test_eof656;
+case 656:
        if ( (*p) == 110 )
-               goto st634;
-       goto tr1921;
-st634:
+               goto st657;
+       goto tr1935;
+st657:
        if ( ++p == pe )
-               goto _test_eof634;
-case 634:
+               goto _test_eof657;
+case 657:
        if ( (*p) == 116 )
-               goto st635;
-       goto tr1921;
-st635:
+               goto st658;
+       goto tr1935;
+st658:
        if ( ++p == pe )
-               goto _test_eof635;
-case 635:
+               goto _test_eof658;
+case 658:
        if ( (*p) == 61 )
-               goto tr2004;
-       goto tr1921;
-tr2004:
+               goto tr2030;
+       goto tr1935;
+tr2030:
        {
                uint16_t val = htons(4);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
-       goto st636;
-st636:
+       goto st659;
+st659:
        if ( ++p == pe )
-               goto _test_eof636;
-case 636:
+               goto _test_eof659;
+case 659:
        switch( (*p) ) {
-               case 34: goto st637;
-               case 46: goto tr2007;
+               case 34: goto st660;
+               case 46: goto tr2033;
        }
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2007;
-       goto tr2005;
-st637:
+               goto tr2033;
+       goto tr2031;
+st660:
        if ( ++p == pe )
-               goto _test_eof637;
-case 637:
+               goto _test_eof660;
+case 660:
        if ( (*p) == 46 )
-               goto tr2008;
+               goto tr2034;
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2008;
-       goto tr2005;
-tr2008:
+               goto tr2034;
+       goto tr2031;
+tr2034:
        {
                if (rdata_tail < rdata_stop) {
                        s->item_length2_location = rdata_tail;
@@ -60465,8 +61041,8 @@ tr2008:
                        p--; {goto st307;}
                }
        }
-       goto st638;
-tr2011:
+       goto st661;
+tr2037:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -60475,8 +61051,8 @@ tr2011:
                        p--; {goto st307;}
                }
        }
-       goto st638;
-tr2012:
+       goto st661;
+tr2038:
        {
                s->buffer_length = 0;
        }
@@ -60488,20 +61064,20 @@ tr2012:
                        p--; {goto st307;}
                }
        }
-       goto st638;
-st638:
+       goto st661;
+st661:
        if ( ++p == pe )
-               goto _test_eof638;
-case 638:
+               goto _test_eof661;
+case 661:
        switch( (*p) ) {
-               case 34: goto tr2009;
-               case 44: goto tr2010;
-               case 46: goto tr2011;
+               case 34: goto tr2035;
+               case 44: goto tr2036;
+               case 46: goto tr2037;
        }
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2011;
-       goto tr2005;
-tr2010:
+               goto tr2037;
+       goto tr2031;
+tr2036:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -60518,17 +61094,17 @@ tr2010:
                memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
                rdata_tail += ZS_INET4_ADDR_LENGTH;
        }
-       goto st639;
-st639:
+       goto st662;
+st662:
        if ( ++p == pe )
-               goto _test_eof639;
-case 639:
+               goto _test_eof662;
+case 662:
        if ( (*p) == 46 )
-               goto tr2012;
+               goto tr2038;
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2012;
-       goto tr2005;
-tr2007:
+               goto tr2038;
+       goto tr2031;
+tr2033:
        {
                if (rdata_tail < rdata_stop) {
                        s->item_length2_location = rdata_tail;
@@ -60549,8 +61125,8 @@ tr2007:
                        p--; {goto st307;}
                }
        }
-       goto st640;
-tr2017:
+       goto st663;
+tr2043:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -60559,8 +61135,8 @@ tr2017:
                        p--; {goto st307;}
                }
        }
-       goto st640;
-tr2023:
+       goto st663;
+tr2049:
        {
                s->buffer_length = 0;
        }
@@ -60572,11 +61148,11 @@ tr2023:
                        p--; {goto st307;}
                }
        }
-       goto st640;
-st640:
+       goto st663;
+st663:
        if ( ++p == pe )
-               goto _test_eof640;
-case 640:
+               goto _test_eof663;
+case 663:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -60594,23 +61170,23 @@ case 640:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2013;
-               case 32: goto tr2013;
-               case 40: goto tr2014;
-               case 41: goto tr2015;
-               case 44: goto tr2016;
-               case 46: goto tr2017;
-               case 3082: goto tr2018;
-               case 3131: goto tr2019;
-               case 3338: goto tr2020;
-               case 3387: goto tr2020;
-               case 3594: goto tr2021;
-               case 3643: goto tr2022;
+               case 9: goto tr2039;
+               case 32: goto tr2039;
+               case 40: goto tr2040;
+               case 41: goto tr2041;
+               case 44: goto tr2042;
+               case 46: goto tr2043;
+               case 3082: goto tr2044;
+               case 3131: goto tr2045;
+               case 3338: goto tr2046;
+               case 3387: goto tr2046;
+               case 3594: goto tr2047;
+               case 3643: goto tr2048;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2017;
-       goto tr2005;
-tr2016:
+               goto tr2043;
+       goto tr2031;
+tr2042:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -60627,91 +61203,91 @@ tr2016:
                memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
                rdata_tail += ZS_INET4_ADDR_LENGTH;
        }
-       goto st641;
-st641:
+       goto st664;
+st664:
        if ( ++p == pe )
-               goto _test_eof641;
-case 641:
+               goto _test_eof664;
+case 664:
        if ( (*p) == 46 )
-               goto tr2023;
+               goto tr2049;
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2023;
-       goto tr2005;
-st642:
+               goto tr2049;
+       goto tr2031;
+st665:
        if ( ++p == pe )
-               goto _test_eof642;
-case 642:
+               goto _test_eof665;
+case 665:
        if ( (*p) == 104 )
-               goto st643;
-       goto tr1921;
-st643:
+               goto st666;
+       goto tr1935;
+st666:
        if ( ++p == pe )
-               goto _test_eof643;
-case 643:
+               goto _test_eof666;
+case 666:
        if ( (*p) == 105 )
-               goto st644;
-       goto tr1921;
-st644:
+               goto st667;
+       goto tr1935;
+st667:
        if ( ++p == pe )
-               goto _test_eof644;
-case 644:
+               goto _test_eof667;
+case 667:
        if ( (*p) == 110 )
-               goto st645;
-       goto tr1921;
-st645:
+               goto st668;
+       goto tr1935;
+st668:
        if ( ++p == pe )
-               goto _test_eof645;
-case 645:
+               goto _test_eof668;
+case 668:
        if ( (*p) == 116 )
-               goto st646;
-       goto tr1921;
-st646:
+               goto st669;
+       goto tr1935;
+st669:
        if ( ++p == pe )
-               goto _test_eof646;
-case 646:
+               goto _test_eof669;
+case 669:
        if ( (*p) == 61 )
-               goto tr2028;
-       goto tr1921;
-tr2028:
+               goto tr2054;
+       goto tr1935;
+tr2054:
        {
                uint16_t val = htons(6);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
-       goto st647;
-st647:
+       goto st670;
+st670:
        if ( ++p == pe )
-               goto _test_eof647;
-case 647:
+               goto _test_eof670;
+case 670:
        switch( (*p) ) {
-               case 34: goto st648;
-               case 46: goto tr2030;
+               case 34: goto st671;
+               case 46: goto tr2056;
        }
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 58 )
-                       goto tr2030;
+                       goto tr2056;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr2030;
+                       goto tr2056;
        } else
-               goto tr2030;
-       goto tr2005;
-st648:
+               goto tr2056;
+       goto tr2031;
+st671:
        if ( ++p == pe )
-               goto _test_eof648;
-case 648:
+               goto _test_eof671;
+case 671:
        if ( (*p) == 46 )
-               goto tr2031;
+               goto tr2057;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 58 )
-                       goto tr2031;
+                       goto tr2057;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr2031;
+                       goto tr2057;
        } else
-               goto tr2031;
-       goto tr2005;
-tr2031:
+               goto tr2057;
+       goto tr2031;
+tr2057:
        {
                if (rdata_tail < rdata_stop) {
                        s->item_length2_location = rdata_tail;
@@ -60732,8 +61308,8 @@ tr2031:
                        p--; {goto st307;}
                }
        }
-       goto st649;
-tr2034:
+       goto st672;
+tr2060:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -60742,8 +61318,8 @@ tr2034:
                        p--; {goto st307;}
                }
        }
-       goto st649;
-tr2035:
+       goto st672;
+tr2061:
        {
                s->buffer_length = 0;
        }
@@ -60755,26 +61331,26 @@ tr2035:
                        p--; {goto st307;}
                }
        }
-       goto st649;
-st649:
+       goto st672;
+st672:
        if ( ++p == pe )
-               goto _test_eof649;
-case 649:
+               goto _test_eof672;
+case 672:
        switch( (*p) ) {
-               case 34: goto tr2032;
-               case 44: goto tr2033;
-               case 46: goto tr2034;
+               case 34: goto tr2058;
+               case 44: goto tr2059;
+               case 46: goto tr2060;
        }
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 58 )
-                       goto tr2034;
+                       goto tr2060;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr2034;
+                       goto tr2060;
        } else
-               goto tr2034;
-       goto tr2005;
-tr2033:
+               goto tr2060;
+       goto tr2031;
+tr2059:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -60791,23 +61367,23 @@ tr2033:
                memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
                rdata_tail += ZS_INET6_ADDR_LENGTH;
        }
-       goto st650;
-st650:
+       goto st673;
+st673:
        if ( ++p == pe )
-               goto _test_eof650;
-case 650:
+               goto _test_eof673;
+case 673:
        if ( (*p) == 46 )
-               goto tr2035;
+               goto tr2061;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 58 )
-                       goto tr2035;
+                       goto tr2061;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr2035;
+                       goto tr2061;
        } else
-               goto tr2035;
-       goto tr2005;
-tr2030:
+               goto tr2061;
+       goto tr2031;
+tr2056:
        {
                if (rdata_tail < rdata_stop) {
                        s->item_length2_location = rdata_tail;
@@ -60828,8 +61404,8 @@ tr2030:
                        p--; {goto st307;}
                }
        }
-       goto st651;
-tr2040:
+       goto st674;
+tr2066:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -60838,8 +61414,8 @@ tr2040:
                        p--; {goto st307;}
                }
        }
-       goto st651;
-tr2046:
+       goto st674;
+tr2072:
        {
                s->buffer_length = 0;
        }
@@ -60851,11 +61427,11 @@ tr2046:
                        p--; {goto st307;}
                }
        }
-       goto st651;
-st651:
+       goto st674;
+st674:
        if ( ++p == pe )
-               goto _test_eof651;
-case 651:
+               goto _test_eof674;
+case 674:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -60873,29 +61449,29 @@ case 651:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2036;
-               case 32: goto tr2036;
-               case 40: goto tr2037;
-               case 41: goto tr2038;
-               case 44: goto tr2039;
-               case 46: goto tr2040;
-               case 3082: goto tr2041;
-               case 3131: goto tr2042;
-               case 3338: goto tr2043;
-               case 3387: goto tr2043;
-               case 3594: goto tr2044;
-               case 3643: goto tr2045;
+               case 9: goto tr2062;
+               case 32: goto tr2062;
+               case 40: goto tr2063;
+               case 41: goto tr2064;
+               case 44: goto tr2065;
+               case 46: goto tr2066;
+               case 3082: goto tr2067;
+               case 3131: goto tr2068;
+               case 3338: goto tr2069;
+               case 3387: goto tr2069;
+               case 3594: goto tr2070;
+               case 3643: goto tr2071;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 58 )
-                       goto tr2040;
+                       goto tr2066;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr2040;
+                       goto tr2066;
        } else
-               goto tr2040;
-       goto tr2005;
-tr2039:
+               goto tr2066;
+       goto tr2031;
+tr2065:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -60912,23 +61488,23 @@ tr2039:
                memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
                rdata_tail += ZS_INET6_ADDR_LENGTH;
        }
-       goto st652;
-st652:
+       goto st675;
+st675:
        if ( ++p == pe )
-               goto _test_eof652;
-case 652:
+               goto _test_eof675;
+case 675:
        if ( (*p) == 46 )
-               goto tr2046;
+               goto tr2072;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 58 )
-                       goto tr2046;
+                       goto tr2072;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr2046;
+                       goto tr2072;
        } else
-               goto tr2046;
-       goto tr2005;
-tr1936:
+               goto tr2072;
+       goto tr2031;
+tr1951:
        {
                if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
                        WARN(ZS_RDATA_OVERFLOW);
@@ -60936,29 +61512,29 @@ tr1936:
                }
                s->svcb.param_position = rdata_tail;
        }
-       goto st653;
-st653:
+       goto st676;
+st676:
        if ( ++p == pe )
-               goto _test_eof653;
-case 653:
+               goto _test_eof676;
+case 676:
        if ( (*p) == 101 )
-               goto st654;
-       goto tr1921;
-st654:
+               goto st677;
+       goto tr1935;
+st677:
        if ( ++p == pe )
-               goto _test_eof654;
-case 654:
+               goto _test_eof677;
+case 677:
        if ( (*p) == 121 )
-               goto st655;
-       goto tr1921;
-st655:
+               goto st678;
+       goto tr1935;
+st678:
        if ( ++p == pe )
-               goto _test_eof655;
-case 655:
+               goto _test_eof678;
+case 678:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2050;
-       goto tr2049;
-tr2050:
+               goto tr2076;
+       goto tr2075;
+tr2076:
        {
                s->number64 = 0;
        }
@@ -60976,8 +61552,8 @@ tr2050:
                        p--; {goto st307;}
                }
        }
-       goto st656;
-tr2054:
+       goto st679;
+tr2080:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -60992,11 +61568,11 @@ tr2054:
                        p--; {goto st307;}
                }
        }
-       goto st656;
-st656:
+       goto st679;
+st679:
        if ( ++p == pe )
-               goto _test_eof656;
-case 656:
+               goto _test_eof679;
+case 679:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -61014,93 +61590,48 @@ case 656:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2051;
-               case 32: goto tr2051;
-               case 40: goto tr2052;
-               case 41: goto tr2053;
-               case 61: goto tr2055;
-               case 3082: goto tr2056;
-               case 3131: goto tr2057;
-               case 3338: goto tr2058;
-               case 3387: goto tr2058;
-               case 3594: goto tr2059;
-               case 3643: goto tr2060;
+               case 9: goto tr2077;
+               case 32: goto tr2077;
+               case 40: goto tr2078;
+               case 41: goto tr2079;
+               case 61: goto tr2081;
+               case 3082: goto tr2082;
+               case 3131: goto tr2083;
+               case 3338: goto tr2084;
+               case 3387: goto tr2084;
+               case 3594: goto tr2085;
+               case 3643: goto tr2086;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2054;
-       goto tr2049;
-tr2055:
-       {
-               if (s->number64 <= UINT16_MAX) {
-                       uint16_t num16 = htons((uint16_t)s->number64);
-                       memcpy(rdata_tail, &num16, 2);
-                       rdata_tail += 2;
-               } else {
-                       WARN(ZS_NUMBER16_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
-       goto st657;
-st657:
-       if ( ++p == pe )
-               goto _test_eof657;
-case 657:
-       switch( (*p) ) {
-               case 32: goto tr1921;
-               case 59: goto tr1921;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr1921;
-       } else if ( (*p) >= 9 )
-               goto tr1921;
-       goto tr2061;
-tr2061:
-       {
-               if (rdata_tail < rdata_stop) {
-                       s->item_length2_location = rdata_tail;
-                       rdata_tail += 2;
-               } else {
-                       WARN(ZS_RDATA_OVERFLOW);
-                       p--; {goto st307;}
-               }
-       }
-       { p--; {stack[top++] = 658;goto st318;} }
-       goto st658;
-st658:
-       if ( ++p == pe )
-               goto _test_eof658;
-case 658:
-       _widec = (*p);
-       if ( (*p) > 10 ) {
-               if ( 59 <= (*p) && (*p) <= 59 ) {
-                       _widec = (short)(2688 + ((*p) - -128));
-                       if (
- s->multiline  ) _widec += 256;
-                       if (
- !s->multiline  ) _widec += 512;
+               goto tr2080;
+       goto tr2075;
+tr2081:
+       {
+               if (s->number64 <= UINT16_MAX) {
+                       uint16_t num16 = htons((uint16_t)s->number64);
+                       memcpy(rdata_tail, &num16, 2);
+                       rdata_tail += 2;
+               } else {
+                       WARN(ZS_NUMBER16_OVERFLOW);
+                       p--; {goto st307;}
                }
-       } else if ( (*p) >= 10 ) {
-               _widec = (short)(2688 + ((*p) - -128));
-               if (
- s->multiline  ) _widec += 256;
-               if (
- !s->multiline  ) _widec += 512;
        }
-       switch( _widec ) {
-               case 9: goto tr1987;
-               case 32: goto tr1987;
-               case 40: goto tr1988;
-               case 41: goto tr1989;
-               case 3082: goto tr1991;
-               case 3131: goto tr1992;
-               case 3338: goto tr1993;
-               case 3387: goto tr1993;
-               case 3594: goto tr1994;
-               case 3643: goto tr1995;
+       goto st680;
+st680:
+       if ( ++p == pe )
+               goto _test_eof680;
+case 680:
+       switch( (*p) ) {
+               case 32: goto tr1935;
+               case 59: goto tr1935;
        }
-       goto tr1921;
-tr1937:
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr1935;
+       } else if ( (*p) >= 9 )
+               goto tr1935;
+       goto tr1984;
+tr1952:
        {
                if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
                        WARN(ZS_RDATA_OVERFLOW);
@@ -61108,100 +61639,100 @@ tr1937:
                }
                s->svcb.param_position = rdata_tail;
        }
-       goto st659;
-st659:
+       goto st681;
+st681:
        if ( ++p == pe )
-               goto _test_eof659;
-case 659:
+               goto _test_eof681;
+case 681:
        if ( (*p) == 97 )
-               goto st660;
-       goto tr1921;
-st660:
+               goto st682;
+       goto tr1935;
+st682:
        if ( ++p == pe )
-               goto _test_eof660;
-case 660:
+               goto _test_eof682;
+case 682:
        if ( (*p) == 110 )
-               goto st661;
-       goto tr1921;
-st661:
+               goto st683;
+       goto tr1935;
+st683:
        if ( ++p == pe )
-               goto _test_eof661;
-case 661:
+               goto _test_eof683;
+case 683:
        if ( (*p) == 100 )
-               goto st662;
-       goto tr1921;
-st662:
+               goto st684;
+       goto tr1935;
+st684:
        if ( ++p == pe )
-               goto _test_eof662;
-case 662:
+               goto _test_eof684;
+case 684:
        if ( (*p) == 97 )
-               goto st663;
-       goto tr1921;
-st663:
+               goto st685;
+       goto tr1935;
+st685:
        if ( ++p == pe )
-               goto _test_eof663;
-case 663:
+               goto _test_eof685;
+case 685:
        if ( (*p) == 116 )
-               goto st664;
-       goto tr1921;
-st664:
+               goto st686;
+       goto tr1935;
+st686:
        if ( ++p == pe )
-               goto _test_eof664;
-case 664:
+               goto _test_eof686;
+case 686:
        if ( (*p) == 111 )
-               goto st665;
-       goto tr1921;
-st665:
+               goto st687;
+       goto tr1935;
+st687:
        if ( ++p == pe )
-               goto _test_eof665;
-case 665:
+               goto _test_eof687;
+case 687:
        if ( (*p) == 114 )
-               goto st666;
-       goto tr1921;
-st666:
+               goto st688;
+       goto tr1935;
+st688:
        if ( ++p == pe )
-               goto _test_eof666;
-case 666:
+               goto _test_eof688;
+case 688:
        if ( (*p) == 121 )
-               goto st667;
-       goto tr1921;
-st667:
+               goto st689;
+       goto tr1935;
+st689:
        if ( ++p == pe )
-               goto _test_eof667;
-case 667:
+               goto _test_eof689;
+case 689:
        if ( (*p) == 61 )
-               goto tr2070;
-       goto tr1921;
-tr2070:
+               goto tr2095;
+       goto tr1935;
+tr2095:
        {
                uint16_t val = htons(0);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
-       goto st668;
-st668:
+       goto st690;
+st690:
        if ( ++p == pe )
-               goto _test_eof668;
-case 668:
+               goto _test_eof690;
+case 690:
        if ( (*p) == 34 )
-               goto st669;
+               goto st691;
        if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr2072;
+                       goto tr2097;
        } else if ( (*p) >= 65 )
-               goto tr2072;
-       goto tr1921;
-st669:
+               goto tr2097;
+       goto tr1935;
+st691:
        if ( ++p == pe )
-               goto _test_eof669;
-case 669:
+               goto _test_eof691;
+case 691:
        if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr2073;
+                       goto tr2098;
        } else if ( (*p) >= 65 )
-               goto tr2073;
-       goto tr1921;
-tr2073:
+               goto tr2098;
+       goto tr1935;
+tr2098:
        {
                s->svcb.mandatory_position = rdata_tail + 2; // Skip 2-B prefix.
        }
@@ -61214,31 +61745,31 @@ tr2073:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 670;goto st559;} }
-       goto st670;
-tr2076:
-       { p--; {stack[top++] = 670;goto st559;} }
-       goto st670;
-st670:
+       { p--; {stack[top++] = 692;goto st559;} }
+       goto st692;
+tr2101:
+       { p--; {stack[top++] = 692;goto st559;} }
+       goto st692;
+st692:
        if ( ++p == pe )
-               goto _test_eof670;
-case 670:
+               goto _test_eof692;
+case 692:
        switch( (*p) ) {
-               case 34: goto tr2074;
-               case 44: goto st671;
+               case 34: goto tr2099;
+               case 44: goto st693;
        }
-       goto tr1921;
-st671:
+       goto tr1935;
+st693:
        if ( ++p == pe )
-               goto _test_eof671;
-case 671:
+               goto _test_eof693;
+case 693:
        if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr2076;
+                       goto tr2101;
        } else if ( (*p) >= 65 )
-               goto tr2076;
-       goto tr1921;
-tr2072:
+               goto tr2101;
+       goto tr1935;
+tr2097:
        {
                s->svcb.mandatory_position = rdata_tail + 2; // Skip 2-B prefix.
        }
@@ -61251,15 +61782,15 @@ tr2072:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 672;goto st559;} }
-       goto st672;
-tr2086:
-       { p--; {stack[top++] = 672;goto st559;} }
-       goto st672;
-st672:
+       { p--; {stack[top++] = 694;goto st559;} }
+       goto st694;
+tr2111:
+       { p--; {stack[top++] = 694;goto st559;} }
+       goto st694;
+st694:
        if ( ++p == pe )
-               goto _test_eof672;
-case 672:
+               goto _test_eof694;
+case 694:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -61277,30 +61808,30 @@ case 672:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2077;
-               case 32: goto tr2077;
-               case 40: goto tr2078;
-               case 41: goto tr2079;
-               case 44: goto st673;
-               case 3082: goto tr2081;
-               case 3131: goto tr2082;
-               case 3338: goto tr2083;
-               case 3387: goto tr2083;
-               case 3594: goto tr2084;
-               case 3643: goto tr2085;
-       }
-       goto tr1921;
-st673:
+               case 9: goto tr2102;
+               case 32: goto tr2102;
+               case 40: goto tr2103;
+               case 41: goto tr2104;
+               case 44: goto st695;
+               case 3082: goto tr2106;
+               case 3131: goto tr2107;
+               case 3338: goto tr2108;
+               case 3387: goto tr2108;
+               case 3594: goto tr2109;
+               case 3643: goto tr2110;
+       }
+       goto tr1935;
+st695:
        if ( ++p == pe )
-               goto _test_eof673;
-case 673:
+               goto _test_eof695;
+case 695:
        if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr2086;
+                       goto tr2111;
        } else if ( (*p) >= 65 )
-               goto tr2086;
-       goto tr1921;
-tr1938:
+               goto tr2111;
+       goto tr1935;
+tr1953:
        {
                if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
                        WARN(ZS_RDATA_OVERFLOW);
@@ -61308,109 +61839,109 @@ tr1938:
                }
                s->svcb.param_position = rdata_tail;
        }
-       goto st674;
-st674:
+       goto st696;
+st696:
        if ( ++p == pe )
-               goto _test_eof674;
-case 674:
+               goto _test_eof696;
+case 696:
        if ( (*p) == 111 )
-               goto st675;
-       goto tr1921;
-st675:
+               goto st697;
+       goto tr1935;
+st697:
        if ( ++p == pe )
-               goto _test_eof675;
-case 675:
+               goto _test_eof697;
+case 697:
        if ( (*p) == 45 )
-               goto st676;
-       goto tr1921;
-st676:
+               goto st698;
+       goto tr1935;
+st698:
        if ( ++p == pe )
-               goto _test_eof676;
-case 676:
+               goto _test_eof698;
+case 698:
        if ( (*p) == 100 )
-               goto st677;
-       goto tr1921;
-st677:
+               goto st699;
+       goto tr1935;
+st699:
        if ( ++p == pe )
-               goto _test_eof677;
-case 677:
+               goto _test_eof699;
+case 699:
        if ( (*p) == 101 )
-               goto st678;
-       goto tr1921;
-st678:
+               goto st700;
+       goto tr1935;
+st700:
        if ( ++p == pe )
-               goto _test_eof678;
-case 678:
+               goto _test_eof700;
+case 700:
        if ( (*p) == 102 )
-               goto st679;
-       goto tr1921;
-st679:
+               goto st701;
+       goto tr1935;
+st701:
        if ( ++p == pe )
-               goto _test_eof679;
-case 679:
+               goto _test_eof701;
+case 701:
        if ( (*p) == 97 )
-               goto st680;
-       goto tr1921;
-st680:
+               goto st702;
+       goto tr1935;
+st702:
        if ( ++p == pe )
-               goto _test_eof680;
-case 680:
+               goto _test_eof702;
+case 702:
        if ( (*p) == 117 )
-               goto st681;
-       goto tr1921;
-st681:
+               goto st703;
+       goto tr1935;
+st703:
        if ( ++p == pe )
-               goto _test_eof681;
-case 681:
+               goto _test_eof703;
+case 703:
        if ( (*p) == 108 )
-               goto st682;
-       goto tr1921;
-st682:
+               goto st704;
+       goto tr1935;
+st704:
        if ( ++p == pe )
-               goto _test_eof682;
-case 682:
+               goto _test_eof704;
+case 704:
        if ( (*p) == 116 )
-               goto st683;
-       goto tr1921;
-st683:
+               goto st705;
+       goto tr1935;
+st705:
        if ( ++p == pe )
-               goto _test_eof683;
-case 683:
+               goto _test_eof705;
+case 705:
        if ( (*p) == 45 )
-               goto st684;
-       goto tr1921;
-st684:
+               goto st706;
+       goto tr1935;
+st706:
        if ( ++p == pe )
-               goto _test_eof684;
-case 684:
+               goto _test_eof706;
+case 706:
        if ( (*p) == 97 )
-               goto st685;
-       goto tr1921;
-st685:
+               goto st707;
+       goto tr1935;
+st707:
        if ( ++p == pe )
-               goto _test_eof685;
-case 685:
+               goto _test_eof707;
+case 707:
        if ( (*p) == 108 )
-               goto st686;
-       goto tr1921;
-st686:
+               goto st708;
+       goto tr1935;
+st708:
        if ( ++p == pe )
-               goto _test_eof686;
-case 686:
+               goto _test_eof708;
+case 708:
        if ( (*p) == 112 )
-               goto st687;
-       goto tr1921;
-st687:
+               goto st709;
+       goto tr1935;
+st709:
        if ( ++p == pe )
-               goto _test_eof687;
-case 687:
+               goto _test_eof709;
+case 709:
        if ( (*p) == 110 )
-               goto st688;
-       goto tr1921;
-st688:
+               goto st710;
+       goto tr1935;
+st710:
        if ( ++p == pe )
-               goto _test_eof688;
-case 688:
+               goto _test_eof710;
+case 710:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -61428,19 +61959,19 @@ case 688:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2101;
-               case 32: goto tr2101;
-               case 40: goto tr2102;
-               case 41: goto tr2103;
-               case 3082: goto tr2104;
-               case 3131: goto tr2105;
-               case 3338: goto tr2106;
-               case 3387: goto tr2106;
-               case 3594: goto tr2107;
-               case 3643: goto tr2108;
+               case 9: goto tr2126;
+               case 32: goto tr2126;
+               case 40: goto tr2127;
+               case 41: goto tr2128;
+               case 3082: goto tr2129;
+               case 3131: goto tr2130;
+               case 3338: goto tr2131;
+               case 3387: goto tr2131;
+               case 3594: goto tr2132;
+               case 3643: goto tr2133;
        }
-       goto tr1921;
-tr1939:
+       goto tr1935;
+tr1954:
        {
                if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
                        WARN(ZS_RDATA_OVERFLOW);
@@ -61448,59 +61979,129 @@ tr1939:
                }
                s->svcb.param_position = rdata_tail;
        }
-       goto st689;
-st689:
+       goto st711;
+st711:
        if ( ++p == pe )
-               goto _test_eof689;
-case 689:
+               goto _test_eof711;
+case 711:
+       if ( (*p) == 104 )
+               goto st712;
+       goto tr1935;
+st712:
+       if ( ++p == pe )
+               goto _test_eof712;
+case 712:
+       if ( (*p) == 116 )
+               goto st713;
+       goto tr1935;
+st713:
+       if ( ++p == pe )
+               goto _test_eof713;
+case 713:
+       if ( (*p) == 116 )
+               goto st714;
+       goto tr1935;
+st714:
+       if ( ++p == pe )
+               goto _test_eof714;
+case 714:
+       if ( (*p) == 112 )
+               goto st715;
+       goto tr1935;
+st715:
+       if ( ++p == pe )
+               goto _test_eof715;
+case 715:
+       _widec = (*p);
+       if ( (*p) > 10 ) {
+               if ( 59 <= (*p) && (*p) <= 59 ) {
+                       _widec = (short)(2688 + ((*p) - -128));
+                       if (
+ s->multiline  ) _widec += 256;
+                       if (
+ !s->multiline  ) _widec += 512;
+               }
+       } else if ( (*p) >= 10 ) {
+               _widec = (short)(2688 + ((*p) - -128));
+               if (
+ s->multiline  ) _widec += 256;
+               if (
+ !s->multiline  ) _widec += 512;
+       }
+       switch( _widec ) {
+               case 9: goto tr2138;
+               case 32: goto tr2138;
+               case 40: goto tr2139;
+               case 41: goto tr2140;
+               case 3082: goto tr2141;
+               case 3131: goto tr2142;
+               case 3338: goto tr2143;
+               case 3387: goto tr2143;
+               case 3594: goto tr2144;
+               case 3643: goto tr2145;
+       }
+       goto tr1935;
+tr1955:
+       {
+               if (rdata_tail + 4 > rdata_stop + 1) { // key_len + val_len
+                       WARN(ZS_RDATA_OVERFLOW);
+                       p--; {goto st307;}
+               }
+               s->svcb.param_position = rdata_tail;
+       }
+       goto st716;
+st716:
+       if ( ++p == pe )
+               goto _test_eof716;
+case 716:
        if ( (*p) == 111 )
-               goto st690;
-       goto tr1921;
-st690:
+               goto st717;
+       goto tr1935;
+st717:
        if ( ++p == pe )
-               goto _test_eof690;
-case 690:
+               goto _test_eof717;
+case 717:
        if ( (*p) == 114 )
-               goto st691;
-       goto tr1921;
-st691:
+               goto st718;
+       goto tr1935;
+st718:
        if ( ++p == pe )
-               goto _test_eof691;
-case 691:
+               goto _test_eof718;
+case 718:
        if ( (*p) == 116 )
-               goto st692;
-       goto tr1921;
-st692:
+               goto st719;
+       goto tr1935;
+st719:
        if ( ++p == pe )
-               goto _test_eof692;
-case 692:
+               goto _test_eof719;
+case 719:
        if ( (*p) == 61 )
-               goto tr2112;
-       goto tr1921;
-tr2112:
+               goto tr2149;
+       goto tr1935;
+tr2149:
        {
                uint16_t val = htons(3);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
-       goto st693;
-st693:
+       goto st720;
+st720:
        if ( ++p == pe )
-               goto _test_eof693;
-case 693:
+               goto _test_eof720;
+case 720:
        if ( (*p) == 34 )
-               goto st694;
+               goto st721;
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2114;
-       goto tr2049;
-st694:
+               goto tr2151;
+       goto tr2075;
+st721:
        if ( ++p == pe )
-               goto _test_eof694;
-case 694:
+               goto _test_eof721;
+case 721:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2115;
-       goto tr2049;
-tr2117:
+               goto tr2152;
+       goto tr2075;
+tr2154:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -61515,8 +62116,8 @@ tr2117:
                        p--; {goto st307;}
                }
        }
-       goto st695;
-tr2115:
+       goto st722;
+tr2152:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -61545,17 +62146,17 @@ tr2115:
                        p--; {goto st307;}
                }
        }
-       goto st695;
-st695:
+       goto st722;
+st722:
        if ( ++p == pe )
-               goto _test_eof695;
-case 695:
+               goto _test_eof722;
+case 722:
        if ( (*p) == 34 )
-               goto tr2116;
+               goto tr2153;
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2117;
-       goto tr2049;
-tr2121:
+               goto tr2154;
+       goto tr2075;
+tr2158:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -61570,8 +62171,8 @@ tr2121:
                        p--; {goto st307;}
                }
        }
-       goto st696;
-tr2114:
+       goto st723;
+tr2151:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -61600,11 +62201,11 @@ tr2114:
                        p--; {goto st307;}
                }
        }
-       goto st696;
-st696:
+       goto st723;
+st723:
        if ( ++p == pe )
-               goto _test_eof696;
-case 696:
+               goto _test_eof723;
+case 723:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -61622,21 +62223,21 @@ case 696:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2118;
-               case 32: goto tr2118;
-               case 40: goto tr2119;
-               case 41: goto tr2120;
-               case 3082: goto tr2122;
-               case 3131: goto tr2123;
-               case 3338: goto tr2124;
-               case 3387: goto tr2124;
-               case 3594: goto tr2125;
-               case 3643: goto tr2126;
+               case 9: goto tr2155;
+               case 32: goto tr2155;
+               case 40: goto tr2156;
+               case 41: goto tr2157;
+               case 3082: goto tr2159;
+               case 3131: goto tr2160;
+               case 3338: goto tr2161;
+               case 3387: goto tr2161;
+               case 3594: goto tr2162;
+               case 3643: goto tr2163;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2121;
-       goto tr2049;
-tr1950:
+               goto tr2158;
+       goto tr2075;
+tr1966:
        {
                s->comma_list = true;
                s->pending_backslash = false;
@@ -61658,12 +62259,12 @@ tr1950:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 697;goto st318;} }
-       goto st697;
-st697:
+       { p--; {stack[top++] = 724;goto st318;} }
+       goto st724;
+st724:
        if ( ++p == pe )
-               goto _test_eof697;
-case 697:
+               goto _test_eof724;
+case 724:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -61681,27 +62282,27 @@ case 697:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr1951;
-               case 32: goto tr1951;
-               case 40: goto tr1952;
-               case 41: goto tr1953;
-               case 3082: goto tr1954;
-               case 3131: goto tr1955;
-               case 3338: goto tr1956;
-               case 3387: goto tr1956;
-               case 3594: goto tr1957;
-               case 3643: goto tr1958;
+               case 9: goto tr1967;
+               case 32: goto tr1967;
+               case 40: goto tr1968;
+               case 41: goto tr1969;
+               case 3082: goto tr1970;
+               case 3131: goto tr1971;
+               case 3338: goto tr1972;
+               case 3387: goto tr1972;
+               case 3594: goto tr1973;
+               case 3643: goto tr1974;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr2127;
+                       goto tr2164;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr2127;
+                       goto tr2164;
        } else
-               goto tr2127;
-       goto tr1921;
-tr2127:
+               goto tr2164;
+       goto tr1935;
+tr2164:
        {
                s->comma_list = true;
                s->pending_backslash = false;
@@ -61723,35 +62324,35 @@ tr2127:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 698;goto st318;} }
-       goto st698;
-st698:
+       { p--; {stack[top++] = 725;goto st318;} }
+       goto st725;
+st725:
        if ( ++p == pe )
-               goto _test_eof698;
-case 698:
+               goto _test_eof725;
+case 725:
        if ( (*p) == 34 )
-               goto tr2128;
-       goto tr1921;
-st699:
+               goto tr2165;
+       goto tr1935;
+st726:
        if ( ++p == pe )
-               goto _test_eof699;
-case 699:
+               goto _test_eof726;
+case 726:
        switch( (*p) ) {
-               case 68: goto st701;
-               case 69: goto st716;
-               case 73: goto st755;
-               case 80: goto st763;
-               case 82: goto st776;
-               case 100: goto st701;
-               case 101: goto st716;
-               case 105: goto st755;
-               case 112: goto st763;
-               case 114: goto st776;
+               case 68: goto st728;
+               case 69: goto st743;
+               case 73: goto st782;
+               case 80: goto st790;
+               case 82: goto st803;
+               case 100: goto st728;
+               case 101: goto st743;
+               case 105: goto st782;
+               case 112: goto st790;
+               case 114: goto st803;
        }
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2130;
-       goto tr2129;
-tr2130:
+               goto tr2167;
+       goto tr2166;
+tr2167:
        {
                s->number64 = 0;
        }
@@ -61769,8 +62370,8 @@ tr2130:
                        p--; {goto st307;}
                }
        }
-       goto st700;
-tr2137:
+       goto st727;
+tr2174:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -61785,25 +62386,25 @@ tr2137:
                        p--; {goto st307;}
                }
        }
-       goto st700;
-st700:
+       goto st727;
+st727:
        if ( ++p == pe )
-               goto _test_eof700;
-case 700:
+               goto _test_eof727;
+case 727:
        switch( (*p) ) {
-               case 32: goto tr2136;
-               case 59: goto tr2136;
+               case 32: goto tr2173;
+               case 59: goto tr2173;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr2136;
+                       goto tr2173;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr2137;
+                       goto tr2174;
        } else
-               goto tr2136;
-       goto tr2129;
-tr2136:
+               goto tr2173;
+       goto tr2166;
+tr2173:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -61816,1117 +62417,1117 @@ tr2136:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2140:
+       goto st1460;
+tr2177:
        {
                *(rdata_tail++) = 2;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2142:
+       goto st1460;
+tr2179:
        {
                *(rdata_tail++) = 3;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2154:
+       goto st1460;
+tr2191:
        {
                *(rdata_tail++) = 6;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2164:
+       goto st1460;
+tr2201:
        {
                *(rdata_tail++) = 12;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2178:
+       goto st1460;
+tr2215:
        {
                *(rdata_tail++) = 13;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2187:
+       goto st1460;
+tr2224:
        {
                *(rdata_tail++) = 14;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2194:
+       goto st1460;
+tr2231:
        {
                *(rdata_tail++) = 15;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2197:
+       goto st1460;
+tr2234:
        {
                *(rdata_tail++) = 16;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1433;
-tr2205:
-       {
-               *(rdata_tail++) = 252;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1433;
-tr2216:
-       {
-               *(rdata_tail++) = 253;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1433;
-tr2219:
-       {
-               *(rdata_tail++) = 254;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1433;
-tr2226:
-       {
-               *(rdata_tail++) = 1;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1433;
-tr2232:
-       {
-               *(rdata_tail++) = 5;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1433;
-tr2244:
-       {
-               *(rdata_tail++) = 7;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1433;
-tr2247:
-       {
-               *(rdata_tail++) = 8;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1433;
-tr2250:
-       {
-               *(rdata_tail++) = 10;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1433;
-st1433:
-       if ( ++p == pe )
-               goto _test_eof1433;
-case 1433:
-       goto st0;
-st701:
-       if ( ++p == pe )
-               goto _test_eof701;
-case 701:
-       switch( (*p) ) {
-               case 72: goto st702;
-               case 83: goto st703;
-               case 104: goto st702;
-               case 115: goto st703;
-       }
-       goto tr2129;
-st702:
-       if ( ++p == pe )
-               goto _test_eof702;
-case 702:
-       switch( (*p) ) {
-               case 32: goto tr2140;
-               case 59: goto tr2140;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2140;
-       } else if ( (*p) >= 9 )
-               goto tr2140;
-       goto tr2129;
-st703:
-       if ( ++p == pe )
-               goto _test_eof703;
-case 703:
-       switch( (*p) ) {
-               case 65: goto st704;
-               case 97: goto st704;
-       }
-       goto tr2129;
-st704:
-       if ( ++p == pe )
-               goto _test_eof704;
-case 704:
-       switch( (*p) ) {
-               case 32: goto tr2142;
-               case 45: goto st705;
-               case 59: goto tr2142;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2142;
-       } else if ( (*p) >= 9 )
-               goto tr2142;
-       goto tr2129;
-st705:
-       if ( ++p == pe )
-               goto _test_eof705;
-case 705:
-       switch( (*p) ) {
-               case 78: goto st706;
-               case 110: goto st706;
-       }
-       goto tr2129;
-st706:
-       if ( ++p == pe )
-               goto _test_eof706;
-case 706:
-       switch( (*p) ) {
-               case 83: goto st707;
-               case 115: goto st707;
-       }
-       goto tr2129;
-st707:
-       if ( ++p == pe )
-               goto _test_eof707;
-case 707:
-       switch( (*p) ) {
-               case 69: goto st708;
-               case 101: goto st708;
+       goto st1460;
+tr2242:
+       {
+               *(rdata_tail++) = 252;
        }
-       goto tr2129;
-st708:
-       if ( ++p == pe )
-               goto _test_eof708;
-case 708:
-       switch( (*p) ) {
-               case 67: goto st709;
-               case 99: goto st709;
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
-       goto tr2129;
-st709:
-       if ( ++p == pe )
-               goto _test_eof709;
-case 709:
-       if ( (*p) == 51 )
-               goto st710;
-       goto tr2129;
-st710:
-       if ( ++p == pe )
-               goto _test_eof710;
-case 710:
-       if ( (*p) == 45 )
-               goto st711;
-       goto tr2129;
-st711:
-       if ( ++p == pe )
-               goto _test_eof711;
-case 711:
-       switch( (*p) ) {
-               case 83: goto st712;
-               case 115: goto st712;
+       goto st1460;
+tr2253:
+       {
+               *(rdata_tail++) = 253;
        }
-       goto tr2129;
-st712:
-       if ( ++p == pe )
-               goto _test_eof712;
-case 712:
-       switch( (*p) ) {
-               case 72: goto st713;
-               case 104: goto st713;
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
-       goto tr2129;
-st713:
-       if ( ++p == pe )
-               goto _test_eof713;
-case 713:
-       switch( (*p) ) {
-               case 65: goto st714;
-               case 97: goto st714;
+       goto st1460;
+tr2256:
+       {
+               *(rdata_tail++) = 254;
        }
-       goto tr2129;
-st714:
-       if ( ++p == pe )
-               goto _test_eof714;
-case 714:
-       if ( (*p) == 49 )
-               goto st715;
-       goto tr2129;
-st715:
-       if ( ++p == pe )
-               goto _test_eof715;
-case 715:
-       switch( (*p) ) {
-               case 32: goto tr2154;
-               case 59: goto tr2154;
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2154;
-       } else if ( (*p) >= 9 )
-               goto tr2154;
-       goto tr2129;
-st716:
-       if ( ++p == pe )
-               goto _test_eof716;
-case 716:
-       switch( (*p) ) {
-               case 67: goto st717;
-               case 68: goto st746;
-               case 99: goto st717;
-               case 100: goto st746;
+       goto st1460;
+tr2263:
+       {
+               *(rdata_tail++) = 1;
        }
-       goto tr2129;
-st717:
-       if ( ++p == pe )
-               goto _test_eof717;
-case 717:
-       switch( (*p) ) {
-               case 67: goto st718;
-               case 68: goto st724;
-               case 99: goto st718;
-               case 100: goto st724;
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
-       goto tr2129;
-st718:
-       if ( ++p == pe )
-               goto _test_eof718;
-case 718:
-       if ( (*p) == 45 )
-               goto st719;
-       goto tr2129;
-st719:
-       if ( ++p == pe )
-               goto _test_eof719;
-case 719:
-       switch( (*p) ) {
-               case 71: goto st720;
-               case 103: goto st720;
+       goto st1460;
+tr2269:
+       {
+               *(rdata_tail++) = 5;
        }
-       goto tr2129;
-st720:
-       if ( ++p == pe )
-               goto _test_eof720;
-case 720:
-       switch( (*p) ) {
-               case 79: goto st721;
-               case 111: goto st721;
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
-       goto tr2129;
-st721:
-       if ( ++p == pe )
-               goto _test_eof721;
-case 721:
-       switch( (*p) ) {
-               case 83: goto st722;
-               case 115: goto st722;
+       goto st1460;
+tr2281:
+       {
+               *(rdata_tail++) = 7;
        }
-       goto tr2129;
-st722:
-       if ( ++p == pe )
-               goto _test_eof722;
-case 722:
-       switch( (*p) ) {
-               case 84: goto st723;
-               case 116: goto st723;
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
-       goto tr2129;
-st723:
-       if ( ++p == pe )
-               goto _test_eof723;
-case 723:
-       switch( (*p) ) {
-               case 32: goto tr2164;
-               case 59: goto tr2164;
+       goto st1460;
+tr2284:
+       {
+               *(rdata_tail++) = 8;
        }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2164;
-       } else if ( (*p) >= 9 )
-               goto tr2164;
-       goto tr2129;
-st724:
-       if ( ++p == pe )
-               goto _test_eof724;
-case 724:
-       switch( (*p) ) {
-               case 83: goto st725;
-               case 115: goto st725;
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
-       goto tr2129;
-st725:
-       if ( ++p == pe )
-               goto _test_eof725;
-case 725:
-       switch( (*p) ) {
-               case 65: goto st726;
-               case 97: goto st726;
+       goto st1460;
+tr2287:
+       {
+               *(rdata_tail++) = 10;
        }
-       goto tr2129;
-st726:
-       if ( ++p == pe )
-               goto _test_eof726;
-case 726:
-       switch( (*p) ) {
-               case 80: goto st727;
-               case 112: goto st727;
+       {
+               p--; {cs = stack[--top];goto _again;}
        }
-       goto tr2129;
-st727:
+       goto st1460;
+st1460:
        if ( ++p == pe )
-               goto _test_eof727;
-case 727:
-       switch( (*p) ) {
-               case 50: goto st728;
-               case 51: goto st737;
-       }
-       goto tr2129;
+               goto _test_eof1460;
+case 1460:
+       goto st0;
 st728:
        if ( ++p == pe )
                goto _test_eof728;
 case 728:
-       if ( (*p) == 53 )
-               goto st729;
-       goto tr2129;
+       switch( (*p) ) {
+               case 72: goto st729;
+               case 83: goto st730;
+               case 104: goto st729;
+               case 115: goto st730;
+       }
+       goto tr2166;
 st729:
        if ( ++p == pe )
                goto _test_eof729;
 case 729:
-       if ( (*p) == 54 )
-               goto st730;
-       goto tr2129;
+       switch( (*p) ) {
+               case 32: goto tr2177;
+               case 59: goto tr2177;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2177;
+       } else if ( (*p) >= 9 )
+               goto tr2177;
+       goto tr2166;
 st730:
        if ( ++p == pe )
                goto _test_eof730;
 case 730:
        switch( (*p) ) {
-               case 83: goto st731;
-               case 115: goto st731;
+               case 65: goto st731;
+               case 97: goto st731;
        }
-       goto tr2129;
+       goto tr2166;
 st731:
        if ( ++p == pe )
                goto _test_eof731;
 case 731:
        switch( (*p) ) {
-               case 72: goto st732;
-               case 104: goto st732;
+               case 32: goto tr2179;
+               case 45: goto st732;
+               case 59: goto tr2179;
        }
-       goto tr2129;
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2179;
+       } else if ( (*p) >= 9 )
+               goto tr2179;
+       goto tr2166;
 st732:
        if ( ++p == pe )
                goto _test_eof732;
 case 732:
        switch( (*p) ) {
-               case 65: goto st733;
-               case 97: goto st733;
+               case 78: goto st733;
+               case 110: goto st733;
        }
-       goto tr2129;
+       goto tr2166;
 st733:
        if ( ++p == pe )
                goto _test_eof733;
 case 733:
-       if ( (*p) == 50 )
-               goto st734;
-       goto tr2129;
+       switch( (*p) ) {
+               case 83: goto st734;
+               case 115: goto st734;
+       }
+       goto tr2166;
 st734:
        if ( ++p == pe )
                goto _test_eof734;
 case 734:
-       if ( (*p) == 53 )
-               goto st735;
-       goto tr2129;
+       switch( (*p) ) {
+               case 69: goto st735;
+               case 101: goto st735;
+       }
+       goto tr2166;
 st735:
        if ( ++p == pe )
                goto _test_eof735;
 case 735:
-       if ( (*p) == 54 )
-               goto st736;
-       goto tr2129;
+       switch( (*p) ) {
+               case 67: goto st736;
+               case 99: goto st736;
+       }
+       goto tr2166;
 st736:
        if ( ++p == pe )
                goto _test_eof736;
 case 736:
-       switch( (*p) ) {
-               case 32: goto tr2178;
-               case 59: goto tr2178;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2178;
-       } else if ( (*p) >= 9 )
-               goto tr2178;
-       goto tr2129;
+       if ( (*p) == 51 )
+               goto st737;
+       goto tr2166;
 st737:
        if ( ++p == pe )
                goto _test_eof737;
 case 737:
-       if ( (*p) == 56 )
+       if ( (*p) == 45 )
                goto st738;
-       goto tr2129;
+       goto tr2166;
 st738:
        if ( ++p == pe )
                goto _test_eof738;
 case 738:
-       if ( (*p) == 52 )
-               goto st739;
-       goto tr2129;
+       switch( (*p) ) {
+               case 83: goto st739;
+               case 115: goto st739;
+       }
+       goto tr2166;
 st739:
        if ( ++p == pe )
                goto _test_eof739;
 case 739:
        switch( (*p) ) {
-               case 83: goto st740;
-               case 115: goto st740;
+               case 72: goto st740;
+               case 104: goto st740;
        }
-       goto tr2129;
+       goto tr2166;
 st740:
        if ( ++p == pe )
                goto _test_eof740;
 case 740:
        switch( (*p) ) {
-               case 72: goto st741;
-               case 104: goto st741;
+               case 65: goto st741;
+               case 97: goto st741;
        }
-       goto tr2129;
+       goto tr2166;
 st741:
        if ( ++p == pe )
                goto _test_eof741;
 case 741:
-       switch( (*p) ) {
-               case 65: goto st742;
-               case 97: goto st742;
-       }
-       goto tr2129;
+       if ( (*p) == 49 )
+               goto st742;
+       goto tr2166;
 st742:
        if ( ++p == pe )
                goto _test_eof742;
 case 742:
-       if ( (*p) == 51 )
-               goto st743;
-       goto tr2129;
+       switch( (*p) ) {
+               case 32: goto tr2191;
+               case 59: goto tr2191;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2191;
+       } else if ( (*p) >= 9 )
+               goto tr2191;
+       goto tr2166;
 st743:
        if ( ++p == pe )
                goto _test_eof743;
 case 743:
-       if ( (*p) == 56 )
-               goto st744;
-       goto tr2129;
+       switch( (*p) ) {
+               case 67: goto st744;
+               case 68: goto st773;
+               case 99: goto st744;
+               case 100: goto st773;
+       }
+       goto tr2166;
 st744:
        if ( ++p == pe )
                goto _test_eof744;
 case 744:
-       if ( (*p) == 52 )
-               goto st745;
-       goto tr2129;
+       switch( (*p) ) {
+               case 67: goto st745;
+               case 68: goto st751;
+               case 99: goto st745;
+               case 100: goto st751;
+       }
+       goto tr2166;
 st745:
        if ( ++p == pe )
                goto _test_eof745;
 case 745:
-       switch( (*p) ) {
-               case 32: goto tr2187;
-               case 59: goto tr2187;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2187;
-       } else if ( (*p) >= 9 )
-               goto tr2187;
-       goto tr2129;
+       if ( (*p) == 45 )
+               goto st746;
+       goto tr2166;
 st746:
        if ( ++p == pe )
                goto _test_eof746;
 case 746:
        switch( (*p) ) {
-               case 50: goto st747;
-               case 52: goto st752;
+               case 71: goto st747;
+               case 103: goto st747;
        }
-       goto tr2129;
+       goto tr2166;
 st747:
        if ( ++p == pe )
                goto _test_eof747;
 case 747:
-       if ( (*p) == 53 )
-               goto st748;
-       goto tr2129;
+       switch( (*p) ) {
+               case 79: goto st748;
+               case 111: goto st748;
+       }
+       goto tr2166;
 st748:
        if ( ++p == pe )
                goto _test_eof748;
 case 748:
-       if ( (*p) == 53 )
-               goto st749;
-       goto tr2129;
+       switch( (*p) ) {
+               case 83: goto st749;
+               case 115: goto st749;
+       }
+       goto tr2166;
 st749:
        if ( ++p == pe )
                goto _test_eof749;
 case 749:
-       if ( (*p) == 49 )
-               goto st750;
-       goto tr2129;
+       switch( (*p) ) {
+               case 84: goto st750;
+               case 116: goto st750;
+       }
+       goto tr2166;
 st750:
        if ( ++p == pe )
                goto _test_eof750;
 case 750:
-       if ( (*p) == 57 )
-               goto st751;
-       goto tr2129;
+       switch( (*p) ) {
+               case 32: goto tr2201;
+               case 59: goto tr2201;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2201;
+       } else if ( (*p) >= 9 )
+               goto tr2201;
+       goto tr2166;
 st751:
        if ( ++p == pe )
                goto _test_eof751;
 case 751:
        switch( (*p) ) {
-               case 32: goto tr2194;
-               case 59: goto tr2194;
+               case 83: goto st752;
+               case 115: goto st752;
        }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2194;
-       } else if ( (*p) >= 9 )
-               goto tr2194;
-       goto tr2129;
+       goto tr2166;
 st752:
        if ( ++p == pe )
                goto _test_eof752;
 case 752:
-       if ( (*p) == 52 )
-               goto st753;
-       goto tr2129;
+       switch( (*p) ) {
+               case 65: goto st753;
+               case 97: goto st753;
+       }
+       goto tr2166;
 st753:
        if ( ++p == pe )
                goto _test_eof753;
 case 753:
-       if ( (*p) == 56 )
-               goto st754;
-       goto tr2129;
+       switch( (*p) ) {
+               case 80: goto st754;
+               case 112: goto st754;
+       }
+       goto tr2166;
 st754:
        if ( ++p == pe )
                goto _test_eof754;
 case 754:
        switch( (*p) ) {
-               case 32: goto tr2197;
-               case 59: goto tr2197;
+               case 50: goto st755;
+               case 51: goto st764;
        }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2197;
-       } else if ( (*p) >= 9 )
-               goto tr2197;
-       goto tr2129;
+       goto tr2166;
 st755:
        if ( ++p == pe )
                goto _test_eof755;
 case 755:
-       switch( (*p) ) {
-               case 78: goto st756;
-               case 110: goto st756;
-       }
-       goto tr2129;
+       if ( (*p) == 53 )
+               goto st756;
+       goto tr2166;
 st756:
        if ( ++p == pe )
                goto _test_eof756;
 case 756:
-       switch( (*p) ) {
-               case 68: goto st757;
-               case 100: goto st757;
-       }
-       goto tr2129;
+       if ( (*p) == 54 )
+               goto st757;
+       goto tr2166;
 st757:
        if ( ++p == pe )
                goto _test_eof757;
 case 757:
        switch( (*p) ) {
-               case 73: goto st758;
-               case 105: goto st758;
+               case 83: goto st758;
+               case 115: goto st758;
        }
-       goto tr2129;
+       goto tr2166;
 st758:
        if ( ++p == pe )
                goto _test_eof758;
 case 758:
        switch( (*p) ) {
-               case 82: goto st759;
-               case 114: goto st759;
+               case 72: goto st759;
+               case 104: goto st759;
        }
-       goto tr2129;
+       goto tr2166;
 st759:
        if ( ++p == pe )
                goto _test_eof759;
 case 759:
        switch( (*p) ) {
-               case 69: goto st760;
-               case 101: goto st760;
+               case 65: goto st760;
+               case 97: goto st760;
        }
-       goto tr2129;
+       goto tr2166;
 st760:
        if ( ++p == pe )
                goto _test_eof760;
 case 760:
-       switch( (*p) ) {
-               case 67: goto st761;
-               case 99: goto st761;
-       }
-       goto tr2129;
+       if ( (*p) == 50 )
+               goto st761;
+       goto tr2166;
 st761:
        if ( ++p == pe )
                goto _test_eof761;
 case 761:
-       switch( (*p) ) {
-               case 84: goto st762;
-               case 116: goto st762;
-       }
-       goto tr2129;
+       if ( (*p) == 53 )
+               goto st762;
+       goto tr2166;
 st762:
        if ( ++p == pe )
                goto _test_eof762;
 case 762:
-       switch( (*p) ) {
-               case 32: goto tr2205;
-               case 59: goto tr2205;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2205;
-       } else if ( (*p) >= 9 )
-               goto tr2205;
-       goto tr2129;
+       if ( (*p) == 54 )
+               goto st763;
+       goto tr2166;
 st763:
        if ( ++p == pe )
                goto _test_eof763;
 case 763:
        switch( (*p) ) {
-               case 82: goto st764;
-               case 114: goto st764;
+               case 32: goto tr2215;
+               case 59: goto tr2215;
        }
-       goto tr2129;
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2215;
+       } else if ( (*p) >= 9 )
+               goto tr2215;
+       goto tr2166;
 st764:
        if ( ++p == pe )
                goto _test_eof764;
 case 764:
-       switch( (*p) ) {
-               case 73: goto st765;
-               case 105: goto st765;
-       }
-       goto tr2129;
+       if ( (*p) == 56 )
+               goto st765;
+       goto tr2166;
 st765:
        if ( ++p == pe )
                goto _test_eof765;
 case 765:
-       switch( (*p) ) {
-               case 86: goto st766;
-               case 118: goto st766;
-       }
-       goto tr2129;
+       if ( (*p) == 52 )
+               goto st766;
+       goto tr2166;
 st766:
        if ( ++p == pe )
                goto _test_eof766;
 case 766:
        switch( (*p) ) {
-               case 65: goto st767;
-               case 97: goto st767;
+               case 83: goto st767;
+               case 115: goto st767;
        }
-       goto tr2129;
+       goto tr2166;
 st767:
        if ( ++p == pe )
                goto _test_eof767;
 case 767:
        switch( (*p) ) {
-               case 84: goto st768;
-               case 116: goto st768;
+               case 72: goto st768;
+               case 104: goto st768;
        }
-       goto tr2129;
+       goto tr2166;
 st768:
        if ( ++p == pe )
                goto _test_eof768;
 case 768:
        switch( (*p) ) {
-               case 69: goto st769;
-               case 101: goto st769;
+               case 65: goto st769;
+               case 97: goto st769;
        }
-       goto tr2129;
+       goto tr2166;
 st769:
        if ( ++p == pe )
                goto _test_eof769;
 case 769:
-       switch( (*p) ) {
-               case 68: goto st770;
-               case 79: goto st773;
-               case 100: goto st770;
-               case 111: goto st773;
-       }
-       goto tr2129;
+       if ( (*p) == 51 )
+               goto st770;
+       goto tr2166;
 st770:
        if ( ++p == pe )
                goto _test_eof770;
 case 770:
-       switch( (*p) ) {
-               case 78: goto st771;
-               case 110: goto st771;
-       }
-       goto tr2129;
+       if ( (*p) == 56 )
+               goto st771;
+       goto tr2166;
 st771:
        if ( ++p == pe )
                goto _test_eof771;
 case 771:
-       switch( (*p) ) {
-               case 83: goto st772;
-               case 115: goto st772;
-       }
-       goto tr2129;
+       if ( (*p) == 52 )
+               goto st772;
+       goto tr2166;
 st772:
        if ( ++p == pe )
                goto _test_eof772;
 case 772:
        switch( (*p) ) {
-               case 32: goto tr2216;
-               case 59: goto tr2216;
+               case 32: goto tr2224;
+               case 59: goto tr2224;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2216;
+                       goto tr2224;
        } else if ( (*p) >= 9 )
-               goto tr2216;
-       goto tr2129;
+               goto tr2224;
+       goto tr2166;
 st773:
        if ( ++p == pe )
                goto _test_eof773;
 case 773:
        switch( (*p) ) {
-               case 73: goto st774;
-               case 105: goto st774;
+               case 50: goto st774;
+               case 52: goto st779;
        }
-       goto tr2129;
+       goto tr2166;
 st774:
        if ( ++p == pe )
                goto _test_eof774;
 case 774:
-       switch( (*p) ) {
-               case 68: goto st775;
-               case 100: goto st775;
-       }
-       goto tr2129;
+       if ( (*p) == 53 )
+               goto st775;
+       goto tr2166;
 st775:
        if ( ++p == pe )
                goto _test_eof775;
 case 775:
-       switch( (*p) ) {
-               case 32: goto tr2219;
-               case 59: goto tr2219;
-       }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2219;
-       } else if ( (*p) >= 9 )
-               goto tr2219;
-       goto tr2129;
+       if ( (*p) == 53 )
+               goto st776;
+       goto tr2166;
 st776:
        if ( ++p == pe )
                goto _test_eof776;
 case 776:
-       switch( (*p) ) {
-               case 83: goto st777;
-               case 115: goto st777;
-       }
-       goto tr2129;
+       if ( (*p) == 49 )
+               goto st777;
+       goto tr2166;
 st777:
        if ( ++p == pe )
                goto _test_eof777;
 case 777:
-       switch( (*p) ) {
-               case 65: goto st778;
-               case 97: goto st778;
-       }
-       goto tr2129;
+       if ( (*p) == 57 )
+               goto st778;
+       goto tr2166;
 st778:
        if ( ++p == pe )
                goto _test_eof778;
 case 778:
        switch( (*p) ) {
-               case 77: goto st779;
-               case 83: goto st782;
-               case 109: goto st779;
-               case 115: goto st782;
+               case 32: goto tr2231;
+               case 59: goto tr2231;
        }
-       goto tr2129;
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2231;
+       } else if ( (*p) >= 9 )
+               goto tr2231;
+       goto tr2166;
 st779:
        if ( ++p == pe )
                goto _test_eof779;
 case 779:
-       switch( (*p) ) {
-               case 68: goto st780;
-               case 100: goto st780;
-       }
-       goto tr2129;
+       if ( (*p) == 52 )
+               goto st780;
+       goto tr2166;
 st780:
        if ( ++p == pe )
                goto _test_eof780;
 case 780:
-       if ( (*p) == 53 )
+       if ( (*p) == 56 )
                goto st781;
-       goto tr2129;
+       goto tr2166;
 st781:
        if ( ++p == pe )
                goto _test_eof781;
 case 781:
        switch( (*p) ) {
-               case 32: goto tr2226;
-               case 59: goto tr2226;
+               case 32: goto tr2234;
+               case 59: goto tr2234;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2226;
+                       goto tr2234;
        } else if ( (*p) >= 9 )
-               goto tr2226;
-       goto tr2129;
+               goto tr2234;
+       goto tr2166;
 st782:
        if ( ++p == pe )
                goto _test_eof782;
 case 782:
        switch( (*p) ) {
-               case 72: goto st783;
-               case 104: goto st783;
+               case 78: goto st783;
+               case 110: goto st783;
        }
-       goto tr2129;
+       goto tr2166;
 st783:
        if ( ++p == pe )
                goto _test_eof783;
 case 783:
        switch( (*p) ) {
-               case 65: goto st784;
-               case 97: goto st784;
+               case 68: goto st784;
+               case 100: goto st784;
        }
-       goto tr2129;
+       goto tr2166;
 st784:
        if ( ++p == pe )
                goto _test_eof784;
 case 784:
        switch( (*p) ) {
-               case 49: goto st785;
-               case 50: goto st797;
-               case 53: goto st800;
+               case 73: goto st785;
+               case 105: goto st785;
        }
-       goto tr2129;
+       goto tr2166;
 st785:
        if ( ++p == pe )
                goto _test_eof785;
 case 785:
        switch( (*p) ) {
-               case 32: goto tr2232;
-               case 45: goto st786;
-               case 59: goto tr2232;
+               case 82: goto st786;
+               case 114: goto st786;
        }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2232;
-       } else if ( (*p) >= 9 )
-               goto tr2232;
-       goto tr2129;
+       goto tr2166;
 st786:
        if ( ++p == pe )
                goto _test_eof786;
 case 786:
        switch( (*p) ) {
-               case 78: goto st787;
-               case 110: goto st787;
+               case 69: goto st787;
+               case 101: goto st787;
        }
-       goto tr2129;
+       goto tr2166;
 st787:
        if ( ++p == pe )
                goto _test_eof787;
 case 787:
        switch( (*p) ) {
-               case 83: goto st788;
-               case 115: goto st788;
+               case 67: goto st788;
+               case 99: goto st788;
        }
-       goto tr2129;
+       goto tr2166;
 st788:
        if ( ++p == pe )
                goto _test_eof788;
 case 788:
        switch( (*p) ) {
-               case 69: goto st789;
-               case 101: goto st789;
+               case 84: goto st789;
+               case 116: goto st789;
        }
-       goto tr2129;
+       goto tr2166;
 st789:
        if ( ++p == pe )
                goto _test_eof789;
 case 789:
        switch( (*p) ) {
-               case 67: goto st790;
-               case 99: goto st790;
+               case 32: goto tr2242;
+               case 59: goto tr2242;
        }
-       goto tr2129;
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2242;
+       } else if ( (*p) >= 9 )
+               goto tr2242;
+       goto tr2166;
 st790:
        if ( ++p == pe )
                goto _test_eof790;
 case 790:
-       if ( (*p) == 51 )
-               goto st791;
-       goto tr2129;
+       switch( (*p) ) {
+               case 82: goto st791;
+               case 114: goto st791;
+       }
+       goto tr2166;
 st791:
        if ( ++p == pe )
                goto _test_eof791;
 case 791:
-       if ( (*p) == 45 )
-               goto st792;
-       goto tr2129;
+       switch( (*p) ) {
+               case 73: goto st792;
+               case 105: goto st792;
+       }
+       goto tr2166;
 st792:
        if ( ++p == pe )
                goto _test_eof792;
 case 792:
        switch( (*p) ) {
-               case 83: goto st793;
-               case 115: goto st793;
+               case 86: goto st793;
+               case 118: goto st793;
        }
-       goto tr2129;
+       goto tr2166;
 st793:
        if ( ++p == pe )
                goto _test_eof793;
 case 793:
        switch( (*p) ) {
-               case 72: goto st794;
-               case 104: goto st794;
+               case 65: goto st794;
+               case 97: goto st794;
        }
-       goto tr2129;
+       goto tr2166;
 st794:
        if ( ++p == pe )
                goto _test_eof794;
 case 794:
        switch( (*p) ) {
-               case 65: goto st795;
-               case 97: goto st795;
+               case 84: goto st795;
+               case 116: goto st795;
        }
-       goto tr2129;
+       goto tr2166;
 st795:
        if ( ++p == pe )
                goto _test_eof795;
 case 795:
-       if ( (*p) == 49 )
-               goto st796;
-       goto tr2129;
+       switch( (*p) ) {
+               case 69: goto st796;
+               case 101: goto st796;
+       }
+       goto tr2166;
 st796:
        if ( ++p == pe )
                goto _test_eof796;
 case 796:
        switch( (*p) ) {
-               case 32: goto tr2244;
-               case 59: goto tr2244;
+               case 68: goto st797;
+               case 79: goto st800;
+               case 100: goto st797;
+               case 111: goto st800;
        }
-       if ( (*p) > 10 ) {
-               if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2244;
-       } else if ( (*p) >= 9 )
-               goto tr2244;
-       goto tr2129;
+       goto tr2166;
 st797:
        if ( ++p == pe )
                goto _test_eof797;
 case 797:
-       if ( (*p) == 53 )
-               goto st798;
-       goto tr2129;
+       switch( (*p) ) {
+               case 78: goto st798;
+               case 110: goto st798;
+       }
+       goto tr2166;
 st798:
        if ( ++p == pe )
                goto _test_eof798;
 case 798:
-       if ( (*p) == 54 )
-               goto st799;
-       goto tr2129;
+       switch( (*p) ) {
+               case 83: goto st799;
+               case 115: goto st799;
+       }
+       goto tr2166;
 st799:
        if ( ++p == pe )
                goto _test_eof799;
 case 799:
        switch( (*p) ) {
-               case 32: goto tr2247;
-               case 59: goto tr2247;
+               case 32: goto tr2253;
+               case 59: goto tr2253;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2247;
+                       goto tr2253;
        } else if ( (*p) >= 9 )
-               goto tr2247;
-       goto tr2129;
+               goto tr2253;
+       goto tr2166;
 st800:
        if ( ++p == pe )
                goto _test_eof800;
 case 800:
-       if ( (*p) == 49 )
-               goto st801;
-       goto tr2129;
+       switch( (*p) ) {
+               case 73: goto st801;
+               case 105: goto st801;
+       }
+       goto tr2166;
 st801:
        if ( ++p == pe )
                goto _test_eof801;
 case 801:
-       if ( (*p) == 50 )
-               goto st802;
-       goto tr2129;
+       switch( (*p) ) {
+               case 68: goto st802;
+               case 100: goto st802;
+       }
+       goto tr2166;
 st802:
        if ( ++p == pe )
                goto _test_eof802;
 case 802:
        switch( (*p) ) {
-               case 32: goto tr2250;
-               case 59: goto tr2250;
+               case 32: goto tr2256;
+               case 59: goto tr2256;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2250;
+                       goto tr2256;
        } else if ( (*p) >= 9 )
-               goto tr2250;
-       goto tr2129;
+               goto tr2256;
+       goto tr2166;
 st803:
        if ( ++p == pe )
                goto _test_eof803;
 case 803:
+       switch( (*p) ) {
+               case 83: goto st804;
+               case 115: goto st804;
+       }
+       goto tr2166;
+st804:
+       if ( ++p == pe )
+               goto _test_eof804;
+case 804:
        switch( (*p) ) {
                case 65: goto st805;
-               case 73: goto st811;
-               case 79: goto st828;
-               case 80: goto st831;
-               case 83: goto st837;
-               case 85: goto st841;
                case 97: goto st805;
-               case 105: goto st811;
-               case 111: goto st828;
-               case 112: goto st831;
-               case 115: goto st837;
-               case 117: goto st841;
+       }
+       goto tr2166;
+st805:
+       if ( ++p == pe )
+               goto _test_eof805;
+case 805:
+       switch( (*p) ) {
+               case 77: goto st806;
+               case 83: goto st809;
+               case 109: goto st806;
+               case 115: goto st809;
+       }
+       goto tr2166;
+st806:
+       if ( ++p == pe )
+               goto _test_eof806;
+case 806:
+       switch( (*p) ) {
+               case 68: goto st807;
+               case 100: goto st807;
+       }
+       goto tr2166;
+st807:
+       if ( ++p == pe )
+               goto _test_eof807;
+case 807:
+       if ( (*p) == 53 )
+               goto st808;
+       goto tr2166;
+st808:
+       if ( ++p == pe )
+               goto _test_eof808;
+case 808:
+       switch( (*p) ) {
+               case 32: goto tr2263;
+               case 59: goto tr2263;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2263;
+       } else if ( (*p) >= 9 )
+               goto tr2263;
+       goto tr2166;
+st809:
+       if ( ++p == pe )
+               goto _test_eof809;
+case 809:
+       switch( (*p) ) {
+               case 72: goto st810;
+               case 104: goto st810;
+       }
+       goto tr2166;
+st810:
+       if ( ++p == pe )
+               goto _test_eof810;
+case 810:
+       switch( (*p) ) {
+               case 65: goto st811;
+               case 97: goto st811;
+       }
+       goto tr2166;
+st811:
+       if ( ++p == pe )
+               goto _test_eof811;
+case 811:
+       switch( (*p) ) {
+               case 49: goto st812;
+               case 50: goto st824;
+               case 53: goto st827;
+       }
+       goto tr2166;
+st812:
+       if ( ++p == pe )
+               goto _test_eof812;
+case 812:
+       switch( (*p) ) {
+               case 32: goto tr2269;
+               case 45: goto st813;
+               case 59: goto tr2269;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2269;
+       } else if ( (*p) >= 9 )
+               goto tr2269;
+       goto tr2166;
+st813:
+       if ( ++p == pe )
+               goto _test_eof813;
+case 813:
+       switch( (*p) ) {
+               case 78: goto st814;
+               case 110: goto st814;
+       }
+       goto tr2166;
+st814:
+       if ( ++p == pe )
+               goto _test_eof814;
+case 814:
+       switch( (*p) ) {
+               case 83: goto st815;
+               case 115: goto st815;
+       }
+       goto tr2166;
+st815:
+       if ( ++p == pe )
+               goto _test_eof815;
+case 815:
+       switch( (*p) ) {
+               case 69: goto st816;
+               case 101: goto st816;
+       }
+       goto tr2166;
+st816:
+       if ( ++p == pe )
+               goto _test_eof816;
+case 816:
+       switch( (*p) ) {
+               case 67: goto st817;
+               case 99: goto st817;
+       }
+       goto tr2166;
+st817:
+       if ( ++p == pe )
+               goto _test_eof817;
+case 817:
+       if ( (*p) == 51 )
+               goto st818;
+       goto tr2166;
+st818:
+       if ( ++p == pe )
+               goto _test_eof818;
+case 818:
+       if ( (*p) == 45 )
+               goto st819;
+       goto tr2166;
+st819:
+       if ( ++p == pe )
+               goto _test_eof819;
+case 819:
+       switch( (*p) ) {
+               case 83: goto st820;
+               case 115: goto st820;
+       }
+       goto tr2166;
+st820:
+       if ( ++p == pe )
+               goto _test_eof820;
+case 820:
+       switch( (*p) ) {
+               case 72: goto st821;
+               case 104: goto st821;
+       }
+       goto tr2166;
+st821:
+       if ( ++p == pe )
+               goto _test_eof821;
+case 821:
+       switch( (*p) ) {
+               case 65: goto st822;
+               case 97: goto st822;
+       }
+       goto tr2166;
+st822:
+       if ( ++p == pe )
+               goto _test_eof822;
+case 822:
+       if ( (*p) == 49 )
+               goto st823;
+       goto tr2166;
+st823:
+       if ( ++p == pe )
+               goto _test_eof823;
+case 823:
+       switch( (*p) ) {
+               case 32: goto tr2281;
+               case 59: goto tr2281;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2281;
+       } else if ( (*p) >= 9 )
+               goto tr2281;
+       goto tr2166;
+st824:
+       if ( ++p == pe )
+               goto _test_eof824;
+case 824:
+       if ( (*p) == 53 )
+               goto st825;
+       goto tr2166;
+st825:
+       if ( ++p == pe )
+               goto _test_eof825;
+case 825:
+       if ( (*p) == 54 )
+               goto st826;
+       goto tr2166;
+st826:
+       if ( ++p == pe )
+               goto _test_eof826;
+case 826:
+       switch( (*p) ) {
+               case 32: goto tr2284;
+               case 59: goto tr2284;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2284;
+       } else if ( (*p) >= 9 )
+               goto tr2284;
+       goto tr2166;
+st827:
+       if ( ++p == pe )
+               goto _test_eof827;
+case 827:
+       if ( (*p) == 49 )
+               goto st828;
+       goto tr2166;
+st828:
+       if ( ++p == pe )
+               goto _test_eof828;
+case 828:
+       if ( (*p) == 50 )
+               goto st829;
+       goto tr2166;
+st829:
+       if ( ++p == pe )
+               goto _test_eof829;
+case 829:
+       switch( (*p) ) {
+               case 32: goto tr2287;
+               case 59: goto tr2287;
+       }
+       if ( (*p) > 10 ) {
+               if ( 40 <= (*p) && (*p) <= 41 )
+                       goto tr2287;
+       } else if ( (*p) >= 9 )
+               goto tr2287;
+       goto tr2166;
+st830:
+       if ( ++p == pe )
+               goto _test_eof830;
+case 830:
+       switch( (*p) ) {
+               case 65: goto st832;
+               case 73: goto st838;
+               case 79: goto st855;
+               case 80: goto st858;
+               case 83: goto st864;
+               case 85: goto st868;
+               case 97: goto st832;
+               case 105: goto st838;
+               case 111: goto st855;
+               case 112: goto st858;
+               case 115: goto st864;
+               case 117: goto st868;
        }
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2252;
-       goto tr2251;
-tr2252:
+               goto tr2289;
+       goto tr2288;
+tr2289:
        {
                s->number64 = 0;
        }
@@ -62944,8 +63545,8 @@ tr2252:
                        p--; {goto st307;}
                }
        }
-       goto st804;
-tr2260:
+       goto st831;
+tr2297:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -62960,25 +63561,25 @@ tr2260:
                        p--; {goto st307;}
                }
        }
-       goto st804;
-st804:
+       goto st831;
+st831:
        if ( ++p == pe )
-               goto _test_eof804;
-case 804:
+               goto _test_eof831;
+case 831:
        switch( (*p) ) {
-               case 32: goto tr2259;
-               case 59: goto tr2259;
+               case 32: goto tr2296;
+               case 59: goto tr2296;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr2259;
+                       goto tr2296;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr2260;
+                       goto tr2297;
        } else
-               goto tr2259;
-       goto tr2251;
-tr2296:
+               goto tr2296;
+       goto tr2288;
+tr2333:
        {
                uint16_t val = htons(1);
                memcpy(rdata_tail, &val, 2);
@@ -62987,8 +63588,18 @@ tr2296:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2286:
+       goto st1461;
+tr2303:
+       {
+               uint16_t val = htons(7);
+               memcpy(rdata_tail, &val, 2);
+               rdata_tail += 2;
+       }
+       {
+               p--; {cs = stack[--top];goto _again;}
+       }
+       goto st1461;
+tr2323:
        {
                uint16_t val = htons(5);
                memcpy(rdata_tail, &val, 2);
@@ -62997,8 +63608,8 @@ tr2286:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2282:
+       goto st1461;
+tr2319:
        {
                uint16_t val = htons(4);
                memcpy(rdata_tail, &val, 2);
@@ -63007,8 +63618,8 @@ tr2282:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2279:
+       goto st1461;
+tr2316:
        {
                uint16_t val = htons(6);
                memcpy(rdata_tail, &val, 2);
@@ -63017,8 +63628,8 @@ tr2279:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2259:
+       goto st1461;
+tr2296:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -63032,8 +63643,8 @@ tr2259:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2300:
+       goto st1461;
+tr2337:
        {
                uint16_t val = htons(2);
                memcpy(rdata_tail, &val, 2);
@@ -63042,38 +63653,28 @@ tr2300:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2293:
-       {
-               uint16_t val = htons(3);
-               memcpy(rdata_tail, &val, 2);
-               rdata_tail += 2;
-       }
-       {
-               p--; {cs = stack[--top];goto _again;}
-       }
-       goto st1434;
-tr2266:
+       goto st1461;
+tr2312:
        {
-               uint16_t val = htons(7);
+               uint16_t val = htons(8);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2275:
+       goto st1461;
+tr2330:
        {
-               uint16_t val = htons(8);
+               uint16_t val = htons(3);
                memcpy(rdata_tail, &val, 2);
                rdata_tail += 2;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2289:
+       goto st1461;
+tr2326:
        {
                uint16_t val = htons(254);
                memcpy(rdata_tail, &val, 2);
@@ -63082,8 +63683,8 @@ tr2289:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-tr2303:
+       goto st1461;
+tr2340:
        {
                uint16_t val = htons(253);
                memcpy(rdata_tail, &val, 2);
@@ -63092,431 +63693,431 @@ tr2303:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1434;
-st1434:
+       goto st1461;
+st1461:
        if ( ++p == pe )
-               goto _test_eof1434;
-case 1434:
+               goto _test_eof1461;
+case 1461:
        goto st0;
-st805:
+st832:
        if ( ++p == pe )
-               goto _test_eof805;
-case 805:
+               goto _test_eof832;
+case 832:
        switch( (*p) ) {
-               case 67: goto st806;
-               case 99: goto st806;
+               case 67: goto st833;
+               case 99: goto st833;
        }
-       goto tr2251;
-st806:
+       goto tr2288;
+st833:
        if ( ++p == pe )
-               goto _test_eof806;
-case 806:
+               goto _test_eof833;
+case 833:
        switch( (*p) ) {
-               case 80: goto st807;
-               case 112: goto st807;
+               case 80: goto st834;
+               case 112: goto st834;
        }
-       goto tr2251;
-st807:
+       goto tr2288;
+st834:
        if ( ++p == pe )
-               goto _test_eof807;
-case 807:
+               goto _test_eof834;
+case 834:
        switch( (*p) ) {
-               case 75: goto st808;
-               case 107: goto st808;
+               case 75: goto st835;
+               case 107: goto st835;
        }
-       goto tr2251;
-st808:
+       goto tr2288;
+st835:
        if ( ++p == pe )
-               goto _test_eof808;
-case 808:
+               goto _test_eof835;
+case 835:
        switch( (*p) ) {
-               case 73: goto st809;
-               case 105: goto st809;
+               case 73: goto st836;
+               case 105: goto st836;
        }
-       goto tr2251;
-st809:
+       goto tr2288;
+st836:
        if ( ++p == pe )
-               goto _test_eof809;
-case 809:
+               goto _test_eof836;
+case 836:
        switch( (*p) ) {
-               case 88: goto st810;
-               case 120: goto st810;
+               case 88: goto st837;
+               case 120: goto st837;
        }
-       goto tr2251;
-st810:
+       goto tr2288;
+st837:
        if ( ++p == pe )
-               goto _test_eof810;
-case 810:
+               goto _test_eof837;
+case 837:
        switch( (*p) ) {
-               case 32: goto tr2266;
-               case 59: goto tr2266;
+               case 32: goto tr2303;
+               case 59: goto tr2303;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2266;
+                       goto tr2303;
        } else if ( (*p) >= 9 )
-               goto tr2266;
-       goto tr2251;
-st811:
+               goto tr2303;
+       goto tr2288;
+st838:
        if ( ++p == pe )
-               goto _test_eof811;
-case 811:
+               goto _test_eof838;
+case 838:
        switch( (*p) ) {
-               case 65: goto st812;
-               case 80: goto st818;
-               case 83: goto st824;
-               case 97: goto st812;
-               case 112: goto st818;
-               case 115: goto st824;
+               case 65: goto st839;
+               case 80: goto st845;
+               case 83: goto st851;
+               case 97: goto st839;
+               case 112: goto st845;
+               case 115: goto st851;
        }
-       goto tr2251;
-st812:
+       goto tr2288;
+st839:
        if ( ++p == pe )
-               goto _test_eof812;
-case 812:
+               goto _test_eof839;
+case 839:
        switch( (*p) ) {
-               case 67: goto st813;
-               case 99: goto st813;
+               case 67: goto st840;
+               case 99: goto st840;
        }
-       goto tr2251;
-st813:
+       goto tr2288;
+st840:
        if ( ++p == pe )
-               goto _test_eof813;
-case 813:
+               goto _test_eof840;
+case 840:
        switch( (*p) ) {
-               case 80: goto st814;
-               case 112: goto st814;
+               case 80: goto st841;
+               case 112: goto st841;
        }
-       goto tr2251;
-st814:
+       goto tr2288;
+st841:
        if ( ++p == pe )
-               goto _test_eof814;
-case 814:
+               goto _test_eof841;
+case 841:
        switch( (*p) ) {
-               case 75: goto st815;
-               case 107: goto st815;
+               case 75: goto st842;
+               case 107: goto st842;
        }
-       goto tr2251;
-st815:
+       goto tr2288;
+st842:
        if ( ++p == pe )
-               goto _test_eof815;
-case 815:
+               goto _test_eof842;
+case 842:
        switch( (*p) ) {
-               case 73: goto st816;
-               case 105: goto st816;
+               case 73: goto st843;
+               case 105: goto st843;
        }
-       goto tr2251;
-st816:
+       goto tr2288;
+st843:
        if ( ++p == pe )
-               goto _test_eof816;
-case 816:
+               goto _test_eof843;
+case 843:
        switch( (*p) ) {
-               case 88: goto st817;
-               case 120: goto st817;
+               case 88: goto st844;
+               case 120: goto st844;
        }
-       goto tr2251;
-st817:
+       goto tr2288;
+st844:
        if ( ++p == pe )
-               goto _test_eof817;
-case 817:
+               goto _test_eof844;
+case 844:
        switch( (*p) ) {
-               case 32: goto tr2275;
-               case 59: goto tr2275;
+               case 32: goto tr2312;
+               case 59: goto tr2312;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2275;
+                       goto tr2312;
        } else if ( (*p) >= 9 )
-               goto tr2275;
-       goto tr2251;
-st818:
+               goto tr2312;
+       goto tr2288;
+st845:
        if ( ++p == pe )
-               goto _test_eof818;
-case 818:
+               goto _test_eof845;
+case 845:
        switch( (*p) ) {
-               case 71: goto st819;
-               case 75: goto st821;
-               case 103: goto st819;
-               case 107: goto st821;
+               case 71: goto st846;
+               case 75: goto st848;
+               case 103: goto st846;
+               case 107: goto st848;
        }
-       goto tr2251;
-st819:
+       goto tr2288;
+st846:
        if ( ++p == pe )
-               goto _test_eof819;
-case 819:
+               goto _test_eof846;
+case 846:
        switch( (*p) ) {
-               case 80: goto st820;
-               case 112: goto st820;
+               case 80: goto st847;
+               case 112: goto st847;
        }
-       goto tr2251;
-st820:
+       goto tr2288;
+st847:
        if ( ++p == pe )
-               goto _test_eof820;
-case 820:
+               goto _test_eof847;
+case 847:
        switch( (*p) ) {
-               case 32: goto tr2279;
-               case 59: goto tr2279;
+               case 32: goto tr2316;
+               case 59: goto tr2316;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2279;
+                       goto tr2316;
        } else if ( (*p) >= 9 )
-               goto tr2279;
-       goto tr2251;
-st821:
+               goto tr2316;
+       goto tr2288;
+st848:
        if ( ++p == pe )
-               goto _test_eof821;
-case 821:
+               goto _test_eof848;
+case 848:
        switch( (*p) ) {
-               case 73: goto st822;
-               case 105: goto st822;
+               case 73: goto st849;
+               case 105: goto st849;
        }
-       goto tr2251;
-st822:
+       goto tr2288;
+st849:
        if ( ++p == pe )
-               goto _test_eof822;
-case 822:
+               goto _test_eof849;
+case 849:
        switch( (*p) ) {
-               case 88: goto st823;
-               case 120: goto st823;
+               case 88: goto st850;
+               case 120: goto st850;
        }
-       goto tr2251;
-st823:
+       goto tr2288;
+st850:
        if ( ++p == pe )
-               goto _test_eof823;
-case 823:
+               goto _test_eof850;
+case 850:
        switch( (*p) ) {
-               case 32: goto tr2282;
-               case 59: goto tr2282;
+               case 32: goto tr2319;
+               case 59: goto tr2319;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2282;
+                       goto tr2319;
        } else if ( (*p) >= 9 )
-               goto tr2282;
-       goto tr2251;
-st824:
+               goto tr2319;
+       goto tr2288;
+st851:
        if ( ++p == pe )
-               goto _test_eof824;
-case 824:
+               goto _test_eof851;
+case 851:
        switch( (*p) ) {
-               case 80: goto st825;
-               case 112: goto st825;
+               case 80: goto st852;
+               case 112: goto st852;
        }
-       goto tr2251;
-st825:
+       goto tr2288;
+st852:
        if ( ++p == pe )
-               goto _test_eof825;
-case 825:
+               goto _test_eof852;
+case 852:
        switch( (*p) ) {
-               case 75: goto st826;
-               case 107: goto st826;
+               case 75: goto st853;
+               case 107: goto st853;
        }
-       goto tr2251;
-st826:
+       goto tr2288;
+st853:
        if ( ++p == pe )
-               goto _test_eof826;
-case 826:
+               goto _test_eof853;
+case 853:
        switch( (*p) ) {
-               case 73: goto st827;
-               case 105: goto st827;
+               case 73: goto st854;
+               case 105: goto st854;
        }
-       goto tr2251;
-st827:
+       goto tr2288;
+st854:
        if ( ++p == pe )
-               goto _test_eof827;
-case 827:
+               goto _test_eof854;
+case 854:
        switch( (*p) ) {
-               case 32: goto tr2286;
-               case 59: goto tr2286;
+               case 32: goto tr2323;
+               case 59: goto tr2323;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2286;
+                       goto tr2323;
        } else if ( (*p) >= 9 )
-               goto tr2286;
-       goto tr2251;
-st828:
+               goto tr2323;
+       goto tr2288;
+st855:
        if ( ++p == pe )
-               goto _test_eof828;
-case 828:
+               goto _test_eof855;
+case 855:
        switch( (*p) ) {
-               case 73: goto st829;
-               case 105: goto st829;
+               case 73: goto st856;
+               case 105: goto st856;
        }
-       goto tr2251;
-st829:
+       goto tr2288;
+st856:
        if ( ++p == pe )
-               goto _test_eof829;
-case 829:
+               goto _test_eof856;
+case 856:
        switch( (*p) ) {
-               case 68: goto st830;
-               case 100: goto st830;
+               case 68: goto st857;
+               case 100: goto st857;
        }
-       goto tr2251;
-st830:
+       goto tr2288;
+st857:
        if ( ++p == pe )
-               goto _test_eof830;
-case 830:
+               goto _test_eof857;
+case 857:
        switch( (*p) ) {
-               case 32: goto tr2289;
-               case 59: goto tr2289;
+               case 32: goto tr2326;
+               case 59: goto tr2326;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2289;
+                       goto tr2326;
        } else if ( (*p) >= 9 )
-               goto tr2289;
-       goto tr2251;
-st831:
+               goto tr2326;
+       goto tr2288;
+st858:
        if ( ++p == pe )
-               goto _test_eof831;
-case 831:
+               goto _test_eof858;
+case 858:
        switch( (*p) ) {
-               case 71: goto st832;
-               case 75: goto st834;
-               case 103: goto st832;
-               case 107: goto st834;
+               case 71: goto st859;
+               case 75: goto st861;
+               case 103: goto st859;
+               case 107: goto st861;
        }
-       goto tr2251;
-st832:
+       goto tr2288;
+st859:
        if ( ++p == pe )
-               goto _test_eof832;
-case 832:
+               goto _test_eof859;
+case 859:
        switch( (*p) ) {
-               case 80: goto st833;
-               case 112: goto st833;
+               case 80: goto st860;
+               case 112: goto st860;
        }
-       goto tr2251;
-st833:
+       goto tr2288;
+st860:
        if ( ++p == pe )
-               goto _test_eof833;
-case 833:
+               goto _test_eof860;
+case 860:
        switch( (*p) ) {
-               case 32: goto tr2293;
-               case 59: goto tr2293;
+               case 32: goto tr2330;
+               case 59: goto tr2330;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2293;
+                       goto tr2330;
        } else if ( (*p) >= 9 )
-               goto tr2293;
-       goto tr2251;
-st834:
+               goto tr2330;
+       goto tr2288;
+st861:
        if ( ++p == pe )
-               goto _test_eof834;
-case 834:
+               goto _test_eof861;
+case 861:
        switch( (*p) ) {
-               case 73: goto st835;
-               case 105: goto st835;
+               case 73: goto st862;
+               case 105: goto st862;
        }
-       goto tr2251;
-st835:
+       goto tr2288;
+st862:
        if ( ++p == pe )
-               goto _test_eof835;
-case 835:
+               goto _test_eof862;
+case 862:
        switch( (*p) ) {
-               case 88: goto st836;
-               case 120: goto st836;
+               case 88: goto st863;
+               case 120: goto st863;
        }
-       goto tr2251;
-st836:
+       goto tr2288;
+st863:
        if ( ++p == pe )
-               goto _test_eof836;
-case 836:
+               goto _test_eof863;
+case 863:
        switch( (*p) ) {
-               case 32: goto tr2296;
-               case 59: goto tr2296;
+               case 32: goto tr2333;
+               case 59: goto tr2333;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2296;
+                       goto tr2333;
        } else if ( (*p) >= 9 )
-               goto tr2296;
-       goto tr2251;
-st837:
+               goto tr2333;
+       goto tr2288;
+st864:
        if ( ++p == pe )
-               goto _test_eof837;
-case 837:
+               goto _test_eof864;
+case 864:
        switch( (*p) ) {
-               case 80: goto st838;
-               case 112: goto st838;
+               case 80: goto st865;
+               case 112: goto st865;
        }
-       goto tr2251;
-st838:
+       goto tr2288;
+st865:
        if ( ++p == pe )
-               goto _test_eof838;
-case 838:
+               goto _test_eof865;
+case 865:
        switch( (*p) ) {
-               case 75: goto st839;
-               case 107: goto st839;
+               case 75: goto st866;
+               case 107: goto st866;
        }
-       goto tr2251;
-st839:
+       goto tr2288;
+st866:
        if ( ++p == pe )
-               goto _test_eof839;
-case 839:
+               goto _test_eof866;
+case 866:
        switch( (*p) ) {
-               case 73: goto st840;
-               case 105: goto st840;
+               case 73: goto st867;
+               case 105: goto st867;
        }
-       goto tr2251;
-st840:
+       goto tr2288;
+st867:
        if ( ++p == pe )
-               goto _test_eof840;
-case 840:
+               goto _test_eof867;
+case 867:
        switch( (*p) ) {
-               case 32: goto tr2300;
-               case 59: goto tr2300;
+               case 32: goto tr2337;
+               case 59: goto tr2337;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2300;
+                       goto tr2337;
        } else if ( (*p) >= 9 )
-               goto tr2300;
-       goto tr2251;
-st841:
+               goto tr2337;
+       goto tr2288;
+st868:
        if ( ++p == pe )
-               goto _test_eof841;
-case 841:
+               goto _test_eof868;
+case 868:
        switch( (*p) ) {
-               case 82: goto st842;
-               case 114: goto st842;
+               case 82: goto st869;
+               case 114: goto st869;
        }
-       goto tr2251;
-st842:
+       goto tr2288;
+st869:
        if ( ++p == pe )
-               goto _test_eof842;
-case 842:
+               goto _test_eof869;
+case 869:
        switch( (*p) ) {
-               case 73: goto st843;
-               case 105: goto st843;
+               case 73: goto st870;
+               case 105: goto st870;
        }
-       goto tr2251;
-st843:
+       goto tr2288;
+st870:
        if ( ++p == pe )
-               goto _test_eof843;
-case 843:
+               goto _test_eof870;
+case 870:
        switch( (*p) ) {
-               case 32: goto tr2303;
-               case 59: goto tr2303;
+               case 32: goto tr2340;
+               case 59: goto tr2340;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2303;
+                       goto tr2340;
        } else if ( (*p) >= 9 )
-               goto tr2303;
-       goto tr2251;
-st844:
+               goto tr2340;
+       goto tr2288;
+st871:
        if ( ++p == pe )
-               goto _test_eof844;
-case 844:
+               goto _test_eof871;
+case 871:
        if ( (*p) == 46 )
-               goto tr2305;
+               goto tr2342;
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2305;
-       goto tr2304;
-tr2307:
+               goto tr2342;
+       goto tr2341;
+tr2344:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -63525,8 +64126,8 @@ tr2307:
                        p--; {goto st307;}
                }
        }
-       goto st845;
-tr2305:
+       goto st872;
+tr2342:
        {
                s->buffer_length = 0;
        }
@@ -63538,26 +64139,26 @@ tr2305:
                        p--; {goto st307;}
                }
        }
-       goto st845;
-st845:
+       goto st872;
+st872:
        if ( ++p == pe )
-               goto _test_eof845;
-case 845:
+               goto _test_eof872;
+case 872:
        switch( (*p) ) {
-               case 32: goto tr2306;
-               case 46: goto tr2307;
-               case 59: goto tr2306;
+               case 32: goto tr2343;
+               case 46: goto tr2344;
+               case 59: goto tr2343;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr2306;
+                       goto tr2343;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr2307;
+                       goto tr2344;
        } else
-               goto tr2306;
-       goto tr2304;
-tr2306:
+               goto tr2343;
+       goto tr2341;
+tr2343:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -63577,91 +64178,91 @@ tr2306:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1435;
-st1435:
+       goto st1462;
+st1462:
        if ( ++p == pe )
-               goto _test_eof1435;
-case 1435:
+               goto _test_eof1462;
+case 1462:
        goto st0;
-st846:
+st873:
        if ( ++p == pe )
-               goto _test_eof846;
-case 846:
+               goto _test_eof873;
+case 873:
        switch( (*p) ) {
-               case 42: goto tr2308;
-               case 92: goto tr2308;
-               case 95: goto tr2308;
+               case 42: goto tr2345;
+               case 92: goto tr2345;
+               case 95: goto tr2345;
        }
        if ( (*p) < 64 ) {
                if ( 45 <= (*p) && (*p) <= 57 )
-                       goto tr2308;
+                       goto tr2345;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr2308;
+                       goto tr2345;
        } else
-               goto tr2308;
+               goto tr2345;
        goto tr75;
-tr2308:
+tr2345:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 847;goto st309;} }
-       goto st847;
-st847:
+       { p--; {stack[top++] = 874;goto st309;} }
+       goto st874;
+st874:
        if ( ++p == pe )
-               goto _test_eof847;
-case 847:
+               goto _test_eof874;
+case 874:
        switch( (*p) ) {
-               case 32: goto tr2309;
-               case 59: goto tr2309;
+               case 32: goto tr2346;
+               case 59: goto tr2346;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2309;
+                       goto tr2346;
        } else if ( (*p) >= 9 )
-               goto tr2309;
+               goto tr2346;
        goto tr75;
-tr2309:
+tr2346:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1436;
-st1436:
+       goto st1463;
+st1463:
        if ( ++p == pe )
-               goto _test_eof1436;
-case 1436:
+               goto _test_eof1463;
+case 1463:
        goto st0;
-st848:
+st875:
        if ( ++p == pe )
-               goto _test_eof848;
-case 848:
+               goto _test_eof875;
+case 875:
        switch( (*p) ) {
-               case 42: goto tr2310;
-               case 92: goto tr2310;
-               case 95: goto tr2310;
+               case 42: goto tr2347;
+               case 92: goto tr2347;
+               case 95: goto tr2347;
        }
        if ( (*p) < 64 ) {
                if ( 45 <= (*p) && (*p) <= 57 )
-                       goto tr2310;
+                       goto tr2347;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr2310;
+                       goto tr2347;
        } else
-               goto tr2310;
+               goto tr2347;
        goto tr75;
-tr2310:
+tr2347:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 849;goto st309;} }
-       goto st849;
-st849:
+       { p--; {stack[top++] = 876;goto st309;} }
+       goto st876;
+st876:
        if ( ++p == pe )
-               goto _test_eof849;
-case 849:
+               goto _test_eof876;
+case 876:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -63675,15 +64276,15 @@ case 849:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2311;
-               case 32: goto tr2311;
-               case 40: goto tr2312;
-               case 41: goto tr2313;
-               case 2058: goto tr2314;
-               case 2107: goto tr2315;
+               case 9: goto tr2348;
+               case 32: goto tr2348;
+               case 40: goto tr2349;
+               case 41: goto tr2350;
+               case 2058: goto tr2351;
+               case 2107: goto tr2352;
        }
        goto tr75;
-tr2317:
+tr2354:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -63691,8 +64292,8 @@ tr2317:
                }
                s->multiline = true;
        }
-       goto st850;
-tr2318:
+       goto st877;
+tr2355:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -63700,13 +64301,13 @@ tr2318:
                }
                s->multiline = false;
        }
-       goto st850;
-tr2320:
+       goto st877;
+tr2357:
        {
                s->line_counter++;
        }
-       goto st850;
-tr2464:
+       goto st877;
+tr2501:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -63716,20 +64317,20 @@ tr2464:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 850; goto _out;}
+                               {p++; cs = 877; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st850;
-tr2311:
+       goto st877;
+tr2348:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       goto st850;
-tr2312:
+       goto st877;
+tr2349:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -63740,8 +64341,8 @@ tr2312:
                }
                s->multiline = true;
        }
-       goto st850;
-tr2313:
+       goto st877;
+tr2350:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -63752,19 +64353,19 @@ tr2313:
                }
                s->multiline = false;
        }
-       goto st850;
-tr2314:
+       goto st877;
+tr2351:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->line_counter++;
        }
-       goto st850;
-st850:
+       goto st877;
+st877:
        if ( ++p == pe )
-               goto _test_eof850;
-case 850:
+               goto _test_eof877;
+case 877:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -63778,35 +64379,35 @@ case 850:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st850;
-               case 32: goto st850;
-               case 40: goto tr2317;
-               case 41: goto tr2318;
-               case 42: goto tr2319;
-               case 92: goto tr2319;
-               case 95: goto tr2319;
-               case 2058: goto tr2320;
-               case 2107: goto tr2321;
+               case 9: goto st877;
+               case 32: goto st877;
+               case 40: goto tr2354;
+               case 41: goto tr2355;
+               case 42: goto tr2356;
+               case 92: goto tr2356;
+               case 95: goto tr2356;
+               case 2058: goto tr2357;
+               case 2107: goto tr2358;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr2319;
+                       goto tr2356;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr2319;
+                       goto tr2356;
        } else
-               goto tr2319;
+               goto tr2356;
        goto tr75;
-tr2319:
+tr2356:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 851;goto st309;} }
-       goto st851;
-st851:
+       { p--; {stack[top++] = 878;goto st309;} }
+       goto st878;
+st878:
        if ( ++p == pe )
-               goto _test_eof851;
-case 851:
+               goto _test_eof878;
+case 878:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -63820,15 +64421,15 @@ case 851:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2322;
-               case 32: goto tr2322;
-               case 40: goto tr2323;
-               case 41: goto tr2324;
-               case 2058: goto tr2325;
-               case 2107: goto tr2326;
+               case 9: goto tr2359;
+               case 32: goto tr2359;
+               case 40: goto tr2360;
+               case 41: goto tr2361;
+               case 2058: goto tr2362;
+               case 2107: goto tr2363;
        }
        goto tr75;
-tr2329:
+tr2366:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -63836,8 +64437,8 @@ tr2329:
                }
                s->multiline = true;
        }
-       goto st852;
-tr2330:
+       goto st879;
+tr2367:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -63845,13 +64446,13 @@ tr2330:
                }
                s->multiline = false;
        }
-       goto st852;
-tr2332:
+       goto st879;
+tr2369:
        {
                s->line_counter++;
        }
-       goto st852;
-tr2462:
+       goto st879;
+tr2499:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -63861,20 +64462,20 @@ tr2462:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 852; goto _out;}
+                               {p++; cs = 879; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st852;
-tr2322:
+       goto st879;
+tr2359:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       goto st852;
-tr2323:
+       goto st879;
+tr2360:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -63885,8 +64486,8 @@ tr2323:
                }
                s->multiline = true;
        }
-       goto st852;
-tr2324:
+       goto st879;
+tr2361:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -63897,19 +64498,19 @@ tr2324:
                }
                s->multiline = false;
        }
-       goto st852;
-tr2325:
+       goto st879;
+tr2362:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->line_counter++;
        }
-       goto st852;
-st852:
+       goto st879;
+st879:
        if ( ++p == pe )
-               goto _test_eof852;
-case 852:
+               goto _test_eof879;
+case 879:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -63923,17 +64524,17 @@ case 852:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st852;
-               case 32: goto st852;
-               case 40: goto tr2329;
-               case 41: goto tr2330;
-               case 2058: goto tr2332;
-               case 2107: goto tr2333;
+               case 9: goto st879;
+               case 32: goto st879;
+               case 40: goto tr2366;
+               case 41: goto tr2367;
+               case 2058: goto tr2369;
+               case 2107: goto tr2370;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2331;
-       goto tr2327;
-tr2331:
+               goto tr2368;
+       goto tr2364;
+tr2368:
        {
                s->number64 = 0;
        }
@@ -63951,8 +64552,8 @@ tr2331:
                        p--; {goto st307;}
                }
        }
-       goto st853;
-tr2337:
+       goto st880;
+tr2374:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -63967,11 +64568,11 @@ tr2337:
                        p--; {goto st307;}
                }
        }
-       goto st853;
-st853:
+       goto st880;
+st880:
        if ( ++p == pe )
-               goto _test_eof853;
-case 853:
+               goto _test_eof880;
+case 880:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -63985,17 +64586,17 @@ case 853:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2334;
-               case 32: goto tr2334;
-               case 40: goto tr2335;
-               case 41: goto tr2336;
-               case 2058: goto tr2338;
-               case 2107: goto tr2339;
+               case 9: goto tr2371;
+               case 32: goto tr2371;
+               case 40: goto tr2372;
+               case 41: goto tr2373;
+               case 2058: goto tr2375;
+               case 2107: goto tr2376;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2337;
-       goto tr2327;
-tr2341:
+               goto tr2374;
+       goto tr2364;
+tr2378:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -64003,8 +64604,8 @@ tr2341:
                }
                s->multiline = true;
        }
-       goto st854;
-tr2342:
+       goto st881;
+tr2379:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -64012,13 +64613,13 @@ tr2342:
                }
                s->multiline = false;
        }
-       goto st854;
-tr2344:
+       goto st881;
+tr2381:
        {
                s->line_counter++;
        }
-       goto st854;
-tr2460:
+       goto st881;
+tr2497:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -64028,15 +64629,15 @@ tr2460:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 854; goto _out;}
+                               {p++; cs = 881; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st854;
-tr2334:
+       goto st881;
+tr2371:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64047,8 +64648,8 @@ tr2334:
                        p--; {goto st307;}
                }
        }
-       goto st854;
-tr2335:
+       goto st881;
+tr2372:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64066,8 +64667,8 @@ tr2335:
                }
                s->multiline = true;
        }
-       goto st854;
-tr2336:
+       goto st881;
+tr2373:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64085,8 +64686,8 @@ tr2336:
                }
                s->multiline = false;
        }
-       goto st854;
-tr2338:
+       goto st881;
+tr2375:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64100,11 +64701,11 @@ tr2338:
        {
                s->line_counter++;
        }
-       goto st854;
-st854:
+       goto st881;
+st881:
        if ( ++p == pe )
-               goto _test_eof854;
-case 854:
+               goto _test_eof881;
+case 881:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -64118,17 +64719,17 @@ case 854:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st854;
-               case 32: goto st854;
-               case 40: goto tr2341;
-               case 41: goto tr2342;
-               case 2058: goto tr2344;
-               case 2107: goto tr2345;
+               case 9: goto st881;
+               case 32: goto st881;
+               case 40: goto tr2378;
+               case 41: goto tr2379;
+               case 2058: goto tr2381;
+               case 2107: goto tr2382;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2343;
-       goto tr2327;
-tr2343:
+               goto tr2380;
+       goto tr2364;
+tr2380:
        {
                s->number64 = 0;
        }
@@ -64146,8 +64747,8 @@ tr2343:
                        p--; {goto st307;}
                }
        }
-       goto st855;
-tr2350:
+       goto st882;
+tr2387:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -64162,11 +64763,11 @@ tr2350:
                        p--; {goto st307;}
                }
        }
-       goto st855;
-st855:
+       goto st882;
+st882:
        if ( ++p == pe )
-               goto _test_eof855;
-case 855:
+               goto _test_eof882;
+case 882:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -64180,27 +64781,27 @@ case 855:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2347;
-               case 32: goto tr2347;
-               case 40: goto tr2348;
-               case 41: goto tr2349;
-               case 68: goto tr2351;
-               case 72: goto tr2352;
-               case 77: goto tr2353;
-               case 83: goto st874;
-               case 87: goto tr2355;
-               case 100: goto tr2351;
-               case 104: goto tr2352;
-               case 109: goto tr2353;
-               case 115: goto st874;
-               case 119: goto tr2355;
-               case 2058: goto tr2356;
-               case 2107: goto tr2357;
+               case 9: goto tr2384;
+               case 32: goto tr2384;
+               case 40: goto tr2385;
+               case 41: goto tr2386;
+               case 68: goto tr2388;
+               case 72: goto tr2389;
+               case 77: goto tr2390;
+               case 83: goto st901;
+               case 87: goto tr2392;
+               case 100: goto tr2388;
+               case 104: goto tr2389;
+               case 109: goto tr2390;
+               case 115: goto st901;
+               case 119: goto tr2392;
+               case 2058: goto tr2393;
+               case 2107: goto tr2394;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2350;
-       goto tr2346;
-tr2359:
+               goto tr2387;
+       goto tr2383;
+tr2396:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -64208,8 +64809,8 @@ tr2359:
                }
                s->multiline = true;
        }
-       goto st856;
-tr2360:
+       goto st883;
+tr2397:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -64217,13 +64818,13 @@ tr2360:
                }
                s->multiline = false;
        }
-       goto st856;
-tr2362:
+       goto st883;
+tr2399:
        {
                s->line_counter++;
        }
-       goto st856;
-tr2445:
+       goto st883;
+tr2482:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -64233,15 +64834,15 @@ tr2445:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 856; goto _out;}
+                               {p++; cs = 883; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st856;
-tr2347:
+       goto st883;
+tr2384:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64252,8 +64853,8 @@ tr2347:
                        p--; {goto st307;}
                }
        }
-       goto st856;
-tr2348:
+       goto st883;
+tr2385:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64271,8 +64872,8 @@ tr2348:
                }
                s->multiline = true;
        }
-       goto st856;
-tr2349:
+       goto st883;
+tr2386:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64290,8 +64891,8 @@ tr2349:
                }
                s->multiline = false;
        }
-       goto st856;
-tr2356:
+       goto st883;
+tr2393:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64305,8 +64906,8 @@ tr2356:
        {
                s->line_counter++;
        }
-       goto st856;
-tr2453:
+       goto st883;
+tr2490:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64325,8 +64926,8 @@ tr2453:
                        p--; {goto st307;}
                }
        }
-       goto st856;
-tr2454:
+       goto st883;
+tr2491:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64352,8 +64953,8 @@ tr2454:
                }
                s->multiline = true;
        }
-       goto st856;
-tr2455:
+       goto st883;
+tr2492:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64379,8 +64980,8 @@ tr2455:
                }
                s->multiline = false;
        }
-       goto st856;
-tr2457:
+       goto st883;
+tr2494:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64402,11 +65003,11 @@ tr2457:
        {
                s->line_counter++;
        }
-       goto st856;
-st856:
+       goto st883;
+st883:
        if ( ++p == pe )
-               goto _test_eof856;
-case 856:
+               goto _test_eof883;
+case 883:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -64420,17 +65021,17 @@ case 856:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st856;
-               case 32: goto st856;
-               case 40: goto tr2359;
-               case 41: goto tr2360;
-               case 2058: goto tr2362;
-               case 2107: goto tr2363;
+               case 9: goto st883;
+               case 32: goto st883;
+               case 40: goto tr2396;
+               case 41: goto tr2397;
+               case 2058: goto tr2399;
+               case 2107: goto tr2400;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2361;
-       goto tr2327;
-tr2361:
+               goto tr2398;
+       goto tr2364;
+tr2398:
        {
                s->number64 = 0;
        }
@@ -64448,8 +65049,8 @@ tr2361:
                        p--; {goto st307;}
                }
        }
-       goto st857;
-tr2367:
+       goto st884;
+tr2404:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -64464,11 +65065,11 @@ tr2367:
                        p--; {goto st307;}
                }
        }
-       goto st857;
-st857:
+       goto st884;
+st884:
        if ( ++p == pe )
-               goto _test_eof857;
-case 857:
+               goto _test_eof884;
+case 884:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -64482,27 +65083,27 @@ case 857:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2364;
-               case 32: goto tr2364;
-               case 40: goto tr2365;
-               case 41: goto tr2366;
-               case 68: goto tr2368;
-               case 72: goto tr2369;
-               case 77: goto tr2370;
-               case 83: goto st870;
-               case 87: goto tr2372;
-               case 100: goto tr2368;
-               case 104: goto tr2369;
-               case 109: goto tr2370;
-               case 115: goto st870;
-               case 119: goto tr2372;
-               case 2058: goto tr2373;
-               case 2107: goto tr2374;
+               case 9: goto tr2401;
+               case 32: goto tr2401;
+               case 40: goto tr2402;
+               case 41: goto tr2403;
+               case 68: goto tr2405;
+               case 72: goto tr2406;
+               case 77: goto tr2407;
+               case 83: goto st897;
+               case 87: goto tr2409;
+               case 100: goto tr2405;
+               case 104: goto tr2406;
+               case 109: goto tr2407;
+               case 115: goto st897;
+               case 119: goto tr2409;
+               case 2058: goto tr2410;
+               case 2107: goto tr2411;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2367;
-       goto tr2346;
-tr2376:
+               goto tr2404;
+       goto tr2383;
+tr2413:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -64510,8 +65111,8 @@ tr2376:
                }
                s->multiline = true;
        }
-       goto st858;
-tr2377:
+       goto st885;
+tr2414:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -64519,13 +65120,13 @@ tr2377:
                }
                s->multiline = false;
        }
-       goto st858;
-tr2379:
+       goto st885;
+tr2416:
        {
                s->line_counter++;
        }
-       goto st858;
-tr2430:
+       goto st885;
+tr2467:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -64535,15 +65136,15 @@ tr2430:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 858; goto _out;}
+                               {p++; cs = 885; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st858;
-tr2364:
+       goto st885;
+tr2401:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64554,8 +65155,8 @@ tr2364:
                        p--; {goto st307;}
                }
        }
-       goto st858;
-tr2365:
+       goto st885;
+tr2402:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64573,8 +65174,8 @@ tr2365:
                }
                s->multiline = true;
        }
-       goto st858;
-tr2366:
+       goto st885;
+tr2403:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64592,8 +65193,8 @@ tr2366:
                }
                s->multiline = false;
        }
-       goto st858;
-tr2373:
+       goto st885;
+tr2410:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64607,8 +65208,8 @@ tr2373:
        {
                s->line_counter++;
        }
-       goto st858;
-tr2438:
+       goto st885;
+tr2475:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64627,8 +65228,8 @@ tr2438:
                        p--; {goto st307;}
                }
        }
-       goto st858;
-tr2439:
+       goto st885;
+tr2476:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64654,8 +65255,8 @@ tr2439:
                }
                s->multiline = true;
        }
-       goto st858;
-tr2440:
+       goto st885;
+tr2477:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64681,8 +65282,8 @@ tr2440:
                }
                s->multiline = false;
        }
-       goto st858;
-tr2442:
+       goto st885;
+tr2479:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64704,11 +65305,11 @@ tr2442:
        {
                s->line_counter++;
        }
-       goto st858;
-st858:
+       goto st885;
+st885:
        if ( ++p == pe )
-               goto _test_eof858;
-case 858:
+               goto _test_eof885;
+case 885:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -64722,17 +65323,17 @@ case 858:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st858;
-               case 32: goto st858;
-               case 40: goto tr2376;
-               case 41: goto tr2377;
-               case 2058: goto tr2379;
-               case 2107: goto tr2380;
+               case 9: goto st885;
+               case 32: goto st885;
+               case 40: goto tr2413;
+               case 41: goto tr2414;
+               case 2058: goto tr2416;
+               case 2107: goto tr2417;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2378;
-       goto tr2327;
-tr2378:
+               goto tr2415;
+       goto tr2364;
+tr2415:
        {
                s->number64 = 0;
        }
@@ -64750,8 +65351,8 @@ tr2378:
                        p--; {goto st307;}
                }
        }
-       goto st859;
-tr2384:
+       goto st886;
+tr2421:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -64766,11 +65367,11 @@ tr2384:
                        p--; {goto st307;}
                }
        }
-       goto st859;
-st859:
+       goto st886;
+st886:
        if ( ++p == pe )
-               goto _test_eof859;
-case 859:
+               goto _test_eof886;
+case 886:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -64784,27 +65385,27 @@ case 859:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2381;
-               case 32: goto tr2381;
-               case 40: goto tr2382;
-               case 41: goto tr2383;
-               case 68: goto tr2385;
-               case 72: goto tr2386;
-               case 77: goto tr2387;
-               case 83: goto st866;
-               case 87: goto tr2389;
-               case 100: goto tr2385;
-               case 104: goto tr2386;
-               case 109: goto tr2387;
-               case 115: goto st866;
-               case 119: goto tr2389;
-               case 2058: goto tr2390;
-               case 2107: goto tr2391;
+               case 9: goto tr2418;
+               case 32: goto tr2418;
+               case 40: goto tr2419;
+               case 41: goto tr2420;
+               case 68: goto tr2422;
+               case 72: goto tr2423;
+               case 77: goto tr2424;
+               case 83: goto st893;
+               case 87: goto tr2426;
+               case 100: goto tr2422;
+               case 104: goto tr2423;
+               case 109: goto tr2424;
+               case 115: goto st893;
+               case 119: goto tr2426;
+               case 2058: goto tr2427;
+               case 2107: goto tr2428;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2384;
-       goto tr2346;
-tr2393:
+               goto tr2421;
+       goto tr2383;
+tr2430:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -64812,8 +65413,8 @@ tr2393:
                }
                s->multiline = true;
        }
-       goto st860;
-tr2394:
+       goto st887;
+tr2431:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -64821,13 +65422,13 @@ tr2394:
                }
                s->multiline = false;
        }
-       goto st860;
-tr2396:
+       goto st887;
+tr2433:
        {
                s->line_counter++;
        }
-       goto st860;
-tr2415:
+       goto st887;
+tr2452:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -64837,15 +65438,15 @@ tr2415:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 860; goto _out;}
+                               {p++; cs = 887; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st860;
-tr2381:
+       goto st887;
+tr2418:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64856,8 +65457,8 @@ tr2381:
                        p--; {goto st307;}
                }
        }
-       goto st860;
-tr2382:
+       goto st887;
+tr2419:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64875,8 +65476,8 @@ tr2382:
                }
                s->multiline = true;
        }
-       goto st860;
-tr2383:
+       goto st887;
+tr2420:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64894,8 +65495,8 @@ tr2383:
                }
                s->multiline = false;
        }
-       goto st860;
-tr2390:
+       goto st887;
+tr2427:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -64909,8 +65510,8 @@ tr2390:
        {
                s->line_counter++;
        }
-       goto st860;
-tr2423:
+       goto st887;
+tr2460:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64929,8 +65530,8 @@ tr2423:
                        p--; {goto st307;}
                }
        }
-       goto st860;
-tr2424:
+       goto st887;
+tr2461:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64956,8 +65557,8 @@ tr2424:
                }
                s->multiline = true;
        }
-       goto st860;
-tr2425:
+       goto st887;
+tr2462:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -64983,8 +65584,8 @@ tr2425:
                }
                s->multiline = false;
        }
-       goto st860;
-tr2427:
+       goto st887;
+tr2464:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -65006,11 +65607,11 @@ tr2427:
        {
                s->line_counter++;
        }
-       goto st860;
-st860:
+       goto st887;
+st887:
        if ( ++p == pe )
-               goto _test_eof860;
-case 860:
+               goto _test_eof887;
+case 887:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -65024,17 +65625,17 @@ case 860:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st860;
-               case 32: goto st860;
-               case 40: goto tr2393;
-               case 41: goto tr2394;
-               case 2058: goto tr2396;
-               case 2107: goto tr2397;
+               case 9: goto st887;
+               case 32: goto st887;
+               case 40: goto tr2430;
+               case 41: goto tr2431;
+               case 2058: goto tr2433;
+               case 2107: goto tr2434;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2395;
-       goto tr2327;
-tr2395:
+               goto tr2432;
+       goto tr2364;
+tr2432:
        {
                s->number64 = 0;
        }
@@ -65052,8 +65653,8 @@ tr2395:
                        p--; {goto st307;}
                }
        }
-       goto st861;
-tr2399:
+       goto st888;
+tr2436:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -65068,35 +65669,35 @@ tr2399:
                        p--; {goto st307;}
                }
        }
-       goto st861;
-st861:
+       goto st888;
+st888:
        if ( ++p == pe )
-               goto _test_eof861;
-case 861:
+               goto _test_eof888;
+case 888:
        switch( (*p) ) {
-               case 32: goto tr2398;
-               case 59: goto tr2398;
-               case 68: goto tr2400;
-               case 72: goto tr2401;
-               case 77: goto tr2402;
-               case 83: goto st862;
-               case 87: goto tr2404;
-               case 100: goto tr2400;
-               case 104: goto tr2401;
-               case 109: goto tr2402;
-               case 115: goto st862;
-               case 119: goto tr2404;
+               case 32: goto tr2435;
+               case 59: goto tr2435;
+               case 68: goto tr2437;
+               case 72: goto tr2438;
+               case 77: goto tr2439;
+               case 83: goto st889;
+               case 87: goto tr2441;
+               case 100: goto tr2437;
+               case 104: goto tr2438;
+               case 109: goto tr2439;
+               case 115: goto st889;
+               case 119: goto tr2441;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr2398;
+                       goto tr2435;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr2399;
+                       goto tr2436;
        } else
-               goto tr2398;
-       goto tr2346;
-tr2398:
+               goto tr2435;
+       goto tr2383;
+tr2435:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -65110,8 +65711,8 @@ tr2398:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1437;
-tr2412:
+       goto st1464;
+tr2449:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -65133,13 +65734,13 @@ tr2412:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1437;
-st1437:
+       goto st1464;
+st1464:
        if ( ++p == pe )
-               goto _test_eof1437;
-case 1437:
+               goto _test_eof1464;
+case 1464:
        goto st0;
-tr2400:
+tr2437:
        { if (s->number64 <= (UINT32_MAX / 86400)) {
                          s->number64 *= 86400;
                      } else {
@@ -65147,8 +65748,8 @@ tr2400:
                          p--; {goto st307;}
                      }
                    }
-       goto st862;
-tr2401:
+       goto st889;
+tr2438:
        { if (s->number64 <= (UINT32_MAX / 3600)) {
                          s->number64 *= 3600;
                      } else {
@@ -65156,8 +65757,8 @@ tr2401:
                          p--; {goto st307;}
                      }
                    }
-       goto st862;
-tr2402:
+       goto st889;
+tr2439:
        { if (s->number64 <= (UINT32_MAX / 60)) {
                          s->number64 *= 60;
                      } else {
@@ -65165,8 +65766,8 @@ tr2402:
                          p--; {goto st307;}
                      }
                    }
-       goto st862;
-tr2404:
+       goto st889;
+tr2441:
        { if (s->number64 <= (UINT32_MAX / 604800)) {
                          s->number64 *= 604800;
                      } else {
@@ -65174,25 +65775,25 @@ tr2404:
                          p--; {goto st307;}
                      }
                    }
-       goto st862;
-st862:
+       goto st889;
+st889:
        if ( ++p == pe )
-               goto _test_eof862;
-case 862:
+               goto _test_eof889;
+case 889:
        switch( (*p) ) {
-               case 32: goto tr2398;
-               case 59: goto tr2398;
+               case 32: goto tr2435;
+               case 59: goto tr2435;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr2398;
+                       goto tr2435;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr2405;
+                       goto tr2442;
        } else
-               goto tr2398;
-       goto tr2346;
-tr2406:
+               goto tr2435;
+       goto tr2383;
+tr2443:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -65207,8 +65808,8 @@ tr2406:
                        p--; {goto st307;}
                }
        }
-       goto st863;
-tr2405:
+       goto st890;
+tr2442:
        {
                s->number64_tmp = s->number64;
        }
@@ -65229,8 +65830,8 @@ tr2405:
                        p--; {goto st307;}
                }
        }
-       goto st863;
-tr2413:
+       goto st890;
+tr2450:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -65259,27 +65860,27 @@ tr2413:
                        p--; {goto st307;}
                }
        }
-       goto st863;
-st863:
+       goto st890;
+st890:
        if ( ++p == pe )
-               goto _test_eof863;
-case 863:
+               goto _test_eof890;
+case 890:
        switch( (*p) ) {
-               case 68: goto tr2407;
-               case 72: goto tr2408;
-               case 77: goto tr2409;
-               case 83: goto st864;
-               case 87: goto tr2411;
-               case 100: goto tr2407;
-               case 104: goto tr2408;
-               case 109: goto tr2409;
-               case 115: goto st864;
-               case 119: goto tr2411;
+               case 68: goto tr2444;
+               case 72: goto tr2445;
+               case 77: goto tr2446;
+               case 83: goto st891;
+               case 87: goto tr2448;
+               case 100: goto tr2444;
+               case 104: goto tr2445;
+               case 109: goto tr2446;
+               case 115: goto st891;
+               case 119: goto tr2448;
        }
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2406;
-       goto tr2346;
-tr2407:
+               goto tr2443;
+       goto tr2383;
+tr2444:
        { if (s->number64 <= (UINT32_MAX / 86400)) {
                          s->number64 *= 86400;
                      } else {
@@ -65287,8 +65888,8 @@ tr2407:
                          p--; {goto st307;}
                      }
                    }
-       goto st864;
-tr2408:
+       goto st891;
+tr2445:
        { if (s->number64 <= (UINT32_MAX / 3600)) {
                          s->number64 *= 3600;
                      } else {
@@ -65296,8 +65897,8 @@ tr2408:
                          p--; {goto st307;}
                      }
                    }
-       goto st864;
-tr2409:
+       goto st891;
+tr2446:
        { if (s->number64 <= (UINT32_MAX / 60)) {
                          s->number64 *= 60;
                      } else {
@@ -65305,8 +65906,8 @@ tr2409:
                          p--; {goto st307;}
                      }
                    }
-       goto st864;
-tr2411:
+       goto st891;
+tr2448:
        { if (s->number64 <= (UINT32_MAX / 604800)) {
                          s->number64 *= 604800;
                      } else {
@@ -65314,37 +65915,37 @@ tr2411:
                          p--; {goto st307;}
                      }
                    }
-       goto st864;
-st864:
+       goto st891;
+st891:
        if ( ++p == pe )
-               goto _test_eof864;
-case 864:
+               goto _test_eof891;
+case 891:
        switch( (*p) ) {
-               case 32: goto tr2412;
-               case 59: goto tr2412;
+               case 32: goto tr2449;
+               case 59: goto tr2449;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr2412;
+                       goto tr2449;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr2413;
+                       goto tr2450;
        } else
-               goto tr2412;
-       goto tr2346;
-tr2397:
+               goto tr2449;
+       goto tr2383;
+tr2434:
        {
                s->buffer_length = 0;
        }
-       goto st865;
-tr2414:
+       goto st892;
+tr2451:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st865;
-tr2391:
+       goto st892;
+tr2428:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -65358,8 +65959,8 @@ tr2391:
        {
                s->buffer_length = 0;
        }
-       goto st865;
-tr2428:
+       goto st892;
+tr2465:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -65381,11 +65982,11 @@ tr2428:
        {
                s->buffer_length = 0;
        }
-       goto st865;
-st865:
+       goto st892;
+st892:
        if ( ++p == pe )
-               goto _test_eof865;
-case 865:
+               goto _test_eof892;
+case 892:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -65405,11 +66006,11 @@ case 865:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2415;
+               goto tr2452;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2414;
+               goto tr2451;
        goto tr75;
-tr2385:
+tr2422:
        { if (s->number64 <= (UINT32_MAX / 86400)) {
                          s->number64 *= 86400;
                      } else {
@@ -65417,8 +66018,8 @@ tr2385:
                          p--; {goto st307;}
                      }
                    }
-       goto st866;
-tr2386:
+       goto st893;
+tr2423:
        { if (s->number64 <= (UINT32_MAX / 3600)) {
                          s->number64 *= 3600;
                      } else {
@@ -65426,8 +66027,8 @@ tr2386:
                          p--; {goto st307;}
                      }
                    }
-       goto st866;
-tr2387:
+       goto st893;
+tr2424:
        { if (s->number64 <= (UINT32_MAX / 60)) {
                          s->number64 *= 60;
                      } else {
@@ -65435,8 +66036,8 @@ tr2387:
                          p--; {goto st307;}
                      }
                    }
-       goto st866;
-tr2389:
+       goto st893;
+tr2426:
        { if (s->number64 <= (UINT32_MAX / 604800)) {
                          s->number64 *= 604800;
                      } else {
@@ -65444,11 +66045,11 @@ tr2389:
                          p--; {goto st307;}
                      }
                    }
-       goto st866;
-st866:
+       goto st893;
+st893:
        if ( ++p == pe )
-               goto _test_eof866;
-case 866:
+               goto _test_eof893;
+case 893:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -65462,17 +66063,17 @@ case 866:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2381;
-               case 32: goto tr2381;
-               case 40: goto tr2382;
-               case 41: goto tr2383;
-               case 2058: goto tr2390;
-               case 2107: goto tr2391;
+               case 9: goto tr2418;
+               case 32: goto tr2418;
+               case 40: goto tr2419;
+               case 41: goto tr2420;
+               case 2058: goto tr2427;
+               case 2107: goto tr2428;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2416;
-       goto tr2346;
-tr2417:
+               goto tr2453;
+       goto tr2383;
+tr2454:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -65487,8 +66088,8 @@ tr2417:
                        p--; {goto st307;}
                }
        }
-       goto st867;
-tr2416:
+       goto st894;
+tr2453:
        {
                s->number64_tmp = s->number64;
        }
@@ -65509,8 +66110,8 @@ tr2416:
                        p--; {goto st307;}
                }
        }
-       goto st867;
-tr2426:
+       goto st894;
+tr2463:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -65539,27 +66140,27 @@ tr2426:
                        p--; {goto st307;}
                }
        }
-       goto st867;
-st867:
+       goto st894;
+st894:
        if ( ++p == pe )
-               goto _test_eof867;
-case 867:
+               goto _test_eof894;
+case 894:
        switch( (*p) ) {
-               case 68: goto tr2418;
-               case 72: goto tr2419;
-               case 77: goto tr2420;
-               case 83: goto st868;
-               case 87: goto tr2422;
-               case 100: goto tr2418;
-               case 104: goto tr2419;
-               case 109: goto tr2420;
-               case 115: goto st868;
-               case 119: goto tr2422;
+               case 68: goto tr2455;
+               case 72: goto tr2456;
+               case 77: goto tr2457;
+               case 83: goto st895;
+               case 87: goto tr2459;
+               case 100: goto tr2455;
+               case 104: goto tr2456;
+               case 109: goto tr2457;
+               case 115: goto st895;
+               case 119: goto tr2459;
        }
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2417;
-       goto tr2346;
-tr2418:
+               goto tr2454;
+       goto tr2383;
+tr2455:
        { if (s->number64 <= (UINT32_MAX / 86400)) {
                          s->number64 *= 86400;
                      } else {
@@ -65567,8 +66168,8 @@ tr2418:
                          p--; {goto st307;}
                      }
                    }
-       goto st868;
-tr2419:
+       goto st895;
+tr2456:
        { if (s->number64 <= (UINT32_MAX / 3600)) {
                          s->number64 *= 3600;
                      } else {
@@ -65576,8 +66177,8 @@ tr2419:
                          p--; {goto st307;}
                      }
                    }
-       goto st868;
-tr2420:
+       goto st895;
+tr2457:
        { if (s->number64 <= (UINT32_MAX / 60)) {
                          s->number64 *= 60;
                      } else {
@@ -65585,8 +66186,8 @@ tr2420:
                          p--; {goto st307;}
                      }
                    }
-       goto st868;
-tr2422:
+       goto st895;
+tr2459:
        { if (s->number64 <= (UINT32_MAX / 604800)) {
                          s->number64 *= 604800;
                      } else {
@@ -65594,11 +66195,11 @@ tr2422:
                          p--; {goto st307;}
                      }
                    }
-       goto st868;
-st868:
+       goto st895;
+st895:
        if ( ++p == pe )
-               goto _test_eof868;
-case 868:
+               goto _test_eof895;
+case 895:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -65612,29 +66213,29 @@ case 868:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2423;
-               case 32: goto tr2423;
-               case 40: goto tr2424;
-               case 41: goto tr2425;
-               case 2058: goto tr2427;
-               case 2107: goto tr2428;
+               case 9: goto tr2460;
+               case 32: goto tr2460;
+               case 40: goto tr2461;
+               case 41: goto tr2462;
+               case 2058: goto tr2464;
+               case 2107: goto tr2465;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2426;
-       goto tr2346;
-tr2380:
+               goto tr2463;
+       goto tr2383;
+tr2417:
        {
                s->buffer_length = 0;
        }
-       goto st869;
-tr2429:
+       goto st896;
+tr2466:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st869;
-tr2374:
+       goto st896;
+tr2411:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -65648,8 +66249,8 @@ tr2374:
        {
                s->buffer_length = 0;
        }
-       goto st869;
-tr2443:
+       goto st896;
+tr2480:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -65671,11 +66272,11 @@ tr2443:
        {
                s->buffer_length = 0;
        }
-       goto st869;
-st869:
+       goto st896;
+st896:
        if ( ++p == pe )
-               goto _test_eof869;
-case 869:
+               goto _test_eof896;
+case 896:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -65695,11 +66296,11 @@ case 869:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2430;
+               goto tr2467;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2429;
+               goto tr2466;
        goto tr75;
-tr2368:
+tr2405:
        { if (s->number64 <= (UINT32_MAX / 86400)) {
                          s->number64 *= 86400;
                      } else {
@@ -65707,8 +66308,8 @@ tr2368:
                          p--; {goto st307;}
                      }
                    }
-       goto st870;
-tr2369:
+       goto st897;
+tr2406:
        { if (s->number64 <= (UINT32_MAX / 3600)) {
                          s->number64 *= 3600;
                      } else {
@@ -65716,8 +66317,8 @@ tr2369:
                          p--; {goto st307;}
                      }
                    }
-       goto st870;
-tr2370:
+       goto st897;
+tr2407:
        { if (s->number64 <= (UINT32_MAX / 60)) {
                          s->number64 *= 60;
                      } else {
@@ -65725,8 +66326,8 @@ tr2370:
                          p--; {goto st307;}
                      }
                    }
-       goto st870;
-tr2372:
+       goto st897;
+tr2409:
        { if (s->number64 <= (UINT32_MAX / 604800)) {
                          s->number64 *= 604800;
                      } else {
@@ -65734,11 +66335,11 @@ tr2372:
                          p--; {goto st307;}
                      }
                    }
-       goto st870;
-st870:
+       goto st897;
+st897:
        if ( ++p == pe )
-               goto _test_eof870;
-case 870:
+               goto _test_eof897;
+case 897:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -65752,17 +66353,17 @@ case 870:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2364;
-               case 32: goto tr2364;
-               case 40: goto tr2365;
-               case 41: goto tr2366;
-               case 2058: goto tr2373;
-               case 2107: goto tr2374;
+               case 9: goto tr2401;
+               case 32: goto tr2401;
+               case 40: goto tr2402;
+               case 41: goto tr2403;
+               case 2058: goto tr2410;
+               case 2107: goto tr2411;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2431;
-       goto tr2346;
-tr2432:
+               goto tr2468;
+       goto tr2383;
+tr2469:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -65777,8 +66378,8 @@ tr2432:
                        p--; {goto st307;}
                }
        }
-       goto st871;
-tr2431:
+       goto st898;
+tr2468:
        {
                s->number64_tmp = s->number64;
        }
@@ -65799,8 +66400,8 @@ tr2431:
                        p--; {goto st307;}
                }
        }
-       goto st871;
-tr2441:
+       goto st898;
+tr2478:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -65829,27 +66430,27 @@ tr2441:
                        p--; {goto st307;}
                }
        }
-       goto st871;
-st871:
+       goto st898;
+st898:
        if ( ++p == pe )
-               goto _test_eof871;
-case 871:
+               goto _test_eof898;
+case 898:
        switch( (*p) ) {
-               case 68: goto tr2433;
-               case 72: goto tr2434;
-               case 77: goto tr2435;
-               case 83: goto st872;
-               case 87: goto tr2437;
-               case 100: goto tr2433;
-               case 104: goto tr2434;
-               case 109: goto tr2435;
-               case 115: goto st872;
-               case 119: goto tr2437;
+               case 68: goto tr2470;
+               case 72: goto tr2471;
+               case 77: goto tr2472;
+               case 83: goto st899;
+               case 87: goto tr2474;
+               case 100: goto tr2470;
+               case 104: goto tr2471;
+               case 109: goto tr2472;
+               case 115: goto st899;
+               case 119: goto tr2474;
        }
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2432;
-       goto tr2346;
-tr2433:
+               goto tr2469;
+       goto tr2383;
+tr2470:
        { if (s->number64 <= (UINT32_MAX / 86400)) {
                          s->number64 *= 86400;
                      } else {
@@ -65857,8 +66458,8 @@ tr2433:
                          p--; {goto st307;}
                      }
                    }
-       goto st872;
-tr2434:
+       goto st899;
+tr2471:
        { if (s->number64 <= (UINT32_MAX / 3600)) {
                          s->number64 *= 3600;
                      } else {
@@ -65866,8 +66467,8 @@ tr2434:
                          p--; {goto st307;}
                      }
                    }
-       goto st872;
-tr2435:
+       goto st899;
+tr2472:
        { if (s->number64 <= (UINT32_MAX / 60)) {
                          s->number64 *= 60;
                      } else {
@@ -65875,8 +66476,8 @@ tr2435:
                          p--; {goto st307;}
                      }
                    }
-       goto st872;
-tr2437:
+       goto st899;
+tr2474:
        { if (s->number64 <= (UINT32_MAX / 604800)) {
                          s->number64 *= 604800;
                      } else {
@@ -65884,11 +66485,11 @@ tr2437:
                          p--; {goto st307;}
                      }
                    }
-       goto st872;
-st872:
+       goto st899;
+st899:
        if ( ++p == pe )
-               goto _test_eof872;
-case 872:
+               goto _test_eof899;
+case 899:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -65902,29 +66503,29 @@ case 872:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2438;
-               case 32: goto tr2438;
-               case 40: goto tr2439;
-               case 41: goto tr2440;
-               case 2058: goto tr2442;
-               case 2107: goto tr2443;
+               case 9: goto tr2475;
+               case 32: goto tr2475;
+               case 40: goto tr2476;
+               case 41: goto tr2477;
+               case 2058: goto tr2479;
+               case 2107: goto tr2480;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2441;
-       goto tr2346;
-tr2363:
+               goto tr2478;
+       goto tr2383;
+tr2400:
        {
                s->buffer_length = 0;
        }
-       goto st873;
-tr2444:
+       goto st900;
+tr2481:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st873;
-tr2357:
+       goto st900;
+tr2394:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -65938,8 +66539,8 @@ tr2357:
        {
                s->buffer_length = 0;
        }
-       goto st873;
-tr2458:
+       goto st900;
+tr2495:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -65961,11 +66562,11 @@ tr2458:
        {
                s->buffer_length = 0;
        }
-       goto st873;
-st873:
+       goto st900;
+st900:
        if ( ++p == pe )
-               goto _test_eof873;
-case 873:
+               goto _test_eof900;
+case 900:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -65985,11 +66586,11 @@ case 873:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2445;
+               goto tr2482;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2444;
+               goto tr2481;
        goto tr75;
-tr2351:
+tr2388:
        { if (s->number64 <= (UINT32_MAX / 86400)) {
                          s->number64 *= 86400;
                      } else {
@@ -65997,8 +66598,8 @@ tr2351:
                          p--; {goto st307;}
                      }
                    }
-       goto st874;
-tr2352:
+       goto st901;
+tr2389:
        { if (s->number64 <= (UINT32_MAX / 3600)) {
                          s->number64 *= 3600;
                      } else {
@@ -66006,8 +66607,8 @@ tr2352:
                          p--; {goto st307;}
                      }
                    }
-       goto st874;
-tr2353:
+       goto st901;
+tr2390:
        { if (s->number64 <= (UINT32_MAX / 60)) {
                          s->number64 *= 60;
                      } else {
@@ -66015,8 +66616,8 @@ tr2353:
                          p--; {goto st307;}
                      }
                    }
-       goto st874;
-tr2355:
+       goto st901;
+tr2392:
        { if (s->number64 <= (UINT32_MAX / 604800)) {
                          s->number64 *= 604800;
                      } else {
@@ -66024,11 +66625,11 @@ tr2355:
                          p--; {goto st307;}
                      }
                    }
-       goto st874;
-st874:
+       goto st901;
+st901:
        if ( ++p == pe )
-               goto _test_eof874;
-case 874:
+               goto _test_eof901;
+case 901:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -66042,17 +66643,17 @@ case 874:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2347;
-               case 32: goto tr2347;
-               case 40: goto tr2348;
-               case 41: goto tr2349;
-               case 2058: goto tr2356;
-               case 2107: goto tr2357;
+               case 9: goto tr2384;
+               case 32: goto tr2384;
+               case 40: goto tr2385;
+               case 41: goto tr2386;
+               case 2058: goto tr2393;
+               case 2107: goto tr2394;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2446;
-       goto tr2346;
-tr2447:
+               goto tr2483;
+       goto tr2383;
+tr2484:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -66067,8 +66668,8 @@ tr2447:
                        p--; {goto st307;}
                }
        }
-       goto st875;
-tr2446:
+       goto st902;
+tr2483:
        {
                s->number64_tmp = s->number64;
        }
@@ -66089,8 +66690,8 @@ tr2446:
                        p--; {goto st307;}
                }
        }
-       goto st875;
-tr2456:
+       goto st902;
+tr2493:
        {
                if (s->number64 + s->number64_tmp < UINT32_MAX) {
                        s->number64 += s->number64_tmp;
@@ -66119,27 +66720,27 @@ tr2456:
                        p--; {goto st307;}
                }
        }
-       goto st875;
-st875:
+       goto st902;
+st902:
        if ( ++p == pe )
-               goto _test_eof875;
-case 875:
+               goto _test_eof902;
+case 902:
        switch( (*p) ) {
-               case 68: goto tr2448;
-               case 72: goto tr2449;
-               case 77: goto tr2450;
-               case 83: goto st876;
-               case 87: goto tr2452;
-               case 100: goto tr2448;
-               case 104: goto tr2449;
-               case 109: goto tr2450;
-               case 115: goto st876;
-               case 119: goto tr2452;
+               case 68: goto tr2485;
+               case 72: goto tr2486;
+               case 77: goto tr2487;
+               case 83: goto st903;
+               case 87: goto tr2489;
+               case 100: goto tr2485;
+               case 104: goto tr2486;
+               case 109: goto tr2487;
+               case 115: goto st903;
+               case 119: goto tr2489;
        }
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2447;
-       goto tr2346;
-tr2448:
+               goto tr2484;
+       goto tr2383;
+tr2485:
        { if (s->number64 <= (UINT32_MAX / 86400)) {
                          s->number64 *= 86400;
                      } else {
@@ -66147,8 +66748,8 @@ tr2448:
                          p--; {goto st307;}
                      }
                    }
-       goto st876;
-tr2449:
+       goto st903;
+tr2486:
        { if (s->number64 <= (UINT32_MAX / 3600)) {
                          s->number64 *= 3600;
                      } else {
@@ -66156,8 +66757,8 @@ tr2449:
                          p--; {goto st307;}
                      }
                    }
-       goto st876;
-tr2450:
+       goto st903;
+tr2487:
        { if (s->number64 <= (UINT32_MAX / 60)) {
                          s->number64 *= 60;
                      } else {
@@ -66165,8 +66766,8 @@ tr2450:
                          p--; {goto st307;}
                      }
                    }
-       goto st876;
-tr2452:
+       goto st903;
+tr2489:
        { if (s->number64 <= (UINT32_MAX / 604800)) {
                          s->number64 *= 604800;
                      } else {
@@ -66174,11 +66775,11 @@ tr2452:
                          p--; {goto st307;}
                      }
                    }
-       goto st876;
-st876:
+       goto st903;
+st903:
        if ( ++p == pe )
-               goto _test_eof876;
-case 876:
+               goto _test_eof903;
+case 903:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -66192,29 +66793,29 @@ case 876:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2453;
-               case 32: goto tr2453;
-               case 40: goto tr2454;
-               case 41: goto tr2455;
-               case 2058: goto tr2457;
-               case 2107: goto tr2458;
+               case 9: goto tr2490;
+               case 32: goto tr2490;
+               case 40: goto tr2491;
+               case 41: goto tr2492;
+               case 2058: goto tr2494;
+               case 2107: goto tr2495;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2456;
-       goto tr2346;
-tr2345:
+               goto tr2493;
+       goto tr2383;
+tr2382:
        {
                s->buffer_length = 0;
        }
-       goto st877;
-tr2459:
+       goto st904;
+tr2496:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st877;
-tr2339:
+       goto st904;
+tr2376:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -66228,11 +66829,11 @@ tr2339:
        {
                s->buffer_length = 0;
        }
-       goto st877;
-st877:
+       goto st904;
+st904:
        if ( ++p == pe )
-               goto _test_eof877;
-case 877:
+               goto _test_eof904;
+case 904:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -66252,34 +66853,34 @@ case 877:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2460;
+               goto tr2497;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2459;
+               goto tr2496;
        goto tr75;
-tr2333:
+tr2370:
        {
                s->buffer_length = 0;
        }
-       goto st878;
-tr2461:
+       goto st905;
+tr2498:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st878;
-tr2326:
+       goto st905;
+tr2363:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->buffer_length = 0;
        }
-       goto st878;
-st878:
+       goto st905;
+st905:
        if ( ++p == pe )
-               goto _test_eof878;
-case 878:
+               goto _test_eof905;
+case 905:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -66299,34 +66900,34 @@ case 878:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2462;
+               goto tr2499;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2461;
+               goto tr2498;
        goto tr75;
-tr2321:
+tr2358:
        {
                s->buffer_length = 0;
        }
-       goto st879;
-tr2463:
+       goto st906;
+tr2500:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st879;
-tr2315:
+       goto st906;
+tr2352:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->buffer_length = 0;
        }
-       goto st879;
-st879:
+       goto st906;
+st906:
        if ( ++p == pe )
-               goto _test_eof879;
-case 879:
+               goto _test_eof906;
+case 906:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -66346,14 +66947,14 @@ case 879:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2464;
+               goto tr2501;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2463;
+               goto tr2500;
        goto tr75;
-st880:
+st907:
        if ( ++p == pe )
-               goto _test_eof880;
-case 880:
+               goto _test_eof907;
+case 907:
        switch( (*p) ) {
                case 32: goto tr75;
                case 59: goto tr75;
@@ -66363,8 +66964,8 @@ case 880:
                        goto tr75;
        } else if ( (*p) >= 9 )
                goto tr75;
-       goto tr2465;
-tr2465:
+       goto tr2502;
+tr2502:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -66373,12 +66974,12 @@ tr2465:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 881;goto st318;} }
-       goto st881;
-st881:
+       { p--; {stack[top++] = 908;goto st318;} }
+       goto st908;
+st908:
        if ( ++p == pe )
-               goto _test_eof881;
-case 881:
+               goto _test_eof908;
+case 908:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -66392,15 +66993,15 @@ case 881:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2466;
-               case 32: goto tr2466;
-               case 40: goto tr2467;
-               case 41: goto tr2468;
-               case 2058: goto tr2469;
-               case 2107: goto tr2470;
+               case 9: goto tr2503;
+               case 32: goto tr2503;
+               case 40: goto tr2504;
+               case 41: goto tr2505;
+               case 2058: goto tr2506;
+               case 2107: goto tr2507;
        }
        goto tr75;
-tr2473:
+tr2510:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -66408,8 +67009,8 @@ tr2473:
                }
                s->multiline = true;
        }
-       goto st882;
-tr2474:
+       goto st909;
+tr2511:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -66417,13 +67018,13 @@ tr2474:
                }
                s->multiline = false;
        }
-       goto st882;
-tr2475:
+       goto st909;
+tr2512:
        {
                s->line_counter++;
        }
-       goto st882;
-tr2479:
+       goto st909;
+tr2516:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -66433,15 +67034,15 @@ tr2479:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 882; goto _out;}
+                               {p++; cs = 909; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st882;
-tr2466:
+       goto st909;
+tr2503:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -66455,8 +67056,8 @@ tr2466:
                        p--; {goto st307;}
                }
        }
-       goto st882;
-tr2467:
+       goto st909;
+tr2504:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -66477,8 +67078,8 @@ tr2467:
                }
                s->multiline = true;
        }
-       goto st882;
-tr2468:
+       goto st909;
+tr2505:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -66499,8 +67100,8 @@ tr2468:
                }
                s->multiline = false;
        }
-       goto st882;
-tr2469:
+       goto st909;
+tr2506:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -66517,11 +67118,11 @@ tr2469:
        {
                s->line_counter++;
        }
-       goto st882;
-st882:
+       goto st909;
+st909:
        if ( ++p == pe )
-               goto _test_eof882;
-case 882:
+               goto _test_eof909;
+case 909:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -66535,23 +67136,23 @@ case 882:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st882;
-               case 32: goto st882;
-               case 40: goto tr2473;
-               case 41: goto tr2474;
-               case 2058: goto tr2475;
-               case 2107: goto tr2476;
+               case 9: goto st909;
+               case 32: goto st909;
+               case 40: goto tr2510;
+               case 41: goto tr2511;
+               case 2058: goto tr2512;
+               case 2107: goto tr2513;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr2471;
+                       goto tr2508;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr2471;
+                       goto tr2508;
        } else
-               goto tr2471;
+               goto tr2508;
        goto tr75;
-tr2471:
+tr2508:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -66560,23 +67161,23 @@ tr2471:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 883;goto st318;} }
-       goto st883;
-st883:
+       { p--; {stack[top++] = 910;goto st318;} }
+       goto st910;
+st910:
        if ( ++p == pe )
-               goto _test_eof883;
-case 883:
+               goto _test_eof910;
+case 910:
        switch( (*p) ) {
-               case 32: goto tr2477;
-               case 59: goto tr2477;
+               case 32: goto tr2514;
+               case 59: goto tr2514;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2477;
+                       goto tr2514;
        } else if ( (*p) >= 9 )
-               goto tr2477;
+               goto tr2514;
        goto tr75;
-tr2477:
+tr2514:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -66593,25 +67194,25 @@ tr2477:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1438;
-st1438:
+       goto st1465;
+st1465:
        if ( ++p == pe )
-               goto _test_eof1438;
-case 1438:
+               goto _test_eof1465;
+case 1465:
        goto st0;
-tr2476:
+tr2513:
        {
                s->buffer_length = 0;
        }
-       goto st884;
-tr2478:
+       goto st911;
+tr2515:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st884;
-tr2470:
+       goto st911;
+tr2507:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -66628,11 +67229,11 @@ tr2470:
        {
                s->buffer_length = 0;
        }
-       goto st884;
-st884:
+       goto st911;
+st911:
        if ( ++p == pe )
-               goto _test_eof884;
-case 884:
+               goto _test_eof911;
+case 911:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -66652,38 +67253,38 @@ case 884:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2479;
+               goto tr2516;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2478;
+               goto tr2515;
        goto tr75;
-st885:
+st912:
        if ( ++p == pe )
-               goto _test_eof885;
-case 885:
+               goto _test_eof912;
+case 912:
        switch( (*p) ) {
-               case 42: goto tr2480;
-               case 92: goto tr2480;
-               case 95: goto tr2480;
+               case 42: goto tr2517;
+               case 92: goto tr2517;
+               case 95: goto tr2517;
        }
        if ( (*p) < 64 ) {
                if ( 45 <= (*p) && (*p) <= 57 )
-                       goto tr2480;
+                       goto tr2517;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr2480;
+                       goto tr2517;
        } else
-               goto tr2480;
+               goto tr2517;
        goto tr75;
-tr2480:
+tr2517:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 886;goto st309;} }
-       goto st886;
-st886:
+       { p--; {stack[top++] = 913;goto st309;} }
+       goto st913;
+st913:
        if ( ++p == pe )
-               goto _test_eof886;
-case 886:
+               goto _test_eof913;
+case 913:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -66697,15 +67298,15 @@ case 886:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2481;
-               case 32: goto tr2481;
-               case 40: goto tr2482;
-               case 41: goto tr2483;
-               case 2058: goto tr2484;
-               case 2107: goto tr2485;
+               case 9: goto tr2518;
+               case 32: goto tr2518;
+               case 40: goto tr2519;
+               case 41: goto tr2520;
+               case 2058: goto tr2521;
+               case 2107: goto tr2522;
        }
        goto tr75;
-tr2487:
+tr2524:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -66713,8 +67314,8 @@ tr2487:
                }
                s->multiline = true;
        }
-       goto st887;
-tr2488:
+       goto st914;
+tr2525:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -66722,13 +67323,13 @@ tr2488:
                }
                s->multiline = false;
        }
-       goto st887;
-tr2490:
+       goto st914;
+tr2527:
        {
                s->line_counter++;
        }
-       goto st887;
-tr2494:
+       goto st914;
+tr2531:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -66738,20 +67339,20 @@ tr2494:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 887; goto _out;}
+                               {p++; cs = 914; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st887;
-tr2481:
+       goto st914;
+tr2518:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       goto st887;
-tr2482:
+       goto st914;
+tr2519:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -66762,8 +67363,8 @@ tr2482:
                }
                s->multiline = true;
        }
-       goto st887;
-tr2483:
+       goto st914;
+tr2520:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -66774,19 +67375,19 @@ tr2483:
                }
                s->multiline = false;
        }
-       goto st887;
-tr2484:
+       goto st914;
+tr2521:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->line_counter++;
        }
-       goto st887;
-st887:
+       goto st914;
+st914:
        if ( ++p == pe )
-               goto _test_eof887;
-case 887:
+               goto _test_eof914;
+case 914:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -66800,82 +67401,82 @@ case 887:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st887;
-               case 32: goto st887;
-               case 40: goto tr2487;
-               case 41: goto tr2488;
-               case 42: goto tr2489;
-               case 92: goto tr2489;
-               case 95: goto tr2489;
-               case 2058: goto tr2490;
-               case 2107: goto tr2491;
+               case 9: goto st914;
+               case 32: goto st914;
+               case 40: goto tr2524;
+               case 41: goto tr2525;
+               case 42: goto tr2526;
+               case 92: goto tr2526;
+               case 95: goto tr2526;
+               case 2058: goto tr2527;
+               case 2107: goto tr2528;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr2489;
+                       goto tr2526;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr2489;
+                       goto tr2526;
        } else
-               goto tr2489;
+               goto tr2526;
        goto tr75;
-tr2489:
+tr2526:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 888;goto st309;} }
-       goto st888;
-st888:
+       { p--; {stack[top++] = 915;goto st309;} }
+       goto st915;
+st915:
        if ( ++p == pe )
-               goto _test_eof888;
-case 888:
+               goto _test_eof915;
+case 915:
        switch( (*p) ) {
-               case 32: goto tr2492;
-               case 59: goto tr2492;
+               case 32: goto tr2529;
+               case 59: goto tr2529;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2492;
+                       goto tr2529;
        } else if ( (*p) >= 9 )
-               goto tr2492;
+               goto tr2529;
        goto tr75;
-tr2492:
+tr2529:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1439;
-st1439:
+       goto st1466;
+st1466:
        if ( ++p == pe )
-               goto _test_eof1439;
-case 1439:
+               goto _test_eof1466;
+case 1466:
        goto st0;
-tr2491:
+tr2528:
        {
                s->buffer_length = 0;
        }
-       goto st889;
-tr2493:
+       goto st916;
+tr2530:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st889;
-tr2485:
+       goto st916;
+tr2522:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->buffer_length = 0;
        }
-       goto st889;
-st889:
+       goto st916;
+st916:
        if ( ++p == pe )
-               goto _test_eof889;
-case 889:
+               goto _test_eof916;
+case 916:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -66895,18 +67496,18 @@ case 889:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2494;
+               goto tr2531;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2493;
+               goto tr2530;
        goto tr75;
-st890:
+st917:
        if ( ++p == pe )
-               goto _test_eof890;
-case 890:
+               goto _test_eof917;
+case 917:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2495;
-       goto tr2327;
-tr2495:
+               goto tr2532;
+       goto tr2364;
+tr2532:
        {
                s->number64 = 0;
        }
@@ -66924,8 +67525,8 @@ tr2495:
                        p--; {goto st307;}
                }
        }
-       goto st891;
-tr2499:
+       goto st918;
+tr2536:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -66940,11 +67541,11 @@ tr2499:
                        p--; {goto st307;}
                }
        }
-       goto st891;
-st891:
+       goto st918;
+st918:
        if ( ++p == pe )
-               goto _test_eof891;
-case 891:
+               goto _test_eof918;
+case 918:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -66958,17 +67559,17 @@ case 891:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2496;
-               case 32: goto tr2496;
-               case 40: goto tr2497;
-               case 41: goto tr2498;
-               case 2058: goto tr2500;
-               case 2107: goto tr2501;
+               case 9: goto tr2533;
+               case 32: goto tr2533;
+               case 40: goto tr2534;
+               case 41: goto tr2535;
+               case 2058: goto tr2537;
+               case 2107: goto tr2538;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2499;
-       goto tr2327;
-tr2503:
+               goto tr2536;
+       goto tr2364;
+tr2540:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -66976,8 +67577,8 @@ tr2503:
                }
                s->multiline = true;
        }
-       goto st892;
-tr2504:
+       goto st919;
+tr2541:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -66985,13 +67586,13 @@ tr2504:
                }
                s->multiline = false;
        }
-       goto st892;
-tr2506:
+       goto st919;
+tr2543:
        {
                s->line_counter++;
        }
-       goto st892;
-tr2510:
+       goto st919;
+tr2547:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -67001,15 +67602,15 @@ tr2510:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 892; goto _out;}
+                               {p++; cs = 919; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st892;
-tr2496:
+       goto st919;
+tr2533:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -67020,8 +67621,8 @@ tr2496:
                        p--; {goto st307;}
                }
        }
-       goto st892;
-tr2497:
+       goto st919;
+tr2534:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -67039,8 +67640,8 @@ tr2497:
                }
                s->multiline = true;
        }
-       goto st892;
-tr2498:
+       goto st919;
+tr2535:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -67058,8 +67659,8 @@ tr2498:
                }
                s->multiline = false;
        }
-       goto st892;
-tr2500:
+       goto st919;
+tr2537:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -67073,11 +67674,11 @@ tr2500:
        {
                s->line_counter++;
        }
-       goto st892;
-st892:
+       goto st919;
+st919:
        if ( ++p == pe )
-               goto _test_eof892;
-case 892:
+               goto _test_eof919;
+case 919:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -67091,71 +67692,71 @@ case 892:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st892;
-               case 32: goto st892;
-               case 40: goto tr2503;
-               case 41: goto tr2504;
-               case 42: goto tr2505;
-               case 92: goto tr2505;
-               case 95: goto tr2505;
-               case 2058: goto tr2506;
-               case 2107: goto tr2507;
+               case 9: goto st919;
+               case 32: goto st919;
+               case 40: goto tr2540;
+               case 41: goto tr2541;
+               case 42: goto tr2542;
+               case 92: goto tr2542;
+               case 95: goto tr2542;
+               case 2058: goto tr2543;
+               case 2107: goto tr2544;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr2505;
+                       goto tr2542;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr2505;
+                       goto tr2542;
        } else
-               goto tr2505;
+               goto tr2542;
        goto tr75;
-tr2505:
+tr2542:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 893;goto st309;} }
-       goto st893;
-st893:
+       { p--; {stack[top++] = 920;goto st309;} }
+       goto st920;
+st920:
        if ( ++p == pe )
-               goto _test_eof893;
-case 893:
+               goto _test_eof920;
+case 920:
        switch( (*p) ) {
-               case 32: goto tr2508;
-               case 59: goto tr2508;
+               case 32: goto tr2545;
+               case 59: goto tr2545;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2508;
+                       goto tr2545;
        } else if ( (*p) >= 9 )
-               goto tr2508;
+               goto tr2545;
        goto tr75;
-tr2508:
+tr2545:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1440;
-st1440:
+       goto st1467;
+st1467:
        if ( ++p == pe )
-               goto _test_eof1440;
-case 1440:
+               goto _test_eof1467;
+case 1467:
        goto st0;
-tr2507:
+tr2544:
        {
                s->buffer_length = 0;
        }
-       goto st894;
-tr2509:
+       goto st921;
+tr2546:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st894;
-tr2501:
+       goto st921;
+tr2538:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -67169,11 +67770,11 @@ tr2501:
        {
                s->buffer_length = 0;
        }
-       goto st894;
-st894:
+       goto st921;
+st921:
        if ( ++p == pe )
-               goto _test_eof894;
-case 894:
+               goto _test_eof921;
+case 921:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -67193,25 +67794,25 @@ case 894:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2510;
+               goto tr2547;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2509;
+               goto tr2546;
        goto tr75;
-st895:
+st922:
        if ( ++p == pe )
-               goto _test_eof895;
-case 895:
+               goto _test_eof922;
+case 922:
        switch( (*p) ) {
-               case 32: goto tr2512;
-               case 59: goto tr2512;
+               case 32: goto tr2549;
+               case 59: goto tr2549;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2512;
+                       goto tr2549;
        } else if ( (*p) >= 9 )
-               goto tr2512;
-       goto tr2511;
-tr2521:
+               goto tr2549;
+       goto tr2548;
+tr2558:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -67220,9 +67821,9 @@ tr2521:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 896;goto st318;} }
-       goto st896;
-tr2511:
+       { p--; {stack[top++] = 923;goto st318;} }
+       goto st923;
+tr2548:
        {
                s->long_string = true;
        }
@@ -67234,12 +67835,12 @@ tr2511:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 896;goto st318;} }
-       goto st896;
-st896:
+       { p--; {stack[top++] = 923;goto st318;} }
+       goto st923;
+st923:
        if ( ++p == pe )
-               goto _test_eof896;
-case 896:
+               goto _test_eof923;
+case 923:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -67257,19 +67858,19 @@ case 896:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2513;
-               case 32: goto tr2513;
-               case 40: goto tr2514;
-               case 41: goto tr2515;
-               case 3082: goto tr2516;
-               case 3131: goto tr2517;
-               case 3338: goto tr2518;
-               case 3387: goto tr2518;
-               case 3594: goto tr2519;
-               case 3643: goto tr2520;
+               case 9: goto tr2550;
+               case 32: goto tr2550;
+               case 40: goto tr2551;
+               case 41: goto tr2552;
+               case 3082: goto tr2553;
+               case 3131: goto tr2554;
+               case 3338: goto tr2555;
+               case 3387: goto tr2555;
+               case 3594: goto tr2556;
+               case 3643: goto tr2557;
        }
-       goto tr2512;
-tr2523:
+       goto tr2549;
+tr2560:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -67277,8 +67878,8 @@ tr2523:
                }
                s->multiline = true;
        }
-       goto st897;
-tr2524:
+       goto st924;
+tr2561:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -67286,13 +67887,13 @@ tr2524:
                }
                s->multiline = false;
        }
-       goto st897;
-tr2525:
+       goto st924;
+tr2562:
        {
                s->line_counter++;
        }
-       goto st897;
-tr2531:
+       goto st924;
+tr2568:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -67302,15 +67903,15 @@ tr2531:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 897; goto _out;}
+                               {p++; cs = 924; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st897;
-tr2513:
+       goto st924;
+tr2550:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -67324,8 +67925,8 @@ tr2513:
                        p--; {goto st307;}
                }
        }
-       goto st897;
-tr2514:
+       goto st924;
+tr2551:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -67346,8 +67947,8 @@ tr2514:
                }
                s->multiline = true;
        }
-       goto st897;
-tr2515:
+       goto st924;
+tr2552:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -67368,8 +67969,8 @@ tr2515:
                }
                s->multiline = false;
        }
-       goto st897;
-tr2516:
+       goto st924;
+tr2553:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -67386,11 +67987,11 @@ tr2516:
        {
                s->line_counter++;
        }
-       goto st897;
-st897:
+       goto st924;
+st924:
        if ( ++p == pe )
-               goto _test_eof897;
-case 897:
+               goto _test_eof924;
+case 924:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -67408,39 +68009,39 @@ case 897:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st897;
-               case 32: goto st897;
-               case 40: goto tr2523;
-               case 41: goto tr2524;
-               case 3082: goto tr2525;
-               case 3131: goto tr2526;
-               case 3338: goto tr2527;
-               case 3387: goto tr2527;
-               case 3594: goto tr2528;
-               case 3643: goto tr2529;
+               case 9: goto st924;
+               case 32: goto st924;
+               case 40: goto tr2560;
+               case 41: goto tr2561;
+               case 3082: goto tr2562;
+               case 3131: goto tr2563;
+               case 3338: goto tr2564;
+               case 3387: goto tr2564;
+               case 3594: goto tr2565;
+               case 3643: goto tr2566;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr2521;
+                       goto tr2558;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr2521;
+                       goto tr2558;
        } else
-               goto tr2521;
-       goto tr2512;
-tr2526:
+               goto tr2558;
+       goto tr2549;
+tr2563:
        {
                s->buffer_length = 0;
        }
-       goto st898;
-tr2530:
+       goto st925;
+tr2567:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st898;
-tr2517:
+       goto st925;
+tr2554:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -67457,11 +68058,11 @@ tr2517:
        {
                s->buffer_length = 0;
        }
-       goto st898;
-st898:
+       goto st925;
+st925:
        if ( ++p == pe )
-               goto _test_eof898;
-case 898:
+               goto _test_eof925;
+case 925:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -67481,11 +68082,11 @@ case 898:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2531;
+               goto tr2568;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2530;
-       goto tr2512;
-tr2518:
+               goto tr2567;
+       goto tr2549;
+tr2555:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -67505,21 +68106,21 @@ tr2518:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1441;
-tr2527:
+       goto st1468;
+tr2564:
        {
                s->long_string = false;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1441;
-st1441:
+       goto st1468;
+st1468:
        if ( ++p == pe )
-               goto _test_eof1441;
-case 1441:
+               goto _test_eof1468;
+case 1468:
        goto st0;
-tr2519:
+tr2556:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -67542,8 +68143,8 @@ tr2519:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1442;
-tr2528:
+       goto st1469;
+tr2565:
        {
                s->line_counter++;
        }
@@ -67553,11 +68154,11 @@ tr2528:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1442;
-st1442:
+       goto st1469;
+st1469:
        if ( ++p == pe )
-               goto _test_eof1442;
-case 1442:
+               goto _test_eof1469;
+case 1469:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -67575,27 +68176,27 @@ case 1442:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st897;
-               case 32: goto st897;
-               case 40: goto tr2523;
-               case 41: goto tr2524;
-               case 3082: goto tr2525;
-               case 3131: goto tr2526;
-               case 3338: goto tr2527;
-               case 3387: goto tr2527;
-               case 3594: goto tr2528;
-               case 3643: goto tr2529;
+               case 9: goto st924;
+               case 32: goto st924;
+               case 40: goto tr2560;
+               case 41: goto tr2561;
+               case 3082: goto tr2562;
+               case 3131: goto tr2563;
+               case 3338: goto tr2564;
+               case 3387: goto tr2564;
+               case 3594: goto tr2565;
+               case 3643: goto tr2566;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr2521;
+                       goto tr2558;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr2521;
+                       goto tr2558;
        } else
-               goto tr2521;
-       goto tr2512;
-tr2520:
+               goto tr2558;
+       goto tr2549;
+tr2557:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -67618,8 +68219,8 @@ tr2520:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1443;
-tr2529:
+       goto st1470;
+tr2566:
        {
                s->buffer_length = 0;
        }
@@ -67629,11 +68230,11 @@ tr2529:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1443;
-st1443:
+       goto st1470;
+st1470:
        if ( ++p == pe )
-               goto _test_eof1443;
-case 1443:
+               goto _test_eof1470;
+case 1470:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -67653,26 +68254,26 @@ case 1443:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2531;
+               goto tr2568;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2530;
-       goto tr2512;
-st899:
+               goto tr2567;
+       goto tr2549;
+st926:
        if ( ++p == pe )
-               goto _test_eof899;
-case 899:
+               goto _test_eof926;
+case 926:
        if ( (*p) == 46 )
-               goto tr2532;
+               goto tr2569;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 58 )
-                       goto tr2532;
+                       goto tr2569;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr2532;
+                       goto tr2569;
        } else
-               goto tr2532;
-       goto tr2304;
-tr2534:
+               goto tr2569;
+       goto tr2341;
+tr2571:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -67681,8 +68282,8 @@ tr2534:
                        p--; {goto st307;}
                }
        }
-       goto st900;
-tr2532:
+       goto st927;
+tr2569:
        {
                s->buffer_length = 0;
        }
@@ -67694,32 +68295,32 @@ tr2532:
                        p--; {goto st307;}
                }
        }
-       goto st900;
-st900:
+       goto st927;
+st927:
        if ( ++p == pe )
-               goto _test_eof900;
-case 900:
+               goto _test_eof927;
+case 927:
        switch( (*p) ) {
-               case 32: goto tr2533;
-               case 46: goto tr2534;
-               case 59: goto tr2533;
+               case 32: goto tr2570;
+               case 46: goto tr2571;
+               case 59: goto tr2570;
        }
        if ( (*p) < 48 ) {
                if ( (*p) > 10 ) {
                        if ( 40 <= (*p) && (*p) <= 41 )
-                               goto tr2533;
+                               goto tr2570;
                } else if ( (*p) >= 9 )
-                       goto tr2533;
+                       goto tr2570;
        } else if ( (*p) > 58 ) {
                if ( (*p) > 70 ) {
                        if ( 97 <= (*p) && (*p) <= 102 )
-                               goto tr2534;
+                               goto tr2571;
                } else if ( (*p) >= 65 )
-                       goto tr2534;
+                       goto tr2571;
        } else
-               goto tr2534;
-       goto tr2304;
-tr2533:
+               goto tr2571;
+       goto tr2341;
+tr2570:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -67739,20 +68340,20 @@ tr2533:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1444;
-st1444:
+       goto st1471;
+st1471:
        if ( ++p == pe )
-               goto _test_eof1444;
-case 1444:
+               goto _test_eof1471;
+case 1471:
        goto st0;
-st901:
+st928:
        if ( ++p == pe )
-               goto _test_eof901;
-case 901:
+               goto _test_eof928;
+case 928:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2536;
-       goto tr2535;
-tr2540:
+               goto tr2573;
+       goto tr2572;
+tr2577:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -67767,8 +68368,8 @@ tr2540:
                        p--; {goto st307;}
                }
        }
-       goto st902;
-tr2536:
+       goto st929;
+tr2573:
        {
                memset(&(s->loc), 0, sizeof(s->loc));
                // Defaults.
@@ -67796,11 +68397,11 @@ tr2536:
                        p--; {goto st307;}
                }
        }
-       goto st902;
-st902:
+       goto st929;
+st929:
        if ( ++p == pe )
-               goto _test_eof902;
-case 902:
+               goto _test_eof929;
+case 929:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -67814,17 +68415,17 @@ case 902:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2537;
-               case 32: goto tr2537;
-               case 40: goto tr2538;
-               case 41: goto tr2539;
-               case 2058: goto tr2541;
-               case 2107: goto tr2542;
+               case 9: goto tr2574;
+               case 32: goto tr2574;
+               case 40: goto tr2575;
+               case 41: goto tr2576;
+               case 2058: goto tr2578;
+               case 2107: goto tr2579;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2540;
-       goto tr2535;
-tr2544:
+               goto tr2577;
+       goto tr2572;
+tr2581:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -67832,8 +68433,8 @@ tr2544:
                }
                s->multiline = true;
        }
-       goto st903;
-tr2545:
+       goto st930;
+tr2582:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -67841,13 +68442,13 @@ tr2545:
                }
                s->multiline = false;
        }
-       goto st903;
-tr2549:
+       goto st930;
+tr2586:
        {
                s->line_counter++;
        }
-       goto st903;
-tr2792:
+       goto st930;
+tr2829:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -67857,15 +68458,15 @@ tr2792:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 903; goto _out;}
+                               {p++; cs = 930; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st903;
-tr2537:
+       goto st930;
+tr2574:
        {
                if (s->number64 <= 90) {
                        s->loc.d1 = (uint32_t)(s->number64);
@@ -67874,8 +68475,8 @@ tr2537:
                        p--; {goto st307;}
                }
        }
-       goto st903;
-tr2538:
+       goto st930;
+tr2575:
        {
                if (s->number64 <= 90) {
                        s->loc.d1 = (uint32_t)(s->number64);
@@ -67891,8 +68492,8 @@ tr2538:
                }
                s->multiline = true;
        }
-       goto st903;
-tr2539:
+       goto st930;
+tr2576:
        {
                if (s->number64 <= 90) {
                        s->loc.d1 = (uint32_t)(s->number64);
@@ -67908,8 +68509,8 @@ tr2539:
                }
                s->multiline = false;
        }
-       goto st903;
-tr2541:
+       goto st930;
+tr2578:
        {
                if (s->number64 <= 90) {
                        s->loc.d1 = (uint32_t)(s->number64);
@@ -67921,11 +68522,11 @@ tr2541:
        {
                s->line_counter++;
        }
-       goto st903;
-st903:
+       goto st930;
+st930:
        if ( ++p == pe )
-               goto _test_eof903;
-case 903:
+               goto _test_eof930;
+case 930:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -67939,19 +68540,19 @@ case 903:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st903;
-               case 32: goto st903;
-               case 40: goto tr2544;
-               case 41: goto tr2545;
-               case 78: goto st908;
-               case 83: goto st950;
-               case 2058: goto tr2549;
-               case 2107: goto tr2550;
+               case 9: goto st930;
+               case 32: goto st930;
+               case 40: goto tr2581;
+               case 41: goto tr2582;
+               case 78: goto st935;
+               case 83: goto st977;
+               case 2058: goto tr2586;
+               case 2107: goto tr2587;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2546;
-       goto tr2535;
-tr2546:
+               goto tr2583;
+       goto tr2572;
+tr2583:
        {
                s->number64 = 0;
        }
@@ -67969,8 +68570,8 @@ tr2546:
                        p--; {goto st307;}
                }
        }
-       goto st904;
-tr2554:
+       goto st931;
+tr2591:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -67985,11 +68586,11 @@ tr2554:
                        p--; {goto st307;}
                }
        }
-       goto st904;
-st904:
+       goto st931;
+st931:
        if ( ++p == pe )
-               goto _test_eof904;
-case 904:
+               goto _test_eof931;
+case 931:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68003,17 +68604,17 @@ case 904:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2551;
-               case 32: goto tr2551;
-               case 40: goto tr2552;
-               case 41: goto tr2553;
-               case 2058: goto tr2555;
-               case 2107: goto tr2556;
+               case 9: goto tr2588;
+               case 32: goto tr2588;
+               case 40: goto tr2589;
+               case 41: goto tr2590;
+               case 2058: goto tr2592;
+               case 2107: goto tr2593;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2554;
-       goto tr2535;
-tr2558:
+               goto tr2591;
+       goto tr2572;
+tr2595:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -68021,8 +68622,8 @@ tr2558:
                }
                s->multiline = true;
        }
-       goto st905;
-tr2559:
+       goto st932;
+tr2596:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -68030,13 +68631,13 @@ tr2559:
                }
                s->multiline = false;
        }
-       goto st905;
-tr2561:
+       goto st932;
+tr2598:
        {
                s->line_counter++;
        }
-       goto st905;
-tr2790:
+       goto st932;
+tr2827:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -68046,15 +68647,15 @@ tr2790:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 905; goto _out;}
+                               {p++; cs = 932; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st905;
-tr2551:
+       goto st932;
+tr2588:
        {
                if (s->number64 <= 59) {
                        s->loc.m1 = (uint32_t)(s->number64);
@@ -68063,8 +68664,8 @@ tr2551:
                        p--; {goto st307;}
                }
        }
-       goto st905;
-tr2552:
+       goto st932;
+tr2589:
        {
                if (s->number64 <= 59) {
                        s->loc.m1 = (uint32_t)(s->number64);
@@ -68080,8 +68681,8 @@ tr2552:
                }
                s->multiline = true;
        }
-       goto st905;
-tr2553:
+       goto st932;
+tr2590:
        {
                if (s->number64 <= 59) {
                        s->loc.m1 = (uint32_t)(s->number64);
@@ -68097,8 +68698,8 @@ tr2553:
                }
                s->multiline = false;
        }
-       goto st905;
-tr2555:
+       goto st932;
+tr2592:
        {
                if (s->number64 <= 59) {
                        s->loc.m1 = (uint32_t)(s->number64);
@@ -68110,11 +68711,11 @@ tr2555:
        {
                s->line_counter++;
        }
-       goto st905;
-st905:
+       goto st932;
+st932:
        if ( ++p == pe )
-               goto _test_eof905;
-case 905:
+               goto _test_eof932;
+case 932:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68128,19 +68729,19 @@ case 905:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st905;
-               case 32: goto st905;
-               case 40: goto tr2558;
-               case 41: goto tr2559;
-               case 78: goto st908;
-               case 83: goto st950;
-               case 2058: goto tr2561;
-               case 2107: goto tr2562;
+               case 9: goto st932;
+               case 32: goto st932;
+               case 40: goto tr2595;
+               case 41: goto tr2596;
+               case 78: goto st935;
+               case 83: goto st977;
+               case 2058: goto tr2598;
+               case 2107: goto tr2599;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2560;
-       goto tr2535;
-tr2567:
+               goto tr2597;
+       goto tr2572;
+tr2604:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -68155,8 +68756,8 @@ tr2567:
                        p--; {goto st307;}
                }
        }
-       goto st906;
-tr2560:
+       goto st933;
+tr2597:
        {
                s->decimals = 3;
        }
@@ -68180,11 +68781,11 @@ tr2560:
                        p--; {goto st307;}
                }
        }
-       goto st906;
-st906:
+       goto st933;
+st933:
        if ( ++p == pe )
-               goto _test_eof906;
-case 906:
+               goto _test_eof933;
+case 933:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68198,18 +68799,18 @@ case 906:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2563;
-               case 32: goto tr2563;
-               case 40: goto tr2564;
-               case 41: goto tr2565;
-               case 46: goto st952;
-               case 2058: goto tr2568;
-               case 2107: goto tr2569;
+               case 9: goto tr2600;
+               case 32: goto tr2600;
+               case 40: goto tr2601;
+               case 41: goto tr2602;
+               case 46: goto st979;
+               case 2058: goto tr2605;
+               case 2107: goto tr2606;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2567;
-       goto tr2535;
-tr2571:
+               goto tr2604;
+       goto tr2572;
+tr2608:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -68217,8 +68818,8 @@ tr2571:
                }
                s->multiline = true;
        }
-       goto st907;
-tr2572:
+       goto st934;
+tr2609:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -68226,13 +68827,13 @@ tr2572:
                }
                s->multiline = false;
        }
-       goto st907;
-tr2573:
+       goto st934;
+tr2610:
        {
                s->line_counter++;
        }
-       goto st907;
-tr2781:
+       goto st934;
+tr2818:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -68242,15 +68843,15 @@ tr2781:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 907; goto _out;}
+                               {p++; cs = 934; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st907;
-tr2563:
+       goto st934;
+tr2600:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -68271,8 +68872,8 @@ tr2563:
                        p--; {goto st307;}
                }
        }
-       goto st907;
-tr2564:
+       goto st934;
+tr2601:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -68300,8 +68901,8 @@ tr2564:
                }
                s->multiline = true;
        }
-       goto st907;
-tr2565:
+       goto st934;
+tr2602:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -68329,8 +68930,8 @@ tr2565:
                }
                s->multiline = false;
        }
-       goto st907;
-tr2568:
+       goto st934;
+tr2605:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -68354,8 +68955,8 @@ tr2568:
        {
                s->line_counter++;
        }
-       goto st907;
-tr2782:
+       goto st934;
+tr2819:
        {
                s->number64_tmp = s->number64;
        }
@@ -68379,8 +68980,8 @@ tr2782:
                        p--; {goto st307;}
                }
        }
-       goto st907;
-tr2783:
+       goto st934;
+tr2820:
        {
                s->number64_tmp = s->number64;
        }
@@ -68411,8 +69012,8 @@ tr2783:
                }
                s->multiline = true;
        }
-       goto st907;
-tr2784:
+       goto st934;
+tr2821:
        {
                s->number64_tmp = s->number64;
        }
@@ -68443,8 +69044,8 @@ tr2784:
                }
                s->multiline = false;
        }
-       goto st907;
-tr2786:
+       goto st934;
+tr2823:
        {
                s->number64_tmp = s->number64;
        }
@@ -68471,11 +69072,11 @@ tr2786:
        {
                s->line_counter++;
        }
-       goto st907;
-st907:
+       goto st934;
+st934:
        if ( ++p == pe )
-               goto _test_eof907;
-case 907:
+               goto _test_eof934;
+case 934:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68489,20 +69090,20 @@ case 907:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st907;
-               case 32: goto st907;
-               case 40: goto tr2571;
-               case 41: goto tr2572;
-               case 78: goto st908;
-               case 83: goto st950;
-               case 2058: goto tr2573;
-               case 2107: goto tr2574;
+               case 9: goto st934;
+               case 32: goto st934;
+               case 40: goto tr2608;
+               case 41: goto tr2609;
+               case 78: goto st935;
+               case 83: goto st977;
+               case 2058: goto tr2610;
+               case 2107: goto tr2611;
        }
-       goto tr2535;
-st908:
+       goto tr2572;
+st935:
        if ( ++p == pe )
-               goto _test_eof908;
-case 908:
+               goto _test_eof935;
+case 935:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68516,15 +69117,15 @@ case 908:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st909;
-               case 32: goto st909;
-               case 40: goto tr2576;
-               case 41: goto tr2577;
-               case 2058: goto tr2578;
-               case 2107: goto tr2579;
+               case 9: goto st936;
+               case 32: goto st936;
+               case 40: goto tr2613;
+               case 41: goto tr2614;
+               case 2058: goto tr2615;
+               case 2107: goto tr2616;
        }
-       goto tr2535;
-tr2576:
+       goto tr2572;
+tr2613:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -68532,8 +69133,8 @@ tr2576:
                }
                s->multiline = true;
        }
-       goto st909;
-tr2577:
+       goto st936;
+tr2614:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -68541,13 +69142,13 @@ tr2577:
                }
                s->multiline = false;
        }
-       goto st909;
-tr2578:
+       goto st936;
+tr2615:
        {
                s->line_counter++;
        }
-       goto st909;
-tr2774:
+       goto st936;
+tr2811:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -68557,20 +69158,20 @@ tr2774:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 909; goto _out;}
+                               {p++; cs = 936; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st909;
-tr2775:
+       goto st936;
+tr2812:
        {
                s->loc.lat_sign = -1;
        }
-       goto st909;
-tr2776:
+       goto st936;
+tr2813:
        {
                s->loc.lat_sign = -1;
        }
@@ -68581,8 +69182,8 @@ tr2776:
                }
                s->multiline = true;
        }
-       goto st909;
-tr2777:
+       goto st936;
+tr2814:
        {
                s->loc.lat_sign = -1;
        }
@@ -68593,19 +69194,19 @@ tr2777:
                }
                s->multiline = false;
        }
-       goto st909;
-tr2778:
+       goto st936;
+tr2815:
        {
                s->loc.lat_sign = -1;
        }
        {
                s->line_counter++;
        }
-       goto st909;
-st909:
+       goto st936;
+st936:
        if ( ++p == pe )
-               goto _test_eof909;
-case 909:
+               goto _test_eof936;
+case 936:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68619,17 +69220,17 @@ case 909:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st909;
-               case 32: goto st909;
-               case 40: goto tr2576;
-               case 41: goto tr2577;
-               case 2058: goto tr2578;
-               case 2107: goto tr2579;
+               case 9: goto st936;
+               case 32: goto st936;
+               case 40: goto tr2613;
+               case 41: goto tr2614;
+               case 2058: goto tr2615;
+               case 2107: goto tr2616;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2580;
-       goto tr2535;
-tr2580:
+               goto tr2617;
+       goto tr2572;
+tr2617:
        {
                s->number64 = 0;
        }
@@ -68647,8 +69248,8 @@ tr2580:
                        p--; {goto st307;}
                }
        }
-       goto st910;
-tr2584:
+       goto st937;
+tr2621:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -68663,11 +69264,11 @@ tr2584:
                        p--; {goto st307;}
                }
        }
-       goto st910;
-st910:
+       goto st937;
+st937:
        if ( ++p == pe )
-               goto _test_eof910;
-case 910:
+               goto _test_eof937;
+case 937:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68681,17 +69282,17 @@ case 910:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2581;
-               case 32: goto tr2581;
-               case 40: goto tr2582;
-               case 41: goto tr2583;
-               case 2058: goto tr2585;
-               case 2107: goto tr2586;
+               case 9: goto tr2618;
+               case 32: goto tr2618;
+               case 40: goto tr2619;
+               case 41: goto tr2620;
+               case 2058: goto tr2622;
+               case 2107: goto tr2623;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2584;
-       goto tr2535;
-tr2588:
+               goto tr2621;
+       goto tr2572;
+tr2625:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -68699,8 +69300,8 @@ tr2588:
                }
                s->multiline = true;
        }
-       goto st911;
-tr2589:
+       goto st938;
+tr2626:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -68708,13 +69309,13 @@ tr2589:
                }
                s->multiline = false;
        }
-       goto st911;
-tr2593:
+       goto st938;
+tr2630:
        {
                s->line_counter++;
        }
-       goto st911;
-tr2772:
+       goto st938;
+tr2809:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -68724,15 +69325,15 @@ tr2772:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 911; goto _out;}
+                               {p++; cs = 938; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st911;
-tr2581:
+       goto st938;
+tr2618:
        {
                if (s->number64 <= 180) {
                        s->loc.d2 = (uint32_t)(s->number64);
@@ -68741,8 +69342,8 @@ tr2581:
                        p--; {goto st307;}
                }
        }
-       goto st911;
-tr2582:
+       goto st938;
+tr2619:
        {
                if (s->number64 <= 180) {
                        s->loc.d2 = (uint32_t)(s->number64);
@@ -68758,8 +69359,8 @@ tr2582:
                }
                s->multiline = true;
        }
-       goto st911;
-tr2583:
+       goto st938;
+tr2620:
        {
                if (s->number64 <= 180) {
                        s->loc.d2 = (uint32_t)(s->number64);
@@ -68775,8 +69376,8 @@ tr2583:
                }
                s->multiline = false;
        }
-       goto st911;
-tr2585:
+       goto st938;
+tr2622:
        {
                if (s->number64 <= 180) {
                        s->loc.d2 = (uint32_t)(s->number64);
@@ -68788,11 +69389,11 @@ tr2585:
        {
                s->line_counter++;
        }
-       goto st911;
-st911:
+       goto st938;
+st938:
        if ( ++p == pe )
-               goto _test_eof911;
-case 911:
+               goto _test_eof938;
+case 938:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68806,19 +69407,19 @@ case 911:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st911;
-               case 32: goto st911;
-               case 40: goto tr2588;
-               case 41: goto tr2589;
-               case 69: goto st916;
-               case 87: goto st943;
-               case 2058: goto tr2593;
-               case 2107: goto tr2594;
+               case 9: goto st938;
+               case 32: goto st938;
+               case 40: goto tr2625;
+               case 41: goto tr2626;
+               case 69: goto st943;
+               case 87: goto st970;
+               case 2058: goto tr2630;
+               case 2107: goto tr2631;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2590;
-       goto tr2535;
-tr2590:
+               goto tr2627;
+       goto tr2572;
+tr2627:
        {
                s->number64 = 0;
        }
@@ -68836,8 +69437,8 @@ tr2590:
                        p--; {goto st307;}
                }
        }
-       goto st912;
-tr2598:
+       goto st939;
+tr2635:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -68852,11 +69453,11 @@ tr2598:
                        p--; {goto st307;}
                }
        }
-       goto st912;
-st912:
+       goto st939;
+st939:
        if ( ++p == pe )
-               goto _test_eof912;
-case 912:
+               goto _test_eof939;
+case 939:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68870,17 +69471,17 @@ case 912:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2595;
-               case 32: goto tr2595;
-               case 40: goto tr2596;
-               case 41: goto tr2597;
-               case 2058: goto tr2599;
-               case 2107: goto tr2600;
+               case 9: goto tr2632;
+               case 32: goto tr2632;
+               case 40: goto tr2633;
+               case 41: goto tr2634;
+               case 2058: goto tr2636;
+               case 2107: goto tr2637;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2598;
-       goto tr2535;
-tr2602:
+               goto tr2635;
+       goto tr2572;
+tr2639:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -68888,8 +69489,8 @@ tr2602:
                }
                s->multiline = true;
        }
-       goto st913;
-tr2603:
+       goto st940;
+tr2640:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -68897,13 +69498,13 @@ tr2603:
                }
                s->multiline = false;
        }
-       goto st913;
-tr2605:
+       goto st940;
+tr2642:
        {
                s->line_counter++;
        }
-       goto st913;
-tr2770:
+       goto st940;
+tr2807:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -68913,15 +69514,15 @@ tr2770:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 913; goto _out;}
+                               {p++; cs = 940; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st913;
-tr2595:
+       goto st940;
+tr2632:
        {
                if (s->number64 <= 59) {
                        s->loc.m2 = (uint32_t)(s->number64);
@@ -68930,8 +69531,8 @@ tr2595:
                        p--; {goto st307;}
                }
        }
-       goto st913;
-tr2596:
+       goto st940;
+tr2633:
        {
                if (s->number64 <= 59) {
                        s->loc.m2 = (uint32_t)(s->number64);
@@ -68947,8 +69548,8 @@ tr2596:
                }
                s->multiline = true;
        }
-       goto st913;
-tr2597:
+       goto st940;
+tr2634:
        {
                if (s->number64 <= 59) {
                        s->loc.m2 = (uint32_t)(s->number64);
@@ -68964,8 +69565,8 @@ tr2597:
                }
                s->multiline = false;
        }
-       goto st913;
-tr2599:
+       goto st940;
+tr2636:
        {
                if (s->number64 <= 59) {
                        s->loc.m2 = (uint32_t)(s->number64);
@@ -68977,11 +69578,11 @@ tr2599:
        {
                s->line_counter++;
        }
-       goto st913;
-st913:
+       goto st940;
+st940:
        if ( ++p == pe )
-               goto _test_eof913;
-case 913:
+               goto _test_eof940;
+case 940:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -68995,19 +69596,19 @@ case 913:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st913;
-               case 32: goto st913;
-               case 40: goto tr2602;
-               case 41: goto tr2603;
-               case 69: goto st916;
-               case 87: goto st943;
-               case 2058: goto tr2605;
-               case 2107: goto tr2606;
+               case 9: goto st940;
+               case 32: goto st940;
+               case 40: goto tr2639;
+               case 41: goto tr2640;
+               case 69: goto st943;
+               case 87: goto st970;
+               case 2058: goto tr2642;
+               case 2107: goto tr2643;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2604;
-       goto tr2535;
-tr2611:
+               goto tr2641;
+       goto tr2572;
+tr2648:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -69022,8 +69623,8 @@ tr2611:
                        p--; {goto st307;}
                }
        }
-       goto st914;
-tr2604:
+       goto st941;
+tr2641:
        {
                s->decimals = 3;
        }
@@ -69047,11 +69648,11 @@ tr2604:
                        p--; {goto st307;}
                }
        }
-       goto st914;
-st914:
+       goto st941;
+st941:
        if ( ++p == pe )
-               goto _test_eof914;
-case 914:
+               goto _test_eof941;
+case 941:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -69065,18 +69666,18 @@ case 914:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2607;
-               case 32: goto tr2607;
-               case 40: goto tr2608;
-               case 41: goto tr2609;
-               case 46: goto st945;
-               case 2058: goto tr2612;
-               case 2107: goto tr2613;
+               case 9: goto tr2644;
+               case 32: goto tr2644;
+               case 40: goto tr2645;
+               case 41: goto tr2646;
+               case 46: goto st972;
+               case 2058: goto tr2649;
+               case 2107: goto tr2650;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2611;
-       goto tr2535;
-tr2615:
+               goto tr2648;
+       goto tr2572;
+tr2652:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -69084,8 +69685,8 @@ tr2615:
                }
                s->multiline = true;
        }
-       goto st915;
-tr2616:
+       goto st942;
+tr2653:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -69093,13 +69694,13 @@ tr2616:
                }
                s->multiline = false;
        }
-       goto st915;
-tr2617:
+       goto st942;
+tr2654:
        {
                s->line_counter++;
        }
-       goto st915;
-tr2761:
+       goto st942;
+tr2798:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -69109,15 +69710,15 @@ tr2761:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 915; goto _out;}
+                               {p++; cs = 942; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st915;
-tr2607:
+       goto st942;
+tr2644:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -69138,8 +69739,8 @@ tr2607:
                        p--; {goto st307;}
                }
        }
-       goto st915;
-tr2608:
+       goto st942;
+tr2645:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -69167,8 +69768,8 @@ tr2608:
                }
                s->multiline = true;
        }
-       goto st915;
-tr2609:
+       goto st942;
+tr2646:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -69196,8 +69797,8 @@ tr2609:
                }
                s->multiline = false;
        }
-       goto st915;
-tr2612:
+       goto st942;
+tr2649:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -69221,8 +69822,8 @@ tr2612:
        {
                s->line_counter++;
        }
-       goto st915;
-tr2762:
+       goto st942;
+tr2799:
        {
                s->number64_tmp = s->number64;
        }
@@ -69246,8 +69847,8 @@ tr2762:
                        p--; {goto st307;}
                }
        }
-       goto st915;
-tr2763:
+       goto st942;
+tr2800:
        {
                s->number64_tmp = s->number64;
        }
@@ -69278,8 +69879,8 @@ tr2763:
                }
                s->multiline = true;
        }
-       goto st915;
-tr2764:
+       goto st942;
+tr2801:
        {
                s->number64_tmp = s->number64;
        }
@@ -69310,8 +69911,8 @@ tr2764:
                }
                s->multiline = false;
        }
-       goto st915;
-tr2766:
+       goto st942;
+tr2803:
        {
                s->number64_tmp = s->number64;
        }
@@ -69338,11 +69939,11 @@ tr2766:
        {
                s->line_counter++;
        }
-       goto st915;
-st915:
+       goto st942;
+st942:
        if ( ++p == pe )
-               goto _test_eof915;
-case 915:
+               goto _test_eof942;
+case 942:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -69356,20 +69957,20 @@ case 915:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st915;
-               case 32: goto st915;
-               case 40: goto tr2615;
-               case 41: goto tr2616;
-               case 69: goto st916;
-               case 87: goto st943;
-               case 2058: goto tr2617;
-               case 2107: goto tr2618;
+               case 9: goto st942;
+               case 32: goto st942;
+               case 40: goto tr2652;
+               case 41: goto tr2653;
+               case 69: goto st943;
+               case 87: goto st970;
+               case 2058: goto tr2654;
+               case 2107: goto tr2655;
        }
-       goto tr2535;
-st916:
+       goto tr2572;
+st943:
        if ( ++p == pe )
-               goto _test_eof916;
-case 916:
+               goto _test_eof943;
+case 943:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -69383,15 +69984,15 @@ case 916:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st917;
-               case 32: goto st917;
-               case 40: goto tr2620;
-               case 41: goto tr2621;
-               case 2058: goto tr2622;
-               case 2107: goto tr2623;
+               case 9: goto st944;
+               case 32: goto st944;
+               case 40: goto tr2657;
+               case 41: goto tr2658;
+               case 2058: goto tr2659;
+               case 2107: goto tr2660;
        }
-       goto tr2535;
-tr2620:
+       goto tr2572;
+tr2657:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -69399,8 +70000,8 @@ tr2620:
                }
                s->multiline = true;
        }
-       goto st917;
-tr2621:
+       goto st944;
+tr2658:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -69408,13 +70009,13 @@ tr2621:
                }
                s->multiline = false;
        }
-       goto st917;
-tr2622:
+       goto st944;
+tr2659:
        {
                s->line_counter++;
        }
-       goto st917;
-tr2754:
+       goto st944;
+tr2791:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -69424,20 +70025,20 @@ tr2754:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 917; goto _out;}
+                               {p++; cs = 944; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st917;
-tr2755:
+       goto st944;
+tr2792:
        {
                s->loc.long_sign = -1;
        }
-       goto st917;
-tr2756:
+       goto st944;
+tr2793:
        {
                s->loc.long_sign = -1;
        }
@@ -69448,8 +70049,8 @@ tr2756:
                }
                s->multiline = true;
        }
-       goto st917;
-tr2757:
+       goto st944;
+tr2794:
        {
                s->loc.long_sign = -1;
        }
@@ -69460,19 +70061,19 @@ tr2757:
                }
                s->multiline = false;
        }
-       goto st917;
-tr2758:
+       goto st944;
+tr2795:
        {
                s->loc.long_sign = -1;
        }
        {
                s->line_counter++;
        }
-       goto st917;
-st917:
+       goto st944;
+st944:
        if ( ++p == pe )
-               goto _test_eof917;
-case 917:
+               goto _test_eof944;
+case 944:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -69486,25 +70087,25 @@ case 917:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st917;
-               case 32: goto st917;
-               case 40: goto tr2620;
-               case 41: goto tr2621;
-               case 45: goto st918;
-               case 2058: goto tr2622;
-               case 2107: goto tr2623;
+               case 9: goto st944;
+               case 32: goto st944;
+               case 40: goto tr2657;
+               case 41: goto tr2658;
+               case 45: goto st945;
+               case 2058: goto tr2659;
+               case 2107: goto tr2660;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2625;
-       goto tr2535;
-st918:
+               goto tr2662;
+       goto tr2572;
+st945:
        if ( ++p == pe )
-               goto _test_eof918;
-case 918:
+               goto _test_eof945;
+case 945:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2626;
-       goto tr2535;
-tr2631:
+               goto tr2663;
+       goto tr2572;
+tr2668:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -69519,8 +70120,8 @@ tr2631:
                        p--; {goto st307;}
                }
        }
-       goto st919;
-tr2625:
+       goto st946;
+tr2662:
        {
                s->decimals = 2;
        }
@@ -69544,8 +70145,8 @@ tr2625:
                        p--; {goto st307;}
                }
        }
-       goto st919;
-tr2626:
+       goto st946;
+tr2663:
        {
                s->loc.alt_sign = -1;
        }
@@ -69572,11 +70173,11 @@ tr2626:
                        p--; {goto st307;}
                }
        }
-       goto st919;
-st919:
+       goto st946;
+st946:
        if ( ++p == pe )
-               goto _test_eof919;
-case 919:
+               goto _test_eof946;
+case 946:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -69594,23 +70195,23 @@ case 919:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2627;
-               case 32: goto tr2627;
-               case 40: goto tr2628;
-               case 41: goto tr2629;
-               case 46: goto st939;
-               case 109: goto tr2632;
-               case 3082: goto tr2633;
-               case 3131: goto tr2634;
-               case 3338: goto tr2635;
-               case 3387: goto tr2635;
-               case 3594: goto tr2636;
-               case 3643: goto tr2637;
+               case 9: goto tr2664;
+               case 32: goto tr2664;
+               case 40: goto tr2665;
+               case 41: goto tr2666;
+               case 46: goto st966;
+               case 109: goto tr2669;
+               case 3082: goto tr2670;
+               case 3131: goto tr2671;
+               case 3338: goto tr2672;
+               case 3387: goto tr2672;
+               case 3594: goto tr2673;
+               case 3643: goto tr2674;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2631;
-       goto tr2535;
-tr2639:
+               goto tr2668;
+       goto tr2572;
+tr2676:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -69618,8 +70219,8 @@ tr2639:
                }
                s->multiline = true;
        }
-       goto st920;
-tr2640:
+       goto st947;
+tr2677:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -69627,13 +70228,13 @@ tr2640:
                }
                s->multiline = false;
        }
-       goto st920;
-tr2642:
+       goto st947;
+tr2679:
        {
                s->line_counter++;
        }
-       goto st920;
-tr2741:
+       goto st947;
+tr2778:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -69643,15 +70244,15 @@ tr2741:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 920; goto _out;}
+                               {p++; cs = 947; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st920;
-tr2627:
+       goto st947;
+tr2664:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -69674,8 +70275,8 @@ tr2627:
                        p--; {goto st307;}
                }
        }
-       goto st920;
-tr2628:
+       goto st947;
+tr2665:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -69705,8 +70306,8 @@ tr2628:
                }
                s->multiline = true;
        }
-       goto st920;
-tr2629:
+       goto st947;
+tr2666:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -69736,8 +70337,8 @@ tr2629:
                }
                s->multiline = false;
        }
-       goto st920;
-tr2633:
+       goto st947;
+tr2670:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -69763,8 +70364,8 @@ tr2633:
        {
                s->line_counter++;
        }
-       goto st920;
-tr2742:
+       goto st947;
+tr2779:
        {
                s->number64_tmp = s->number64;
        }
@@ -69790,8 +70391,8 @@ tr2742:
                        p--; {goto st307;}
                }
        }
-       goto st920;
-tr2743:
+       goto st947;
+tr2780:
        {
                s->number64_tmp = s->number64;
        }
@@ -69824,8 +70425,8 @@ tr2743:
                }
                s->multiline = true;
        }
-       goto st920;
-tr2744:
+       goto st947;
+tr2781:
        {
                s->number64_tmp = s->number64;
        }
@@ -69858,8 +70459,8 @@ tr2744:
                }
                s->multiline = false;
        }
-       goto st920;
-tr2747:
+       goto st947;
+tr2784:
        {
                s->number64_tmp = s->number64;
        }
@@ -69888,11 +70489,11 @@ tr2747:
        {
                s->line_counter++;
        }
-       goto st920;
-st920:
+       goto st947;
+st947:
        if ( ++p == pe )
-               goto _test_eof920;
-case 920:
+               goto _test_eof947;
+case 947:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -69910,21 +70511,21 @@ case 920:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st920;
-               case 32: goto st920;
-               case 40: goto tr2639;
-               case 41: goto tr2640;
-               case 3082: goto tr2642;
-               case 3131: goto tr2643;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2645;
-               case 3643: goto tr2646;
+               case 9: goto st947;
+               case 32: goto st947;
+               case 40: goto tr2676;
+               case 41: goto tr2677;
+               case 3082: goto tr2679;
+               case 3131: goto tr2680;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2682;
+               case 3643: goto tr2683;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2641;
-       goto tr2535;
-tr2651:
+               goto tr2678;
+       goto tr2572;
+tr2688:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -69939,8 +70540,8 @@ tr2651:
                        p--; {goto st307;}
                }
        }
-       goto st921;
-tr2641:
+       goto st948;
+tr2678:
        {
                s->decimals = 2;
        }
@@ -69964,11 +70565,11 @@ tr2641:
                        p--; {goto st307;}
                }
        }
-       goto st921;
-st921:
+       goto st948;
+st948:
        if ( ++p == pe )
-               goto _test_eof921;
-case 921:
+               goto _test_eof948;
+case 948:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -69986,23 +70587,23 @@ case 921:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2647;
-               case 32: goto tr2647;
-               case 40: goto tr2648;
-               case 41: goto tr2649;
-               case 46: goto st935;
-               case 109: goto tr2652;
-               case 3082: goto tr2653;
-               case 3131: goto tr2654;
-               case 3338: goto tr2655;
-               case 3387: goto tr2655;
-               case 3594: goto tr2656;
-               case 3643: goto tr2657;
+               case 9: goto tr2684;
+               case 32: goto tr2684;
+               case 40: goto tr2685;
+               case 41: goto tr2686;
+               case 46: goto st962;
+               case 109: goto tr2689;
+               case 3082: goto tr2690;
+               case 3131: goto tr2691;
+               case 3338: goto tr2692;
+               case 3387: goto tr2692;
+               case 3594: goto tr2693;
+               case 3643: goto tr2694;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2651;
-       goto tr2535;
-tr2659:
+               goto tr2688;
+       goto tr2572;
+tr2696:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -70010,8 +70611,8 @@ tr2659:
                }
                s->multiline = true;
        }
-       goto st922;
-tr2660:
+       goto st949;
+tr2697:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -70019,13 +70620,13 @@ tr2660:
                }
                s->multiline = false;
        }
-       goto st922;
-tr2662:
+       goto st949;
+tr2699:
        {
                s->line_counter++;
        }
-       goto st922;
-tr2728:
+       goto st949;
+tr2765:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -70035,15 +70636,15 @@ tr2728:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 922; goto _out;}
+                               {p++; cs = 949; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st922;
-tr2647:
+       goto st949;
+tr2684:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70064,8 +70665,8 @@ tr2647:
                        p--; {goto st307;}
                }
        }
-       goto st922;
-tr2648:
+       goto st949;
+tr2685:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70093,8 +70694,8 @@ tr2648:
                }
                s->multiline = true;
        }
-       goto st922;
-tr2649:
+       goto st949;
+tr2686:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70122,8 +70723,8 @@ tr2649:
                }
                s->multiline = false;
        }
-       goto st922;
-tr2653:
+       goto st949;
+tr2690:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70147,8 +70748,8 @@ tr2653:
        {
                s->line_counter++;
        }
-       goto st922;
-tr2729:
+       goto st949;
+tr2766:
        {
                s->number64_tmp = s->number64;
        }
@@ -70172,8 +70773,8 @@ tr2729:
                        p--; {goto st307;}
                }
        }
-       goto st922;
-tr2730:
+       goto st949;
+tr2767:
        {
                s->number64_tmp = s->number64;
        }
@@ -70204,8 +70805,8 @@ tr2730:
                }
                s->multiline = true;
        }
-       goto st922;
-tr2731:
+       goto st949;
+tr2768:
        {
                s->number64_tmp = s->number64;
        }
@@ -70236,8 +70837,8 @@ tr2731:
                }
                s->multiline = false;
        }
-       goto st922;
-tr2734:
+       goto st949;
+tr2771:
        {
                s->number64_tmp = s->number64;
        }
@@ -70264,11 +70865,11 @@ tr2734:
        {
                s->line_counter++;
        }
-       goto st922;
-st922:
+       goto st949;
+st949:
        if ( ++p == pe )
-               goto _test_eof922;
-case 922:
+               goto _test_eof949;
+case 949:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -70286,21 +70887,21 @@ case 922:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st922;
-               case 32: goto st922;
-               case 40: goto tr2659;
-               case 41: goto tr2660;
-               case 3082: goto tr2662;
-               case 3131: goto tr2663;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2664;
-               case 3643: goto tr2665;
+               case 9: goto st949;
+               case 32: goto st949;
+               case 40: goto tr2696;
+               case 41: goto tr2697;
+               case 3082: goto tr2699;
+               case 3131: goto tr2700;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2701;
+               case 3643: goto tr2702;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2661;
-       goto tr2535;
-tr2670:
+               goto tr2698;
+       goto tr2572;
+tr2707:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -70315,8 +70916,8 @@ tr2670:
                        p--; {goto st307;}
                }
        }
-       goto st923;
-tr2661:
+       goto st950;
+tr2698:
        {
                s->decimals = 2;
        }
@@ -70340,11 +70941,11 @@ tr2661:
                        p--; {goto st307;}
                }
        }
-       goto st923;
-st923:
+       goto st950;
+st950:
        if ( ++p == pe )
-               goto _test_eof923;
-case 923:
+               goto _test_eof950;
+case 950:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -70362,23 +70963,23 @@ case 923:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2666;
-               case 32: goto tr2666;
-               case 40: goto tr2667;
-               case 41: goto tr2668;
-               case 46: goto st931;
-               case 109: goto tr2671;
-               case 3082: goto tr2672;
-               case 3131: goto tr2673;
-               case 3338: goto tr2674;
-               case 3387: goto tr2674;
-               case 3594: goto tr2675;
-               case 3643: goto tr2676;
+               case 9: goto tr2703;
+               case 32: goto tr2703;
+               case 40: goto tr2704;
+               case 41: goto tr2705;
+               case 46: goto st958;
+               case 109: goto tr2708;
+               case 3082: goto tr2709;
+               case 3131: goto tr2710;
+               case 3338: goto tr2711;
+               case 3387: goto tr2711;
+               case 3594: goto tr2712;
+               case 3643: goto tr2713;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2670;
-       goto tr2535;
-tr2678:
+               goto tr2707;
+       goto tr2572;
+tr2715:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -70386,8 +70987,8 @@ tr2678:
                }
                s->multiline = true;
        }
-       goto st924;
-tr2679:
+       goto st951;
+tr2716:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -70395,13 +70996,13 @@ tr2679:
                }
                s->multiline = false;
        }
-       goto st924;
-tr2681:
+       goto st951;
+tr2718:
        {
                s->line_counter++;
        }
-       goto st924;
-tr2715:
+       goto st951;
+tr2752:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -70411,15 +71012,15 @@ tr2715:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 924; goto _out;}
+                               {p++; cs = 951; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st924;
-tr2666:
+       goto st951;
+tr2703:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70440,8 +71041,8 @@ tr2666:
                        p--; {goto st307;}
                }
        }
-       goto st924;
-tr2667:
+       goto st951;
+tr2704:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70469,8 +71070,8 @@ tr2667:
                }
                s->multiline = true;
        }
-       goto st924;
-tr2668:
+       goto st951;
+tr2705:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70498,8 +71099,8 @@ tr2668:
                }
                s->multiline = false;
        }
-       goto st924;
-tr2672:
+       goto st951;
+tr2709:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70523,8 +71124,8 @@ tr2672:
        {
                s->line_counter++;
        }
-       goto st924;
-tr2716:
+       goto st951;
+tr2753:
        {
                s->number64_tmp = s->number64;
        }
@@ -70548,8 +71149,8 @@ tr2716:
                        p--; {goto st307;}
                }
        }
-       goto st924;
-tr2717:
+       goto st951;
+tr2754:
        {
                s->number64_tmp = s->number64;
        }
@@ -70580,8 +71181,8 @@ tr2717:
                }
                s->multiline = true;
        }
-       goto st924;
-tr2718:
+       goto st951;
+tr2755:
        {
                s->number64_tmp = s->number64;
        }
@@ -70612,8 +71213,8 @@ tr2718:
                }
                s->multiline = false;
        }
-       goto st924;
-tr2721:
+       goto st951;
+tr2758:
        {
                s->number64_tmp = s->number64;
        }
@@ -70640,11 +71241,11 @@ tr2721:
        {
                s->line_counter++;
        }
-       goto st924;
-st924:
+       goto st951;
+st951:
        if ( ++p == pe )
-               goto _test_eof924;
-case 924:
+               goto _test_eof951;
+case 951:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -70662,21 +71263,21 @@ case 924:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st924;
-               case 32: goto st924;
-               case 40: goto tr2678;
-               case 41: goto tr2679;
-               case 3082: goto tr2681;
-               case 3131: goto tr2682;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2683;
-               case 3643: goto tr2684;
+               case 9: goto st951;
+               case 32: goto st951;
+               case 40: goto tr2715;
+               case 41: goto tr2716;
+               case 3082: goto tr2718;
+               case 3131: goto tr2719;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2720;
+               case 3643: goto tr2721;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2680;
-       goto tr2535;
-tr2689:
+               goto tr2717;
+       goto tr2572;
+tr2726:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -70691,8 +71292,8 @@ tr2689:
                        p--; {goto st307;}
                }
        }
-       goto st925;
-tr2680:
+       goto st952;
+tr2717:
        {
                s->decimals = 2;
        }
@@ -70716,11 +71317,11 @@ tr2680:
                        p--; {goto st307;}
                }
        }
-       goto st925;
-st925:
+       goto st952;
+st952:
        if ( ++p == pe )
-               goto _test_eof925;
-case 925:
+               goto _test_eof952;
+case 952:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -70738,23 +71339,23 @@ case 925:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2685;
-               case 32: goto tr2685;
-               case 40: goto tr2686;
-               case 41: goto tr2687;
-               case 46: goto st928;
-               case 109: goto tr2685;
-               case 3082: goto tr2690;
-               case 3131: goto tr2691;
-               case 3338: goto tr2692;
-               case 3387: goto tr2692;
-               case 3594: goto tr2693;
-               case 3643: goto tr2694;
+               case 9: goto tr2722;
+               case 32: goto tr2722;
+               case 40: goto tr2723;
+               case 41: goto tr2724;
+               case 46: goto st955;
+               case 109: goto tr2722;
+               case 3082: goto tr2727;
+               case 3131: goto tr2728;
+               case 3338: goto tr2729;
+               case 3387: goto tr2729;
+               case 3594: goto tr2730;
+               case 3643: goto tr2731;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2689;
-       goto tr2535;
-tr2696:
+               goto tr2726;
+       goto tr2572;
+tr2733:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -70762,8 +71363,8 @@ tr2696:
                }
                s->multiline = true;
        }
-       goto st926;
-tr2697:
+       goto st953;
+tr2734:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -70771,13 +71372,13 @@ tr2697:
                }
                s->multiline = false;
        }
-       goto st926;
-tr2698:
+       goto st953;
+tr2735:
        {
                s->line_counter++;
        }
-       goto st926;
-tr2703:
+       goto st953;
+tr2740:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -70787,15 +71388,15 @@ tr2703:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 926; goto _out;}
+                               {p++; cs = 953; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st926;
-tr2685:
+       goto st953;
+tr2722:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70816,8 +71417,8 @@ tr2685:
                        p--; {goto st307;}
                }
        }
-       goto st926;
-tr2686:
+       goto st953;
+tr2723:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70845,8 +71446,8 @@ tr2686:
                }
                s->multiline = true;
        }
-       goto st926;
-tr2687:
+       goto st953;
+tr2724:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70874,8 +71475,8 @@ tr2687:
                }
                s->multiline = false;
        }
-       goto st926;
-tr2690:
+       goto st953;
+tr2727:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -70899,8 +71500,8 @@ tr2690:
        {
                s->line_counter++;
        }
-       goto st926;
-tr2704:
+       goto st953;
+tr2741:
        {
                s->number64_tmp = s->number64;
        }
@@ -70924,8 +71525,8 @@ tr2704:
                        p--; {goto st307;}
                }
        }
-       goto st926;
-tr2705:
+       goto st953;
+tr2742:
        {
                s->number64_tmp = s->number64;
        }
@@ -70956,8 +71557,8 @@ tr2705:
                }
                s->multiline = true;
        }
-       goto st926;
-tr2706:
+       goto st953;
+tr2743:
        {
                s->number64_tmp = s->number64;
        }
@@ -70988,8 +71589,8 @@ tr2706:
                }
                s->multiline = false;
        }
-       goto st926;
-tr2708:
+       goto st953;
+tr2745:
        {
                s->number64_tmp = s->number64;
        }
@@ -71016,11 +71617,11 @@ tr2708:
        {
                s->line_counter++;
        }
-       goto st926;
-st926:
+       goto st953;
+st953:
        if ( ++p == pe )
-               goto _test_eof926;
-case 926:
+               goto _test_eof953;
+case 953:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -71038,31 +71639,31 @@ case 926:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st926;
-               case 32: goto st926;
-               case 40: goto tr2696;
-               case 41: goto tr2697;
-               case 3082: goto tr2698;
-               case 3131: goto tr2699;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2700;
-               case 3643: goto tr2701;
-       }
-       goto tr2535;
-tr2699:
+               case 9: goto st953;
+               case 32: goto st953;
+               case 40: goto tr2733;
+               case 41: goto tr2734;
+               case 3082: goto tr2735;
+               case 3131: goto tr2736;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2737;
+               case 3643: goto tr2738;
+       }
+       goto tr2572;
+tr2736:
        {
                s->buffer_length = 0;
        }
-       goto st927;
-tr2702:
+       goto st954;
+tr2739:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st927;
-tr2691:
+       goto st954;
+tr2728:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -71086,8 +71687,8 @@ tr2691:
        {
                s->buffer_length = 0;
        }
-       goto st927;
-tr2709:
+       goto st954;
+tr2746:
        {
                s->number64_tmp = s->number64;
        }
@@ -71114,11 +71715,11 @@ tr2709:
        {
                s->buffer_length = 0;
        }
-       goto st927;
-st927:
+       goto st954;
+st954:
        if ( ++p == pe )
-               goto _test_eof927;
-case 927:
+               goto _test_eof954;
+case 954:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -71138,11 +71739,11 @@ case 927:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2703;
+               goto tr2740;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2702;
-       goto tr2535;
-tr2635:
+               goto tr2739;
+       goto tr2572;
+tr2672:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -71194,8 +71795,8 @@ tr2635:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-tr2644:
+       goto st1472;
+tr2681:
        {
                // Write version.
                *(rdata_tail) = 0;
@@ -71225,8 +71826,8 @@ tr2644:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-tr2655:
+       goto st1472;
+tr2692:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -71276,8 +71877,8 @@ tr2655:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-tr2674:
+       goto st1472;
+tr2711:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -71327,8 +71928,8 @@ tr2674:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-tr2692:
+       goto st1472;
+tr2729:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -71378,8 +71979,8 @@ tr2692:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-tr2710:
+       goto st1472;
+tr2747:
        {
                s->number64_tmp = s->number64;
        }
@@ -71432,8 +72033,8 @@ tr2710:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-tr2723:
+       goto st1472;
+tr2760:
        {
                s->number64_tmp = s->number64;
        }
@@ -71486,8 +72087,8 @@ tr2723:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-tr2736:
+       goto st1472;
+tr2773:
        {
                s->number64_tmp = s->number64;
        }
@@ -71540,8 +72141,8 @@ tr2736:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-tr2749:
+       goto st1472;
+tr2786:
        {
                s->number64_tmp = s->number64;
        }
@@ -71596,13 +72197,13 @@ tr2749:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1445;
-st1445:
+       goto st1472;
+st1472:
        if ( ++p == pe )
-               goto _test_eof1445;
-case 1445:
+               goto _test_eof1472;
+case 1472:
        goto st0;
-tr2700:
+tr2737:
        {
                s->line_counter++;
        }
@@ -71635,8 +72236,8 @@ tr2700:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1446;
-tr2693:
+       goto st1473;
+tr2730:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -71689,8 +72290,8 @@ tr2693:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1446;
-tr2711:
+       goto st1473;
+tr2748:
        {
                s->number64_tmp = s->number64;
        }
@@ -71746,11 +72347,11 @@ tr2711:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1446;
-st1446:
+       goto st1473;
+st1473:
        if ( ++p == pe )
-               goto _test_eof1446;
-case 1446:
+               goto _test_eof1473;
+case 1473:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -71768,19 +72369,19 @@ case 1446:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st926;
-               case 32: goto st926;
-               case 40: goto tr2696;
-               case 41: goto tr2697;
-               case 3082: goto tr2698;
-               case 3131: goto tr2699;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2700;
-               case 3643: goto tr2701;
-       }
-       goto tr2535;
-tr2701:
+               case 9: goto st953;
+               case 32: goto st953;
+               case 40: goto tr2733;
+               case 41: goto tr2734;
+               case 3082: goto tr2735;
+               case 3131: goto tr2736;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2737;
+               case 3643: goto tr2738;
+       }
+       goto tr2572;
+tr2738:
        {
                s->buffer_length = 0;
        }
@@ -71813,8 +72414,8 @@ tr2701:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1447;
-tr2694:
+       goto st1474;
+tr2731:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -71867,8 +72468,8 @@ tr2694:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1447;
-tr2712:
+       goto st1474;
+tr2749:
        {
                s->number64_tmp = s->number64;
        }
@@ -71924,11 +72525,11 @@ tr2712:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1447;
-st1447:
+       goto st1474;
+st1474:
        if ( ++p == pe )
-               goto _test_eof1447;
-case 1447:
+               goto _test_eof1474;
+case 1474:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -71948,14 +72549,14 @@ case 1447:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2703;
+               goto tr2740;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2702;
-       goto tr2535;
-st928:
+               goto tr2739;
+       goto tr2572;
+st955:
        if ( ++p == pe )
-               goto _test_eof928;
-case 928:
+               goto _test_eof955;
+case 955:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -71973,22 +72574,22 @@ case 928:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2704;
-               case 32: goto tr2704;
-               case 40: goto tr2705;
-               case 41: goto tr2706;
-               case 109: goto tr2704;
-               case 3082: goto tr2708;
-               case 3131: goto tr2709;
-               case 3338: goto tr2710;
-               case 3387: goto tr2710;
-               case 3594: goto tr2711;
-               case 3643: goto tr2712;
+               case 9: goto tr2741;
+               case 32: goto tr2741;
+               case 40: goto tr2742;
+               case 41: goto tr2743;
+               case 109: goto tr2741;
+               case 3082: goto tr2745;
+               case 3131: goto tr2746;
+               case 3338: goto tr2747;
+               case 3387: goto tr2747;
+               case 3594: goto tr2748;
+               case 3643: goto tr2749;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2707;
-       goto tr2535;
-tr2707:
+               goto tr2744;
+       goto tr2572;
+tr2744:
        {
                s->number64_tmp = s->number64;
        }
@@ -72012,8 +72613,8 @@ tr2707:
        {
                s->decimal_counter++;
        }
-       goto st929;
-tr2713:
+       goto st956;
+tr2750:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -72031,11 +72632,11 @@ tr2713:
        {
                s->decimal_counter++;
        }
-       goto st929;
-st929:
+       goto st956;
+st956:
        if ( ++p == pe )
-               goto _test_eof929;
-case 929:
+               goto _test_eof956;
+case 956:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -72053,34 +72654,34 @@ case 929:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2685;
-               case 32: goto tr2685;
-               case 40: goto tr2686;
-               case 41: goto tr2687;
-               case 109: goto tr2685;
-               case 3082: goto tr2690;
-               case 3131: goto tr2691;
-               case 3338: goto tr2692;
-               case 3387: goto tr2692;
-               case 3594: goto tr2693;
-               case 3643: goto tr2694;
+               case 9: goto tr2722;
+               case 32: goto tr2722;
+               case 40: goto tr2723;
+               case 41: goto tr2724;
+               case 109: goto tr2722;
+               case 3082: goto tr2727;
+               case 3131: goto tr2728;
+               case 3338: goto tr2729;
+               case 3387: goto tr2729;
+               case 3594: goto tr2730;
+               case 3643: goto tr2731;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2713;
-       goto tr2535;
-tr2682:
+               goto tr2750;
+       goto tr2572;
+tr2719:
        {
                s->buffer_length = 0;
        }
-       goto st930;
-tr2714:
+       goto st957;
+tr2751:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st930;
-tr2673:
+       goto st957;
+tr2710:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -72104,8 +72705,8 @@ tr2673:
        {
                s->buffer_length = 0;
        }
-       goto st930;
-tr2722:
+       goto st957;
+tr2759:
        {
                s->number64_tmp = s->number64;
        }
@@ -72132,11 +72733,11 @@ tr2722:
        {
                s->buffer_length = 0;
        }
-       goto st930;
-st930:
+       goto st957;
+st957:
        if ( ++p == pe )
-               goto _test_eof930;
-case 930:
+               goto _test_eof957;
+case 957:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -72156,11 +72757,11 @@ case 930:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2715;
+               goto tr2752;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2714;
-       goto tr2535;
-tr2683:
+               goto tr2751;
+       goto tr2572;
+tr2720:
        {
                s->line_counter++;
        }
@@ -72193,8 +72794,8 @@ tr2683:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1448;
-tr2675:
+       goto st1475;
+tr2712:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -72247,8 +72848,8 @@ tr2675:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1448;
-tr2724:
+       goto st1475;
+tr2761:
        {
                s->number64_tmp = s->number64;
        }
@@ -72304,11 +72905,11 @@ tr2724:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1448;
-st1448:
+       goto st1475;
+st1475:
        if ( ++p == pe )
-               goto _test_eof1448;
-case 1448:
+               goto _test_eof1475;
+case 1475:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -72326,21 +72927,21 @@ case 1448:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st924;
-               case 32: goto st924;
-               case 40: goto tr2678;
-               case 41: goto tr2679;
-               case 3082: goto tr2681;
-               case 3131: goto tr2682;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2683;
-               case 3643: goto tr2684;
+               case 9: goto st951;
+               case 32: goto st951;
+               case 40: goto tr2715;
+               case 41: goto tr2716;
+               case 3082: goto tr2718;
+               case 3131: goto tr2719;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2720;
+               case 3643: goto tr2721;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2680;
-       goto tr2535;
-tr2684:
+               goto tr2717;
+       goto tr2572;
+tr2721:
        {
                s->buffer_length = 0;
        }
@@ -72373,8 +72974,8 @@ tr2684:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1449;
-tr2676:
+       goto st1476;
+tr2713:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -72427,8 +73028,8 @@ tr2676:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1449;
-tr2725:
+       goto st1476;
+tr2762:
        {
                s->number64_tmp = s->number64;
        }
@@ -72484,11 +73085,11 @@ tr2725:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1449;
-st1449:
+       goto st1476;
+st1476:
        if ( ++p == pe )
-               goto _test_eof1449;
-case 1449:
+               goto _test_eof1476;
+case 1476:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -72508,14 +73109,14 @@ case 1449:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2715;
+               goto tr2752;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2714;
-       goto tr2535;
-st931:
+               goto tr2751;
+       goto tr2572;
+st958:
        if ( ++p == pe )
-               goto _test_eof931;
-case 931:
+               goto _test_eof958;
+case 958:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -72533,22 +73134,22 @@ case 931:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2716;
-               case 32: goto tr2716;
-               case 40: goto tr2717;
-               case 41: goto tr2718;
-               case 109: goto tr2720;
-               case 3082: goto tr2721;
-               case 3131: goto tr2722;
-               case 3338: goto tr2723;
-               case 3387: goto tr2723;
-               case 3594: goto tr2724;
-               case 3643: goto tr2725;
+               case 9: goto tr2753;
+               case 32: goto tr2753;
+               case 40: goto tr2754;
+               case 41: goto tr2755;
+               case 109: goto tr2757;
+               case 3082: goto tr2758;
+               case 3131: goto tr2759;
+               case 3338: goto tr2760;
+               case 3387: goto tr2760;
+               case 3594: goto tr2761;
+               case 3643: goto tr2762;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2719;
-       goto tr2535;
-tr2719:
+               goto tr2756;
+       goto tr2572;
+tr2756:
        {
                s->number64_tmp = s->number64;
        }
@@ -72572,8 +73173,8 @@ tr2719:
        {
                s->decimal_counter++;
        }
-       goto st932;
-tr2726:
+       goto st959;
+tr2763:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -72591,11 +73192,11 @@ tr2726:
        {
                s->decimal_counter++;
        }
-       goto st932;
-st932:
+       goto st959;
+st959:
        if ( ++p == pe )
-               goto _test_eof932;
-case 932:
+               goto _test_eof959;
+case 959:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -72613,22 +73214,22 @@ case 932:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2666;
-               case 32: goto tr2666;
-               case 40: goto tr2667;
-               case 41: goto tr2668;
-               case 109: goto tr2671;
-               case 3082: goto tr2672;
-               case 3131: goto tr2673;
-               case 3338: goto tr2674;
-               case 3387: goto tr2674;
-               case 3594: goto tr2675;
-               case 3643: goto tr2676;
+               case 9: goto tr2703;
+               case 32: goto tr2703;
+               case 40: goto tr2704;
+               case 41: goto tr2705;
+               case 109: goto tr2708;
+               case 3082: goto tr2709;
+               case 3131: goto tr2710;
+               case 3338: goto tr2711;
+               case 3387: goto tr2711;
+               case 3594: goto tr2712;
+               case 3643: goto tr2713;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2726;
-       goto tr2535;
-tr2671:
+               goto tr2763;
+       goto tr2572;
+tr2708:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -72649,8 +73250,8 @@ tr2671:
                        p--; {goto st307;}
                }
        }
-       goto st933;
-tr2720:
+       goto st960;
+tr2757:
        {
                s->number64_tmp = s->number64;
        }
@@ -72674,11 +73275,11 @@ tr2720:
                        p--; {goto st307;}
                }
        }
-       goto st933;
-st933:
+       goto st960;
+st960:
        if ( ++p == pe )
-               goto _test_eof933;
-case 933:
+               goto _test_eof960;
+case 960:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -72696,31 +73297,31 @@ case 933:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st924;
-               case 32: goto st924;
-               case 40: goto tr2678;
-               case 41: goto tr2679;
-               case 3082: goto tr2681;
-               case 3131: goto tr2682;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2683;
-               case 3643: goto tr2684;
-       }
-       goto tr2535;
-tr2663:
+               case 9: goto st951;
+               case 32: goto st951;
+               case 40: goto tr2715;
+               case 41: goto tr2716;
+               case 3082: goto tr2718;
+               case 3131: goto tr2719;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2720;
+               case 3643: goto tr2721;
+       }
+       goto tr2572;
+tr2700:
        {
                s->buffer_length = 0;
        }
-       goto st934;
-tr2727:
+       goto st961;
+tr2764:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st934;
-tr2654:
+       goto st961;
+tr2691:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -72744,8 +73345,8 @@ tr2654:
        {
                s->buffer_length = 0;
        }
-       goto st934;
-tr2735:
+       goto st961;
+tr2772:
        {
                s->number64_tmp = s->number64;
        }
@@ -72772,11 +73373,11 @@ tr2735:
        {
                s->buffer_length = 0;
        }
-       goto st934;
-st934:
+       goto st961;
+st961:
        if ( ++p == pe )
-               goto _test_eof934;
-case 934:
+               goto _test_eof961;
+case 961:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -72796,11 +73397,11 @@ case 934:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2728;
+               goto tr2765;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2727;
-       goto tr2535;
-tr2664:
+               goto tr2764;
+       goto tr2572;
+tr2701:
        {
                s->line_counter++;
        }
@@ -72833,8 +73434,8 @@ tr2664:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1450;
-tr2656:
+       goto st1477;
+tr2693:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -72887,8 +73488,8 @@ tr2656:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1450;
-tr2737:
+       goto st1477;
+tr2774:
        {
                s->number64_tmp = s->number64;
        }
@@ -72944,11 +73545,11 @@ tr2737:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1450;
-st1450:
+       goto st1477;
+st1477:
        if ( ++p == pe )
-               goto _test_eof1450;
-case 1450:
+               goto _test_eof1477;
+case 1477:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -72966,21 +73567,21 @@ case 1450:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st922;
-               case 32: goto st922;
-               case 40: goto tr2659;
-               case 41: goto tr2660;
-               case 3082: goto tr2662;
-               case 3131: goto tr2663;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2664;
-               case 3643: goto tr2665;
+               case 9: goto st949;
+               case 32: goto st949;
+               case 40: goto tr2696;
+               case 41: goto tr2697;
+               case 3082: goto tr2699;
+               case 3131: goto tr2700;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2701;
+               case 3643: goto tr2702;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2661;
-       goto tr2535;
-tr2665:
+               goto tr2698;
+       goto tr2572;
+tr2702:
        {
                s->buffer_length = 0;
        }
@@ -73013,8 +73614,8 @@ tr2665:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1451;
-tr2657:
+       goto st1478;
+tr2694:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -73067,8 +73668,8 @@ tr2657:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1451;
-tr2738:
+       goto st1478;
+tr2775:
        {
                s->number64_tmp = s->number64;
        }
@@ -73124,11 +73725,11 @@ tr2738:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1451;
-st1451:
+       goto st1478;
+st1478:
        if ( ++p == pe )
-               goto _test_eof1451;
-case 1451:
+               goto _test_eof1478;
+case 1478:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -73148,14 +73749,14 @@ case 1451:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2728;
+               goto tr2765;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2727;
-       goto tr2535;
-st935:
+               goto tr2764;
+       goto tr2572;
+st962:
        if ( ++p == pe )
-               goto _test_eof935;
-case 935:
+               goto _test_eof962;
+case 962:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -73173,22 +73774,22 @@ case 935:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2729;
-               case 32: goto tr2729;
-               case 40: goto tr2730;
-               case 41: goto tr2731;
-               case 109: goto tr2733;
-               case 3082: goto tr2734;
-               case 3131: goto tr2735;
-               case 3338: goto tr2736;
-               case 3387: goto tr2736;
-               case 3594: goto tr2737;
-               case 3643: goto tr2738;
+               case 9: goto tr2766;
+               case 32: goto tr2766;
+               case 40: goto tr2767;
+               case 41: goto tr2768;
+               case 109: goto tr2770;
+               case 3082: goto tr2771;
+               case 3131: goto tr2772;
+               case 3338: goto tr2773;
+               case 3387: goto tr2773;
+               case 3594: goto tr2774;
+               case 3643: goto tr2775;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2732;
-       goto tr2535;
-tr2732:
+               goto tr2769;
+       goto tr2572;
+tr2769:
        {
                s->number64_tmp = s->number64;
        }
@@ -73212,8 +73813,8 @@ tr2732:
        {
                s->decimal_counter++;
        }
-       goto st936;
-tr2739:
+       goto st963;
+tr2776:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -73231,11 +73832,11 @@ tr2739:
        {
                s->decimal_counter++;
        }
-       goto st936;
-st936:
+       goto st963;
+st963:
        if ( ++p == pe )
-               goto _test_eof936;
-case 936:
+               goto _test_eof963;
+case 963:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -73253,22 +73854,22 @@ case 936:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2647;
-               case 32: goto tr2647;
-               case 40: goto tr2648;
-               case 41: goto tr2649;
-               case 109: goto tr2652;
-               case 3082: goto tr2653;
-               case 3131: goto tr2654;
-               case 3338: goto tr2655;
-               case 3387: goto tr2655;
-               case 3594: goto tr2656;
-               case 3643: goto tr2657;
+               case 9: goto tr2684;
+               case 32: goto tr2684;
+               case 40: goto tr2685;
+               case 41: goto tr2686;
+               case 109: goto tr2689;
+               case 3082: goto tr2690;
+               case 3131: goto tr2691;
+               case 3338: goto tr2692;
+               case 3387: goto tr2692;
+               case 3594: goto tr2693;
+               case 3643: goto tr2694;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2739;
-       goto tr2535;
-tr2652:
+               goto tr2776;
+       goto tr2572;
+tr2689:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -73289,8 +73890,8 @@ tr2652:
                        p--; {goto st307;}
                }
        }
-       goto st937;
-tr2733:
+       goto st964;
+tr2770:
        {
                s->number64_tmp = s->number64;
        }
@@ -73314,11 +73915,11 @@ tr2733:
                        p--; {goto st307;}
                }
        }
-       goto st937;
-st937:
+       goto st964;
+st964:
        if ( ++p == pe )
-               goto _test_eof937;
-case 937:
+               goto _test_eof964;
+case 964:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -73336,31 +73937,31 @@ case 937:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st922;
-               case 32: goto st922;
-               case 40: goto tr2659;
-               case 41: goto tr2660;
-               case 3082: goto tr2662;
-               case 3131: goto tr2663;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2664;
-               case 3643: goto tr2665;
-       }
-       goto tr2535;
-tr2643:
+               case 9: goto st949;
+               case 32: goto st949;
+               case 40: goto tr2696;
+               case 41: goto tr2697;
+               case 3082: goto tr2699;
+               case 3131: goto tr2700;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2701;
+               case 3643: goto tr2702;
+       }
+       goto tr2572;
+tr2680:
        {
                s->buffer_length = 0;
        }
-       goto st938;
-tr2740:
+       goto st965;
+tr2777:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st938;
-tr2634:
+       goto st965;
+tr2671:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -73386,8 +73987,8 @@ tr2634:
        {
                s->buffer_length = 0;
        }
-       goto st938;
-tr2748:
+       goto st965;
+tr2785:
        {
                s->number64_tmp = s->number64;
        }
@@ -73416,11 +74017,11 @@ tr2748:
        {
                s->buffer_length = 0;
        }
-       goto st938;
-st938:
+       goto st965;
+st965:
        if ( ++p == pe )
-               goto _test_eof938;
-case 938:
+               goto _test_eof965;
+case 965:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -73440,11 +74041,11 @@ case 938:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2741;
+               goto tr2778;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2740;
-       goto tr2535;
-tr2636:
+               goto tr2777;
+       goto tr2572;
+tr2673:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -73499,8 +74100,8 @@ tr2636:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1452;
-tr2645:
+       goto st1479;
+tr2682:
        {
                s->line_counter++;
        }
@@ -73533,8 +74134,8 @@ tr2645:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1452;
-tr2750:
+       goto st1479;
+tr2787:
        {
                s->number64_tmp = s->number64;
        }
@@ -73592,11 +74193,11 @@ tr2750:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1452;
-st1452:
+       goto st1479;
+st1479:
        if ( ++p == pe )
-               goto _test_eof1452;
-case 1452:
+               goto _test_eof1479;
+case 1479:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -73614,21 +74215,21 @@ case 1452:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st920;
-               case 32: goto st920;
-               case 40: goto tr2639;
-               case 41: goto tr2640;
-               case 3082: goto tr2642;
-               case 3131: goto tr2643;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2645;
-               case 3643: goto tr2646;
+               case 9: goto st947;
+               case 32: goto st947;
+               case 40: goto tr2676;
+               case 41: goto tr2677;
+               case 3082: goto tr2679;
+               case 3131: goto tr2680;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2682;
+               case 3643: goto tr2683;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2641;
-       goto tr2535;
-tr2637:
+               goto tr2678;
+       goto tr2572;
+tr2674:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -73683,8 +74284,8 @@ tr2637:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1453;
-tr2646:
+       goto st1480;
+tr2683:
        {
                s->buffer_length = 0;
        }
@@ -73717,8 +74318,8 @@ tr2646:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1453;
-tr2751:
+       goto st1480;
+tr2788:
        {
                s->number64_tmp = s->number64;
        }
@@ -73776,11 +74377,11 @@ tr2751:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1453;
-st1453:
+       goto st1480;
+st1480:
        if ( ++p == pe )
-               goto _test_eof1453;
-case 1453:
+               goto _test_eof1480;
+case 1480:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -73800,14 +74401,14 @@ case 1453:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2741;
+               goto tr2778;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2740;
-       goto tr2535;
-st939:
+               goto tr2777;
+       goto tr2572;
+st966:
        if ( ++p == pe )
-               goto _test_eof939;
-case 939:
+               goto _test_eof966;
+case 966:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -73825,22 +74426,22 @@ case 939:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2742;
-               case 32: goto tr2742;
-               case 40: goto tr2743;
-               case 41: goto tr2744;
-               case 109: goto tr2746;
-               case 3082: goto tr2747;
-               case 3131: goto tr2748;
-               case 3338: goto tr2749;
-               case 3387: goto tr2749;
-               case 3594: goto tr2750;
-               case 3643: goto tr2751;
+               case 9: goto tr2779;
+               case 32: goto tr2779;
+               case 40: goto tr2780;
+               case 41: goto tr2781;
+               case 109: goto tr2783;
+               case 3082: goto tr2784;
+               case 3131: goto tr2785;
+               case 3338: goto tr2786;
+               case 3387: goto tr2786;
+               case 3594: goto tr2787;
+               case 3643: goto tr2788;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2745;
-       goto tr2535;
-tr2745:
+               goto tr2782;
+       goto tr2572;
+tr2782:
        {
                s->number64_tmp = s->number64;
        }
@@ -73864,8 +74465,8 @@ tr2745:
        {
                s->decimal_counter++;
        }
-       goto st940;
-tr2752:
+       goto st967;
+tr2789:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -73883,11 +74484,11 @@ tr2752:
        {
                s->decimal_counter++;
        }
-       goto st940;
-st940:
+       goto st967;
+st967:
        if ( ++p == pe )
-               goto _test_eof940;
-case 940:
+               goto _test_eof967;
+case 967:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -73905,22 +74506,22 @@ case 940:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2627;
-               case 32: goto tr2627;
-               case 40: goto tr2628;
-               case 41: goto tr2629;
-               case 109: goto tr2632;
-               case 3082: goto tr2633;
-               case 3131: goto tr2634;
-               case 3338: goto tr2635;
-               case 3387: goto tr2635;
-               case 3594: goto tr2636;
-               case 3643: goto tr2637;
+               case 9: goto tr2664;
+               case 32: goto tr2664;
+               case 40: goto tr2665;
+               case 41: goto tr2666;
+               case 109: goto tr2669;
+               case 3082: goto tr2670;
+               case 3131: goto tr2671;
+               case 3338: goto tr2672;
+               case 3387: goto tr2672;
+               case 3594: goto tr2673;
+               case 3643: goto tr2674;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2752;
-       goto tr2535;
-tr2632:
+               goto tr2789;
+       goto tr2572;
+tr2669:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -73943,8 +74544,8 @@ tr2632:
                        p--; {goto st307;}
                }
        }
-       goto st941;
-tr2746:
+       goto st968;
+tr2783:
        {
                s->number64_tmp = s->number64;
        }
@@ -73970,11 +74571,11 @@ tr2746:
                        p--; {goto st307;}
                }
        }
-       goto st941;
-st941:
+       goto st968;
+st968:
        if ( ++p == pe )
-               goto _test_eof941;
-case 941:
+               goto _test_eof968;
+case 968:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -73992,42 +74593,42 @@ case 941:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st920;
-               case 32: goto st920;
-               case 40: goto tr2639;
-               case 41: goto tr2640;
-               case 3082: goto tr2642;
-               case 3131: goto tr2643;
-               case 3338: goto tr2644;
-               case 3387: goto tr2644;
-               case 3594: goto tr2645;
-               case 3643: goto tr2646;
-       }
-       goto tr2535;
-tr2623:
+               case 9: goto st947;
+               case 32: goto st947;
+               case 40: goto tr2676;
+               case 41: goto tr2677;
+               case 3082: goto tr2679;
+               case 3131: goto tr2680;
+               case 3338: goto tr2681;
+               case 3387: goto tr2681;
+               case 3594: goto tr2682;
+               case 3643: goto tr2683;
+       }
+       goto tr2572;
+tr2660:
        {
                s->buffer_length = 0;
        }
-       goto st942;
-tr2753:
+       goto st969;
+tr2790:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st942;
-tr2759:
+       goto st969;
+tr2796:
        {
                s->loc.long_sign = -1;
        }
        {
                s->buffer_length = 0;
        }
-       goto st942;
-st942:
+       goto st969;
+st969:
        if ( ++p == pe )
-               goto _test_eof942;
-case 942:
+               goto _test_eof969;
+case 969:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -74047,14 +74648,14 @@ case 942:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2754;
+               goto tr2791;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2753;
-       goto tr2535;
-st943:
+               goto tr2790;
+       goto tr2572;
+st970:
        if ( ++p == pe )
-               goto _test_eof943;
-case 943:
+               goto _test_eof970;
+case 970:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74068,27 +74669,27 @@ case 943:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2755;
-               case 32: goto tr2755;
-               case 40: goto tr2756;
-               case 41: goto tr2757;
-               case 2058: goto tr2758;
-               case 2107: goto tr2759;
+               case 9: goto tr2792;
+               case 32: goto tr2792;
+               case 40: goto tr2793;
+               case 41: goto tr2794;
+               case 2058: goto tr2795;
+               case 2107: goto tr2796;
        }
-       goto tr2535;
-tr2618:
+       goto tr2572;
+tr2655:
        {
                s->buffer_length = 0;
        }
-       goto st944;
-tr2760:
+       goto st971;
+tr2797:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st944;
-tr2613:
+       goto st971;
+tr2650:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -74112,8 +74713,8 @@ tr2613:
        {
                s->buffer_length = 0;
        }
-       goto st944;
-tr2767:
+       goto st971;
+tr2804:
        {
                s->number64_tmp = s->number64;
        }
@@ -74140,11 +74741,11 @@ tr2767:
        {
                s->buffer_length = 0;
        }
-       goto st944;
-st944:
+       goto st971;
+st971:
        if ( ++p == pe )
-               goto _test_eof944;
-case 944:
+               goto _test_eof971;
+case 971:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -74164,14 +74765,14 @@ case 944:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2761;
+               goto tr2798;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2760;
-       goto tr2535;
-st945:
+               goto tr2797;
+       goto tr2572;
+st972:
        if ( ++p == pe )
-               goto _test_eof945;
-case 945:
+               goto _test_eof972;
+case 972:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74185,17 +74786,17 @@ case 945:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2762;
-               case 32: goto tr2762;
-               case 40: goto tr2763;
-               case 41: goto tr2764;
-               case 2058: goto tr2766;
-               case 2107: goto tr2767;
+               case 9: goto tr2799;
+               case 32: goto tr2799;
+               case 40: goto tr2800;
+               case 41: goto tr2801;
+               case 2058: goto tr2803;
+               case 2107: goto tr2804;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2765;
-       goto tr2535;
-tr2765:
+               goto tr2802;
+       goto tr2572;
+tr2802:
        {
                s->number64_tmp = s->number64;
        }
@@ -74219,8 +74820,8 @@ tr2765:
        {
                s->decimal_counter++;
        }
-       goto st946;
-tr2768:
+       goto st973;
+tr2805:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -74238,11 +74839,11 @@ tr2768:
        {
                s->decimal_counter++;
        }
-       goto st946;
-st946:
+       goto st973;
+st973:
        if ( ++p == pe )
-               goto _test_eof946;
-case 946:
+               goto _test_eof973;
+case 973:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74256,29 +74857,29 @@ case 946:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2607;
-               case 32: goto tr2607;
-               case 40: goto tr2608;
-               case 41: goto tr2609;
-               case 2058: goto tr2612;
-               case 2107: goto tr2613;
+               case 9: goto tr2644;
+               case 32: goto tr2644;
+               case 40: goto tr2645;
+               case 41: goto tr2646;
+               case 2058: goto tr2649;
+               case 2107: goto tr2650;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2768;
-       goto tr2535;
-tr2606:
+               goto tr2805;
+       goto tr2572;
+tr2643:
        {
                s->buffer_length = 0;
        }
-       goto st947;
-tr2769:
+       goto st974;
+tr2806:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st947;
-tr2600:
+       goto st974;
+tr2637:
        {
                if (s->number64 <= 59) {
                        s->loc.m2 = (uint32_t)(s->number64);
@@ -74290,11 +74891,11 @@ tr2600:
        {
                s->buffer_length = 0;
        }
-       goto st947;
-st947:
+       goto st974;
+st974:
        if ( ++p == pe )
-               goto _test_eof947;
-case 947:
+               goto _test_eof974;
+case 974:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -74314,23 +74915,23 @@ case 947:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2770;
+               goto tr2807;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2769;
-       goto tr2535;
-tr2594:
+               goto tr2806;
+       goto tr2572;
+tr2631:
        {
                s->buffer_length = 0;
        }
-       goto st948;
-tr2771:
+       goto st975;
+tr2808:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st948;
-tr2586:
+       goto st975;
+tr2623:
        {
                if (s->number64 <= 180) {
                        s->loc.d2 = (uint32_t)(s->number64);
@@ -74342,11 +74943,11 @@ tr2586:
        {
                s->buffer_length = 0;
        }
-       goto st948;
-st948:
+       goto st975;
+st975:
        if ( ++p == pe )
-               goto _test_eof948;
-case 948:
+               goto _test_eof975;
+case 975:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -74366,34 +74967,34 @@ case 948:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2772;
+               goto tr2809;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2771;
-       goto tr2535;
-tr2579:
+               goto tr2808;
+       goto tr2572;
+tr2616:
        {
                s->buffer_length = 0;
        }
-       goto st949;
-tr2773:
+       goto st976;
+tr2810:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st949;
-tr2779:
+       goto st976;
+tr2816:
        {
                s->loc.lat_sign = -1;
        }
        {
                s->buffer_length = 0;
        }
-       goto st949;
-st949:
+       goto st976;
+st976:
        if ( ++p == pe )
-               goto _test_eof949;
-case 949:
+               goto _test_eof976;
+case 976:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -74413,14 +75014,14 @@ case 949:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2774;
+               goto tr2811;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2773;
-       goto tr2535;
-st950:
+               goto tr2810;
+       goto tr2572;
+st977:
        if ( ++p == pe )
-               goto _test_eof950;
-case 950:
+               goto _test_eof977;
+case 977:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74434,27 +75035,27 @@ case 950:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2775;
-               case 32: goto tr2775;
-               case 40: goto tr2776;
-               case 41: goto tr2777;
-               case 2058: goto tr2778;
-               case 2107: goto tr2779;
+               case 9: goto tr2812;
+               case 32: goto tr2812;
+               case 40: goto tr2813;
+               case 41: goto tr2814;
+               case 2058: goto tr2815;
+               case 2107: goto tr2816;
        }
-       goto tr2535;
-tr2574:
+       goto tr2572;
+tr2611:
        {
                s->buffer_length = 0;
        }
-       goto st951;
-tr2780:
+       goto st978;
+tr2817:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st951;
-tr2569:
+       goto st978;
+tr2606:
        {
                if (s->decimal_counter == 0 && s->number64 < UINT32_MAX) {
                        s->number64 *= pow(10, s->decimals);
@@ -74478,8 +75079,8 @@ tr2569:
        {
                s->buffer_length = 0;
        }
-       goto st951;
-tr2787:
+       goto st978;
+tr2824:
        {
                s->number64_tmp = s->number64;
        }
@@ -74506,11 +75107,11 @@ tr2787:
        {
                s->buffer_length = 0;
        }
-       goto st951;
-st951:
+       goto st978;
+st978:
        if ( ++p == pe )
-               goto _test_eof951;
-case 951:
+               goto _test_eof978;
+case 978:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -74530,14 +75131,14 @@ case 951:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2781;
+               goto tr2818;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2780;
-       goto tr2535;
-st952:
+               goto tr2817;
+       goto tr2572;
+st979:
        if ( ++p == pe )
-               goto _test_eof952;
-case 952:
+               goto _test_eof979;
+case 979:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74551,17 +75152,17 @@ case 952:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2782;
-               case 32: goto tr2782;
-               case 40: goto tr2783;
-               case 41: goto tr2784;
-               case 2058: goto tr2786;
-               case 2107: goto tr2787;
+               case 9: goto tr2819;
+               case 32: goto tr2819;
+               case 40: goto tr2820;
+               case 41: goto tr2821;
+               case 2058: goto tr2823;
+               case 2107: goto tr2824;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2785;
-       goto tr2535;
-tr2785:
+               goto tr2822;
+       goto tr2572;
+tr2822:
        {
                s->number64_tmp = s->number64;
        }
@@ -74585,8 +75186,8 @@ tr2785:
        {
                s->decimal_counter++;
        }
-       goto st953;
-tr2788:
+       goto st980;
+tr2825:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -74604,11 +75205,11 @@ tr2788:
        {
                s->decimal_counter++;
        }
-       goto st953;
-st953:
+       goto st980;
+st980:
        if ( ++p == pe )
-               goto _test_eof953;
-case 953:
+               goto _test_eof980;
+case 980:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74622,29 +75223,29 @@ case 953:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2563;
-               case 32: goto tr2563;
-               case 40: goto tr2564;
-               case 41: goto tr2565;
-               case 2058: goto tr2568;
-               case 2107: goto tr2569;
+               case 9: goto tr2600;
+               case 32: goto tr2600;
+               case 40: goto tr2601;
+               case 41: goto tr2602;
+               case 2058: goto tr2605;
+               case 2107: goto tr2606;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2788;
-       goto tr2535;
-tr2562:
+               goto tr2825;
+       goto tr2572;
+tr2599:
        {
                s->buffer_length = 0;
        }
-       goto st954;
-tr2789:
+       goto st981;
+tr2826:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st954;
-tr2556:
+       goto st981;
+tr2593:
        {
                if (s->number64 <= 59) {
                        s->loc.m1 = (uint32_t)(s->number64);
@@ -74656,11 +75257,11 @@ tr2556:
        {
                s->buffer_length = 0;
        }
-       goto st954;
-st954:
+       goto st981;
+st981:
        if ( ++p == pe )
-               goto _test_eof954;
-case 954:
+               goto _test_eof981;
+case 981:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -74680,23 +75281,23 @@ case 954:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2790;
+               goto tr2827;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2789;
-       goto tr2535;
-tr2550:
+               goto tr2826;
+       goto tr2572;
+tr2587:
        {
                s->buffer_length = 0;
        }
-       goto st955;
-tr2791:
+       goto st982;
+tr2828:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st955;
-tr2542:
+       goto st982;
+tr2579:
        {
                if (s->number64 <= 90) {
                        s->loc.d1 = (uint32_t)(s->number64);
@@ -74708,11 +75309,11 @@ tr2542:
        {
                s->buffer_length = 0;
        }
-       goto st955;
-st955:
+       goto st982;
+st982:
        if ( ++p == pe )
-               goto _test_eof955;
-case 955:
+               goto _test_eof982;
+case 982:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -74732,18 +75333,18 @@ case 955:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2792;
+               goto tr2829;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2791;
-       goto tr2535;
-st956:
+               goto tr2828;
+       goto tr2572;
+st983:
        if ( ++p == pe )
-               goto _test_eof956;
-case 956:
+               goto _test_eof983;
+case 983:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2793;
-       goto tr2327;
-tr2793:
+               goto tr2830;
+       goto tr2364;
+tr2830:
        {
                s->number64 = 0;
        }
@@ -74761,8 +75362,8 @@ tr2793:
                        p--; {goto st307;}
                }
        }
-       goto st957;
-tr2797:
+       goto st984;
+tr2834:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -74777,11 +75378,11 @@ tr2797:
                        p--; {goto st307;}
                }
        }
-       goto st957;
-st957:
+       goto st984;
+st984:
        if ( ++p == pe )
-               goto _test_eof957;
-case 957:
+               goto _test_eof984;
+case 984:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74795,17 +75396,17 @@ case 957:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2794;
-               case 32: goto tr2794;
-               case 40: goto tr2795;
-               case 41: goto tr2796;
-               case 2058: goto tr2798;
-               case 2107: goto tr2799;
+               case 9: goto tr2831;
+               case 32: goto tr2831;
+               case 40: goto tr2832;
+               case 41: goto tr2833;
+               case 2058: goto tr2835;
+               case 2107: goto tr2836;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2797;
-       goto tr2327;
-tr2801:
+               goto tr2834;
+       goto tr2364;
+tr2838:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -74813,8 +75414,8 @@ tr2801:
                }
                s->multiline = true;
        }
-       goto st958;
-tr2802:
+       goto st985;
+tr2839:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -74822,13 +75423,13 @@ tr2802:
                }
                s->multiline = false;
        }
-       goto st958;
-tr2804:
+       goto st985;
+tr2841:
        {
                s->line_counter++;
        }
-       goto st958;
-tr2836:
+       goto st985;
+tr2873:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -74838,15 +75439,15 @@ tr2836:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 958; goto _out;}
+                               {p++; cs = 985; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st958;
-tr2794:
+       goto st985;
+tr2831:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -74857,8 +75458,8 @@ tr2794:
                        p--; {goto st307;}
                }
        }
-       goto st958;
-tr2795:
+       goto st985;
+tr2832:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -74876,8 +75477,8 @@ tr2795:
                }
                s->multiline = true;
        }
-       goto st958;
-tr2796:
+       goto st985;
+tr2833:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -74895,8 +75496,8 @@ tr2796:
                }
                s->multiline = false;
        }
-       goto st958;
-tr2798:
+       goto st985;
+tr2835:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -74910,11 +75511,11 @@ tr2798:
        {
                s->line_counter++;
        }
-       goto st958;
-st958:
+       goto st985;
+st985:
        if ( ++p == pe )
-               goto _test_eof958;
-case 958:
+               goto _test_eof985;
+case 985:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74928,17 +75529,17 @@ case 958:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st958;
-               case 32: goto st958;
-               case 40: goto tr2801;
-               case 41: goto tr2802;
-               case 2058: goto tr2804;
-               case 2107: goto tr2805;
+               case 9: goto st985;
+               case 32: goto st985;
+               case 40: goto tr2838;
+               case 41: goto tr2839;
+               case 2058: goto tr2841;
+               case 2107: goto tr2842;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2803;
-       goto tr2327;
-tr2803:
+               goto tr2840;
+       goto tr2364;
+tr2840:
        {
                s->number64 = 0;
        }
@@ -74956,8 +75557,8 @@ tr2803:
                        p--; {goto st307;}
                }
        }
-       goto st959;
-tr2809:
+       goto st986;
+tr2846:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -74972,11 +75573,11 @@ tr2809:
                        p--; {goto st307;}
                }
        }
-       goto st959;
-st959:
+       goto st986;
+st986:
        if ( ++p == pe )
-               goto _test_eof959;
-case 959:
+               goto _test_eof986;
+case 986:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -74990,17 +75591,17 @@ case 959:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2806;
-               case 32: goto tr2806;
-               case 40: goto tr2807;
-               case 41: goto tr2808;
-               case 2058: goto tr2810;
-               case 2107: goto tr2811;
+               case 9: goto tr2843;
+               case 32: goto tr2843;
+               case 40: goto tr2844;
+               case 41: goto tr2845;
+               case 2058: goto tr2847;
+               case 2107: goto tr2848;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2809;
-       goto tr2327;
-tr2813:
+               goto tr2846;
+       goto tr2364;
+tr2850:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -75008,8 +75609,8 @@ tr2813:
                }
                s->multiline = true;
        }
-       goto st960;
-tr2814:
+       goto st987;
+tr2851:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -75017,13 +75618,13 @@ tr2814:
                }
                s->multiline = false;
        }
-       goto st960;
-tr2816:
+       goto st987;
+tr2853:
        {
                s->line_counter++;
        }
-       goto st960;
-tr2834:
+       goto st987;
+tr2871:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -75033,15 +75634,15 @@ tr2834:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 960; goto _out;}
+                               {p++; cs = 987; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st960;
-tr2806:
+       goto st987;
+tr2843:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75052,8 +75653,8 @@ tr2806:
                        p--; {goto st307;}
                }
        }
-       goto st960;
-tr2807:
+       goto st987;
+tr2844:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75071,8 +75672,8 @@ tr2807:
                }
                s->multiline = true;
        }
-       goto st960;
-tr2808:
+       goto st987;
+tr2845:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75090,8 +75691,8 @@ tr2808:
                }
                s->multiline = false;
        }
-       goto st960;
-tr2810:
+       goto st987;
+tr2847:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75105,11 +75706,11 @@ tr2810:
        {
                s->line_counter++;
        }
-       goto st960;
-st960:
+       goto st987;
+st987:
        if ( ++p == pe )
-               goto _test_eof960;
-case 960:
+               goto _test_eof987;
+case 987:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -75123,17 +75724,17 @@ case 960:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st960;
-               case 32: goto st960;
-               case 40: goto tr2813;
-               case 41: goto tr2814;
-               case 2058: goto tr2816;
-               case 2107: goto tr2817;
+               case 9: goto st987;
+               case 32: goto st987;
+               case 40: goto tr2850;
+               case 41: goto tr2851;
+               case 2058: goto tr2853;
+               case 2107: goto tr2854;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2815;
-       goto tr2327;
-tr2815:
+               goto tr2852;
+       goto tr2364;
+tr2852:
        {
                s->number64 = 0;
        }
@@ -75151,8 +75752,8 @@ tr2815:
                        p--; {goto st307;}
                }
        }
-       goto st961;
-tr2821:
+       goto st988;
+tr2858:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -75167,11 +75768,11 @@ tr2821:
                        p--; {goto st307;}
                }
        }
-       goto st961;
-st961:
+       goto st988;
+st988:
        if ( ++p == pe )
-               goto _test_eof961;
-case 961:
+               goto _test_eof988;
+case 988:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -75185,17 +75786,17 @@ case 961:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2818;
-               case 32: goto tr2818;
-               case 40: goto tr2819;
-               case 41: goto tr2820;
-               case 2058: goto tr2822;
-               case 2107: goto tr2823;
+               case 9: goto tr2855;
+               case 32: goto tr2855;
+               case 40: goto tr2856;
+               case 41: goto tr2857;
+               case 2058: goto tr2859;
+               case 2107: goto tr2860;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2821;
-       goto tr2327;
-tr2825:
+               goto tr2858;
+       goto tr2364;
+tr2862:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -75203,8 +75804,8 @@ tr2825:
                }
                s->multiline = true;
        }
-       goto st962;
-tr2826:
+       goto st989;
+tr2863:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -75212,13 +75813,13 @@ tr2826:
                }
                s->multiline = false;
        }
-       goto st962;
-tr2828:
+       goto st989;
+tr2865:
        {
                s->line_counter++;
        }
-       goto st962;
-tr2832:
+       goto st989;
+tr2869:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -75228,15 +75829,15 @@ tr2832:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 962; goto _out;}
+                               {p++; cs = 989; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st962;
-tr2818:
+       goto st989;
+tr2855:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75247,8 +75848,8 @@ tr2818:
                        p--; {goto st307;}
                }
        }
-       goto st962;
-tr2819:
+       goto st989;
+tr2856:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75266,8 +75867,8 @@ tr2819:
                }
                s->multiline = true;
        }
-       goto st962;
-tr2820:
+       goto st989;
+tr2857:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75285,8 +75886,8 @@ tr2820:
                }
                s->multiline = false;
        }
-       goto st962;
-tr2822:
+       goto st989;
+tr2859:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75300,11 +75901,11 @@ tr2822:
        {
                s->line_counter++;
        }
-       goto st962;
-st962:
+       goto st989;
+st989:
        if ( ++p == pe )
-               goto _test_eof962;
-case 962:
+               goto _test_eof989;
+case 989:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -75318,71 +75919,71 @@ case 962:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st962;
-               case 32: goto st962;
-               case 40: goto tr2825;
-               case 41: goto tr2826;
-               case 42: goto tr2827;
-               case 92: goto tr2827;
-               case 95: goto tr2827;
-               case 2058: goto tr2828;
-               case 2107: goto tr2829;
+               case 9: goto st989;
+               case 32: goto st989;
+               case 40: goto tr2862;
+               case 41: goto tr2863;
+               case 42: goto tr2864;
+               case 92: goto tr2864;
+               case 95: goto tr2864;
+               case 2058: goto tr2865;
+               case 2107: goto tr2866;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr2827;
+                       goto tr2864;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr2827;
+                       goto tr2864;
        } else
-               goto tr2827;
+               goto tr2864;
        goto tr75;
-tr2827:
+tr2864:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 963;goto st309;} }
-       goto st963;
-st963:
+       { p--; {stack[top++] = 990;goto st309;} }
+       goto st990;
+st990:
        if ( ++p == pe )
-               goto _test_eof963;
-case 963:
+               goto _test_eof990;
+case 990:
        switch( (*p) ) {
-               case 32: goto tr2830;
-               case 59: goto tr2830;
+               case 32: goto tr2867;
+               case 59: goto tr2867;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2830;
+                       goto tr2867;
        } else if ( (*p) >= 9 )
-               goto tr2830;
+               goto tr2867;
        goto tr75;
-tr2830:
+tr2867:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1454;
-st1454:
+       goto st1481;
+st1481:
        if ( ++p == pe )
-               goto _test_eof1454;
-case 1454:
+               goto _test_eof1481;
+case 1481:
        goto st0;
-tr2829:
+tr2866:
        {
                s->buffer_length = 0;
        }
-       goto st964;
-tr2831:
+       goto st991;
+tr2868:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st964;
-tr2823:
+       goto st991;
+tr2860:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75396,11 +75997,11 @@ tr2823:
        {
                s->buffer_length = 0;
        }
-       goto st964;
-st964:
+       goto st991;
+st991:
        if ( ++p == pe )
-               goto _test_eof964;
-case 964:
+               goto _test_eof991;
+case 991:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -75420,23 +76021,23 @@ case 964:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2832;
+               goto tr2869;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2831;
+               goto tr2868;
        goto tr75;
-tr2817:
+tr2854:
        {
                s->buffer_length = 0;
        }
-       goto st965;
-tr2833:
+       goto st992;
+tr2870:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st965;
-tr2811:
+       goto st992;
+tr2848:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75450,11 +76051,11 @@ tr2811:
        {
                s->buffer_length = 0;
        }
-       goto st965;
-st965:
+       goto st992;
+st992:
        if ( ++p == pe )
-               goto _test_eof965;
-case 965:
+               goto _test_eof992;
+case 992:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -75474,23 +76075,23 @@ case 965:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2834;
+               goto tr2871;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2833;
+               goto tr2870;
        goto tr75;
-tr2805:
+tr2842:
        {
                s->buffer_length = 0;
        }
-       goto st966;
-tr2835:
+       goto st993;
+tr2872:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st966;
-tr2799:
+       goto st993;
+tr2836:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75504,11 +76105,11 @@ tr2799:
        {
                s->buffer_length = 0;
        }
-       goto st966;
-st966:
+       goto st993;
+st993:
        if ( ++p == pe )
-               goto _test_eof966;
-case 966:
+               goto _test_eof993;
+case 993:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -75528,18 +76129,18 @@ case 966:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2836;
+               goto tr2873;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2835;
+               goto tr2872;
        goto tr75;
-st967:
+st994:
        if ( ++p == pe )
-               goto _test_eof967;
-case 967:
+               goto _test_eof994;
+case 994:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2837;
-       goto tr2327;
-tr2837:
+               goto tr2874;
+       goto tr2364;
+tr2874:
        {
                s->number64 = 0;
        }
@@ -75557,8 +76158,8 @@ tr2837:
                        p--; {goto st307;}
                }
        }
-       goto st968;
-tr2841:
+       goto st995;
+tr2878:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -75573,11 +76174,11 @@ tr2841:
                        p--; {goto st307;}
                }
        }
-       goto st968;
-st968:
+       goto st995;
+st995:
        if ( ++p == pe )
-               goto _test_eof968;
-case 968:
+               goto _test_eof995;
+case 995:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -75591,17 +76192,17 @@ case 968:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2838;
-               case 32: goto tr2838;
-               case 40: goto tr2839;
-               case 41: goto tr2840;
-               case 2058: goto tr2842;
-               case 2107: goto tr2843;
+               case 9: goto tr2875;
+               case 32: goto tr2875;
+               case 40: goto tr2876;
+               case 41: goto tr2877;
+               case 2058: goto tr2879;
+               case 2107: goto tr2880;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2841;
-       goto tr2327;
-tr2845:
+               goto tr2878;
+       goto tr2364;
+tr2882:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -75609,8 +76210,8 @@ tr2845:
                }
                s->multiline = true;
        }
-       goto st969;
-tr2846:
+       goto st996;
+tr2883:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -75618,13 +76219,13 @@ tr2846:
                }
                s->multiline = false;
        }
-       goto st969;
-tr2848:
+       goto st996;
+tr2885:
        {
                s->line_counter++;
        }
-       goto st969;
-tr2905:
+       goto st996;
+tr2942:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -75634,15 +76235,15 @@ tr2905:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 969; goto _out;}
+                               {p++; cs = 996; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st969;
-tr2838:
+       goto st996;
+tr2875:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75653,8 +76254,8 @@ tr2838:
                        p--; {goto st307;}
                }
        }
-       goto st969;
-tr2839:
+       goto st996;
+tr2876:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75672,8 +76273,8 @@ tr2839:
                }
                s->multiline = true;
        }
-       goto st969;
-tr2840:
+       goto st996;
+tr2877:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75691,8 +76292,8 @@ tr2840:
                }
                s->multiline = false;
        }
-       goto st969;
-tr2842:
+       goto st996;
+tr2879:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75706,11 +76307,11 @@ tr2842:
        {
                s->line_counter++;
        }
-       goto st969;
-st969:
+       goto st996;
+st996:
        if ( ++p == pe )
-               goto _test_eof969;
-case 969:
+               goto _test_eof996;
+case 996:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -75724,17 +76325,17 @@ case 969:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st969;
-               case 32: goto st969;
-               case 40: goto tr2845;
-               case 41: goto tr2846;
-               case 2058: goto tr2848;
-               case 2107: goto tr2849;
+               case 9: goto st996;
+               case 32: goto st996;
+               case 40: goto tr2882;
+               case 41: goto tr2883;
+               case 2058: goto tr2885;
+               case 2107: goto tr2886;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2847;
-       goto tr2327;
-tr2847:
+               goto tr2884;
+       goto tr2364;
+tr2884:
        {
                s->number64 = 0;
        }
@@ -75752,8 +76353,8 @@ tr2847:
                        p--; {goto st307;}
                }
        }
-       goto st970;
-tr2853:
+       goto st997;
+tr2890:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -75768,11 +76369,11 @@ tr2853:
                        p--; {goto st307;}
                }
        }
-       goto st970;
-st970:
+       goto st997;
+st997:
        if ( ++p == pe )
-               goto _test_eof970;
-case 970:
+               goto _test_eof997;
+case 997:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -75786,17 +76387,17 @@ case 970:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2850;
-               case 32: goto tr2850;
-               case 40: goto tr2851;
-               case 41: goto tr2852;
-               case 2058: goto tr2854;
-               case 2107: goto tr2855;
+               case 9: goto tr2887;
+               case 32: goto tr2887;
+               case 40: goto tr2888;
+               case 41: goto tr2889;
+               case 2058: goto tr2891;
+               case 2107: goto tr2892;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2853;
-       goto tr2327;
-tr2858:
+               goto tr2890;
+       goto tr2364;
+tr2895:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -75804,8 +76405,8 @@ tr2858:
                }
                s->multiline = true;
        }
-       goto st971;
-tr2859:
+       goto st998;
+tr2896:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -75813,13 +76414,13 @@ tr2859:
                }
                s->multiline = false;
        }
-       goto st971;
-tr2860:
+       goto st998;
+tr2897:
        {
                s->line_counter++;
        }
-       goto st971;
-tr2903:
+       goto st998;
+tr2940:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -75829,15 +76430,15 @@ tr2903:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 971; goto _out;}
+                               {p++; cs = 998; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st971;
-tr2850:
+       goto st998;
+tr2887:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75848,8 +76449,8 @@ tr2850:
                        p--; {goto st307;}
                }
        }
-       goto st971;
-tr2851:
+       goto st998;
+tr2888:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75867,8 +76468,8 @@ tr2851:
                }
                s->multiline = true;
        }
-       goto st971;
-tr2852:
+       goto st998;
+tr2889:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75886,8 +76487,8 @@ tr2852:
                }
                s->multiline = false;
        }
-       goto st971;
-tr2854:
+       goto st998;
+tr2891:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -75901,11 +76502,11 @@ tr2854:
        {
                s->line_counter++;
        }
-       goto st971;
-st971:
+       goto st998;
+st998:
        if ( ++p == pe )
-               goto _test_eof971;
-case 971:
+               goto _test_eof998;
+case 998:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -75919,23 +76520,23 @@ case 971:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st971;
-               case 32: goto st971;
-               case 40: goto tr2858;
-               case 41: goto tr2859;
-               case 2058: goto tr2860;
-               case 2107: goto tr2861;
+               case 9: goto st998;
+               case 32: goto st998;
+               case 40: goto tr2895;
+               case 41: goto tr2896;
+               case 2058: goto tr2897;
+               case 2107: goto tr2898;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr2856;
+                       goto tr2893;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr2856;
+                       goto tr2893;
        } else
-               goto tr2856;
+               goto tr2893;
        goto tr75;
-tr2856:
+tr2893:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -75944,12 +76545,12 @@ tr2856:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 972;goto st318;} }
-       goto st972;
-st972:
+       { p--; {stack[top++] = 999;goto st318;} }
+       goto st999;
+st999:
        if ( ++p == pe )
-               goto _test_eof972;
-case 972:
+               goto _test_eof999;
+case 999:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -75963,15 +76564,15 @@ case 972:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2862;
-               case 32: goto tr2862;
-               case 40: goto tr2863;
-               case 41: goto tr2864;
-               case 2058: goto tr2865;
-               case 2107: goto tr2866;
+               case 9: goto tr2899;
+               case 32: goto tr2899;
+               case 40: goto tr2900;
+               case 41: goto tr2901;
+               case 2058: goto tr2902;
+               case 2107: goto tr2903;
        }
        goto tr75;
-tr2869:
+tr2906:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -75979,8 +76580,8 @@ tr2869:
                }
                s->multiline = true;
        }
-       goto st973;
-tr2870:
+       goto st1000;
+tr2907:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -75988,13 +76589,13 @@ tr2870:
                }
                s->multiline = false;
        }
-       goto st973;
-tr2871:
+       goto st1000;
+tr2908:
        {
                s->line_counter++;
        }
-       goto st973;
-tr2901:
+       goto st1000;
+tr2938:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -76004,15 +76605,15 @@ tr2901:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 973; goto _out;}
+                               {p++; cs = 1000; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st973;
-tr2862:
+       goto st1000;
+tr2899:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76026,8 +76627,8 @@ tr2862:
                        p--; {goto st307;}
                }
        }
-       goto st973;
-tr2863:
+       goto st1000;
+tr2900:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76048,8 +76649,8 @@ tr2863:
                }
                s->multiline = true;
        }
-       goto st973;
-tr2864:
+       goto st1000;
+tr2901:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76070,8 +76671,8 @@ tr2864:
                }
                s->multiline = false;
        }
-       goto st973;
-tr2865:
+       goto st1000;
+tr2902:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76088,11 +76689,11 @@ tr2865:
        {
                s->line_counter++;
        }
-       goto st973;
-st973:
+       goto st1000;
+st1000:
        if ( ++p == pe )
-               goto _test_eof973;
-case 973:
+               goto _test_eof1000;
+case 1000:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -76106,23 +76707,23 @@ case 973:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st973;
-               case 32: goto st973;
-               case 40: goto tr2869;
-               case 41: goto tr2870;
-               case 2058: goto tr2871;
-               case 2107: goto tr2872;
+               case 9: goto st1000;
+               case 32: goto st1000;
+               case 40: goto tr2906;
+               case 41: goto tr2907;
+               case 2058: goto tr2908;
+               case 2107: goto tr2909;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr2867;
+                       goto tr2904;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr2867;
+                       goto tr2904;
        } else
-               goto tr2867;
+               goto tr2904;
        goto tr75;
-tr2867:
+tr2904:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -76131,12 +76732,12 @@ tr2867:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 974;goto st318;} }
-       goto st974;
-st974:
+       { p--; {stack[top++] = 1001;goto st318;} }
+       goto st1001;
+st1001:
        if ( ++p == pe )
-               goto _test_eof974;
-case 974:
+               goto _test_eof1001;
+case 1001:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -76150,15 +76751,15 @@ case 974:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2873;
-               case 32: goto tr2873;
-               case 40: goto tr2874;
-               case 41: goto tr2875;
-               case 2058: goto tr2876;
-               case 2107: goto tr2877;
+               case 9: goto tr2910;
+               case 32: goto tr2910;
+               case 40: goto tr2911;
+               case 41: goto tr2912;
+               case 2058: goto tr2913;
+               case 2107: goto tr2914;
        }
        goto tr75;
-tr2880:
+tr2917:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -76166,8 +76767,8 @@ tr2880:
                }
                s->multiline = true;
        }
-       goto st975;
-tr2881:
+       goto st1002;
+tr2918:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -76175,13 +76776,13 @@ tr2881:
                }
                s->multiline = false;
        }
-       goto st975;
-tr2882:
+       goto st1002;
+tr2919:
        {
                s->line_counter++;
        }
-       goto st975;
-tr2899:
+       goto st1002;
+tr2936:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -76191,15 +76792,15 @@ tr2899:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 975; goto _out;}
+                               {p++; cs = 1002; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st975;
-tr2873:
+       goto st1002;
+tr2910:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76213,8 +76814,8 @@ tr2873:
                        p--; {goto st307;}
                }
        }
-       goto st975;
-tr2874:
+       goto st1002;
+tr2911:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76235,8 +76836,8 @@ tr2874:
                }
                s->multiline = true;
        }
-       goto st975;
-tr2875:
+       goto st1002;
+tr2912:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76257,8 +76858,8 @@ tr2875:
                }
                s->multiline = false;
        }
-       goto st975;
-tr2876:
+       goto st1002;
+tr2913:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76275,11 +76876,11 @@ tr2876:
        {
                s->line_counter++;
        }
-       goto st975;
-st975:
+       goto st1002;
+st1002:
        if ( ++p == pe )
-               goto _test_eof975;
-case 975:
+               goto _test_eof1002;
+case 1002:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -76293,23 +76894,23 @@ case 975:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st975;
-               case 32: goto st975;
-               case 40: goto tr2880;
-               case 41: goto tr2881;
-               case 2058: goto tr2882;
-               case 2107: goto tr2883;
+               case 9: goto st1002;
+               case 32: goto st1002;
+               case 40: goto tr2917;
+               case 41: goto tr2918;
+               case 2058: goto tr2919;
+               case 2107: goto tr2920;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr2878;
+                       goto tr2915;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr2878;
+                       goto tr2915;
        } else
-               goto tr2878;
+               goto tr2915;
        goto tr75;
-tr2878:
+tr2915:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -76318,12 +76919,12 @@ tr2878:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 976;goto st318;} }
-       goto st976;
-st976:
+       { p--; {stack[top++] = 1003;goto st318;} }
+       goto st1003;
+st1003:
        if ( ++p == pe )
-               goto _test_eof976;
-case 976:
+               goto _test_eof1003;
+case 1003:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -76337,15 +76938,15 @@ case 976:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2884;
-               case 32: goto tr2884;
-               case 40: goto tr2885;
-               case 41: goto tr2886;
-               case 2058: goto tr2887;
-               case 2107: goto tr2888;
+               case 9: goto tr2921;
+               case 32: goto tr2921;
+               case 40: goto tr2922;
+               case 41: goto tr2923;
+               case 2058: goto tr2924;
+               case 2107: goto tr2925;
        }
        goto tr75;
-tr2890:
+tr2927:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -76353,8 +76954,8 @@ tr2890:
                }
                s->multiline = true;
        }
-       goto st977;
-tr2891:
+       goto st1004;
+tr2928:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -76362,13 +76963,13 @@ tr2891:
                }
                s->multiline = false;
        }
-       goto st977;
-tr2893:
+       goto st1004;
+tr2930:
        {
                s->line_counter++;
        }
-       goto st977;
-tr2897:
+       goto st1004;
+tr2934:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -76378,15 +76979,15 @@ tr2897:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 977; goto _out;}
+                               {p++; cs = 1004; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st977;
-tr2884:
+       goto st1004;
+tr2921:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76400,8 +77001,8 @@ tr2884:
                        p--; {goto st307;}
                }
        }
-       goto st977;
-tr2885:
+       goto st1004;
+tr2922:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76422,8 +77023,8 @@ tr2885:
                }
                s->multiline = true;
        }
-       goto st977;
-tr2886:
+       goto st1004;
+tr2923:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76444,8 +77045,8 @@ tr2886:
                }
                s->multiline = false;
        }
-       goto st977;
-tr2887:
+       goto st1004;
+tr2924:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76462,11 +77063,11 @@ tr2887:
        {
                s->line_counter++;
        }
-       goto st977;
-st977:
+       goto st1004;
+st1004:
        if ( ++p == pe )
-               goto _test_eof977;
-case 977:
+               goto _test_eof1004;
+case 1004:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -76480,71 +77081,71 @@ case 977:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st977;
-               case 32: goto st977;
-               case 40: goto tr2890;
-               case 41: goto tr2891;
-               case 42: goto tr2892;
-               case 92: goto tr2892;
-               case 95: goto tr2892;
-               case 2058: goto tr2893;
-               case 2107: goto tr2894;
+               case 9: goto st1004;
+               case 32: goto st1004;
+               case 40: goto tr2927;
+               case 41: goto tr2928;
+               case 42: goto tr2929;
+               case 92: goto tr2929;
+               case 95: goto tr2929;
+               case 2058: goto tr2930;
+               case 2107: goto tr2931;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr2892;
+                       goto tr2929;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr2892;
+                       goto tr2929;
        } else
-               goto tr2892;
+               goto tr2929;
        goto tr75;
-tr2892:
+tr2929:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 978;goto st309;} }
-       goto st978;
-st978:
+       { p--; {stack[top++] = 1005;goto st309;} }
+       goto st1005;
+st1005:
        if ( ++p == pe )
-               goto _test_eof978;
-case 978:
+               goto _test_eof1005;
+case 1005:
        switch( (*p) ) {
-               case 32: goto tr2895;
-               case 59: goto tr2895;
+               case 32: goto tr2932;
+               case 59: goto tr2932;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr2895;
+                       goto tr2932;
        } else if ( (*p) >= 9 )
-               goto tr2895;
+               goto tr2932;
        goto tr75;
-tr2895:
+tr2932:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1455;
-st1455:
+       goto st1482;
+st1482:
        if ( ++p == pe )
-               goto _test_eof1455;
-case 1455:
+               goto _test_eof1482;
+case 1482:
        goto st0;
-tr2894:
+tr2931:
        {
                s->buffer_length = 0;
        }
-       goto st979;
-tr2896:
+       goto st1006;
+tr2933:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st979;
-tr2888:
+       goto st1006;
+tr2925:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76561,11 +77162,11 @@ tr2888:
        {
                s->buffer_length = 0;
        }
-       goto st979;
-st979:
+       goto st1006;
+st1006:
        if ( ++p == pe )
-               goto _test_eof979;
-case 979:
+               goto _test_eof1006;
+case 1006:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -76585,23 +77186,23 @@ case 979:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2897;
+               goto tr2934;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2896;
+               goto tr2933;
        goto tr75;
-tr2883:
+tr2920:
        {
                s->buffer_length = 0;
        }
-       goto st980;
-tr2898:
+       goto st1007;
+tr2935:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st980;
-tr2877:
+       goto st1007;
+tr2914:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76618,11 +77219,11 @@ tr2877:
        {
                s->buffer_length = 0;
        }
-       goto st980;
-st980:
+       goto st1007;
+st1007:
        if ( ++p == pe )
-               goto _test_eof980;
-case 980:
+               goto _test_eof1007;
+case 1007:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -76642,23 +77243,23 @@ case 980:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2899;
+               goto tr2936;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2898;
+               goto tr2935;
        goto tr75;
-tr2872:
+tr2909:
        {
                s->buffer_length = 0;
        }
-       goto st981;
-tr2900:
+       goto st1008;
+tr2937:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st981;
-tr2866:
+       goto st1008;
+tr2903:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -76675,11 +77276,11 @@ tr2866:
        {
                s->buffer_length = 0;
        }
-       goto st981;
-st981:
+       goto st1008;
+st1008:
        if ( ++p == pe )
-               goto _test_eof981;
-case 981:
+               goto _test_eof1008;
+case 1008:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -76699,23 +77300,23 @@ case 981:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2901;
+               goto tr2938;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2900;
+               goto tr2937;
        goto tr75;
-tr2861:
+tr2898:
        {
                s->buffer_length = 0;
        }
-       goto st982;
-tr2902:
+       goto st1009;
+tr2939:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st982;
-tr2855:
+       goto st1009;
+tr2892:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -76729,11 +77330,11 @@ tr2855:
        {
                s->buffer_length = 0;
        }
-       goto st982;
-st982:
+       goto st1009;
+st1009:
        if ( ++p == pe )
-               goto _test_eof982;
-case 982:
+               goto _test_eof1009;
+case 1009:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -76753,23 +77354,23 @@ case 982:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2903;
+               goto tr2940;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2902;
+               goto tr2939;
        goto tr75;
-tr2849:
+tr2886:
        {
                s->buffer_length = 0;
        }
-       goto st983;
-tr2904:
+       goto st1010;
+tr2941:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st983;
-tr2843:
+       goto st1010;
+tr2880:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -76783,11 +77384,11 @@ tr2843:
        {
                s->buffer_length = 0;
        }
-       goto st983;
-st983:
+       goto st1010;
+st1010:
        if ( ++p == pe )
-               goto _test_eof983;
-case 983:
+               goto _test_eof1010;
+case 1010:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -76807,30 +77408,30 @@ case 983:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2905;
+               goto tr2942;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2904;
+               goto tr2941;
        goto tr75;
-st984:
+st1011:
        if ( ++p == pe )
-               goto _test_eof984;
-case 984:
+               goto _test_eof1011;
+case 1011:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr2906;
+                       goto tr2943;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr2906;
+                       goto tr2943;
        } else
-               goto tr2906;
+               goto tr2943;
        goto tr75;
-tr2906:
-       { p--; {stack[top++] = 985;goto st803;} }
-       goto st985;
-st985:
+tr2943:
+       { p--; {stack[top++] = 1012;goto st830;} }
+       goto st1012;
+st1012:
        if ( ++p == pe )
-               goto _test_eof985;
-case 985:
+               goto _test_eof1012;
+case 1012:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -76844,15 +77445,15 @@ case 985:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st986;
-               case 32: goto st986;
-               case 40: goto tr2908;
-               case 41: goto tr2909;
-               case 2058: goto tr2910;
-               case 2107: goto tr2911;
+               case 9: goto st1013;
+               case 32: goto st1013;
+               case 40: goto tr2945;
+               case 41: goto tr2946;
+               case 2058: goto tr2947;
+               case 2107: goto tr2948;
        }
        goto tr75;
-tr2908:
+tr2945:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -76860,8 +77461,8 @@ tr2908:
                }
                s->multiline = true;
        }
-       goto st986;
-tr2909:
+       goto st1013;
+tr2946:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -76869,13 +77470,13 @@ tr2909:
                }
                s->multiline = false;
        }
-       goto st986;
-tr2910:
+       goto st1013;
+tr2947:
        {
                s->line_counter++;
        }
-       goto st986;
-tr2937:
+       goto st1013;
+tr2974:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -76885,18 +77486,18 @@ tr2937:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 986; goto _out;}
+                               {p++; cs = 1013; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st986;
-st986:
+       goto st1013;
+st1013:
        if ( ++p == pe )
-               goto _test_eof986;
-case 986:
+               goto _test_eof1013;
+case 1013:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -76910,17 +77511,17 @@ case 986:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st986;
-               case 32: goto st986;
-               case 40: goto tr2908;
-               case 41: goto tr2909;
-               case 2058: goto tr2910;
-               case 2107: goto tr2911;
+               case 9: goto st1013;
+               case 32: goto st1013;
+               case 40: goto tr2945;
+               case 41: goto tr2946;
+               case 2058: goto tr2947;
+               case 2107: goto tr2948;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2912;
-       goto tr2327;
-tr2912:
+               goto tr2949;
+       goto tr2364;
+tr2949:
        {
                s->number64 = 0;
        }
@@ -76938,8 +77539,8 @@ tr2912:
                        p--; {goto st307;}
                }
        }
-       goto st987;
-tr2916:
+       goto st1014;
+tr2953:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -76954,11 +77555,11 @@ tr2916:
                        p--; {goto st307;}
                }
        }
-       goto st987;
-st987:
+       goto st1014;
+st1014:
        if ( ++p == pe )
-               goto _test_eof987;
-case 987:
+               goto _test_eof1014;
+case 1014:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -76972,17 +77573,17 @@ case 987:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2913;
-               case 32: goto tr2913;
-               case 40: goto tr2914;
-               case 41: goto tr2915;
-               case 2058: goto tr2917;
-               case 2107: goto tr2918;
+               case 9: goto tr2950;
+               case 32: goto tr2950;
+               case 40: goto tr2951;
+               case 41: goto tr2952;
+               case 2058: goto tr2954;
+               case 2107: goto tr2955;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2916;
-       goto tr2327;
-tr2920:
+               goto tr2953;
+       goto tr2364;
+tr2957:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -76990,8 +77591,8 @@ tr2920:
                }
                s->multiline = true;
        }
-       goto st988;
-tr2921:
+       goto st1015;
+tr2958:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -76999,13 +77600,13 @@ tr2921:
                }
                s->multiline = false;
        }
-       goto st988;
-tr2923:
+       goto st1015;
+tr2960:
        {
                s->line_counter++;
        }
-       goto st988;
-tr2935:
+       goto st1015;
+tr2972:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -77015,15 +77616,15 @@ tr2935:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 988; goto _out;}
+                               {p++; cs = 1015; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st988;
-tr2913:
+       goto st1015;
+tr2950:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -77034,8 +77635,8 @@ tr2913:
                        p--; {goto st307;}
                }
        }
-       goto st988;
-tr2914:
+       goto st1015;
+tr2951:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -77053,8 +77654,8 @@ tr2914:
                }
                s->multiline = true;
        }
-       goto st988;
-tr2915:
+       goto st1015;
+tr2952:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -77072,8 +77673,8 @@ tr2915:
                }
                s->multiline = false;
        }
-       goto st988;
-tr2917:
+       goto st1015;
+tr2954:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -77087,11 +77688,11 @@ tr2917:
        {
                s->line_counter++;
        }
-       goto st988;
-st988:
+       goto st1015;
+st1015:
        if ( ++p == pe )
-               goto _test_eof988;
-case 988:
+               goto _test_eof1015;
+case 1015:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -77105,29 +77706,29 @@ case 988:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st988;
-               case 32: goto st988;
-               case 40: goto tr2920;
-               case 41: goto tr2921;
-               case 2058: goto tr2923;
-               case 2107: goto tr2924;
+               case 9: goto st1015;
+               case 32: goto st1015;
+               case 40: goto tr2957;
+               case 41: goto tr2958;
+               case 2058: goto tr2960;
+               case 2107: goto tr2961;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr2922;
+                       goto tr2959;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr2922;
+                       goto tr2959;
        } else
-               goto tr2922;
+               goto tr2959;
        goto tr75;
-tr2922:
-       { p--; {stack[top++] = 989;goto st699;} }
-       goto st989;
-st989:
+tr2959:
+       { p--; {stack[top++] = 1016;goto st726;} }
+       goto st1016;
+st1016:
        if ( ++p == pe )
-               goto _test_eof989;
-case 989:
+               goto _test_eof1016;
+case 1016:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -77141,15 +77742,15 @@ case 989:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st990;
-               case 32: goto st990;
-               case 40: goto tr2926;
-               case 41: goto tr2927;
-               case 2058: goto tr2928;
-               case 2107: goto tr2929;
+               case 9: goto st1017;
+               case 32: goto st1017;
+               case 40: goto tr2963;
+               case 41: goto tr2964;
+               case 2058: goto tr2965;
+               case 2107: goto tr2966;
        }
        goto tr75;
-tr2926:
+tr2963:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -77157,8 +77758,8 @@ tr2926:
                }
                s->multiline = true;
        }
-       goto st990;
-tr2927:
+       goto st1017;
+tr2964:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -77166,13 +77767,13 @@ tr2927:
                }
                s->multiline = false;
        }
-       goto st990;
-tr2928:
+       goto st1017;
+tr2965:
        {
                s->line_counter++;
        }
-       goto st990;
-tr2933:
+       goto st1017;
+tr2970:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -77182,18 +77783,18 @@ tr2933:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 990; goto _out;}
+                               {p++; cs = 1017; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st990;
-st990:
+       goto st1017;
+st1017:
        if ( ++p == pe )
-               goto _test_eof990;
-case 990:
+               goto _test_eof1017;
+case 1017:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -77207,30 +77808,30 @@ case 990:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st990;
-               case 32: goto st990;
-               case 40: goto tr2926;
-               case 41: goto tr2927;
-               case 43: goto tr2930;
-               case 2058: goto tr2928;
-               case 2107: goto tr2929;
+               case 9: goto st1017;
+               case 32: goto st1017;
+               case 40: goto tr2963;
+               case 41: goto tr2964;
+               case 43: goto tr2967;
+               case 2058: goto tr2965;
+               case 2107: goto tr2966;
        }
        if ( _widec < 65 ) {
                if ( 47 <= _widec && _widec <= 57 )
-                       goto tr2930;
+                       goto tr2967;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr2930;
+                       goto tr2967;
        } else
-               goto tr2930;
+               goto tr2967;
        goto tr75;
-tr2930:
-       { p--; {stack[top++] = 991;goto st369;} }
-       goto st991;
-st991:
+tr2967:
+       { p--; {stack[top++] = 1018;goto st369;} }
+       goto st1018;
+st1018:
        if ( ++p == pe )
-               goto _test_eof991;
-case 991:
+               goto _test_eof1018;
+case 1018:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -77244,36 +77845,36 @@ case 991:
  !s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 2570: goto tr2931;
-               case 2619: goto tr2931;
+               case 2570: goto tr2968;
+               case 2619: goto tr2968;
        }
        goto tr75;
-tr2931:
+tr2968:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1456;
-st1456:
+       goto st1483;
+st1483:
        if ( ++p == pe )
-               goto _test_eof1456;
-case 1456:
+               goto _test_eof1483;
+case 1483:
        goto st0;
-tr2929:
+tr2966:
        {
                s->buffer_length = 0;
        }
-       goto st992;
-tr2932:
+       goto st1019;
+tr2969:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st992;
-st992:
+       goto st1019;
+st1019:
        if ( ++p == pe )
-               goto _test_eof992;
-case 992:
+               goto _test_eof1019;
+case 1019:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -77293,23 +77894,23 @@ case 992:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2933;
+               goto tr2970;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2932;
+               goto tr2969;
        goto tr75;
-tr2924:
+tr2961:
        {
                s->buffer_length = 0;
        }
-       goto st993;
-tr2934:
+       goto st1020;
+tr2971:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st993;
-tr2918:
+       goto st1020;
+tr2955:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -77323,11 +77924,11 @@ tr2918:
        {
                s->buffer_length = 0;
        }
-       goto st993;
-st993:
+       goto st1020;
+st1020:
        if ( ++p == pe )
-               goto _test_eof993;
-case 993:
+               goto _test_eof1020;
+case 1020:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -77347,26 +77948,26 @@ case 993:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2935;
+               goto tr2972;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2934;
+               goto tr2971;
        goto tr75;
-tr2911:
+tr2948:
        {
                s->buffer_length = 0;
        }
-       goto st994;
-tr2936:
+       goto st1021;
+tr2973:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st994;
-st994:
+       goto st1021;
+st1021:
        if ( ++p == pe )
-               goto _test_eof994;
-case 994:
+               goto _test_eof1021;
+case 1021:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -77386,11 +77987,11 @@ case 994:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2937;
+               goto tr2974;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2936;
+               goto tr2973;
        goto tr75;
-tr2941:
+tr2978:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -77398,8 +77999,8 @@ tr2941:
                }
                s->multiline = true;
        }
-       goto st995;
-tr2942:
+       goto st1022;
+tr2979:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -77407,13 +78008,13 @@ tr2942:
                }
                s->multiline = false;
        }
-       goto st995;
-tr2945:
+       goto st1022;
+tr2982:
        {
                s->line_counter++;
        }
-       goto st995;
-tr2968:
+       goto st1022;
+tr3005:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -77423,15 +78024,15 @@ tr2968:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 995; goto _out;}
+                               {p++; cs = 1022; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st995;
-tr2958:
+       goto st1022;
+tr2995:
        {
                if ((s->apl.addr_family == 1 && s->number64 <= 32) ||
                    (s->apl.addr_family == 2 && s->number64 <= 128)) {
@@ -77483,8 +78084,8 @@ tr2958:
                memcpy(rdata_tail, s->buffer, len);
                rdata_tail += len;
        }
-       goto st995;
-tr2959:
+       goto st1022;
+tr2996:
        {
                if ((s->apl.addr_family == 1 && s->number64 <= 32) ||
                    (s->apl.addr_family == 2 && s->number64 <= 128)) {
@@ -77543,8 +78144,8 @@ tr2959:
                }
                s->multiline = true;
        }
-       goto st995;
-tr2960:
+       goto st1022;
+tr2997:
        {
                if ((s->apl.addr_family == 1 && s->number64 <= 32) ||
                    (s->apl.addr_family == 2 && s->number64 <= 128)) {
@@ -77603,8 +78204,8 @@ tr2960:
                }
                s->multiline = false;
        }
-       goto st995;
-tr2962:
+       goto st1022;
+tr2999:
        {
                if ((s->apl.addr_family == 1 && s->number64 <= 32) ||
                    (s->apl.addr_family == 2 && s->number64 <= 128)) {
@@ -77659,11 +78260,11 @@ tr2962:
        {
                s->line_counter++;
        }
-       goto st995;
-st995:
+       goto st1022;
+st1022:
        if ( ++p == pe )
-               goto _test_eof995;
-case 995:
+               goto _test_eof1022;
+case 1022:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -77681,68 +78282,68 @@ case 995:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st995;
-               case 32: goto st995;
-               case 33: goto tr2940;
-               case 40: goto tr2941;
-               case 41: goto tr2942;
-               case 49: goto tr2943;
-               case 50: goto tr2944;
-               case 3082: goto tr2945;
-               case 3131: goto tr2946;
-               case 3338: goto tr2947;
-               case 3387: goto tr2947;
-               case 3594: goto tr2948;
-               case 3643: goto tr2949;
-       }
-       goto tr2938;
-tr2940:
+               case 9: goto st1022;
+               case 32: goto st1022;
+               case 33: goto tr2977;
+               case 40: goto tr2978;
+               case 41: goto tr2979;
+               case 49: goto tr2980;
+               case 50: goto tr2981;
+               case 3082: goto tr2982;
+               case 3131: goto tr2983;
+               case 3338: goto tr2984;
+               case 3387: goto tr2984;
+               case 3594: goto tr2985;
+               case 3643: goto tr2986;
+       }
+       goto tr2975;
+tr2977:
        {
                memset(&(s->apl), 0, sizeof(s->apl));
        }
        {
                s->apl.excl_flag = 128; // dec 128  = bin 10000000.
        }
-       goto st996;
-st996:
+       goto st1023;
+st1023:
        if ( ++p == pe )
-               goto _test_eof996;
-case 996:
+               goto _test_eof1023;
+case 1023:
        switch( (*p) ) {
-               case 49: goto tr2950;
-               case 50: goto tr2951;
+               case 49: goto tr2987;
+               case 50: goto tr2988;
        }
-       goto tr2938;
-tr2943:
+       goto tr2975;
+tr2980:
        {
                memset(&(s->apl), 0, sizeof(s->apl));
        }
        {
                s->apl.addr_family = 1;
        }
-       goto st997;
-tr2950:
+       goto st1024;
+tr2987:
        {
                s->apl.addr_family = 1;
        }
-       goto st997;
-st997:
+       goto st1024;
+st1024:
        if ( ++p == pe )
-               goto _test_eof997;
-case 997:
+               goto _test_eof1024;
+case 1024:
        if ( (*p) == 58 )
-               goto st998;
-       goto tr2938;
-st998:
+               goto st1025;
+       goto tr2975;
+st1025:
        if ( ++p == pe )
-               goto _test_eof998;
-case 998:
+               goto _test_eof1025;
+case 1025:
        if ( (*p) == 46 )
-               goto tr2954;
+               goto tr2991;
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2954;
-       goto tr2953;
-tr2955:
+               goto tr2991;
+       goto tr2990;
+tr2992:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -77751,8 +78352,8 @@ tr2955:
                        p--; {goto st307;}
                }
        }
-       goto st999;
-tr2954:
+       goto st1026;
+tr2991:
        {
                s->buffer_length = 0;
        }
@@ -77764,17 +78365,17 @@ tr2954:
                        p--; {goto st307;}
                }
        }
-       goto st999;
-st999:
+       goto st1026;
+st1026:
        if ( ++p == pe )
-               goto _test_eof999;
-case 999:
+               goto _test_eof1026;
+case 1026:
        if ( (*p) == 47 )
-               goto tr2956;
+               goto tr2993;
        if ( 46 <= (*p) && (*p) <= 57 )
-               goto tr2955;
-       goto tr2953;
-tr2956:
+               goto tr2992;
+       goto tr2990;
+tr2993:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -77783,8 +78384,8 @@ tr2956:
                        p--; {goto st307;}
                }
        }
-       goto st1000;
-tr2972:
+       goto st1027;
+tr3009:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -77793,15 +78394,15 @@ tr2972:
                        p--; {goto st307;}
                }
        }
-       goto st1000;
-st1000:
+       goto st1027;
+st1027:
        if ( ++p == pe )
-               goto _test_eof1000;
-case 1000:
+               goto _test_eof1027;
+case 1027:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2957;
-       goto tr2938;
-tr2957:
+               goto tr2994;
+       goto tr2975;
+tr2994:
        {
                s->number64 = 0;
        }
@@ -77819,8 +78420,8 @@ tr2957:
                        p--; {goto st307;}
                }
        }
-       goto st1001;
-tr2961:
+       goto st1028;
+tr2998:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -77835,11 +78436,11 @@ tr2961:
                        p--; {goto st307;}
                }
        }
-       goto st1001;
-st1001:
+       goto st1028;
+st1028:
        if ( ++p == pe )
-               goto _test_eof1001;
-case 1001:
+               goto _test_eof1028;
+case 1028:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -77857,33 +78458,33 @@ case 1001:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto tr2958;
-               case 32: goto tr2958;
-               case 40: goto tr2959;
-               case 41: goto tr2960;
-               case 3082: goto tr2962;
-               case 3131: goto tr2963;
-               case 3338: goto tr2964;
-               case 3387: goto tr2964;
-               case 3594: goto tr2965;
-               case 3643: goto tr2966;
+               case 9: goto tr2995;
+               case 32: goto tr2995;
+               case 40: goto tr2996;
+               case 41: goto tr2997;
+               case 3082: goto tr2999;
+               case 3131: goto tr3000;
+               case 3338: goto tr3001;
+               case 3387: goto tr3001;
+               case 3594: goto tr3002;
+               case 3643: goto tr3003;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2961;
-       goto tr2938;
-tr2946:
+               goto tr2998;
+       goto tr2975;
+tr2983:
        {
                s->buffer_length = 0;
        }
-       goto st1002;
-tr2967:
+       goto st1029;
+tr3004:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1002;
-tr2963:
+       goto st1029;
+tr3000:
        {
                if ((s->apl.addr_family == 1 && s->number64 <= 32) ||
                    (s->apl.addr_family == 2 && s->number64 <= 128)) {
@@ -77938,11 +78539,11 @@ tr2963:
        {
                s->buffer_length = 0;
        }
-       goto st1002;
-st1002:
+       goto st1029;
+st1029:
        if ( ++p == pe )
-               goto _test_eof1002;
-case 1002:
+               goto _test_eof1029;
+case 1029:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -77962,16 +78563,16 @@ case 1002:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2968;
+               goto tr3005;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2967;
+               goto tr3004;
        goto tr75;
-tr2947:
+tr2984:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1457;
-tr2964:
+       goto st1484;
+tr3001:
        {
                if ((s->apl.addr_family == 1 && s->number64 <= 32) ||
                    (s->apl.addr_family == 2 && s->number64 <= 128)) {
@@ -78026,21 +78627,21 @@ tr2964:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1457;
-st1457:
+       goto st1484;
+st1484:
        if ( ++p == pe )
-               goto _test_eof1457;
-case 1457:
+               goto _test_eof1484;
+case 1484:
        goto st0;
-tr2948:
+tr2985:
        {
                s->line_counter++;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1458;
-tr2965:
+       goto st1485;
+tr3002:
        {
                if ((s->apl.addr_family == 1 && s->number64 <= 32) ||
                    (s->apl.addr_family == 2 && s->number64 <= 128)) {
@@ -78098,11 +78699,11 @@ tr2965:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1458;
-st1458:
+       goto st1485;
+st1485:
        if ( ++p == pe )
-               goto _test_eof1458;
-case 1458:
+               goto _test_eof1485;
+case 1485:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78120,57 +78721,57 @@ case 1458:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st995;
-               case 32: goto st995;
-               case 33: goto tr2940;
-               case 40: goto tr2941;
-               case 41: goto tr2942;
-               case 49: goto tr2943;
-               case 50: goto tr2944;
-               case 3082: goto tr2945;
-               case 3131: goto tr2946;
-               case 3338: goto tr2947;
-               case 3387: goto tr2947;
-               case 3594: goto tr2948;
-               case 3643: goto tr2949;
-       }
-       goto tr2938;
-tr2944:
+               case 9: goto st1022;
+               case 32: goto st1022;
+               case 33: goto tr2977;
+               case 40: goto tr2978;
+               case 41: goto tr2979;
+               case 49: goto tr2980;
+               case 50: goto tr2981;
+               case 3082: goto tr2982;
+               case 3131: goto tr2983;
+               case 3338: goto tr2984;
+               case 3387: goto tr2984;
+               case 3594: goto tr2985;
+               case 3643: goto tr2986;
+       }
+       goto tr2975;
+tr2981:
        {
                memset(&(s->apl), 0, sizeof(s->apl));
        }
        {
                s->apl.addr_family = 2;
        }
-       goto st1003;
-tr2951:
+       goto st1030;
+tr2988:
        {
                s->apl.addr_family = 2;
        }
-       goto st1003;
-st1003:
+       goto st1030;
+st1030:
        if ( ++p == pe )
-               goto _test_eof1003;
-case 1003:
+               goto _test_eof1030;
+case 1030:
        if ( (*p) == 58 )
-               goto st1004;
-       goto tr2938;
-st1004:
+               goto st1031;
+       goto tr2975;
+st1031:
        if ( ++p == pe )
-               goto _test_eof1004;
-case 1004:
+               goto _test_eof1031;
+case 1031:
        if ( (*p) == 46 )
-               goto tr2970;
+               goto tr3007;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 58 )
-                       goto tr2970;
+                       goto tr3007;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr2970;
+                       goto tr3007;
        } else
-               goto tr2970;
-       goto tr2953;
-tr2971:
+               goto tr3007;
+       goto tr2990;
+tr3008:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -78179,8 +78780,8 @@ tr2971:
                        p--; {goto st307;}
                }
        }
-       goto st1005;
-tr2970:
+       goto st1032;
+tr3007:
        {
                s->buffer_length = 0;
        }
@@ -78192,31 +78793,31 @@ tr2970:
                        p--; {goto st307;}
                }
        }
-       goto st1005;
-st1005:
+       goto st1032;
+st1032:
        if ( ++p == pe )
-               goto _test_eof1005;
-case 1005:
+               goto _test_eof1032;
+case 1032:
        if ( (*p) == 47 )
-               goto tr2972;
+               goto tr3009;
        if ( (*p) < 65 ) {
                if ( 46 <= (*p) && (*p) <= 58 )
-                       goto tr2971;
+                       goto tr3008;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr2971;
+                       goto tr3008;
        } else
-               goto tr2971;
-       goto tr2953;
-tr2949:
+               goto tr3008;
+       goto tr2990;
+tr2986:
        {
                s->buffer_length = 0;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1459;
-tr2966:
+       goto st1486;
+tr3003:
        {
                if ((s->apl.addr_family == 1 && s->number64 <= 32) ||
                    (s->apl.addr_family == 2 && s->number64 <= 128)) {
@@ -78274,11 +78875,11 @@ tr2966:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1459;
-st1459:
+       goto st1486;
+st1486:
        if ( ++p == pe )
-               goto _test_eof1459;
-case 1459:
+               goto _test_eof1486;
+case 1486:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -78298,18 +78899,18 @@ case 1459:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr2968;
+               goto tr3005;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr2967;
+               goto tr3004;
        goto tr75;
-st1006:
+st1033:
        if ( ++p == pe )
-               goto _test_eof1006;
-case 1006:
+               goto _test_eof1033;
+case 1033:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr2973;
-       goto tr2327;
-tr2973:
+               goto tr3010;
+       goto tr2364;
+tr3010:
        {
                s->number64 = 0;
        }
@@ -78327,8 +78928,8 @@ tr2973:
                        p--; {goto st307;}
                }
        }
-       goto st1007;
-tr2977:
+       goto st1034;
+tr3014:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -78343,11 +78944,11 @@ tr2977:
                        p--; {goto st307;}
                }
        }
-       goto st1007;
-st1007:
+       goto st1034;
+st1034:
        if ( ++p == pe )
-               goto _test_eof1007;
-case 1007:
+               goto _test_eof1034;
+case 1034:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78361,17 +78962,17 @@ case 1007:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2974;
-               case 32: goto tr2974;
-               case 40: goto tr2975;
-               case 41: goto tr2976;
-               case 2058: goto tr2978;
-               case 2107: goto tr2979;
+               case 9: goto tr3011;
+               case 32: goto tr3011;
+               case 40: goto tr3012;
+               case 41: goto tr3013;
+               case 2058: goto tr3015;
+               case 2107: goto tr3016;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2977;
-       goto tr2327;
-tr2981:
+               goto tr3014;
+       goto tr2364;
+tr3018:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -78379,8 +78980,8 @@ tr2981:
                }
                s->multiline = true;
        }
-       goto st1008;
-tr2982:
+       goto st1035;
+tr3019:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -78388,13 +78989,13 @@ tr2982:
                }
                s->multiline = false;
        }
-       goto st1008;
-tr2984:
+       goto st1035;
+tr3021:
        {
                s->line_counter++;
        }
-       goto st1008;
-tr3021:
+       goto st1035;
+tr3058:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -78404,15 +79005,15 @@ tr3021:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1008; goto _out;}
+                               {p++; cs = 1035; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1008;
-tr2974:
+       goto st1035;
+tr3011:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -78423,8 +79024,8 @@ tr2974:
                        p--; {goto st307;}
                }
        }
-       goto st1008;
-tr2975:
+       goto st1035;
+tr3012:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -78442,8 +79043,8 @@ tr2975:
                }
                s->multiline = true;
        }
-       goto st1008;
-tr2976:
+       goto st1035;
+tr3013:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -78461,8 +79062,8 @@ tr2976:
                }
                s->multiline = false;
        }
-       goto st1008;
-tr2978:
+       goto st1035;
+tr3015:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -78476,11 +79077,11 @@ tr2978:
        {
                s->line_counter++;
        }
-       goto st1008;
-st1008:
+       goto st1035;
+st1035:
        if ( ++p == pe )
-               goto _test_eof1008;
-case 1008:
+               goto _test_eof1035;
+case 1035:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78494,29 +79095,29 @@ case 1008:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1008;
-               case 32: goto st1008;
-               case 40: goto tr2981;
-               case 41: goto tr2982;
-               case 2058: goto tr2984;
-               case 2107: goto tr2985;
+               case 9: goto st1035;
+               case 32: goto st1035;
+               case 40: goto tr3018;
+               case 41: goto tr3019;
+               case 2058: goto tr3021;
+               case 2107: goto tr3022;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr2983;
+                       goto tr3020;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr2983;
+                       goto tr3020;
        } else
-               goto tr2983;
+               goto tr3020;
        goto tr75;
-tr2983:
-       { p--; {stack[top++] = 1009;goto st699;} }
-       goto st1009;
-st1009:
+tr3020:
+       { p--; {stack[top++] = 1036;goto st726;} }
+       goto st1036;
+st1036:
        if ( ++p == pe )
-               goto _test_eof1009;
-case 1009:
+               goto _test_eof1036;
+case 1036:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78530,15 +79131,15 @@ case 1009:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1010;
-               case 32: goto st1010;
-               case 40: goto tr2987;
-               case 41: goto tr2988;
-               case 2058: goto tr2989;
-               case 2107: goto tr2990;
+               case 9: goto st1037;
+               case 32: goto st1037;
+               case 40: goto tr3024;
+               case 41: goto tr3025;
+               case 2058: goto tr3026;
+               case 2107: goto tr3027;
        }
        goto tr75;
-tr2987:
+tr3024:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -78546,8 +79147,8 @@ tr2987:
                }
                s->multiline = true;
        }
-       goto st1010;
-tr2988:
+       goto st1037;
+tr3025:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -78555,13 +79156,13 @@ tr2988:
                }
                s->multiline = false;
        }
-       goto st1010;
-tr2989:
+       goto st1037;
+tr3026:
        {
                s->line_counter++;
        }
-       goto st1010;
-tr3019:
+       goto st1037;
+tr3056:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -78571,18 +79172,18 @@ tr3019:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1010; goto _out;}
+                               {p++; cs = 1037; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1010;
-st1010:
+       goto st1037;
+st1037:
        if ( ++p == pe )
-               goto _test_eof1010;
-case 1010:
+               goto _test_eof1037;
+case 1037:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78596,17 +79197,17 @@ case 1010:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1010;
-               case 32: goto st1010;
-               case 40: goto tr2987;
-               case 41: goto tr2988;
-               case 2058: goto tr2989;
-               case 2107: goto tr2990;
+               case 9: goto st1037;
+               case 32: goto st1037;
+               case 40: goto tr3024;
+               case 41: goto tr3025;
+               case 2058: goto tr3026;
+               case 2107: goto tr3027;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2991;
-       goto tr2327;
-tr2991:
+               goto tr3028;
+       goto tr2364;
+tr3028:
        {
                s->number64 = 0;
        }
@@ -78624,8 +79225,8 @@ tr2991:
                        p--; {goto st307;}
                }
        }
-       goto st1011;
-tr2995:
+       goto st1038;
+tr3032:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -78640,11 +79241,11 @@ tr2995:
                        p--; {goto st307;}
                }
        }
-       goto st1011;
-st1011:
+       goto st1038;
+st1038:
        if ( ++p == pe )
-               goto _test_eof1011;
-case 1011:
+               goto _test_eof1038;
+case 1038:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78658,17 +79259,17 @@ case 1011:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr2992;
-               case 32: goto tr2992;
-               case 40: goto tr2993;
-               case 41: goto tr2994;
-               case 2058: goto tr2996;
-               case 2107: goto tr2997;
+               case 9: goto tr3029;
+               case 32: goto tr3029;
+               case 40: goto tr3030;
+               case 41: goto tr3031;
+               case 2058: goto tr3033;
+               case 2107: goto tr3034;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr2995;
-       goto tr2327;
-tr3000:
+               goto tr3032;
+       goto tr2364;
+tr3037:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -78676,8 +79277,8 @@ tr3000:
                }
                s->multiline = true;
        }
-       goto st1012;
-tr3001:
+       goto st1039;
+tr3038:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -78685,13 +79286,13 @@ tr3001:
                }
                s->multiline = false;
        }
-       goto st1012;
-tr3003:
+       goto st1039;
+tr3040:
        {
                s->line_counter++;
        }
-       goto st1012;
-tr3017:
+       goto st1039;
+tr3054:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -78701,15 +79302,15 @@ tr3017:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1012; goto _out;}
+                               {p++; cs = 1039; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1012;
-tr2992:
+       goto st1039;
+tr3029:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -78719,8 +79320,8 @@ tr2992:
                        p--; {goto st307;}
                }
        }
-       goto st1012;
-tr2993:
+       goto st1039;
+tr3030:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -78737,8 +79338,8 @@ tr2993:
                }
                s->multiline = true;
        }
-       goto st1012;
-tr2994:
+       goto st1039;
+tr3031:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -78755,8 +79356,8 @@ tr2994:
                }
                s->multiline = false;
        }
-       goto st1012;
-tr2996:
+       goto st1039;
+tr3033:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -78769,11 +79370,11 @@ tr2996:
        {
                s->line_counter++;
        }
-       goto st1012;
-st1012:
+       goto st1039;
+st1039:
        if ( ++p == pe )
-               goto _test_eof1012;
-case 1012:
+               goto _test_eof1039;
+case 1039:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78787,23 +79388,23 @@ case 1012:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1012;
-               case 32: goto st1012;
-               case 40: goto tr3000;
-               case 41: goto tr3001;
-               case 2058: goto tr3003;
-               case 2107: goto tr3004;
+               case 9: goto st1039;
+               case 32: goto st1039;
+               case 40: goto tr3037;
+               case 41: goto tr3038;
+               case 2058: goto tr3040;
+               case 2107: goto tr3041;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3002;
+                       goto tr3039;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3002;
+                       goto tr3039;
        } else
-               goto tr3002;
-       goto tr2998;
-tr3002:
+               goto tr3039;
+       goto tr3035;
+tr3039:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -78812,21 +79413,21 @@ tr3002:
                        p--; {goto st307;}
                }
        }
-       goto st1013;
-st1013:
+       goto st1040;
+st1040:
        if ( ++p == pe )
-               goto _test_eof1013;
-case 1013:
+               goto _test_eof1040;
+case 1040:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3005;
+                       goto tr3042;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr3005;
+                       goto tr3042;
        } else
-               goto tr3005;
-       goto tr2998;
-tr3007:
+               goto tr3042;
+       goto tr3035;
+tr3044:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -78834,8 +79435,8 @@ tr3007:
                }
                s->multiline = true;
        }
-       goto st1014;
-tr3008:
+       goto st1041;
+tr3045:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -78843,13 +79444,13 @@ tr3008:
                }
                s->multiline = false;
        }
-       goto st1014;
-tr3009:
+       goto st1041;
+tr3046:
        {
                s->line_counter++;
        }
-       goto st1014;
-tr3015:
+       goto st1041;
+tr3052:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -78859,24 +79460,24 @@ tr3015:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1014; goto _out;}
+                               {p++; cs = 1041; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1014;
-tr3005:
+       goto st1041;
+tr3042:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1014;
-st1014:
+       goto st1041;
+st1041:
        if ( ++p == pe )
-               goto _test_eof1014;
-case 1014:
+               goto _test_eof1041;
+case 1041:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78894,42 +79495,42 @@ case 1014:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st1014;
-               case 32: goto st1014;
-               case 40: goto tr3007;
-               case 41: goto tr3008;
-               case 3082: goto tr3009;
-               case 3131: goto tr3010;
-               case 3338: goto tr3011;
-               case 3387: goto tr3011;
-               case 3594: goto tr3012;
-               case 3643: goto tr3013;
+               case 9: goto st1041;
+               case 32: goto st1041;
+               case 40: goto tr3044;
+               case 41: goto tr3045;
+               case 3082: goto tr3046;
+               case 3131: goto tr3047;
+               case 3338: goto tr3048;
+               case 3387: goto tr3048;
+               case 3594: goto tr3049;
+               case 3643: goto tr3050;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3002;
+                       goto tr3039;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3002;
+                       goto tr3039;
        } else
-               goto tr3002;
-       goto tr2998;
-tr3010:
+               goto tr3039;
+       goto tr3035;
+tr3047:
        {
                s->buffer_length = 0;
        }
-       goto st1015;
-tr3014:
+       goto st1042;
+tr3051:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1015;
-st1015:
+       goto st1042;
+st1042:
        if ( ++p == pe )
-               goto _test_eof1015;
-case 1015:
+               goto _test_eof1042;
+case 1042:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -78949,32 +79550,32 @@ case 1015:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3015;
+               goto tr3052;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3014;
-       goto tr2998;
-tr3011:
+               goto tr3051;
+       goto tr3035;
+tr3048:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1460;
-st1460:
+       goto st1487;
+st1487:
        if ( ++p == pe )
-               goto _test_eof1460;
-case 1460:
+               goto _test_eof1487;
+case 1487:
        goto st0;
-tr3012:
+tr3049:
        {
                s->line_counter++;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1461;
-st1461:
+       goto st1488;
+st1488:
        if ( ++p == pe )
-               goto _test_eof1461;
-case 1461:
+               goto _test_eof1488;
+case 1488:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -78992,38 +79593,38 @@ case 1461:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st1014;
-               case 32: goto st1014;
-               case 40: goto tr3007;
-               case 41: goto tr3008;
-               case 3082: goto tr3009;
-               case 3131: goto tr3010;
-               case 3338: goto tr3011;
-               case 3387: goto tr3011;
-               case 3594: goto tr3012;
-               case 3643: goto tr3013;
+               case 9: goto st1041;
+               case 32: goto st1041;
+               case 40: goto tr3044;
+               case 41: goto tr3045;
+               case 3082: goto tr3046;
+               case 3131: goto tr3047;
+               case 3338: goto tr3048;
+               case 3387: goto tr3048;
+               case 3594: goto tr3049;
+               case 3643: goto tr3050;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3002;
+                       goto tr3039;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3002;
+                       goto tr3039;
        } else
-               goto tr3002;
-       goto tr2998;
-tr3013:
+               goto tr3039;
+       goto tr3035;
+tr3050:
        {
                s->buffer_length = 0;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1462;
-st1462:
+       goto st1489;
+st1489:
        if ( ++p == pe )
-               goto _test_eof1462;
-case 1462:
+               goto _test_eof1489;
+case 1489:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -79043,23 +79644,23 @@ case 1462:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3015;
+               goto tr3052;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3014;
-       goto tr2998;
-tr3004:
+               goto tr3051;
+       goto tr3035;
+tr3041:
        {
                s->buffer_length = 0;
        }
-       goto st1016;
-tr3016:
+       goto st1043;
+tr3053:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1016;
-tr2997:
+       goto st1043;
+tr3034:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79072,11 +79673,11 @@ tr2997:
        {
                s->buffer_length = 0;
        }
-       goto st1016;
-st1016:
+       goto st1043;
+st1043:
        if ( ++p == pe )
-               goto _test_eof1016;
-case 1016:
+               goto _test_eof1043;
+case 1043:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -79096,26 +79697,26 @@ case 1016:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3017;
+               goto tr3054;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3016;
+               goto tr3053;
        goto tr75;
-tr2990:
+tr3027:
        {
                s->buffer_length = 0;
        }
-       goto st1017;
-tr3018:
+       goto st1044;
+tr3055:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1017;
-st1017:
+       goto st1044;
+st1044:
        if ( ++p == pe )
-               goto _test_eof1017;
-case 1017:
+               goto _test_eof1044;
+case 1044:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -79135,23 +79736,23 @@ case 1017:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3019;
+               goto tr3056;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3018;
+               goto tr3055;
        goto tr75;
-tr2985:
+tr3022:
        {
                s->buffer_length = 0;
        }
-       goto st1018;
-tr3020:
+       goto st1045;
+tr3057:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1018;
-tr2979:
+       goto st1045;
+tr3016:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -79165,11 +79766,11 @@ tr2979:
        {
                s->buffer_length = 0;
        }
-       goto st1018;
-st1018:
+       goto st1045;
+st1045:
        if ( ++p == pe )
-               goto _test_eof1018;
-case 1018:
+               goto _test_eof1045;
+case 1045:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -79189,18 +79790,18 @@ case 1018:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3021;
+               goto tr3058;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3020;
+               goto tr3057;
        goto tr75;
-st1019:
+st1046:
        if ( ++p == pe )
-               goto _test_eof1019;
-case 1019:
+               goto _test_eof1046;
+case 1046:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr3022;
-       goto tr2327;
-tr3022:
+               goto tr3059;
+       goto tr2364;
+tr3059:
        {
                s->number64 = 0;
        }
@@ -79218,8 +79819,8 @@ tr3022:
                        p--; {goto st307;}
                }
        }
-       goto st1020;
-tr3026:
+       goto st1047;
+tr3063:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -79234,11 +79835,11 @@ tr3026:
                        p--; {goto st307;}
                }
        }
-       goto st1020;
-st1020:
+       goto st1047;
+st1047:
        if ( ++p == pe )
-               goto _test_eof1020;
-case 1020:
+               goto _test_eof1047;
+case 1047:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -79252,17 +79853,17 @@ case 1020:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3023;
-               case 32: goto tr3023;
-               case 40: goto tr3024;
-               case 41: goto tr3025;
-               case 2058: goto tr3027;
-               case 2107: goto tr3028;
+               case 9: goto tr3060;
+               case 32: goto tr3060;
+               case 40: goto tr3061;
+               case 41: goto tr3062;
+               case 2058: goto tr3064;
+               case 2107: goto tr3065;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3026;
-       goto tr2327;
-tr3030:
+               goto tr3063;
+       goto tr2364;
+tr3067:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -79270,8 +79871,8 @@ tr3030:
                }
                s->multiline = true;
        }
-       goto st1021;
-tr3031:
+       goto st1048;
+tr3068:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -79279,13 +79880,13 @@ tr3031:
                }
                s->multiline = false;
        }
-       goto st1021;
-tr3033:
+       goto st1048;
+tr3070:
        {
                s->line_counter++;
        }
-       goto st1021;
-tr3061:
+       goto st1048;
+tr3098:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -79295,15 +79896,15 @@ tr3061:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1021; goto _out;}
+                               {p++; cs = 1048; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1021;
-tr3023:
+       goto st1048;
+tr3060:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79313,8 +79914,8 @@ tr3023:
                        p--; {goto st307;}
                }
        }
-       goto st1021;
-tr3024:
+       goto st1048;
+tr3061:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79331,8 +79932,8 @@ tr3024:
                }
                s->multiline = true;
        }
-       goto st1021;
-tr3025:
+       goto st1048;
+tr3062:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79349,8 +79950,8 @@ tr3025:
                }
                s->multiline = false;
        }
-       goto st1021;
-tr3027:
+       goto st1048;
+tr3064:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79363,11 +79964,11 @@ tr3027:
        {
                s->line_counter++;
        }
-       goto st1021;
-st1021:
+       goto st1048;
+st1048:
        if ( ++p == pe )
-               goto _test_eof1021;
-case 1021:
+               goto _test_eof1048;
+case 1048:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -79381,17 +79982,17 @@ case 1021:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1021;
-               case 32: goto st1021;
-               case 40: goto tr3030;
-               case 41: goto tr3031;
-               case 2058: goto tr3033;
-               case 2107: goto tr3034;
+               case 9: goto st1048;
+               case 32: goto st1048;
+               case 40: goto tr3067;
+               case 41: goto tr3068;
+               case 2058: goto tr3070;
+               case 2107: goto tr3071;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3032;
-       goto tr2327;
-tr3032:
+               goto tr3069;
+       goto tr2364;
+tr3069:
        {
                s->number64 = 0;
        }
@@ -79409,8 +80010,8 @@ tr3032:
                        p--; {goto st307;}
                }
        }
-       goto st1022;
-tr3038:
+       goto st1049;
+tr3075:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -79425,11 +80026,11 @@ tr3038:
                        p--; {goto st307;}
                }
        }
-       goto st1022;
-st1022:
+       goto st1049;
+st1049:
        if ( ++p == pe )
-               goto _test_eof1022;
-case 1022:
+               goto _test_eof1049;
+case 1049:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -79443,17 +80044,17 @@ case 1022:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3035;
-               case 32: goto tr3035;
-               case 40: goto tr3036;
-               case 41: goto tr3037;
-               case 2058: goto tr3039;
-               case 2107: goto tr3040;
+               case 9: goto tr3072;
+               case 32: goto tr3072;
+               case 40: goto tr3073;
+               case 41: goto tr3074;
+               case 2058: goto tr3076;
+               case 2107: goto tr3077;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3038;
-       goto tr2327;
-tr3042:
+               goto tr3075;
+       goto tr2364;
+tr3079:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -79461,8 +80062,8 @@ tr3042:
                }
                s->multiline = true;
        }
-       goto st1023;
-tr3043:
+       goto st1050;
+tr3080:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -79470,13 +80071,13 @@ tr3043:
                }
                s->multiline = false;
        }
-       goto st1023;
-tr3045:
+       goto st1050;
+tr3082:
        {
                s->line_counter++;
        }
-       goto st1023;
-tr3059:
+       goto st1050;
+tr3096:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -79486,15 +80087,15 @@ tr3059:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1023; goto _out;}
+                               {p++; cs = 1050; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1023;
-tr3035:
+       goto st1050;
+tr3072:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79504,8 +80105,8 @@ tr3035:
                        p--; {goto st307;}
                }
        }
-       goto st1023;
-tr3036:
+       goto st1050;
+tr3073:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79522,8 +80123,8 @@ tr3036:
                }
                s->multiline = true;
        }
-       goto st1023;
-tr3037:
+       goto st1050;
+tr3074:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79540,8 +80141,8 @@ tr3037:
                }
                s->multiline = false;
        }
-       goto st1023;
-tr3039:
+       goto st1050;
+tr3076:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79554,11 +80155,11 @@ tr3039:
        {
                s->line_counter++;
        }
-       goto st1023;
-st1023:
+       goto st1050;
+st1050:
        if ( ++p == pe )
-               goto _test_eof1023;
-case 1023:
+               goto _test_eof1050;
+case 1050:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -79572,23 +80173,23 @@ case 1023:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1023;
-               case 32: goto st1023;
-               case 40: goto tr3042;
-               case 41: goto tr3043;
-               case 2058: goto tr3045;
-               case 2107: goto tr3046;
+               case 9: goto st1050;
+               case 32: goto st1050;
+               case 40: goto tr3079;
+               case 41: goto tr3080;
+               case 2058: goto tr3082;
+               case 2107: goto tr3083;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3044;
+                       goto tr3081;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3044;
+                       goto tr3081;
        } else
-               goto tr3044;
-       goto tr2998;
-tr3044:
+               goto tr3081;
+       goto tr3035;
+tr3081:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -79597,21 +80198,21 @@ tr3044:
                        p--; {goto st307;}
                }
        }
-       goto st1024;
-st1024:
+       goto st1051;
+st1051:
        if ( ++p == pe )
-               goto _test_eof1024;
-case 1024:
+               goto _test_eof1051;
+case 1051:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3047;
+                       goto tr3084;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr3047;
+                       goto tr3084;
        } else
-               goto tr3047;
-       goto tr2998;
-tr3049:
+               goto tr3084;
+       goto tr3035;
+tr3086:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -79619,8 +80220,8 @@ tr3049:
                }
                s->multiline = true;
        }
-       goto st1025;
-tr3050:
+       goto st1052;
+tr3087:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -79628,13 +80229,13 @@ tr3050:
                }
                s->multiline = false;
        }
-       goto st1025;
-tr3051:
+       goto st1052;
+tr3088:
        {
                s->line_counter++;
        }
-       goto st1025;
-tr3057:
+       goto st1052;
+tr3094:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -79644,24 +80245,24 @@ tr3057:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1025; goto _out;}
+                               {p++; cs = 1052; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1025;
-tr3047:
+       goto st1052;
+tr3084:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1025;
-st1025:
+       goto st1052;
+st1052:
        if ( ++p == pe )
-               goto _test_eof1025;
-case 1025:
+               goto _test_eof1052;
+case 1052:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -79679,42 +80280,42 @@ case 1025:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st1025;
-               case 32: goto st1025;
-               case 40: goto tr3049;
-               case 41: goto tr3050;
-               case 3082: goto tr3051;
-               case 3131: goto tr3052;
-               case 3338: goto tr3053;
-               case 3387: goto tr3053;
-               case 3594: goto tr3054;
-               case 3643: goto tr3055;
+               case 9: goto st1052;
+               case 32: goto st1052;
+               case 40: goto tr3086;
+               case 41: goto tr3087;
+               case 3082: goto tr3088;
+               case 3131: goto tr3089;
+               case 3338: goto tr3090;
+               case 3387: goto tr3090;
+               case 3594: goto tr3091;
+               case 3643: goto tr3092;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3044;
+                       goto tr3081;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3044;
+                       goto tr3081;
        } else
-               goto tr3044;
-       goto tr2998;
-tr3052:
+               goto tr3081;
+       goto tr3035;
+tr3089:
        {
                s->buffer_length = 0;
        }
-       goto st1026;
-tr3056:
+       goto st1053;
+tr3093:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1026;
-st1026:
+       goto st1053;
+st1053:
        if ( ++p == pe )
-               goto _test_eof1026;
-case 1026:
+               goto _test_eof1053;
+case 1053:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -79734,32 +80335,32 @@ case 1026:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3057;
+               goto tr3094;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3056;
-       goto tr2998;
-tr3053:
+               goto tr3093;
+       goto tr3035;
+tr3090:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1463;
-st1463:
+       goto st1490;
+st1490:
        if ( ++p == pe )
-               goto _test_eof1463;
-case 1463:
+               goto _test_eof1490;
+case 1490:
        goto st0;
-tr3054:
+tr3091:
        {
                s->line_counter++;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1464;
-st1464:
+       goto st1491;
+st1491:
        if ( ++p == pe )
-               goto _test_eof1464;
-case 1464:
+               goto _test_eof1491;
+case 1491:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -79777,38 +80378,38 @@ case 1464:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st1025;
-               case 32: goto st1025;
-               case 40: goto tr3049;
-               case 41: goto tr3050;
-               case 3082: goto tr3051;
-               case 3131: goto tr3052;
-               case 3338: goto tr3053;
-               case 3387: goto tr3053;
-               case 3594: goto tr3054;
-               case 3643: goto tr3055;
+               case 9: goto st1052;
+               case 32: goto st1052;
+               case 40: goto tr3086;
+               case 41: goto tr3087;
+               case 3082: goto tr3088;
+               case 3131: goto tr3089;
+               case 3338: goto tr3090;
+               case 3387: goto tr3090;
+               case 3594: goto tr3091;
+               case 3643: goto tr3092;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3044;
+                       goto tr3081;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3044;
+                       goto tr3081;
        } else
-               goto tr3044;
-       goto tr2998;
-tr3055:
+               goto tr3081;
+       goto tr3035;
+tr3092:
        {
                s->buffer_length = 0;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1465;
-st1465:
+       goto st1492;
+st1492:
        if ( ++p == pe )
-               goto _test_eof1465;
-case 1465:
+               goto _test_eof1492;
+case 1492:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -79828,23 +80429,23 @@ case 1465:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3057;
+               goto tr3094;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3056;
-       goto tr2998;
-tr3046:
+               goto tr3093;
+       goto tr3035;
+tr3083:
        {
                s->buffer_length = 0;
        }
-       goto st1027;
-tr3058:
+       goto st1054;
+tr3095:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1027;
-tr3040:
+       goto st1054;
+tr3077:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79857,11 +80458,11 @@ tr3040:
        {
                s->buffer_length = 0;
        }
-       goto st1027;
-st1027:
+       goto st1054;
+st1054:
        if ( ++p == pe )
-               goto _test_eof1027;
-case 1027:
+               goto _test_eof1054;
+case 1054:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -79881,23 +80482,23 @@ case 1027:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3059;
+               goto tr3096;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3058;
+               goto tr3095;
        goto tr75;
-tr3034:
+tr3071:
        {
                s->buffer_length = 0;
        }
-       goto st1028;
-tr3060:
+       goto st1055;
+tr3097:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1028;
-tr3028:
+       goto st1055;
+tr3065:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -79910,11 +80511,11 @@ tr3028:
        {
                s->buffer_length = 0;
        }
-       goto st1028;
-st1028:
+       goto st1055;
+st1055:
        if ( ++p == pe )
-               goto _test_eof1028;
-case 1028:
+               goto _test_eof1055;
+case 1055:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -79934,18 +80535,18 @@ case 1028:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3061;
+               goto tr3098;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3060;
+               goto tr3097;
        goto tr75;
-st1029:
+st1056:
        if ( ++p == pe )
-               goto _test_eof1029;
-case 1029:
+               goto _test_eof1056;
+case 1056:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr3062;
-       goto tr2327;
-tr3062:
+               goto tr3099;
+       goto tr2364;
+tr3099:
        {
                s->number64 = 0;
        }
@@ -79963,8 +80564,8 @@ tr3062:
                        p--; {goto st307;}
                }
        }
-       goto st1030;
-tr3066:
+       goto st1057;
+tr3103:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -79979,11 +80580,11 @@ tr3066:
                        p--; {goto st307;}
                }
        }
-       goto st1030;
-st1030:
+       goto st1057;
+st1057:
        if ( ++p == pe )
-               goto _test_eof1030;
-case 1030:
+               goto _test_eof1057;
+case 1057:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -79997,17 +80598,17 @@ case 1030:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3063;
-               case 32: goto tr3063;
-               case 40: goto tr3064;
-               case 41: goto tr3065;
-               case 2058: goto tr3067;
-               case 2107: goto tr3068;
+               case 9: goto tr3100;
+               case 32: goto tr3100;
+               case 40: goto tr3101;
+               case 41: goto tr3102;
+               case 2058: goto tr3104;
+               case 2107: goto tr3105;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3066;
-       goto tr2327;
-tr3071:
+               goto tr3103;
+       goto tr2364;
+tr3108:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -80015,8 +80616,8 @@ tr3071:
                }
                s->multiline = true;
        }
-       goto st1031;
-tr3072:
+       goto st1058;
+tr3109:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -80024,13 +80625,13 @@ tr3072:
                }
                s->multiline = false;
        }
-       goto st1031;
-tr3077:
+       goto st1058;
+tr3114:
        {
                s->line_counter++;
        }
-       goto st1031;
-tr3270:
+       goto st1058;
+tr3307:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -80040,15 +80641,15 @@ tr3270:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1031; goto _out;}
+                               {p++; cs = 1058; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1031;
-tr3063:
+       goto st1058;
+tr3100:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -80058,8 +80659,8 @@ tr3063:
                        p--; {goto st307;}
                }
        }
-       goto st1031;
-tr3064:
+       goto st1058;
+tr3101:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -80076,8 +80677,8 @@ tr3064:
                }
                s->multiline = true;
        }
-       goto st1031;
-tr3065:
+       goto st1058;
+tr3102:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -80094,8 +80695,8 @@ tr3065:
                }
                s->multiline = false;
        }
-       goto st1031;
-tr3067:
+       goto st1058;
+tr3104:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -80108,11 +80709,11 @@ tr3067:
        {
                s->line_counter++;
        }
-       goto st1031;
-st1031:
+       goto st1058;
+st1058:
        if ( ++p == pe )
-               goto _test_eof1031;
-case 1031:
+               goto _test_eof1058;
+case 1058:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -80126,27 +80727,27 @@ case 1031:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1031;
-               case 32: goto st1031;
-               case 40: goto tr3071;
-               case 41: goto tr3072;
-               case 48: goto tr3073;
-               case 49: goto tr3074;
-               case 50: goto tr3075;
-               case 51: goto tr3076;
-               case 2058: goto tr3077;
-               case 2107: goto tr3078;
+               case 9: goto st1058;
+               case 32: goto st1058;
+               case 40: goto tr3108;
+               case 41: goto tr3109;
+               case 48: goto tr3110;
+               case 49: goto tr3111;
+               case 50: goto tr3112;
+               case 51: goto tr3113;
+               case 2058: goto tr3114;
+               case 2107: goto tr3115;
        }
-       goto tr3069;
-tr3073:
+       goto tr3106;
+tr3110:
        {
                *(rdata_tail++) = 0;
        }
-       goto st1032;
-st1032:
+       goto st1059;
+st1059:
        if ( ++p == pe )
-               goto _test_eof1032;
-case 1032:
+               goto _test_eof1059;
+case 1059:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -80160,15 +80761,15 @@ case 1032:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1033;
-               case 32: goto st1033;
-               case 40: goto tr3080;
-               case 41: goto tr3081;
-               case 2058: goto tr3082;
-               case 2107: goto tr3083;
+               case 9: goto st1060;
+               case 32: goto st1060;
+               case 40: goto tr3117;
+               case 41: goto tr3118;
+               case 2058: goto tr3119;
+               case 2107: goto tr3120;
        }
-       goto tr3069;
-tr3080:
+       goto tr3106;
+tr3117:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -80176,8 +80777,8 @@ tr3080:
                }
                s->multiline = true;
        }
-       goto st1033;
-tr3081:
+       goto st1060;
+tr3118:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -80185,13 +80786,13 @@ tr3081:
                }
                s->multiline = false;
        }
-       goto st1033;
-tr3082:
+       goto st1060;
+tr3119:
        {
                s->line_counter++;
        }
-       goto st1033;
-tr3132:
+       goto st1060;
+tr3169:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -80201,18 +80802,18 @@ tr3132:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1033; goto _out;}
+                               {p++; cs = 1060; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1033;
-st1033:
+       goto st1060;
+st1060:
        if ( ++p == pe )
-               goto _test_eof1033;
-case 1033:
+               goto _test_eof1060;
+case 1060:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -80226,17 +80827,17 @@ case 1033:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1033;
-               case 32: goto st1033;
-               case 40: goto tr3080;
-               case 41: goto tr3081;
-               case 2058: goto tr3082;
-               case 2107: goto tr3083;
+               case 9: goto st1060;
+               case 32: goto st1060;
+               case 40: goto tr3117;
+               case 41: goto tr3118;
+               case 2058: goto tr3119;
+               case 2107: goto tr3120;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3085;
-       goto tr3084;
-tr3085:
+               goto tr3122;
+       goto tr3121;
+tr3122:
        {
                s->number64 = 0;
        }
@@ -80254,8 +80855,8 @@ tr3085:
                        p--; {goto st307;}
                }
        }
-       goto st1034;
-tr3089:
+       goto st1061;
+tr3126:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -80270,11 +80871,11 @@ tr3089:
                        p--; {goto st307;}
                }
        }
-       goto st1034;
-st1034:
+       goto st1061;
+st1061:
        if ( ++p == pe )
-               goto _test_eof1034;
-case 1034:
+               goto _test_eof1061;
+case 1061:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -80288,17 +80889,17 @@ case 1034:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3086;
-               case 32: goto tr3086;
-               case 40: goto tr3087;
-               case 41: goto tr3088;
-               case 2058: goto tr3090;
-               case 2107: goto tr3091;
+               case 9: goto tr3123;
+               case 32: goto tr3123;
+               case 40: goto tr3124;
+               case 41: goto tr3125;
+               case 2058: goto tr3127;
+               case 2107: goto tr3128;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3089;
-       goto tr3084;
-tr3093:
+               goto tr3126;
+       goto tr3121;
+tr3130:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -80306,8 +80907,8 @@ tr3093:
                }
                s->multiline = true;
        }
-       goto st1035;
-tr3094:
+       goto st1062;
+tr3131:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -80315,13 +80916,13 @@ tr3094:
                }
                s->multiline = false;
        }
-       goto st1035;
-tr3096:
+       goto st1062;
+tr3133:
        {
                s->line_counter++;
        }
-       goto st1035;
-tr3130:
+       goto st1062;
+tr3167:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -80331,15 +80932,15 @@ tr3130:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1035; goto _out;}
+                               {p++; cs = 1062; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1035;
-tr3086:
+       goto st1062;
+tr3123:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -80349,8 +80950,8 @@ tr3086:
                        p--; {goto st307;}
                }
        }
-       goto st1035;
-tr3087:
+       goto st1062;
+tr3124:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -80367,8 +80968,8 @@ tr3087:
                }
                s->multiline = true;
        }
-       goto st1035;
-tr3088:
+       goto st1062;
+tr3125:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -80385,8 +80986,8 @@ tr3088:
                }
                s->multiline = false;
        }
-       goto st1035;
-tr3090:
+       goto st1062;
+tr3127:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -80399,11 +81000,11 @@ tr3090:
        {
                s->line_counter++;
        }
-       goto st1035;
-st1035:
+       goto st1062;
+st1062:
        if ( ++p == pe )
-               goto _test_eof1035;
-case 1035:
+               goto _test_eof1062;
+case 1062:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -80417,19 +81018,19 @@ case 1035:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1035;
-               case 32: goto st1035;
-               case 40: goto tr3093;
-               case 41: goto tr3094;
-               case 46: goto st1036;
-               case 2058: goto tr3096;
-               case 2107: goto tr3097;
+               case 9: goto st1062;
+               case 32: goto st1062;
+               case 40: goto tr3130;
+               case 41: goto tr3131;
+               case 46: goto st1063;
+               case 2058: goto tr3133;
+               case 2107: goto tr3134;
        }
-       goto tr3069;
-st1036:
+       goto tr3106;
+st1063:
        if ( ++p == pe )
-               goto _test_eof1036;
-case 1036:
+               goto _test_eof1063;
+case 1063:
        _widec = (*p);
        if ( (*p) < 32 ) {
                if ( (*p) > 9 ) {
@@ -80487,43 +81088,43 @@ case 1036:
  s->number64 == 0  ) _widec += 512;
        }
        switch( _widec ) {
-               case 7177: goto st1037;
-               case 7200: goto st1037;
-               case 7208: goto tr3100;
-               case 7209: goto tr3101;
-               case 7433: goto st1040;
-               case 7456: goto st1040;
-               case 7464: goto tr3103;
-               case 7465: goto tr3104;
-               case 7689: goto st1042;
-               case 7712: goto st1042;
-               case 7720: goto tr3106;
-               case 7721: goto tr3107;
-               case 10506: goto tr3108;
-               case 10555: goto tr3108;
-               case 10762: goto tr3108;
-               case 10811: goto tr3108;
-               case 11274: goto tr3109;
-               case 11323: goto tr3110;
-               case 11530: goto tr3108;
-               case 11579: goto tr3108;
-               case 11786: goto tr3111;
-               case 11835: goto tr3112;
-               case 12298: goto tr3113;
-               case 12347: goto tr3114;
-               case 12554: goto tr3108;
-               case 12603: goto tr3108;
-               case 12810: goto tr3115;
-               case 12859: goto tr3116;
-               case 13322: goto tr3117;
-               case 13371: goto tr3118;
-               case 13578: goto tr3108;
-               case 13627: goto tr3108;
-               case 13834: goto tr3119;
-               case 13883: goto tr3120;
-       }
-       goto tr3098;
-tr3100:
+               case 7177: goto st1064;
+               case 7200: goto st1064;
+               case 7208: goto tr3137;
+               case 7209: goto tr3138;
+               case 7433: goto st1067;
+               case 7456: goto st1067;
+               case 7464: goto tr3140;
+               case 7465: goto tr3141;
+               case 7689: goto st1069;
+               case 7712: goto st1069;
+               case 7720: goto tr3143;
+               case 7721: goto tr3144;
+               case 10506: goto tr3145;
+               case 10555: goto tr3145;
+               case 10762: goto tr3145;
+               case 10811: goto tr3145;
+               case 11274: goto tr3146;
+               case 11323: goto tr3147;
+               case 11530: goto tr3145;
+               case 11579: goto tr3145;
+               case 11786: goto tr3148;
+               case 11835: goto tr3149;
+               case 12298: goto tr3150;
+               case 12347: goto tr3151;
+               case 12554: goto tr3145;
+               case 12603: goto tr3145;
+               case 12810: goto tr3152;
+               case 12859: goto tr3153;
+               case 13322: goto tr3154;
+               case 13371: goto tr3155;
+               case 13578: goto tr3145;
+               case 13627: goto tr3145;
+               case 13834: goto tr3156;
+               case 13883: goto tr3157;
+       }
+       goto tr3135;
+tr3137:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -80531,8 +81132,8 @@ tr3100:
                }
                s->multiline = true;
        }
-       goto st1037;
-tr3101:
+       goto st1064;
+tr3138:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -80540,13 +81141,13 @@ tr3101:
                }
                s->multiline = false;
        }
-       goto st1037;
-tr3109:
+       goto st1064;
+tr3146:
        {
                s->line_counter++;
        }
-       goto st1037;
-tr3124:
+       goto st1064;
+tr3161:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -80556,15 +81157,15 @@ tr3124:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1037; goto _out;}
+                               {p++; cs = 1064; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1037;
-tr3154:
+       goto st1064;
+tr3191:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80581,8 +81182,8 @@ tr3154:
                memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
                rdata_tail += ZS_INET4_ADDR_LENGTH;
        }
-       goto st1037;
-tr3199:
+       goto st1064;
+tr3236:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80599,13 +81200,13 @@ tr3199:
                memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
                rdata_tail += ZS_INET6_ADDR_LENGTH;
        }
-       goto st1037;
-tr3243:
+       goto st1064;
+tr3280:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       goto st1037;
-tr3244:
+       goto st1064;
+tr3281:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -80616,8 +81217,8 @@ tr3244:
                }
                s->multiline = true;
        }
-       goto st1037;
-tr3245:
+       goto st1064;
+tr3282:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -80628,16 +81229,16 @@ tr3245:
                }
                s->multiline = false;
        }
-       goto st1037;
-tr3253:
+       goto st1064;
+tr3290:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->line_counter++;
        }
-       goto st1037;
-tr3155:
+       goto st1064;
+tr3192:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80661,8 +81262,8 @@ tr3155:
                }
                s->multiline = true;
        }
-       goto st1037;
-tr3156:
+       goto st1064;
+tr3193:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80686,8 +81287,8 @@ tr3156:
                }
                s->multiline = false;
        }
-       goto st1037;
-tr3164:
+       goto st1064;
+tr3201:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80707,8 +81308,8 @@ tr3164:
        {
                s->line_counter++;
        }
-       goto st1037;
-tr3200:
+       goto st1064;
+tr3237:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80732,8 +81333,8 @@ tr3200:
                }
                s->multiline = true;
        }
-       goto st1037;
-tr3201:
+       goto st1064;
+tr3238:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80757,8 +81358,8 @@ tr3201:
                }
                s->multiline = false;
        }
-       goto st1037;
-tr3209:
+       goto st1064;
+tr3246:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80778,11 +81379,11 @@ tr3209:
        {
                s->line_counter++;
        }
-       goto st1037;
-st1037:
+       goto st1064;
+st1064:
        if ( ++p == pe )
-               goto _test_eof1037;
-case 1037:
+               goto _test_eof1064;
+case 1064:
        _widec = (*p);
        if ( (*p) < 43 ) {
                if ( (*p) < 32 ) {
@@ -80854,30 +81455,30 @@ case 1037:
  s->number64 != 0  ) _widec += 256;
        }
        switch( _widec ) {
-               case 4105: goto st1037;
-               case 4128: goto st1037;
-               case 4136: goto tr3100;
-               case 4137: goto tr3101;
-               case 4139: goto tr3122;
-               case 5130: goto tr3109;
-               case 5179: goto tr3110;
+               case 4105: goto st1064;
+               case 4128: goto st1064;
+               case 4136: goto tr3137;
+               case 4137: goto tr3138;
+               case 4139: goto tr3159;
+               case 5130: goto tr3146;
+               case 5179: goto tr3147;
        }
        if ( _widec < 4161 ) {
                if ( 4143 <= _widec && _widec <= 4153 )
-                       goto tr3122;
+                       goto tr3159;
        } else if ( _widec > 4186 ) {
                if ( 4193 <= _widec && _widec <= 4218 )
-                       goto tr3122;
+                       goto tr3159;
        } else
-               goto tr3122;
-       goto tr3121;
-tr3122:
-       { p--; {stack[top++] = 1038;goto st369;} }
-       goto st1038;
-st1038:
+               goto tr3159;
+       goto tr3158;
+tr3159:
+       { p--; {stack[top++] = 1065;goto st369;} }
+       goto st1065;
+st1065:
        if ( ++p == pe )
-               goto _test_eof1038;
-case 1038:
+               goto _test_eof1065;
+case 1065:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -80891,16 +81492,16 @@ case 1038:
  !s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 2570: goto tr3108;
-               case 2619: goto tr3108;
+               case 2570: goto tr3145;
+               case 2619: goto tr3145;
        }
-       goto tr3121;
-tr3108:
+       goto tr3158;
+tr3145:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1466;
-tr3163:
+       goto st1493;
+tr3200:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80920,16 +81521,16 @@ tr3163:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1466;
-tr3252:
+       goto st1493;
+tr3289:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1466;
-tr3208:
+       goto st1493;
+tr3245:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80949,33 +81550,33 @@ tr3208:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1466;
-st1466:
+       goto st1493;
+st1493:
        if ( ++p == pe )
-               goto _test_eof1466;
-case 1466:
+               goto _test_eof1493;
+case 1493:
        goto st0;
-tr3110:
+tr3147:
        {
                s->buffer_length = 0;
        }
-       goto st1039;
-tr3123:
+       goto st1066;
+tr3160:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1039;
-tr3254:
+       goto st1066;
+tr3291:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->buffer_length = 0;
        }
-       goto st1039;
-tr3165:
+       goto st1066;
+tr3202:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -80995,8 +81596,8 @@ tr3165:
        {
                s->buffer_length = 0;
        }
-       goto st1039;
-tr3210:
+       goto st1066;
+tr3247:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81016,11 +81617,11 @@ tr3210:
        {
                s->buffer_length = 0;
        }
-       goto st1039;
-st1039:
+       goto st1066;
+st1066:
        if ( ++p == pe )
-               goto _test_eof1039;
-case 1039:
+               goto _test_eof1066;
+case 1066:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -81046,11 +81647,11 @@ case 1039:
  s->number64 != 0  ) _widec += 512;
        }
        if ( _widec == 5130 )
-               goto tr3124;
+               goto tr3161;
        if ( 4992 <= _widec && _widec <= 5247 )
-               goto tr3123;
-       goto tr3121;
-tr3103:
+               goto tr3160;
+       goto tr3158;
+tr3140:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -81058,8 +81659,8 @@ tr3103:
                }
                s->multiline = true;
        }
-       goto st1040;
-tr3104:
+       goto st1067;
+tr3141:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -81067,13 +81668,13 @@ tr3104:
                }
                s->multiline = false;
        }
-       goto st1040;
-tr3113:
+       goto st1067;
+tr3150:
        {
                s->line_counter++;
        }
-       goto st1040;
-tr3126:
+       goto st1067;
+tr3163:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -81083,15 +81684,15 @@ tr3126:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1040; goto _out;}
+                               {p++; cs = 1067; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1040;
-tr3157:
+       goto st1067;
+tr3194:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81108,8 +81709,8 @@ tr3157:
                memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
                rdata_tail += ZS_INET4_ADDR_LENGTH;
        }
-       goto st1040;
-tr3202:
+       goto st1067;
+tr3239:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81126,13 +81727,13 @@ tr3202:
                memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
                rdata_tail += ZS_INET6_ADDR_LENGTH;
        }
-       goto st1040;
-tr3246:
+       goto st1067;
+tr3283:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       goto st1040;
-tr3247:
+       goto st1067;
+tr3284:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -81143,8 +81744,8 @@ tr3247:
                }
                s->multiline = true;
        }
-       goto st1040;
-tr3248:
+       goto st1067;
+tr3285:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -81155,16 +81756,16 @@ tr3248:
                }
                s->multiline = false;
        }
-       goto st1040;
-tr3257:
+       goto st1067;
+tr3294:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->line_counter++;
        }
-       goto st1040;
-tr3158:
+       goto st1067;
+tr3195:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81188,8 +81789,8 @@ tr3158:
                }
                s->multiline = true;
        }
-       goto st1040;
-tr3159:
+       goto st1067;
+tr3196:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81213,8 +81814,8 @@ tr3159:
                }
                s->multiline = false;
        }
-       goto st1040;
-tr3168:
+       goto st1067;
+tr3205:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81234,8 +81835,8 @@ tr3168:
        {
                s->line_counter++;
        }
-       goto st1040;
-tr3203:
+       goto st1067;
+tr3240:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81259,8 +81860,8 @@ tr3203:
                }
                s->multiline = true;
        }
-       goto st1040;
-tr3204:
+       goto st1067;
+tr3241:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81284,8 +81885,8 @@ tr3204:
                }
                s->multiline = false;
        }
-       goto st1040;
-tr3213:
+       goto st1067;
+tr3250:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81305,11 +81906,11 @@ tr3213:
        {
                s->line_counter++;
        }
-       goto st1040;
-st1040:
+       goto st1067;
+st1067:
        if ( ++p == pe )
-               goto _test_eof1040;
-case 1040:
+               goto _test_eof1067;
+case 1067:
        _widec = (*p);
        if ( (*p) < 32 ) {
                if ( (*p) > 9 ) {
@@ -81355,43 +81956,43 @@ case 1040:
  s->number64 == 0  ) _widec += 256;
        }
        switch( _widec ) {
-               case 5641: goto st1040;
-               case 5664: goto st1040;
-               case 5672: goto tr3103;
-               case 5673: goto tr3104;
-               case 14602: goto tr3108;
-               case 14651: goto tr3108;
-               case 14858: goto tr3108;
-               case 14907: goto tr3108;
-               case 15370: goto tr3113;
-               case 15419: goto tr3114;
-               case 15626: goto tr3108;
-               case 15675: goto tr3108;
-               case 15882: goto tr3115;
-               case 15931: goto tr3116;
-       }
-       goto tr3121;
-tr3114:
+               case 5641: goto st1067;
+               case 5664: goto st1067;
+               case 5672: goto tr3140;
+               case 5673: goto tr3141;
+               case 14602: goto tr3145;
+               case 14651: goto tr3145;
+               case 14858: goto tr3145;
+               case 14907: goto tr3145;
+               case 15370: goto tr3150;
+               case 15419: goto tr3151;
+               case 15626: goto tr3145;
+               case 15675: goto tr3145;
+               case 15882: goto tr3152;
+               case 15931: goto tr3153;
+       }
+       goto tr3158;
+tr3151:
        {
                s->buffer_length = 0;
        }
-       goto st1041;
-tr3125:
+       goto st1068;
+tr3162:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1041;
-tr3258:
+       goto st1068;
+tr3295:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->buffer_length = 0;
        }
-       goto st1041;
-tr3169:
+       goto st1068;
+tr3206:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81411,8 +82012,8 @@ tr3169:
        {
                s->buffer_length = 0;
        }
-       goto st1041;
-tr3214:
+       goto st1068;
+tr3251:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81432,11 +82033,11 @@ tr3214:
        {
                s->buffer_length = 0;
        }
-       goto st1041;
-st1041:
+       goto st1068;
+st1068:
        if ( ++p == pe )
-               goto _test_eof1041;
-case 1041:
+               goto _test_eof1068;
+case 1068:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -81462,19 +82063,19 @@ case 1041:
  s->number64 == 0  ) _widec += 512;
        }
        if ( _widec == 6666 )
-               goto tr3126;
+               goto tr3163;
        if ( 6528 <= _widec && _widec <= 6783 )
-               goto tr3125;
-       goto tr3121;
-tr3115:
+               goto tr3162;
+       goto tr3158;
+tr3152:
        {
                s->line_counter++;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1467;
-tr3170:
+       goto st1494;
+tr3207:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81497,8 +82098,8 @@ tr3170:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1467;
-tr3215:
+       goto st1494;
+tr3252:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81521,8 +82122,8 @@ tr3215:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1467;
-tr3259:
+       goto st1494;
+tr3296:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -81532,11 +82133,11 @@ tr3259:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1467;
-st1467:
+       goto st1494;
+st1494:
        if ( ++p == pe )
-               goto _test_eof1467;
-case 1467:
+               goto _test_eof1494;
+case 1494:
        _widec = (*p);
        if ( (*p) < 32 ) {
                if ( (*p) > 9 ) {
@@ -81582,31 +82183,31 @@ case 1467:
  s->number64 == 0  ) _widec += 256;
        }
        switch( _widec ) {
-               case 5641: goto st1040;
-               case 5664: goto st1040;
-               case 5672: goto tr3103;
-               case 5673: goto tr3104;
-               case 14602: goto tr3108;
-               case 14651: goto tr3108;
-               case 14858: goto tr3108;
-               case 14907: goto tr3108;
-               case 15370: goto tr3113;
-               case 15419: goto tr3114;
-               case 15626: goto tr3108;
-               case 15675: goto tr3108;
-               case 15882: goto tr3115;
-               case 15931: goto tr3116;
-       }
-       goto tr3121;
-tr3116:
+               case 5641: goto st1067;
+               case 5664: goto st1067;
+               case 5672: goto tr3140;
+               case 5673: goto tr3141;
+               case 14602: goto tr3145;
+               case 14651: goto tr3145;
+               case 14858: goto tr3145;
+               case 14907: goto tr3145;
+               case 15370: goto tr3150;
+               case 15419: goto tr3151;
+               case 15626: goto tr3145;
+               case 15675: goto tr3145;
+               case 15882: goto tr3152;
+               case 15931: goto tr3153;
+       }
+       goto tr3158;
+tr3153:
        {
                s->buffer_length = 0;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1468;
-tr3171:
+       goto st1495;
+tr3208:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81629,8 +82230,8 @@ tr3171:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1468;
-tr3216:
+       goto st1495;
+tr3253:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81653,8 +82254,8 @@ tr3216:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1468;
-tr3260:
+       goto st1495;
+tr3297:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -81664,11 +82265,11 @@ tr3260:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1468;
-st1468:
+       goto st1495;
+st1495:
        if ( ++p == pe )
-               goto _test_eof1468;
-case 1468:
+               goto _test_eof1495;
+case 1495:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -81694,11 +82295,11 @@ case 1468:
  s->number64 == 0  ) _widec += 512;
        }
        if ( _widec == 6666 )
-               goto tr3126;
+               goto tr3163;
        if ( 6528 <= _widec && _widec <= 6783 )
-               goto tr3125;
-       goto tr3121;
-tr3106:
+               goto tr3162;
+       goto tr3158;
+tr3143:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -81706,8 +82307,8 @@ tr3106:
                }
                s->multiline = true;
        }
-       goto st1042;
-tr3107:
+       goto st1069;
+tr3144:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -81715,13 +82316,13 @@ tr3107:
                }
                s->multiline = false;
        }
-       goto st1042;
-tr3117:
+       goto st1069;
+tr3154:
        {
                s->line_counter++;
        }
-       goto st1042;
-tr3128:
+       goto st1069;
+tr3165:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -81731,15 +82332,15 @@ tr3128:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1042; goto _out;}
+                               {p++; cs = 1069; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1042;
-tr3160:
+       goto st1069;
+tr3197:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81756,8 +82357,8 @@ tr3160:
                memcpy(rdata_tail, s->addr, ZS_INET4_ADDR_LENGTH);
                rdata_tail += ZS_INET4_ADDR_LENGTH;
        }
-       goto st1042;
-tr3205:
+       goto st1069;
+tr3242:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81774,13 +82375,13 @@ tr3205:
                memcpy(rdata_tail, s->addr, ZS_INET6_ADDR_LENGTH);
                rdata_tail += ZS_INET6_ADDR_LENGTH;
        }
-       goto st1042;
-tr3249:
+       goto st1069;
+tr3286:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       goto st1042;
-tr3250:
+       goto st1069;
+tr3287:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -81791,8 +82392,8 @@ tr3250:
                }
                s->multiline = true;
        }
-       goto st1042;
-tr3251:
+       goto st1069;
+tr3288:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -81803,16 +82404,16 @@ tr3251:
                }
                s->multiline = false;
        }
-       goto st1042;
-tr3261:
+       goto st1069;
+tr3298:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->line_counter++;
        }
-       goto st1042;
-tr3161:
+       goto st1069;
+tr3198:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81836,8 +82437,8 @@ tr3161:
                }
                s->multiline = true;
        }
-       goto st1042;
-tr3162:
+       goto st1069;
+tr3199:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81861,8 +82462,8 @@ tr3162:
                }
                s->multiline = false;
        }
-       goto st1042;
-tr3172:
+       goto st1069;
+tr3209:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81882,8 +82483,8 @@ tr3172:
        {
                s->line_counter++;
        }
-       goto st1042;
-tr3206:
+       goto st1069;
+tr3243:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81907,8 +82508,8 @@ tr3206:
                }
                s->multiline = true;
        }
-       goto st1042;
-tr3207:
+       goto st1069;
+tr3244:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81932,8 +82533,8 @@ tr3207:
                }
                s->multiline = false;
        }
-       goto st1042;
-tr3217:
+       goto st1069;
+tr3254:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -81953,11 +82554,11 @@ tr3217:
        {
                s->line_counter++;
        }
-       goto st1042;
-st1042:
+       goto st1069;
+st1069:
        if ( ++p == pe )
-               goto _test_eof1042;
-case 1042:
+               goto _test_eof1069;
+case 1069:
        _widec = (*p);
        if ( (*p) < 43 ) {
                if ( (*p) < 32 ) {
@@ -82045,60 +82646,60 @@ case 1042:
  s->number64 != 0  ) _widec += 256;
        }
        switch( _widec ) {
-               case 4139: goto tr3122;
-               case 7177: goto st1037;
-               case 7200: goto st1037;
-               case 7208: goto tr3100;
-               case 7209: goto tr3101;
-               case 7433: goto st1040;
-               case 7456: goto st1040;
-               case 7464: goto tr3103;
-               case 7465: goto tr3104;
-               case 7689: goto st1042;
-               case 7712: goto st1042;
-               case 7720: goto tr3106;
-               case 7721: goto tr3107;
-               case 10506: goto tr3108;
-               case 10555: goto tr3108;
-               case 10762: goto tr3108;
-               case 10811: goto tr3108;
-               case 11274: goto tr3109;
-               case 11323: goto tr3110;
-               case 11530: goto tr3108;
-               case 11579: goto tr3108;
-               case 11786: goto tr3111;
-               case 11835: goto tr3112;
-               case 12298: goto tr3113;
-               case 12347: goto tr3114;
-               case 12554: goto tr3108;
-               case 12603: goto tr3108;
-               case 12810: goto tr3115;
-               case 12859: goto tr3116;
-               case 13322: goto tr3117;
-               case 13371: goto tr3118;
-               case 13578: goto tr3108;
-               case 13627: goto tr3108;
-               case 13834: goto tr3119;
-               case 13883: goto tr3120;
+               case 4139: goto tr3159;
+               case 7177: goto st1064;
+               case 7200: goto st1064;
+               case 7208: goto tr3137;
+               case 7209: goto tr3138;
+               case 7433: goto st1067;
+               case 7456: goto st1067;
+               case 7464: goto tr3140;
+               case 7465: goto tr3141;
+               case 7689: goto st1069;
+               case 7712: goto st1069;
+               case 7720: goto tr3143;
+               case 7721: goto tr3144;
+               case 10506: goto tr3145;
+               case 10555: goto tr3145;
+               case 10762: goto tr3145;
+               case 10811: goto tr3145;
+               case 11274: goto tr3146;
+               case 11323: goto tr3147;
+               case 11530: goto tr3145;
+               case 11579: goto tr3145;
+               case 11786: goto tr3148;
+               case 11835: goto tr3149;
+               case 12298: goto tr3150;
+               case 12347: goto tr3151;
+               case 12554: goto tr3145;
+               case 12603: goto tr3145;
+               case 12810: goto tr3152;
+               case 12859: goto tr3153;
+               case 13322: goto tr3154;
+               case 13371: goto tr3155;
+               case 13578: goto tr3145;
+               case 13627: goto tr3145;
+               case 13834: goto tr3156;
+               case 13883: goto tr3157;
        }
        if ( _widec < 4161 ) {
                if ( 4143 <= _widec && _widec <= 4153 )
-                       goto tr3122;
+                       goto tr3159;
        } else if ( _widec > 4186 ) {
                if ( 4193 <= _widec && _widec <= 4218 )
-                       goto tr3122;
+                       goto tr3159;
        } else
-               goto tr3122;
-       goto tr3121;
-tr3111:
+               goto tr3159;
+       goto tr3158;
+tr3148:
        {
                s->line_counter++;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1469;
-tr3166:
+       goto st1496;
+tr3203:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82121,8 +82722,8 @@ tr3166:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1469;
-tr3211:
+       goto st1496;
+tr3248:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82145,8 +82746,8 @@ tr3211:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1469;
-tr3255:
+       goto st1496;
+tr3292:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -82156,11 +82757,11 @@ tr3255:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1469;
-st1469:
+       goto st1496;
+st1496:
        if ( ++p == pe )
-               goto _test_eof1469;
-case 1469:
+               goto _test_eof1496;
+case 1496:
        _widec = (*p);
        if ( (*p) < 43 ) {
                if ( (*p) < 32 ) {
@@ -82232,32 +82833,32 @@ case 1469:
  s->number64 != 0  ) _widec += 256;
        }
        switch( _widec ) {
-               case 4105: goto st1037;
-               case 4128: goto st1037;
-               case 4136: goto tr3100;
-               case 4137: goto tr3101;
-               case 4139: goto tr3122;
-               case 5130: goto tr3109;
-               case 5179: goto tr3110;
+               case 4105: goto st1064;
+               case 4128: goto st1064;
+               case 4136: goto tr3137;
+               case 4137: goto tr3138;
+               case 4139: goto tr3159;
+               case 5130: goto tr3146;
+               case 5179: goto tr3147;
        }
        if ( _widec < 4161 ) {
                if ( 4143 <= _widec && _widec <= 4153 )
-                       goto tr3122;
+                       goto tr3159;
        } else if ( _widec > 4186 ) {
                if ( 4193 <= _widec && _widec <= 4218 )
-                       goto tr3122;
+                       goto tr3159;
        } else
-               goto tr3122;
-       goto tr3121;
-tr3112:
+               goto tr3159;
+       goto tr3158;
+tr3149:
        {
                s->buffer_length = 0;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1470;
-tr3167:
+       goto st1497;
+tr3204:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82280,8 +82881,8 @@ tr3167:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1470;
-tr3212:
+       goto st1497;
+tr3249:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82304,8 +82905,8 @@ tr3212:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1470;
-tr3256:
+       goto st1497;
+tr3293:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -82315,11 +82916,11 @@ tr3256:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1470;
-st1470:
+       goto st1497;
+st1497:
        if ( ++p == pe )
-               goto _test_eof1470;
-case 1470:
+               goto _test_eof1497;
+case 1497:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -82345,31 +82946,31 @@ case 1470:
  s->number64 != 0  ) _widec += 512;
        }
        if ( _widec == 5130 )
-               goto tr3124;
+               goto tr3161;
        if ( 4992 <= _widec && _widec <= 5247 )
-               goto tr3123;
-       goto tr3121;
-tr3118:
+               goto tr3160;
+       goto tr3158;
+tr3155:
        {
                s->buffer_length = 0;
        }
-       goto st1043;
-tr3127:
+       goto st1070;
+tr3164:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1043;
-tr3262:
+       goto st1070;
+tr3299:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->buffer_length = 0;
        }
-       goto st1043;
-tr3173:
+       goto st1070;
+tr3210:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82389,8 +82990,8 @@ tr3173:
        {
                s->buffer_length = 0;
        }
-       goto st1043;
-tr3218:
+       goto st1070;
+tr3255:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82410,11 +83011,11 @@ tr3218:
        {
                s->buffer_length = 0;
        }
-       goto st1043;
-st1043:
+       goto st1070;
+st1070:
        if ( ++p == pe )
-               goto _test_eof1043;
-case 1043:
+               goto _test_eof1070;
+case 1070:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -82446,28 +83047,28 @@ case 1043:
  s->number64 == 0  ) _widec += 1024;
        }
        switch( _widec ) {
-               case 8714: goto tr3124;
-               case 9226: goto tr3126;
-               case 9738: goto tr3128;
+               case 8714: goto tr3161;
+               case 9226: goto tr3163;
+               case 9738: goto tr3165;
        }
        if ( _widec < 9088 ) {
                if ( 8576 <= _widec && _widec <= 8831 )
-                       goto tr3123;
+                       goto tr3160;
        } else if ( _widec > 9343 ) {
                if ( 9600 <= _widec && _widec <= 9855 )
-                       goto tr3127;
+                       goto tr3164;
        } else
-               goto tr3125;
-       goto tr3121;
-tr3119:
+               goto tr3162;
+       goto tr3158;
+tr3156:
        {
                s->line_counter++;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1471;
-tr3174:
+       goto st1498;
+tr3211:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82490,8 +83091,8 @@ tr3174:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1471;
-tr3219:
+       goto st1498;
+tr3256:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82514,8 +83115,8 @@ tr3219:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1471;
-tr3263:
+       goto st1498;
+tr3300:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -82525,11 +83126,11 @@ tr3263:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1471;
-st1471:
+       goto st1498;
+st1498:
        if ( ++p == pe )
-               goto _test_eof1471;
-case 1471:
+               goto _test_eof1498;
+case 1498:
        _widec = (*p);
        if ( (*p) < 43 ) {
                if ( (*p) < 32 ) {
@@ -82617,60 +83218,60 @@ case 1471:
  s->number64 != 0  ) _widec += 256;
        }
        switch( _widec ) {
-               case 4139: goto tr3122;
-               case 7177: goto st1037;
-               case 7200: goto st1037;
-               case 7208: goto tr3100;
-               case 7209: goto tr3101;
-               case 7433: goto st1040;
-               case 7456: goto st1040;
-               case 7464: goto tr3103;
-               case 7465: goto tr3104;
-               case 7689: goto st1042;
-               case 7712: goto st1042;
-               case 7720: goto tr3106;
-               case 7721: goto tr3107;
-               case 10506: goto tr3108;
-               case 10555: goto tr3108;
-               case 10762: goto tr3108;
-               case 10811: goto tr3108;
-               case 11274: goto tr3109;
-               case 11323: goto tr3110;
-               case 11530: goto tr3108;
-               case 11579: goto tr3108;
-               case 11786: goto tr3111;
-               case 11835: goto tr3112;
-               case 12298: goto tr3113;
-               case 12347: goto tr3114;
-               case 12554: goto tr3108;
-               case 12603: goto tr3108;
-               case 12810: goto tr3115;
-               case 12859: goto tr3116;
-               case 13322: goto tr3117;
-               case 13371: goto tr3118;
-               case 13578: goto tr3108;
-               case 13627: goto tr3108;
-               case 13834: goto tr3119;
-               case 13883: goto tr3120;
+               case 4139: goto tr3159;
+               case 7177: goto st1064;
+               case 7200: goto st1064;
+               case 7208: goto tr3137;
+               case 7209: goto tr3138;
+               case 7433: goto st1067;
+               case 7456: goto st1067;
+               case 7464: goto tr3140;
+               case 7465: goto tr3141;
+               case 7689: goto st1069;
+               case 7712: goto st1069;
+               case 7720: goto tr3143;
+               case 7721: goto tr3144;
+               case 10506: goto tr3145;
+               case 10555: goto tr3145;
+               case 10762: goto tr3145;
+               case 10811: goto tr3145;
+               case 11274: goto tr3146;
+               case 11323: goto tr3147;
+               case 11530: goto tr3145;
+               case 11579: goto tr3145;
+               case 11786: goto tr3148;
+               case 11835: goto tr3149;
+               case 12298: goto tr3150;
+               case 12347: goto tr3151;
+               case 12554: goto tr3145;
+               case 12603: goto tr3145;
+               case 12810: goto tr3152;
+               case 12859: goto tr3153;
+               case 13322: goto tr3154;
+               case 13371: goto tr3155;
+               case 13578: goto tr3145;
+               case 13627: goto tr3145;
+               case 13834: goto tr3156;
+               case 13883: goto tr3157;
        }
        if ( _widec < 4161 ) {
                if ( 4143 <= _widec && _widec <= 4153 )
-                       goto tr3122;
+                       goto tr3159;
        } else if ( _widec > 4186 ) {
                if ( 4193 <= _widec && _widec <= 4218 )
-                       goto tr3122;
+                       goto tr3159;
        } else
-               goto tr3122;
-       goto tr3121;
-tr3120:
+               goto tr3159;
+       goto tr3158;
+tr3157:
        {
                s->buffer_length = 0;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1472;
-tr3175:
+       goto st1499;
+tr3212:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82693,8 +83294,8 @@ tr3175:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1472;
-tr3220:
+       goto st1499;
+tr3257:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -82717,8 +83318,8 @@ tr3220:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1472;
-tr3264:
+       goto st1499;
+tr3301:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -82728,11 +83329,11 @@ tr3264:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1472;
-st1472:
+       goto st1499;
+st1499:
        if ( ++p == pe )
-               goto _test_eof1472;
-case 1472:
+               goto _test_eof1499;
+case 1499:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -82764,32 +83365,32 @@ case 1472:
  s->number64 == 0  ) _widec += 1024;
        }
        switch( _widec ) {
-               case 8714: goto tr3124;
-               case 9226: goto tr3126;
-               case 9738: goto tr3128;
+               case 8714: goto tr3161;
+               case 9226: goto tr3163;
+               case 9738: goto tr3165;
        }
        if ( _widec < 9088 ) {
                if ( 8576 <= _widec && _widec <= 8831 )
-                       goto tr3123;
+                       goto tr3160;
        } else if ( _widec > 9343 ) {
                if ( 9600 <= _widec && _widec <= 9855 )
-                       goto tr3127;
+                       goto tr3164;
        } else
-               goto tr3125;
-       goto tr3121;
-tr3097:
+               goto tr3162;
+       goto tr3158;
+tr3134:
        {
                s->buffer_length = 0;
        }
-       goto st1044;
-tr3129:
+       goto st1071;
+tr3166:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1044;
-tr3091:
+       goto st1071;
+tr3128:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -82802,11 +83403,11 @@ tr3091:
        {
                s->buffer_length = 0;
        }
-       goto st1044;
-st1044:
+       goto st1071;
+st1071:
        if ( ++p == pe )
-               goto _test_eof1044;
-case 1044:
+               goto _test_eof1071;
+case 1071:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -82826,26 +83427,26 @@ case 1044:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3130;
+               goto tr3167;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3129;
-       goto tr3069;
-tr3083:
+               goto tr3166;
+       goto tr3106;
+tr3120:
        {
                s->buffer_length = 0;
        }
-       goto st1045;
-tr3131:
+       goto st1072;
+tr3168:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1045;
-st1045:
+       goto st1072;
+st1072:
        if ( ++p == pe )
-               goto _test_eof1045;
-case 1045:
+               goto _test_eof1072;
+case 1072:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -82865,19 +83466,19 @@ case 1045:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3132;
+               goto tr3169;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3131;
-       goto tr3069;
-tr3074:
+               goto tr3168;
+       goto tr3106;
+tr3111:
        {
                *(rdata_tail++) = 1;
        }
-       goto st1046;
-st1046:
+       goto st1073;
+st1073:
        if ( ++p == pe )
-               goto _test_eof1046;
-case 1046:
+               goto _test_eof1073;
+case 1073:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -82891,15 +83492,15 @@ case 1046:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1047;
-               case 32: goto st1047;
-               case 40: goto tr3134;
-               case 41: goto tr3135;
-               case 2058: goto tr3136;
-               case 2107: goto tr3137;
+               case 9: goto st1074;
+               case 32: goto st1074;
+               case 40: goto tr3171;
+               case 41: goto tr3172;
+               case 2058: goto tr3173;
+               case 2107: goto tr3174;
        }
-       goto tr3069;
-tr3134:
+       goto tr3106;
+tr3171:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -82907,8 +83508,8 @@ tr3134:
                }
                s->multiline = true;
        }
-       goto st1047;
-tr3135:
+       goto st1074;
+tr3172:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -82916,13 +83517,13 @@ tr3135:
                }
                s->multiline = false;
        }
-       goto st1047;
-tr3136:
+       goto st1074;
+tr3173:
        {
                s->line_counter++;
        }
-       goto st1047;
-tr3179:
+       goto st1074;
+tr3216:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -82932,18 +83533,18 @@ tr3179:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1047; goto _out;}
+                               {p++; cs = 1074; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1047;
-st1047:
+       goto st1074;
+st1074:
        if ( ++p == pe )
-               goto _test_eof1047;
-case 1047:
+               goto _test_eof1074;
+case 1074:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -82957,17 +83558,17 @@ case 1047:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1047;
-               case 32: goto st1047;
-               case 40: goto tr3134;
-               case 41: goto tr3135;
-               case 2058: goto tr3136;
-               case 2107: goto tr3137;
+               case 9: goto st1074;
+               case 32: goto st1074;
+               case 40: goto tr3171;
+               case 41: goto tr3172;
+               case 2058: goto tr3173;
+               case 2107: goto tr3174;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3138;
-       goto tr3084;
-tr3138:
+               goto tr3175;
+       goto tr3121;
+tr3175:
        {
                s->number64 = 0;
        }
@@ -82985,8 +83586,8 @@ tr3138:
                        p--; {goto st307;}
                }
        }
-       goto st1048;
-tr3142:
+       goto st1075;
+tr3179:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -83001,11 +83602,11 @@ tr3142:
                        p--; {goto st307;}
                }
        }
-       goto st1048;
-st1048:
+       goto st1075;
+st1075:
        if ( ++p == pe )
-               goto _test_eof1048;
-case 1048:
+               goto _test_eof1075;
+case 1075:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -83019,17 +83620,17 @@ case 1048:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3139;
-               case 32: goto tr3139;
-               case 40: goto tr3140;
-               case 41: goto tr3141;
-               case 2058: goto tr3143;
-               case 2107: goto tr3144;
+               case 9: goto tr3176;
+               case 32: goto tr3176;
+               case 40: goto tr3177;
+               case 41: goto tr3178;
+               case 2058: goto tr3180;
+               case 2107: goto tr3181;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3142;
-       goto tr3084;
-tr3147:
+               goto tr3179;
+       goto tr3121;
+tr3184:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -83037,8 +83638,8 @@ tr3147:
                }
                s->multiline = true;
        }
-       goto st1049;
-tr3148:
+       goto st1076;
+tr3185:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -83046,13 +83647,13 @@ tr3148:
                }
                s->multiline = false;
        }
-       goto st1049;
-tr3150:
+       goto st1076;
+tr3187:
        {
                s->line_counter++;
        }
-       goto st1049;
-tr3177:
+       goto st1076;
+tr3214:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -83062,15 +83663,15 @@ tr3177:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1049; goto _out;}
+                               {p++; cs = 1076; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1049;
-tr3139:
+       goto st1076;
+tr3176:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83080,8 +83681,8 @@ tr3139:
                        p--; {goto st307;}
                }
        }
-       goto st1049;
-tr3140:
+       goto st1076;
+tr3177:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83098,8 +83699,8 @@ tr3140:
                }
                s->multiline = true;
        }
-       goto st1049;
-tr3141:
+       goto st1076;
+tr3178:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83116,8 +83717,8 @@ tr3141:
                }
                s->multiline = false;
        }
-       goto st1049;
-tr3143:
+       goto st1076;
+tr3180:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83130,11 +83731,11 @@ tr3143:
        {
                s->line_counter++;
        }
-       goto st1049;
-st1049:
+       goto st1076;
+st1076:
        if ( ++p == pe )
-               goto _test_eof1049;
-case 1049:
+               goto _test_eof1076;
+case 1076:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -83148,18 +83749,18 @@ case 1049:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1049;
-               case 32: goto st1049;
-               case 40: goto tr3147;
-               case 41: goto tr3148;
-               case 46: goto tr3149;
-               case 2058: goto tr3150;
-               case 2107: goto tr3151;
+               case 9: goto st1076;
+               case 32: goto st1076;
+               case 40: goto tr3184;
+               case 41: goto tr3185;
+               case 46: goto tr3186;
+               case 2058: goto tr3187;
+               case 2107: goto tr3188;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3149;
-       goto tr3145;
-tr3153:
+               goto tr3186;
+       goto tr3182;
+tr3190:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -83168,8 +83769,8 @@ tr3153:
                        p--; {goto st307;}
                }
        }
-       goto st1050;
-tr3149:
+       goto st1077;
+tr3186:
        {
                s->buffer_length = 0;
        }
@@ -83181,11 +83782,11 @@ tr3149:
                        p--; {goto st307;}
                }
        }
-       goto st1050;
-st1050:
+       goto st1077;
+st1077:
        if ( ++p == pe )
-               goto _test_eof1050;
-case 1050:
+               goto _test_eof1077;
+case 1077:
        _widec = (*p);
        if ( (*p) < 32 ) {
                if ( (*p) > 9 ) {
@@ -83243,58 +83844,58 @@ case 1050:
  s->number64 == 0  ) _widec += 512;
        }
        switch( _widec ) {
-               case 46: goto tr3153;
-               case 7177: goto tr3154;
-               case 7200: goto tr3154;
-               case 7208: goto tr3155;
-               case 7209: goto tr3156;
-               case 7433: goto tr3157;
-               case 7456: goto tr3157;
-               case 7464: goto tr3158;
-               case 7465: goto tr3159;
-               case 7689: goto tr3160;
-               case 7712: goto tr3160;
-               case 7720: goto tr3161;
-               case 7721: goto tr3162;
-               case 10506: goto tr3163;
-               case 10555: goto tr3163;
-               case 10762: goto tr3163;
-               case 10811: goto tr3163;
-               case 11274: goto tr3164;
-               case 11323: goto tr3165;
-               case 11530: goto tr3163;
-               case 11579: goto tr3163;
-               case 11786: goto tr3166;
-               case 11835: goto tr3167;
-               case 12298: goto tr3168;
-               case 12347: goto tr3169;
-               case 12554: goto tr3163;
-               case 12603: goto tr3163;
-               case 12810: goto tr3170;
-               case 12859: goto tr3171;
-               case 13322: goto tr3172;
-               case 13371: goto tr3173;
-               case 13578: goto tr3163;
-               case 13627: goto tr3163;
-               case 13834: goto tr3174;
-               case 13883: goto tr3175;
+               case 46: goto tr3190;
+               case 7177: goto tr3191;
+               case 7200: goto tr3191;
+               case 7208: goto tr3192;
+               case 7209: goto tr3193;
+               case 7433: goto tr3194;
+               case 7456: goto tr3194;
+               case 7464: goto tr3195;
+               case 7465: goto tr3196;
+               case 7689: goto tr3197;
+               case 7712: goto tr3197;
+               case 7720: goto tr3198;
+               case 7721: goto tr3199;
+               case 10506: goto tr3200;
+               case 10555: goto tr3200;
+               case 10762: goto tr3200;
+               case 10811: goto tr3200;
+               case 11274: goto tr3201;
+               case 11323: goto tr3202;
+               case 11530: goto tr3200;
+               case 11579: goto tr3200;
+               case 11786: goto tr3203;
+               case 11835: goto tr3204;
+               case 12298: goto tr3205;
+               case 12347: goto tr3206;
+               case 12554: goto tr3200;
+               case 12603: goto tr3200;
+               case 12810: goto tr3207;
+               case 12859: goto tr3208;
+               case 13322: goto tr3209;
+               case 13371: goto tr3210;
+               case 13578: goto tr3200;
+               case 13627: goto tr3200;
+               case 13834: goto tr3211;
+               case 13883: goto tr3212;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3153;
-       goto tr3152;
-tr3151:
+               goto tr3190;
+       goto tr3189;
+tr3188:
        {
                s->buffer_length = 0;
        }
-       goto st1051;
-tr3176:
+       goto st1078;
+tr3213:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1051;
-tr3144:
+       goto st1078;
+tr3181:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83307,11 +83908,11 @@ tr3144:
        {
                s->buffer_length = 0;
        }
-       goto st1051;
-st1051:
+       goto st1078;
+st1078:
        if ( ++p == pe )
-               goto _test_eof1051;
-case 1051:
+               goto _test_eof1078;
+case 1078:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -83331,26 +83932,26 @@ case 1051:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3177;
+               goto tr3214;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3176;
-       goto tr3069;
-tr3137:
+               goto tr3213;
+       goto tr3106;
+tr3174:
        {
                s->buffer_length = 0;
        }
-       goto st1052;
-tr3178:
+       goto st1079;
+tr3215:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1052;
-st1052:
+       goto st1079;
+st1079:
        if ( ++p == pe )
-               goto _test_eof1052;
-case 1052:
+               goto _test_eof1079;
+case 1079:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -83370,19 +83971,19 @@ case 1052:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3179;
+               goto tr3216;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3178;
-       goto tr3069;
-tr3075:
+               goto tr3215;
+       goto tr3106;
+tr3112:
        {
                *(rdata_tail++) = 2;
        }
-       goto st1053;
-st1053:
+       goto st1080;
+st1080:
        if ( ++p == pe )
-               goto _test_eof1053;
-case 1053:
+               goto _test_eof1080;
+case 1080:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -83396,15 +83997,15 @@ case 1053:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1054;
-               case 32: goto st1054;
-               case 40: goto tr3181;
-               case 41: goto tr3182;
-               case 2058: goto tr3183;
-               case 2107: goto tr3184;
+               case 9: goto st1081;
+               case 32: goto st1081;
+               case 40: goto tr3218;
+               case 41: goto tr3219;
+               case 2058: goto tr3220;
+               case 2107: goto tr3221;
        }
-       goto tr3069;
-tr3181:
+       goto tr3106;
+tr3218:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -83412,8 +84013,8 @@ tr3181:
                }
                s->multiline = true;
        }
-       goto st1054;
-tr3182:
+       goto st1081;
+tr3219:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -83421,13 +84022,13 @@ tr3182:
                }
                s->multiline = false;
        }
-       goto st1054;
-tr3183:
+       goto st1081;
+tr3220:
        {
                s->line_counter++;
        }
-       goto st1054;
-tr3224:
+       goto st1081;
+tr3261:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -83437,18 +84038,18 @@ tr3224:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1054; goto _out;}
+                               {p++; cs = 1081; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1054;
-st1054:
+       goto st1081;
+st1081:
        if ( ++p == pe )
-               goto _test_eof1054;
-case 1054:
+               goto _test_eof1081;
+case 1081:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -83462,17 +84063,17 @@ case 1054:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1054;
-               case 32: goto st1054;
-               case 40: goto tr3181;
-               case 41: goto tr3182;
-               case 2058: goto tr3183;
-               case 2107: goto tr3184;
+               case 9: goto st1081;
+               case 32: goto st1081;
+               case 40: goto tr3218;
+               case 41: goto tr3219;
+               case 2058: goto tr3220;
+               case 2107: goto tr3221;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3185;
-       goto tr3084;
-tr3185:
+               goto tr3222;
+       goto tr3121;
+tr3222:
        {
                s->number64 = 0;
        }
@@ -83490,8 +84091,8 @@ tr3185:
                        p--; {goto st307;}
                }
        }
-       goto st1055;
-tr3189:
+       goto st1082;
+tr3226:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -83506,11 +84107,11 @@ tr3189:
                        p--; {goto st307;}
                }
        }
-       goto st1055;
-st1055:
+       goto st1082;
+st1082:
        if ( ++p == pe )
-               goto _test_eof1055;
-case 1055:
+               goto _test_eof1082;
+case 1082:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -83524,17 +84125,17 @@ case 1055:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3186;
-               case 32: goto tr3186;
-               case 40: goto tr3187;
-               case 41: goto tr3188;
-               case 2058: goto tr3190;
-               case 2107: goto tr3191;
+               case 9: goto tr3223;
+               case 32: goto tr3223;
+               case 40: goto tr3224;
+               case 41: goto tr3225;
+               case 2058: goto tr3227;
+               case 2107: goto tr3228;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3189;
-       goto tr3084;
-tr3193:
+               goto tr3226;
+       goto tr3121;
+tr3230:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -83542,8 +84143,8 @@ tr3193:
                }
                s->multiline = true;
        }
-       goto st1056;
-tr3194:
+       goto st1083;
+tr3231:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -83551,13 +84152,13 @@ tr3194:
                }
                s->multiline = false;
        }
-       goto st1056;
-tr3196:
+       goto st1083;
+tr3233:
        {
                s->line_counter++;
        }
-       goto st1056;
-tr3222:
+       goto st1083;
+tr3259:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -83567,15 +84168,15 @@ tr3222:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1056; goto _out;}
+                               {p++; cs = 1083; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1056;
-tr3186:
+       goto st1083;
+tr3223:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83585,8 +84186,8 @@ tr3186:
                        p--; {goto st307;}
                }
        }
-       goto st1056;
-tr3187:
+       goto st1083;
+tr3224:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83603,8 +84204,8 @@ tr3187:
                }
                s->multiline = true;
        }
-       goto st1056;
-tr3188:
+       goto st1083;
+tr3225:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83621,8 +84222,8 @@ tr3188:
                }
                s->multiline = false;
        }
-       goto st1056;
-tr3190:
+       goto st1083;
+tr3227:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83635,11 +84236,11 @@ tr3190:
        {
                s->line_counter++;
        }
-       goto st1056;
-st1056:
+       goto st1083;
+st1083:
        if ( ++p == pe )
-               goto _test_eof1056;
-case 1056:
+               goto _test_eof1083;
+case 1083:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -83653,24 +84254,24 @@ case 1056:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1056;
-               case 32: goto st1056;
-               case 40: goto tr3193;
-               case 41: goto tr3194;
-               case 46: goto tr3195;
-               case 2058: goto tr3196;
-               case 2107: goto tr3197;
+               case 9: goto st1083;
+               case 32: goto st1083;
+               case 40: goto tr3230;
+               case 41: goto tr3231;
+               case 46: goto tr3232;
+               case 2058: goto tr3233;
+               case 2107: goto tr3234;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 58 )
-                       goto tr3195;
+                       goto tr3232;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3195;
+                       goto tr3232;
        } else
-               goto tr3195;
-       goto tr3145;
-tr3198:
+               goto tr3232;
+       goto tr3182;
+tr3235:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -83679,8 +84280,8 @@ tr3198:
                        p--; {goto st307;}
                }
        }
-       goto st1057;
-tr3195:
+       goto st1084;
+tr3232:
        {
                s->buffer_length = 0;
        }
@@ -83692,11 +84293,11 @@ tr3195:
                        p--; {goto st307;}
                }
        }
-       goto st1057;
-st1057:
+       goto st1084;
+st1084:
        if ( ++p == pe )
-               goto _test_eof1057;
-case 1057:
+               goto _test_eof1084;
+case 1084:
        _widec = (*p);
        if ( (*p) < 32 ) {
                if ( (*p) > 9 ) {
@@ -83754,64 +84355,64 @@ case 1057:
  s->number64 == 0  ) _widec += 512;
        }
        switch( _widec ) {
-               case 46: goto tr3198;
-               case 7177: goto tr3199;
-               case 7200: goto tr3199;
-               case 7208: goto tr3200;
-               case 7209: goto tr3201;
-               case 7433: goto tr3202;
-               case 7456: goto tr3202;
-               case 7464: goto tr3203;
-               case 7465: goto tr3204;
-               case 7689: goto tr3205;
-               case 7712: goto tr3205;
-               case 7720: goto tr3206;
-               case 7721: goto tr3207;
-               case 10506: goto tr3208;
-               case 10555: goto tr3208;
-               case 10762: goto tr3208;
-               case 10811: goto tr3208;
-               case 11274: goto tr3209;
-               case 11323: goto tr3210;
-               case 11530: goto tr3208;
-               case 11579: goto tr3208;
-               case 11786: goto tr3211;
-               case 11835: goto tr3212;
-               case 12298: goto tr3213;
-               case 12347: goto tr3214;
-               case 12554: goto tr3208;
-               case 12603: goto tr3208;
-               case 12810: goto tr3215;
-               case 12859: goto tr3216;
-               case 13322: goto tr3217;
-               case 13371: goto tr3218;
-               case 13578: goto tr3208;
-               case 13627: goto tr3208;
-               case 13834: goto tr3219;
-               case 13883: goto tr3220;
+               case 46: goto tr3235;
+               case 7177: goto tr3236;
+               case 7200: goto tr3236;
+               case 7208: goto tr3237;
+               case 7209: goto tr3238;
+               case 7433: goto tr3239;
+               case 7456: goto tr3239;
+               case 7464: goto tr3240;
+               case 7465: goto tr3241;
+               case 7689: goto tr3242;
+               case 7712: goto tr3242;
+               case 7720: goto tr3243;
+               case 7721: goto tr3244;
+               case 10506: goto tr3245;
+               case 10555: goto tr3245;
+               case 10762: goto tr3245;
+               case 10811: goto tr3245;
+               case 11274: goto tr3246;
+               case 11323: goto tr3247;
+               case 11530: goto tr3245;
+               case 11579: goto tr3245;
+               case 11786: goto tr3248;
+               case 11835: goto tr3249;
+               case 12298: goto tr3250;
+               case 12347: goto tr3251;
+               case 12554: goto tr3245;
+               case 12603: goto tr3245;
+               case 12810: goto tr3252;
+               case 12859: goto tr3253;
+               case 13322: goto tr3254;
+               case 13371: goto tr3255;
+               case 13578: goto tr3245;
+               case 13627: goto tr3245;
+               case 13834: goto tr3256;
+               case 13883: goto tr3257;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 58 )
-                       goto tr3198;
+                       goto tr3235;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3198;
+                       goto tr3235;
        } else
-               goto tr3198;
-       goto tr3152;
-tr3197:
+               goto tr3235;
+       goto tr3189;
+tr3234:
        {
                s->buffer_length = 0;
        }
-       goto st1058;
-tr3221:
+       goto st1085;
+tr3258:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1058;
-tr3191:
+       goto st1085;
+tr3228:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -83824,11 +84425,11 @@ tr3191:
        {
                s->buffer_length = 0;
        }
-       goto st1058;
-st1058:
+       goto st1085;
+st1085:
        if ( ++p == pe )
-               goto _test_eof1058;
-case 1058:
+               goto _test_eof1085;
+case 1085:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -83848,26 +84449,26 @@ case 1058:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3222;
+               goto tr3259;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3221;
-       goto tr3069;
-tr3184:
+               goto tr3258;
+       goto tr3106;
+tr3221:
        {
                s->buffer_length = 0;
        }
-       goto st1059;
-tr3223:
+       goto st1086;
+tr3260:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1059;
-st1059:
+       goto st1086;
+st1086:
        if ( ++p == pe )
-               goto _test_eof1059;
-case 1059:
+               goto _test_eof1086;
+case 1086:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -83887,19 +84488,19 @@ case 1059:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3224;
+               goto tr3261;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3223;
-       goto tr3069;
-tr3076:
+               goto tr3260;
+       goto tr3106;
+tr3113:
        {
                *(rdata_tail++) = 3;
        }
-       goto st1060;
-st1060:
+       goto st1087;
+st1087:
        if ( ++p == pe )
-               goto _test_eof1060;
-case 1060:
+               goto _test_eof1087;
+case 1087:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -83913,15 +84514,15 @@ case 1060:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1061;
-               case 32: goto st1061;
-               case 40: goto tr3226;
-               case 41: goto tr3227;
-               case 2058: goto tr3228;
-               case 2107: goto tr3229;
+               case 9: goto st1088;
+               case 32: goto st1088;
+               case 40: goto tr3263;
+               case 41: goto tr3264;
+               case 2058: goto tr3265;
+               case 2107: goto tr3266;
        }
-       goto tr3069;
-tr3226:
+       goto tr3106;
+tr3263:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -83929,8 +84530,8 @@ tr3226:
                }
                s->multiline = true;
        }
-       goto st1061;
-tr3227:
+       goto st1088;
+tr3264:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -83938,13 +84539,13 @@ tr3227:
                }
                s->multiline = false;
        }
-       goto st1061;
-tr3228:
+       goto st1088;
+tr3265:
        {
                s->line_counter++;
        }
-       goto st1061;
-tr3268:
+       goto st1088;
+tr3305:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -83954,18 +84555,18 @@ tr3268:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1061; goto _out;}
+                               {p++; cs = 1088; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1061;
-st1061:
+       goto st1088;
+st1088:
        if ( ++p == pe )
-               goto _test_eof1061;
-case 1061:
+               goto _test_eof1088;
+case 1088:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -83979,17 +84580,17 @@ case 1061:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1061;
-               case 32: goto st1061;
-               case 40: goto tr3226;
-               case 41: goto tr3227;
-               case 2058: goto tr3228;
-               case 2107: goto tr3229;
+               case 9: goto st1088;
+               case 32: goto st1088;
+               case 40: goto tr3263;
+               case 41: goto tr3264;
+               case 2058: goto tr3265;
+               case 2107: goto tr3266;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3230;
-       goto tr3084;
-tr3230:
+               goto tr3267;
+       goto tr3121;
+tr3267:
        {
                s->number64 = 0;
        }
@@ -84007,8 +84608,8 @@ tr3230:
                        p--; {goto st307;}
                }
        }
-       goto st1062;
-tr3234:
+       goto st1089;
+tr3271:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -84023,11 +84624,11 @@ tr3234:
                        p--; {goto st307;}
                }
        }
-       goto st1062;
-st1062:
+       goto st1089;
+st1089:
        if ( ++p == pe )
-               goto _test_eof1062;
-case 1062:
+               goto _test_eof1089;
+case 1089:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -84041,17 +84642,17 @@ case 1062:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3231;
-               case 32: goto tr3231;
-               case 40: goto tr3232;
-               case 41: goto tr3233;
-               case 2058: goto tr3235;
-               case 2107: goto tr3236;
+               case 9: goto tr3268;
+               case 32: goto tr3268;
+               case 40: goto tr3269;
+               case 41: goto tr3270;
+               case 2058: goto tr3272;
+               case 2107: goto tr3273;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3234;
-       goto tr3084;
-tr3238:
+               goto tr3271;
+       goto tr3121;
+tr3275:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -84059,8 +84660,8 @@ tr3238:
                }
                s->multiline = true;
        }
-       goto st1063;
-tr3239:
+       goto st1090;
+tr3276:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -84068,13 +84669,13 @@ tr3239:
                }
                s->multiline = false;
        }
-       goto st1063;
-tr3241:
+       goto st1090;
+tr3278:
        {
                s->line_counter++;
        }
-       goto st1063;
-tr3266:
+       goto st1090;
+tr3303:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -84084,15 +84685,15 @@ tr3266:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1063; goto _out;}
+                               {p++; cs = 1090; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1063;
-tr3231:
+       goto st1090;
+tr3268:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -84102,8 +84703,8 @@ tr3231:
                        p--; {goto st307;}
                }
        }
-       goto st1063;
-tr3232:
+       goto st1090;
+tr3269:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -84120,8 +84721,8 @@ tr3232:
                }
                s->multiline = true;
        }
-       goto st1063;
-tr3233:
+       goto st1090;
+tr3270:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -84138,8 +84739,8 @@ tr3233:
                }
                s->multiline = false;
        }
-       goto st1063;
-tr3235:
+       goto st1090;
+tr3272:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -84152,11 +84753,11 @@ tr3235:
        {
                s->line_counter++;
        }
-       goto st1063;
-st1063:
+       goto st1090;
+st1090:
        if ( ++p == pe )
-               goto _test_eof1063;
-case 1063:
+               goto _test_eof1090;
+case 1090:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -84170,35 +84771,35 @@ case 1063:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1063;
-               case 32: goto st1063;
-               case 40: goto tr3238;
-               case 41: goto tr3239;
-               case 42: goto tr3240;
-               case 92: goto tr3240;
-               case 95: goto tr3240;
-               case 2058: goto tr3241;
-               case 2107: goto tr3242;
+               case 9: goto st1090;
+               case 32: goto st1090;
+               case 40: goto tr3275;
+               case 41: goto tr3276;
+               case 42: goto tr3277;
+               case 92: goto tr3277;
+               case 95: goto tr3277;
+               case 2058: goto tr3278;
+               case 2107: goto tr3279;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr3240;
+                       goto tr3277;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr3240;
+                       goto tr3277;
        } else
-               goto tr3240;
-       goto tr3069;
-tr3240:
+               goto tr3277;
+       goto tr3106;
+tr3277:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 1064;goto st309;} }
-       goto st1064;
-st1064:
+       { p--; {stack[top++] = 1091;goto st309;} }
+       goto st1091;
+st1091:
        if ( ++p == pe )
-               goto _test_eof1064;
-case 1064:
+               goto _test_eof1091;
+case 1091:
        _widec = (*p);
        if ( (*p) < 32 ) {
                if ( (*p) > 9 ) {
@@ -84256,55 +84857,55 @@ case 1064:
  s->number64 == 0  ) _widec += 512;
        }
        switch( _widec ) {
-               case 7177: goto tr3243;
-               case 7200: goto tr3243;
-               case 7208: goto tr3244;
-               case 7209: goto tr3245;
-               case 7433: goto tr3246;
-               case 7456: goto tr3246;
-               case 7464: goto tr3247;
-               case 7465: goto tr3248;
-               case 7689: goto tr3249;
-               case 7712: goto tr3249;
-               case 7720: goto tr3250;
-               case 7721: goto tr3251;
-               case 10506: goto tr3252;
-               case 10555: goto tr3252;
-               case 10762: goto tr3252;
-               case 10811: goto tr3252;
-               case 11274: goto tr3253;
-               case 11323: goto tr3254;
-               case 11530: goto tr3252;
-               case 11579: goto tr3252;
-               case 11786: goto tr3255;
-               case 11835: goto tr3256;
-               case 12298: goto tr3257;
-               case 12347: goto tr3258;
-               case 12554: goto tr3252;
-               case 12603: goto tr3252;
-               case 12810: goto tr3259;
-               case 12859: goto tr3260;
-               case 13322: goto tr3261;
-               case 13371: goto tr3262;
-               case 13578: goto tr3252;
-               case 13627: goto tr3252;
-               case 13834: goto tr3263;
-               case 13883: goto tr3264;
-       }
-       goto tr3098;
-tr3242:
+               case 7177: goto tr3280;
+               case 7200: goto tr3280;
+               case 7208: goto tr3281;
+               case 7209: goto tr3282;
+               case 7433: goto tr3283;
+               case 7456: goto tr3283;
+               case 7464: goto tr3284;
+               case 7465: goto tr3285;
+               case 7689: goto tr3286;
+               case 7712: goto tr3286;
+               case 7720: goto tr3287;
+               case 7721: goto tr3288;
+               case 10506: goto tr3289;
+               case 10555: goto tr3289;
+               case 10762: goto tr3289;
+               case 10811: goto tr3289;
+               case 11274: goto tr3290;
+               case 11323: goto tr3291;
+               case 11530: goto tr3289;
+               case 11579: goto tr3289;
+               case 11786: goto tr3292;
+               case 11835: goto tr3293;
+               case 12298: goto tr3294;
+               case 12347: goto tr3295;
+               case 12554: goto tr3289;
+               case 12603: goto tr3289;
+               case 12810: goto tr3296;
+               case 12859: goto tr3297;
+               case 13322: goto tr3298;
+               case 13371: goto tr3299;
+               case 13578: goto tr3289;
+               case 13627: goto tr3289;
+               case 13834: goto tr3300;
+               case 13883: goto tr3301;
+       }
+       goto tr3135;
+tr3279:
        {
                s->buffer_length = 0;
        }
-       goto st1065;
-tr3265:
+       goto st1092;
+tr3302:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1065;
-tr3236:
+       goto st1092;
+tr3273:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -84317,11 +84918,11 @@ tr3236:
        {
                s->buffer_length = 0;
        }
-       goto st1065;
-st1065:
+       goto st1092;
+st1092:
        if ( ++p == pe )
-               goto _test_eof1065;
-case 1065:
+               goto _test_eof1092;
+case 1092:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -84341,26 +84942,26 @@ case 1065:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3266;
+               goto tr3303;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3265;
-       goto tr3069;
-tr3229:
+               goto tr3302;
+       goto tr3106;
+tr3266:
        {
                s->buffer_length = 0;
        }
-       goto st1066;
-tr3267:
+       goto st1093;
+tr3304:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1066;
-st1066:
+       goto st1093;
+st1093:
        if ( ++p == pe )
-               goto _test_eof1066;
-case 1066:
+               goto _test_eof1093;
+case 1093:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -84380,23 +84981,23 @@ case 1066:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3268;
+               goto tr3305;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3267;
-       goto tr3069;
-tr3078:
+               goto tr3304;
+       goto tr3106;
+tr3115:
        {
                s->buffer_length = 0;
        }
-       goto st1067;
-tr3269:
+       goto st1094;
+tr3306:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1067;
-tr3068:
+       goto st1094;
+tr3105:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -84409,11 +85010,11 @@ tr3068:
        {
                s->buffer_length = 0;
        }
-       goto st1067;
-st1067:
+       goto st1094;
+st1094:
        if ( ++p == pe )
-               goto _test_eof1067;
-case 1067:
+               goto _test_eof1094;
+case 1094:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -84433,55 +85034,55 @@ case 1067:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3270;
+               goto tr3307;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3269;
+               goto tr3306;
        goto tr75;
-st1068:
+st1095:
        if ( ++p == pe )
-               goto _test_eof1068;
-case 1068:
+               goto _test_eof1095;
+case 1095:
        switch( (*p) ) {
-               case 65: goto st1069;
-               case 67: goto st1103;
-               case 68: goto st1124;
-               case 69: goto st1138;
-               case 72: goto st1145;
-               case 73: goto st1154;
-               case 75: goto st1162;
-               case 76: goto st1166;
-               case 77: goto st1174;
-               case 78: goto st1180;
-               case 79: goto st1196;
-               case 80: goto st1206;
-               case 82: goto st1209;
-               case 83: goto st1216;
-               case 84: goto st1235;
-               case 85: goto st1245;
-               case 90: goto st1248;
-               case 97: goto st1069;
-               case 99: goto st1103;
-               case 100: goto st1124;
-               case 101: goto st1138;
-               case 104: goto st1145;
-               case 105: goto st1154;
-               case 107: goto st1162;
-               case 108: goto st1166;
-               case 109: goto st1174;
-               case 110: goto st1180;
-               case 111: goto st1196;
-               case 112: goto st1206;
-               case 114: goto st1209;
-               case 115: goto st1216;
-               case 116: goto st1235;
-               case 117: goto st1245;
-               case 122: goto st1248;
-       }
-       goto tr3271;
-st1069:
+               case 65: goto st1096;
+               case 67: goto st1130;
+               case 68: goto st1151;
+               case 69: goto st1165;
+               case 72: goto st1172;
+               case 73: goto st1181;
+               case 75: goto st1189;
+               case 76: goto st1193;
+               case 77: goto st1201;
+               case 78: goto st1207;
+               case 79: goto st1223;
+               case 80: goto st1233;
+               case 82: goto st1236;
+               case 83: goto st1243;
+               case 84: goto st1262;
+               case 85: goto st1272;
+               case 90: goto st1275;
+               case 97: goto st1096;
+               case 99: goto st1130;
+               case 100: goto st1151;
+               case 101: goto st1165;
+               case 104: goto st1172;
+               case 105: goto st1181;
+               case 107: goto st1189;
+               case 108: goto st1193;
+               case 109: goto st1201;
+               case 110: goto st1207;
+               case 111: goto st1223;
+               case 112: goto st1233;
+               case 114: goto st1236;
+               case 115: goto st1243;
+               case 116: goto st1262;
+               case 117: goto st1272;
+               case 122: goto st1275;
+       }
+       goto tr3308;
+st1096:
        if ( ++p == pe )
-               goto _test_eof1069;
-case 1069:
+               goto _test_eof1096;
+case 1096:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -84495,21 +85096,21 @@ case 1069:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3289;
-               case 32: goto tr3289;
-               case 40: goto tr3290;
-               case 41: goto tr3291;
-               case 65: goto st1094;
-               case 70: goto st1097;
-               case 80: goto st1101;
-               case 97: goto st1094;
-               case 102: goto st1097;
-               case 112: goto st1101;
-               case 2058: goto tr3295;
-               case 2107: goto tr3296;
+               case 9: goto tr3326;
+               case 32: goto tr3326;
+               case 40: goto tr3327;
+               case 41: goto tr3328;
+               case 65: goto st1121;
+               case 70: goto st1124;
+               case 80: goto st1128;
+               case 97: goto st1121;
+               case 102: goto st1124;
+               case 112: goto st1128;
+               case 2058: goto tr3332;
+               case 2107: goto tr3333;
        }
-       goto tr3271;
-tr3298:
+       goto tr3308;
+tr3335:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -84517,8 +85118,8 @@ tr3298:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3299:
+       goto st1097;
+tr3336:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -84526,13 +85127,13 @@ tr3299:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3301:
+       goto st1097;
+tr3338:
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3397:
+       goto st1097;
+tr3434:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -84542,15 +85143,15 @@ tr3397:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1070; goto _out;}
+                               {p++; cs = 1097; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3758:
+       goto st1097;
+tr3795:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -84561,8 +85162,8 @@ tr3758:
                        p--; {goto st307;}
                }
        }
-       goto st1070;
-tr3759:
+       goto st1097;
+tr3796:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -84580,8 +85181,8 @@ tr3759:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3760:
+       goto st1097;
+tr3797:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -84599,8 +85200,8 @@ tr3760:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3762:
+       goto st1097;
+tr3799:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -84614,11 +85215,11 @@ tr3762:
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3289:
+       goto st1097;
+tr3326:
        { type_num(KNOT_RRTYPE_A, &rdata_tail); }
-       goto st1070;
-tr3290:
+       goto st1097;
+tr3327:
        { type_num(KNOT_RRTYPE_A, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84627,8 +85228,8 @@ tr3290:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3291:
+       goto st1097;
+tr3328:
        { type_num(KNOT_RRTYPE_A, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84637,17 +85238,17 @@ tr3291:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3295:
+       goto st1097;
+tr3332:
        { type_num(KNOT_RRTYPE_A, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3400:
+       goto st1097;
+tr3437:
        { type_num(KNOT_RRTYPE_AAAA, &rdata_tail); }
-       goto st1070;
-tr3401:
+       goto st1097;
+tr3438:
        { type_num(KNOT_RRTYPE_AAAA, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84656,8 +85257,8 @@ tr3401:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3402:
+       goto st1097;
+tr3439:
        { type_num(KNOT_RRTYPE_AAAA, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84666,17 +85267,17 @@ tr3402:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3403:
+       goto st1097;
+tr3440:
        { type_num(KNOT_RRTYPE_AAAA, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3408:
+       goto st1097;
+tr3445:
        { type_num(KNOT_RRTYPE_AFSDB, &rdata_tail); }
-       goto st1070;
-tr3409:
+       goto st1097;
+tr3446:
        { type_num(KNOT_RRTYPE_AFSDB, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84685,8 +85286,8 @@ tr3409:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3410:
+       goto st1097;
+tr3447:
        { type_num(KNOT_RRTYPE_AFSDB, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84695,17 +85296,17 @@ tr3410:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3411:
+       goto st1097;
+tr3448:
        { type_num(KNOT_RRTYPE_AFSDB, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3414:
+       goto st1097;
+tr3451:
        { type_num(KNOT_RRTYPE_APL, &rdata_tail); }
-       goto st1070;
-tr3415:
+       goto st1097;
+tr3452:
        { type_num(KNOT_RRTYPE_APL, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84714,8 +85315,8 @@ tr3415:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3416:
+       goto st1097;
+tr3453:
        { type_num(KNOT_RRTYPE_APL, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84724,17 +85325,17 @@ tr3416:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3417:
+       goto st1097;
+tr3454:
        { type_num(KNOT_RRTYPE_APL, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3425:
+       goto st1097;
+tr3462:
        { type_num(KNOT_RRTYPE_CAA, &rdata_tail); }
-       goto st1070;
-tr3426:
+       goto st1097;
+tr3463:
        { type_num(KNOT_RRTYPE_CAA, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84743,8 +85344,8 @@ tr3426:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3427:
+       goto st1097;
+tr3464:
        { type_num(KNOT_RRTYPE_CAA, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84753,17 +85354,17 @@ tr3427:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3428:
+       goto st1097;
+tr3465:
        { type_num(KNOT_RRTYPE_CAA, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3436:
+       goto st1097;
+tr3473:
        { type_num(KNOT_RRTYPE_CDNSKEY, &rdata_tail); }
-       goto st1070;
-tr3437:
+       goto st1097;
+tr3474:
        { type_num(KNOT_RRTYPE_CDNSKEY, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84772,8 +85373,8 @@ tr3437:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3438:
+       goto st1097;
+tr3475:
        { type_num(KNOT_RRTYPE_CDNSKEY, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84782,17 +85383,17 @@ tr3438:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3439:
+       goto st1097;
+tr3476:
        { type_num(KNOT_RRTYPE_CDNSKEY, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3441:
+       goto st1097;
+tr3478:
        { type_num(KNOT_RRTYPE_CDS, &rdata_tail); }
-       goto st1070;
-tr3442:
+       goto st1097;
+tr3479:
        { type_num(KNOT_RRTYPE_CDS, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84801,8 +85402,8 @@ tr3442:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3443:
+       goto st1097;
+tr3480:
        { type_num(KNOT_RRTYPE_CDS, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84811,17 +85412,17 @@ tr3443:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3444:
+       goto st1097;
+tr3481:
        { type_num(KNOT_RRTYPE_CDS, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3448:
+       goto st1097;
+tr3485:
        { type_num(KNOT_RRTYPE_CERT, &rdata_tail); }
-       goto st1070;
-tr3449:
+       goto st1097;
+tr3486:
        { type_num(KNOT_RRTYPE_CERT, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84830,8 +85431,8 @@ tr3449:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3450:
+       goto st1097;
+tr3487:
        { type_num(KNOT_RRTYPE_CERT, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84840,17 +85441,17 @@ tr3450:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3451:
+       goto st1097;
+tr3488:
        { type_num(KNOT_RRTYPE_CERT, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3456:
+       goto st1097;
+tr3493:
        { type_num(KNOT_RRTYPE_CNAME, &rdata_tail); }
-       goto st1070;
-tr3457:
+       goto st1097;
+tr3494:
        { type_num(KNOT_RRTYPE_CNAME, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84859,8 +85460,8 @@ tr3457:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3458:
+       goto st1097;
+tr3495:
        { type_num(KNOT_RRTYPE_CNAME, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84869,17 +85470,17 @@ tr3458:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3459:
+       goto st1097;
+tr3496:
        { type_num(KNOT_RRTYPE_CNAME, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3464:
+       goto st1097;
+tr3501:
        { type_num(KNOT_RRTYPE_CSYNC, &rdata_tail); }
-       goto st1070;
-tr3465:
+       goto st1097;
+tr3502:
        { type_num(KNOT_RRTYPE_CSYNC, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84888,8 +85489,8 @@ tr3465:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3466:
+       goto st1097;
+tr3503:
        { type_num(KNOT_RRTYPE_CSYNC, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84898,17 +85499,17 @@ tr3466:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3467:
+       goto st1097;
+tr3504:
        { type_num(KNOT_RRTYPE_CSYNC, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3475:
+       goto st1097;
+tr3512:
        { type_num(KNOT_RRTYPE_DHCID, &rdata_tail); }
-       goto st1070;
-tr3476:
+       goto st1097;
+tr3513:
        { type_num(KNOT_RRTYPE_DHCID, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84917,8 +85518,8 @@ tr3476:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3477:
+       goto st1097;
+tr3514:
        { type_num(KNOT_RRTYPE_DHCID, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84927,17 +85528,17 @@ tr3477:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3478:
+       goto st1097;
+tr3515:
        { type_num(KNOT_RRTYPE_DHCID, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3484:
+       goto st1097;
+tr3521:
        { type_num(KNOT_RRTYPE_DNAME, &rdata_tail); }
-       goto st1070;
-tr3485:
+       goto st1097;
+tr3522:
        { type_num(KNOT_RRTYPE_DNAME, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84946,8 +85547,8 @@ tr3485:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3486:
+       goto st1097;
+tr3523:
        { type_num(KNOT_RRTYPE_DNAME, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84956,17 +85557,17 @@ tr3486:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3487:
+       goto st1097;
+tr3524:
        { type_num(KNOT_RRTYPE_DNAME, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3492:
+       goto st1097;
+tr3529:
        { type_num(KNOT_RRTYPE_DNSKEY, &rdata_tail); }
-       goto st1070;
-tr3493:
+       goto st1097;
+tr3530:
        { type_num(KNOT_RRTYPE_DNSKEY, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -84975,8 +85576,8 @@ tr3493:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3494:
+       goto st1097;
+tr3531:
        { type_num(KNOT_RRTYPE_DNSKEY, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -84985,17 +85586,17 @@ tr3494:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3495:
+       goto st1097;
+tr3532:
        { type_num(KNOT_RRTYPE_DNSKEY, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3497:
+       goto st1097;
+tr3534:
        { type_num(KNOT_RRTYPE_DS, &rdata_tail); }
-       goto st1070;
-tr3498:
+       goto st1097;
+tr3535:
        { type_num(KNOT_RRTYPE_DS, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85004,8 +85605,8 @@ tr3498:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3499:
+       goto st1097;
+tr3536:
        { type_num(KNOT_RRTYPE_DS, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85014,17 +85615,17 @@ tr3499:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3500:
+       goto st1097;
+tr3537:
        { type_num(KNOT_RRTYPE_DS, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3507:
+       goto st1097;
+tr3544:
        { type_num(KNOT_RRTYPE_EUI48, &rdata_tail); }
-       goto st1070;
-tr3508:
+       goto st1097;
+tr3545:
        { type_num(KNOT_RRTYPE_EUI48, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85033,8 +85634,8 @@ tr3508:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3509:
+       goto st1097;
+tr3546:
        { type_num(KNOT_RRTYPE_EUI48, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85043,17 +85644,17 @@ tr3509:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3510:
+       goto st1097;
+tr3547:
        { type_num(KNOT_RRTYPE_EUI48, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3513:
+       goto st1097;
+tr3550:
        { type_num(KNOT_RRTYPE_EUI64, &rdata_tail); }
-       goto st1070;
-tr3514:
+       goto st1097;
+tr3551:
        { type_num(KNOT_RRTYPE_EUI64, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85062,8 +85663,8 @@ tr3514:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3515:
+       goto st1097;
+tr3552:
        { type_num(KNOT_RRTYPE_EUI64, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85072,17 +85673,17 @@ tr3515:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3516:
+       goto st1097;
+tr3553:
        { type_num(KNOT_RRTYPE_EUI64, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3523:
+       goto st1097;
+tr3560:
        { type_num(KNOT_RRTYPE_HINFO, &rdata_tail); }
-       goto st1070;
-tr3524:
+       goto st1097;
+tr3561:
        { type_num(KNOT_RRTYPE_HINFO, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85091,8 +85692,8 @@ tr3524:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3525:
+       goto st1097;
+tr3562:
        { type_num(KNOT_RRTYPE_HINFO, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85101,17 +85702,17 @@ tr3525:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3526:
+       goto st1097;
+tr3563:
        { type_num(KNOT_RRTYPE_HINFO, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3531:
+       goto st1097;
+tr3568:
        { type_num(KNOT_RRTYPE_HTTPS, &rdata_tail); }
-       goto st1070;
-tr3532:
+       goto st1097;
+tr3569:
        { type_num(KNOT_RRTYPE_HTTPS, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85120,8 +85721,8 @@ tr3532:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3533:
+       goto st1097;
+tr3570:
        { type_num(KNOT_RRTYPE_HTTPS, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85130,17 +85731,17 @@ tr3533:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3534:
+       goto st1097;
+tr3571:
        { type_num(KNOT_RRTYPE_HTTPS, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3543:
+       goto st1097;
+tr3580:
        { type_num(KNOT_RRTYPE_IPSECKEY, &rdata_tail); }
-       goto st1070;
-tr3544:
+       goto st1097;
+tr3581:
        { type_num(KNOT_RRTYPE_IPSECKEY, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85149,8 +85750,8 @@ tr3544:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3545:
+       goto st1097;
+tr3582:
        { type_num(KNOT_RRTYPE_IPSECKEY, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85159,17 +85760,17 @@ tr3545:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3546:
+       goto st1097;
+tr3583:
        { type_num(KNOT_RRTYPE_IPSECKEY, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3551:
+       goto st1097;
+tr3588:
        { type_num(KNOT_RRTYPE_KEY, &rdata_tail); }
-       goto st1070;
-tr3552:
+       goto st1097;
+tr3589:
        { type_num(KNOT_RRTYPE_KEY, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85178,8 +85779,8 @@ tr3552:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3553:
+       goto st1097;
+tr3590:
        { type_num(KNOT_RRTYPE_KEY, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85188,17 +85789,17 @@ tr3553:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3554:
+       goto st1097;
+tr3591:
        { type_num(KNOT_RRTYPE_KEY, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3556:
+       goto st1097;
+tr3593:
        { type_num(KNOT_RRTYPE_KX, &rdata_tail); }
-       goto st1070;
-tr3557:
+       goto st1097;
+tr3594:
        { type_num(KNOT_RRTYPE_KX, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85207,8 +85808,8 @@ tr3557:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3558:
+       goto st1097;
+tr3595:
        { type_num(KNOT_RRTYPE_KX, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85217,17 +85818,17 @@ tr3558:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3559:
+       goto st1097;
+tr3596:
        { type_num(KNOT_RRTYPE_KX, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3566:
+       goto st1097;
+tr3603:
        { type_num(KNOT_RRTYPE_L32, &rdata_tail); }
-       goto st1070;
-tr3567:
+       goto st1097;
+tr3604:
        { type_num(KNOT_RRTYPE_L32, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85236,8 +85837,8 @@ tr3567:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3568:
+       goto st1097;
+tr3605:
        { type_num(KNOT_RRTYPE_L32, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85246,17 +85847,17 @@ tr3568:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3569:
+       goto st1097;
+tr3606:
        { type_num(KNOT_RRTYPE_L32, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3572:
+       goto st1097;
+tr3609:
        { type_num(KNOT_RRTYPE_L64, &rdata_tail); }
-       goto st1070;
-tr3573:
+       goto st1097;
+tr3610:
        { type_num(KNOT_RRTYPE_L64, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85265,8 +85866,8 @@ tr3573:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3574:
+       goto st1097;
+tr3611:
        { type_num(KNOT_RRTYPE_L64, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85275,17 +85876,17 @@ tr3574:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3575:
+       goto st1097;
+tr3612:
        { type_num(KNOT_RRTYPE_L64, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3578:
+       goto st1097;
+tr3615:
        { type_num(KNOT_RRTYPE_LOC, &rdata_tail); }
-       goto st1070;
-tr3579:
+       goto st1097;
+tr3616:
        { type_num(KNOT_RRTYPE_LOC, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85294,8 +85895,8 @@ tr3579:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3580:
+       goto st1097;
+tr3617:
        { type_num(KNOT_RRTYPE_LOC, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85304,17 +85905,17 @@ tr3580:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3581:
+       goto st1097;
+tr3618:
        { type_num(KNOT_RRTYPE_LOC, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3583:
+       goto st1097;
+tr3620:
        { type_num(KNOT_RRTYPE_LP, &rdata_tail); }
-       goto st1070;
-tr3584:
+       goto st1097;
+tr3621:
        { type_num(KNOT_RRTYPE_LP, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85323,8 +85924,8 @@ tr3584:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3585:
+       goto st1097;
+tr3622:
        { type_num(KNOT_RRTYPE_LP, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85333,17 +85934,17 @@ tr3585:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3586:
+       goto st1097;
+tr3623:
        { type_num(KNOT_RRTYPE_LP, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3593:
+       goto st1097;
+tr3630:
        { type_num(KNOT_RRTYPE_MINFO, &rdata_tail); }
-       goto st1070;
-tr3594:
+       goto st1097;
+tr3631:
        { type_num(KNOT_RRTYPE_MINFO, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85352,8 +85953,8 @@ tr3594:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3595:
+       goto st1097;
+tr3632:
        { type_num(KNOT_RRTYPE_MINFO, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85362,17 +85963,17 @@ tr3595:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3596:
+       goto st1097;
+tr3633:
        { type_num(KNOT_RRTYPE_MINFO, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3598:
+       goto st1097;
+tr3635:
        { type_num(KNOT_RRTYPE_MX, &rdata_tail); }
-       goto st1070;
-tr3599:
+       goto st1097;
+tr3636:
        { type_num(KNOT_RRTYPE_MX, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85381,8 +85982,8 @@ tr3599:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3600:
+       goto st1097;
+tr3637:
        { type_num(KNOT_RRTYPE_MX, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85391,17 +85992,17 @@ tr3600:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3601:
+       goto st1097;
+tr3638:
        { type_num(KNOT_RRTYPE_MX, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3609:
+       goto st1097;
+tr3646:
        { type_num(KNOT_RRTYPE_NAPTR, &rdata_tail); }
-       goto st1070;
-tr3610:
+       goto st1097;
+tr3647:
        { type_num(KNOT_RRTYPE_NAPTR, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85410,8 +86011,8 @@ tr3610:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3611:
+       goto st1097;
+tr3648:
        { type_num(KNOT_RRTYPE_NAPTR, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85420,17 +86021,17 @@ tr3611:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3612:
+       goto st1097;
+tr3649:
        { type_num(KNOT_RRTYPE_NAPTR, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3615:
+       goto st1097;
+tr3652:
        { type_num(KNOT_RRTYPE_NID, &rdata_tail); }
-       goto st1070;
-tr3616:
+       goto st1097;
+tr3653:
        { type_num(KNOT_RRTYPE_NID, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85439,8 +86040,8 @@ tr3616:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3617:
+       goto st1097;
+tr3654:
        { type_num(KNOT_RRTYPE_NID, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85449,17 +86050,17 @@ tr3617:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3618:
+       goto st1097;
+tr3655:
        { type_num(KNOT_RRTYPE_NID, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3620:
+       goto st1097;
+tr3657:
        { type_num(KNOT_RRTYPE_NS, &rdata_tail); }
-       goto st1070;
-tr3621:
+       goto st1097;
+tr3658:
        { type_num(KNOT_RRTYPE_NS, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85468,8 +86069,8 @@ tr3621:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3622:
+       goto st1097;
+tr3659:
        { type_num(KNOT_RRTYPE_NS, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85478,17 +86079,17 @@ tr3622:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3624:
+       goto st1097;
+tr3661:
        { type_num(KNOT_RRTYPE_NS, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3627:
+       goto st1097;
+tr3664:
        { type_num(KNOT_RRTYPE_NSEC, &rdata_tail); }
-       goto st1070;
-tr3628:
+       goto st1097;
+tr3665:
        { type_num(KNOT_RRTYPE_NSEC, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85497,8 +86098,8 @@ tr3628:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3629:
+       goto st1097;
+tr3666:
        { type_num(KNOT_RRTYPE_NSEC, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85507,17 +86108,17 @@ tr3629:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3631:
+       goto st1097;
+tr3668:
        { type_num(KNOT_RRTYPE_NSEC, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3633:
+       goto st1097;
+tr3670:
        { type_num(KNOT_RRTYPE_NSEC3, &rdata_tail); }
-       goto st1070;
-tr3634:
+       goto st1097;
+tr3671:
        { type_num(KNOT_RRTYPE_NSEC3, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85526,8 +86127,8 @@ tr3634:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3635:
+       goto st1097;
+tr3672:
        { type_num(KNOT_RRTYPE_NSEC3, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85536,17 +86137,17 @@ tr3635:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3637:
+       goto st1097;
+tr3674:
        { type_num(KNOT_RRTYPE_NSEC3, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3643:
+       goto st1097;
+tr3680:
        { type_num(KNOT_RRTYPE_NSEC3PARAM, &rdata_tail); }
-       goto st1070;
-tr3644:
+       goto st1097;
+tr3681:
        { type_num(KNOT_RRTYPE_NSEC3PARAM, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85555,8 +86156,8 @@ tr3644:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3645:
+       goto st1097;
+tr3682:
        { type_num(KNOT_RRTYPE_NSEC3PARAM, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85565,17 +86166,17 @@ tr3645:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3646:
+       goto st1097;
+tr3683:
        { type_num(KNOT_RRTYPE_NSEC3PARAM, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3657:
-       { type_num(KNOT_RRTYPE_OPENPGPKEY, &rdata_tail); }
-       goto st1070;
-tr3658:
+       goto st1097;
+tr3694:
+       { type_num(KNOT_RRTYPE_OPENPGPKEY, &rdata_tail); }
+       goto st1097;
+tr3695:
        { type_num(KNOT_RRTYPE_OPENPGPKEY, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85584,8 +86185,8 @@ tr3658:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3659:
+       goto st1097;
+tr3696:
        { type_num(KNOT_RRTYPE_OPENPGPKEY, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85594,17 +86195,17 @@ tr3659:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3660:
+       goto st1097;
+tr3697:
        { type_num(KNOT_RRTYPE_OPENPGPKEY, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3664:
+       goto st1097;
+tr3701:
        { type_num(KNOT_RRTYPE_PTR, &rdata_tail); }
-       goto st1070;
-tr3665:
+       goto st1097;
+tr3702:
        { type_num(KNOT_RRTYPE_PTR, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85613,8 +86214,8 @@ tr3665:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3666:
+       goto st1097;
+tr3703:
        { type_num(KNOT_RRTYPE_PTR, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85623,17 +86224,17 @@ tr3666:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3667:
+       goto st1097;
+tr3704:
        { type_num(KNOT_RRTYPE_PTR, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3672:
+       goto st1097;
+tr3709:
        { type_num(KNOT_RRTYPE_RP, &rdata_tail); }
-       goto st1070;
-tr3673:
+       goto st1097;
+tr3710:
        { type_num(KNOT_RRTYPE_RP, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85642,8 +86243,8 @@ tr3673:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3674:
+       goto st1097;
+tr3711:
        { type_num(KNOT_RRTYPE_RP, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85652,17 +86253,17 @@ tr3674:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3675:
+       goto st1097;
+tr3712:
        { type_num(KNOT_RRTYPE_RP, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3680:
+       goto st1097;
+tr3717:
        { type_num(KNOT_RRTYPE_RRSIG, &rdata_tail); }
-       goto st1070;
-tr3681:
+       goto st1097;
+tr3718:
        { type_num(KNOT_RRTYPE_RRSIG, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85671,8 +86272,8 @@ tr3681:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3682:
+       goto st1097;
+tr3719:
        { type_num(KNOT_RRTYPE_RRSIG, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85681,17 +86282,17 @@ tr3682:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3683:
+       goto st1097;
+tr3720:
        { type_num(KNOT_RRTYPE_RRSIG, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3685:
+       goto st1097;
+tr3722:
        { type_num(KNOT_RRTYPE_RT, &rdata_tail); }
-       goto st1070;
-tr3686:
+       goto st1097;
+tr3723:
        { type_num(KNOT_RRTYPE_RT, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85700,8 +86301,8 @@ tr3686:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3687:
+       goto st1097;
+tr3724:
        { type_num(KNOT_RRTYPE_RT, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85710,17 +86311,17 @@ tr3687:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3688:
+       goto st1097;
+tr3725:
        { type_num(KNOT_RRTYPE_RT, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3700:
+       goto st1097;
+tr3737:
        { type_num(KNOT_RRTYPE_SMIMEA, &rdata_tail); }
-       goto st1070;
-tr3701:
+       goto st1097;
+tr3738:
        { type_num(KNOT_RRTYPE_SMIMEA, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85729,8 +86330,8 @@ tr3701:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3702:
+       goto st1097;
+tr3739:
        { type_num(KNOT_RRTYPE_SMIMEA, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85739,17 +86340,17 @@ tr3702:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3703:
+       goto st1097;
+tr3740:
        { type_num(KNOT_RRTYPE_SMIMEA, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3706:
+       goto st1097;
+tr3743:
        { type_num(KNOT_RRTYPE_SOA, &rdata_tail); }
-       goto st1070;
-tr3707:
+       goto st1097;
+tr3744:
        { type_num(KNOT_RRTYPE_SOA, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85758,8 +86359,8 @@ tr3707:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3708:
+       goto st1097;
+tr3745:
        { type_num(KNOT_RRTYPE_SOA, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85768,17 +86369,17 @@ tr3708:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3709:
+       goto st1097;
+tr3746:
        { type_num(KNOT_RRTYPE_SOA, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3712:
+       goto st1097;
+tr3749:
        { type_num(KNOT_RRTYPE_SPF, &rdata_tail); }
-       goto st1070;
-tr3713:
+       goto st1097;
+tr3750:
        { type_num(KNOT_RRTYPE_SPF, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85787,8 +86388,8 @@ tr3713:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3714:
+       goto st1097;
+tr3751:
        { type_num(KNOT_RRTYPE_SPF, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85797,17 +86398,17 @@ tr3714:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3715:
+       goto st1097;
+tr3752:
        { type_num(KNOT_RRTYPE_SPF, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3718:
+       goto st1097;
+tr3755:
        { type_num(KNOT_RRTYPE_SRV, &rdata_tail); }
-       goto st1070;
-tr3719:
+       goto st1097;
+tr3756:
        { type_num(KNOT_RRTYPE_SRV, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85816,8 +86417,8 @@ tr3719:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3720:
+       goto st1097;
+tr3757:
        { type_num(KNOT_RRTYPE_SRV, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85826,17 +86427,17 @@ tr3720:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3721:
+       goto st1097;
+tr3758:
        { type_num(KNOT_RRTYPE_SRV, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3726:
+       goto st1097;
+tr3763:
        { type_num(KNOT_RRTYPE_SSHFP, &rdata_tail); }
-       goto st1070;
-tr3727:
+       goto st1097;
+tr3764:
        { type_num(KNOT_RRTYPE_SSHFP, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85845,8 +86446,8 @@ tr3727:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3728:
+       goto st1097;
+tr3765:
        { type_num(KNOT_RRTYPE_SSHFP, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85855,17 +86456,17 @@ tr3728:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3729:
+       goto st1097;
+tr3766:
        { type_num(KNOT_RRTYPE_SSHFP, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3733:
+       goto st1097;
+tr3770:
        { type_num(KNOT_RRTYPE_SVCB, &rdata_tail); }
-       goto st1070;
-tr3734:
+       goto st1097;
+tr3771:
        { type_num(KNOT_RRTYPE_SVCB, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85874,8 +86475,8 @@ tr3734:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3735:
+       goto st1097;
+tr3772:
        { type_num(KNOT_RRTYPE_SVCB, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85884,17 +86485,17 @@ tr3735:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3736:
+       goto st1097;
+tr3773:
        { type_num(KNOT_RRTYPE_SVCB, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3743:
+       goto st1097;
+tr3780:
        { type_num(KNOT_RRTYPE_TLSA, &rdata_tail); }
-       goto st1070;
-tr3744:
+       goto st1097;
+tr3781:
        { type_num(KNOT_RRTYPE_TLSA, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85903,8 +86504,8 @@ tr3744:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3745:
+       goto st1097;
+tr3782:
        { type_num(KNOT_RRTYPE_TLSA, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85913,17 +86514,17 @@ tr3745:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3746:
+       goto st1097;
+tr3783:
        { type_num(KNOT_RRTYPE_TLSA, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3749:
+       goto st1097;
+tr3786:
        { type_num(KNOT_RRTYPE_TXT, &rdata_tail); }
-       goto st1070;
-tr3750:
+       goto st1097;
+tr3787:
        { type_num(KNOT_RRTYPE_TXT, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85932,8 +86533,8 @@ tr3750:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3751:
+       goto st1097;
+tr3788:
        { type_num(KNOT_RRTYPE_TXT, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85942,17 +86543,17 @@ tr3751:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3752:
+       goto st1097;
+tr3789:
        { type_num(KNOT_RRTYPE_TXT, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3766:
+       goto st1097;
+tr3803:
        { type_num(KNOT_RRTYPE_URI, &rdata_tail); }
-       goto st1070;
-tr3767:
+       goto st1097;
+tr3804:
        { type_num(KNOT_RRTYPE_URI, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85961,8 +86562,8 @@ tr3767:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3768:
+       goto st1097;
+tr3805:
        { type_num(KNOT_RRTYPE_URI, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -85971,17 +86572,17 @@ tr3768:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3769:
+       goto st1097;
+tr3806:
        { type_num(KNOT_RRTYPE_URI, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-tr3776:
+       goto st1097;
+tr3813:
        { type_num(KNOT_RRTYPE_ZONEMD, &rdata_tail); }
-       goto st1070;
-tr3777:
+       goto st1097;
+tr3814:
        { type_num(KNOT_RRTYPE_ZONEMD, &rdata_tail); }
        {
                if (s->multiline == true) {
@@ -85990,8 +86591,8 @@ tr3777:
                }
                s->multiline = true;
        }
-       goto st1070;
-tr3778:
+       goto st1097;
+tr3815:
        { type_num(KNOT_RRTYPE_ZONEMD, &rdata_tail); }
        {
                if (s->multiline == false) {
@@ -86000,17 +86601,17 @@ tr3778:
                }
                s->multiline = false;
        }
-       goto st1070;
-tr3779:
+       goto st1097;
+tr3816:
        { type_num(KNOT_RRTYPE_ZONEMD, &rdata_tail); }
        {
                s->line_counter++;
        }
-       goto st1070;
-st1070:
+       goto st1097;
+st1097:
        if ( ++p == pe )
-               goto _test_eof1070;
-case 1070:
+               goto _test_eof1097;
+case 1097:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86024,29 +86625,29 @@ case 1070:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1070;
-               case 32: goto st1070;
-               case 40: goto tr3298;
-               case 41: goto tr3299;
-               case 2058: goto tr3301;
-               case 2107: goto tr3302;
+               case 9: goto st1097;
+               case 32: goto st1097;
+               case 40: goto tr3335;
+               case 41: goto tr3336;
+               case 2058: goto tr3338;
+               case 2107: goto tr3339;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3300;
+                       goto tr3337;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr3300;
+                       goto tr3337;
        } else
-               goto tr3300;
+               goto tr3337;
        goto tr75;
-tr3300:
-       { p--; {stack[top++] = 1071;goto st699;} }
-       goto st1071;
-st1071:
+tr3337:
+       { p--; {stack[top++] = 1098;goto st726;} }
+       goto st1098;
+st1098:
        if ( ++p == pe )
-               goto _test_eof1071;
-case 1071:
+               goto _test_eof1098;
+case 1098:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86060,15 +86661,15 @@ case 1071:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1072;
-               case 32: goto st1072;
-               case 40: goto tr3304;
-               case 41: goto tr3305;
-               case 2058: goto tr3306;
-               case 2107: goto tr3307;
+               case 9: goto st1099;
+               case 32: goto st1099;
+               case 40: goto tr3341;
+               case 41: goto tr3342;
+               case 2058: goto tr3343;
+               case 2107: goto tr3344;
        }
        goto tr75;
-tr3304:
+tr3341:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -86076,8 +86677,8 @@ tr3304:
                }
                s->multiline = true;
        }
-       goto st1072;
-tr3305:
+       goto st1099;
+tr3342:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -86085,13 +86686,13 @@ tr3305:
                }
                s->multiline = false;
        }
-       goto st1072;
-tr3306:
+       goto st1099;
+tr3343:
        {
                s->line_counter++;
        }
-       goto st1072;
-tr3395:
+       goto st1099;
+tr3432:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -86101,18 +86702,18 @@ tr3395:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1072; goto _out;}
+                               {p++; cs = 1099; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1072;
-st1072:
+       goto st1099;
+st1099:
        if ( ++p == pe )
-               goto _test_eof1072;
-case 1072:
+               goto _test_eof1099;
+case 1099:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86126,17 +86727,17 @@ case 1072:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1072;
-               case 32: goto st1072;
-               case 40: goto tr3304;
-               case 41: goto tr3305;
-               case 2058: goto tr3306;
-               case 2107: goto tr3307;
+               case 9: goto st1099;
+               case 32: goto st1099;
+               case 40: goto tr3341;
+               case 41: goto tr3342;
+               case 2058: goto tr3343;
+               case 2107: goto tr3344;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3308;
-       goto tr2327;
-tr3308:
+               goto tr3345;
+       goto tr2364;
+tr3345:
        {
                s->number64 = 0;
        }
@@ -86154,8 +86755,8 @@ tr3308:
                        p--; {goto st307;}
                }
        }
-       goto st1073;
-tr3312:
+       goto st1100;
+tr3349:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -86170,11 +86771,11 @@ tr3312:
                        p--; {goto st307;}
                }
        }
-       goto st1073;
-st1073:
+       goto st1100;
+st1100:
        if ( ++p == pe )
-               goto _test_eof1073;
-case 1073:
+               goto _test_eof1100;
+case 1100:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86188,17 +86789,17 @@ case 1073:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3309;
-               case 32: goto tr3309;
-               case 40: goto tr3310;
-               case 41: goto tr3311;
-               case 2058: goto tr3313;
-               case 2107: goto tr3314;
+               case 9: goto tr3346;
+               case 32: goto tr3346;
+               case 40: goto tr3347;
+               case 41: goto tr3348;
+               case 2058: goto tr3350;
+               case 2107: goto tr3351;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3312;
-       goto tr2327;
-tr3316:
+               goto tr3349;
+       goto tr2364;
+tr3353:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -86206,8 +86807,8 @@ tr3316:
                }
                s->multiline = true;
        }
-       goto st1074;
-tr3317:
+       goto st1101;
+tr3354:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -86215,13 +86816,13 @@ tr3317:
                }
                s->multiline = false;
        }
-       goto st1074;
-tr3319:
+       goto st1101;
+tr3356:
        {
                s->line_counter++;
        }
-       goto st1074;
-tr3393:
+       goto st1101;
+tr3430:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -86231,15 +86832,15 @@ tr3393:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1074; goto _out;}
+                               {p++; cs = 1101; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1074;
-tr3309:
+       goto st1101;
+tr3346:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -86249,8 +86850,8 @@ tr3309:
                        p--; {goto st307;}
                }
        }
-       goto st1074;
-tr3310:
+       goto st1101;
+tr3347:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -86267,8 +86868,8 @@ tr3310:
                }
                s->multiline = true;
        }
-       goto st1074;
-tr3311:
+       goto st1101;
+tr3348:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -86285,8 +86886,8 @@ tr3311:
                }
                s->multiline = false;
        }
-       goto st1074;
-tr3313:
+       goto st1101;
+tr3350:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -86299,11 +86900,11 @@ tr3313:
        {
                s->line_counter++;
        }
-       goto st1074;
-st1074:
+       goto st1101;
+st1101:
        if ( ++p == pe )
-               goto _test_eof1074;
-case 1074:
+               goto _test_eof1101;
+case 1101:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86317,17 +86918,17 @@ case 1074:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1074;
-               case 32: goto st1074;
-               case 40: goto tr3316;
-               case 41: goto tr3317;
-               case 2058: goto tr3319;
-               case 2107: goto tr3320;
+               case 9: goto st1101;
+               case 32: goto st1101;
+               case 40: goto tr3353;
+               case 41: goto tr3354;
+               case 2058: goto tr3356;
+               case 2107: goto tr3357;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3318;
-       goto tr2327;
-tr3318:
+               goto tr3355;
+       goto tr2364;
+tr3355:
        {
                s->number64 = 0;
        }
@@ -86345,8 +86946,8 @@ tr3318:
                        p--; {goto st307;}
                }
        }
-       goto st1075;
-tr3324:
+       goto st1102;
+tr3361:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -86361,11 +86962,11 @@ tr3324:
                        p--; {goto st307;}
                }
        }
-       goto st1075;
-st1075:
+       goto st1102;
+st1102:
        if ( ++p == pe )
-               goto _test_eof1075;
-case 1075:
+               goto _test_eof1102;
+case 1102:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86379,17 +86980,17 @@ case 1075:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3321;
-               case 32: goto tr3321;
-               case 40: goto tr3322;
-               case 41: goto tr3323;
-               case 2058: goto tr3325;
-               case 2107: goto tr3326;
+               case 9: goto tr3358;
+               case 32: goto tr3358;
+               case 40: goto tr3359;
+               case 41: goto tr3360;
+               case 2058: goto tr3362;
+               case 2107: goto tr3363;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3324;
-       goto tr2327;
-tr3329:
+               goto tr3361;
+       goto tr2364;
+tr3366:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -86397,8 +86998,8 @@ tr3329:
                }
                s->multiline = true;
        }
-       goto st1076;
-tr3330:
+       goto st1103;
+tr3367:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -86406,13 +87007,13 @@ tr3330:
                }
                s->multiline = false;
        }
-       goto st1076;
-tr3332:
+       goto st1103;
+tr3369:
        {
                s->line_counter++;
        }
-       goto st1076;
-tr3391:
+       goto st1103;
+tr3428:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -86422,15 +87023,15 @@ tr3391:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1076; goto _out;}
+                               {p++; cs = 1103; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1076;
-tr3321:
+       goto st1103;
+tr3358:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -86441,8 +87042,8 @@ tr3321:
                        p--; {goto st307;}
                }
        }
-       goto st1076;
-tr3322:
+       goto st1103;
+tr3359:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -86460,8 +87061,8 @@ tr3322:
                }
                s->multiline = true;
        }
-       goto st1076;
-tr3323:
+       goto st1103;
+tr3360:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -86479,8 +87080,8 @@ tr3323:
                }
                s->multiline = false;
        }
-       goto st1076;
-tr3325:
+       goto st1103;
+tr3362:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -86494,11 +87095,11 @@ tr3325:
        {
                s->line_counter++;
        }
-       goto st1076;
-st1076:
+       goto st1103;
+st1103:
        if ( ++p == pe )
-               goto _test_eof1076;
-case 1076:
+               goto _test_eof1103;
+case 1103:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86512,17 +87113,17 @@ case 1076:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1076;
-               case 32: goto st1076;
-               case 40: goto tr3329;
-               case 41: goto tr3330;
-               case 2058: goto tr3332;
-               case 2107: goto tr3333;
+               case 9: goto st1103;
+               case 32: goto st1103;
+               case 40: goto tr3366;
+               case 41: goto tr3367;
+               case 2058: goto tr3369;
+               case 2107: goto tr3370;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3331;
-       goto tr3327;
-tr3331:
+               goto tr3368;
+       goto tr3364;
+tr3368:
        {
                s->buffer_length = 0;
        }
@@ -86534,8 +87135,8 @@ tr3331:
                        p--; {goto st307;}
                }
        }
-       goto st1077;
-tr3337:
+       goto st1104;
+tr3374:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -86544,11 +87145,11 @@ tr3337:
                        p--; {goto st307;}
                }
        }
-       goto st1077;
-st1077:
+       goto st1104;
+st1104:
        if ( ++p == pe )
-               goto _test_eof1077;
-case 1077:
+               goto _test_eof1104;
+case 1104:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86562,17 +87163,17 @@ case 1077:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3334;
-               case 32: goto tr3334;
-               case 40: goto tr3335;
-               case 41: goto tr3336;
-               case 2058: goto tr3338;
-               case 2107: goto tr3339;
+               case 9: goto tr3371;
+               case 32: goto tr3371;
+               case 40: goto tr3372;
+               case 41: goto tr3373;
+               case 2058: goto tr3375;
+               case 2107: goto tr3376;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3337;
-       goto tr3327;
-tr3341:
+               goto tr3374;
+       goto tr3364;
+tr3378:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -86580,8 +87181,8 @@ tr3341:
                }
                s->multiline = true;
        }
-       goto st1078;
-tr3342:
+       goto st1105;
+tr3379:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -86589,13 +87190,13 @@ tr3342:
                }
                s->multiline = false;
        }
-       goto st1078;
-tr3344:
+       goto st1105;
+tr3381:
        {
                s->line_counter++;
        }
-       goto st1078;
-tr3389:
+       goto st1105;
+tr3426:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -86605,15 +87206,15 @@ tr3389:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1078; goto _out;}
+                               {p++; cs = 1105; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1078;
-tr3334:
+       goto st1105;
+tr3371:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -86650,8 +87251,8 @@ tr3334:
                        p--; {goto st307;}
                }
        }
-       goto st1078;
-tr3335:
+       goto st1105;
+tr3372:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -86695,8 +87296,8 @@ tr3335:
                }
                s->multiline = true;
        }
-       goto st1078;
-tr3336:
+       goto st1105;
+tr3373:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -86740,8 +87341,8 @@ tr3336:
                }
                s->multiline = false;
        }
-       goto st1078;
-tr3338:
+       goto st1105;
+tr3375:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -86781,11 +87382,11 @@ tr3338:
        {
                s->line_counter++;
        }
-       goto st1078;
-st1078:
+       goto st1105;
+st1105:
        if ( ++p == pe )
-               goto _test_eof1078;
-case 1078:
+               goto _test_eof1105;
+case 1105:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86799,17 +87400,17 @@ case 1078:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1078;
-               case 32: goto st1078;
-               case 40: goto tr3341;
-               case 41: goto tr3342;
-               case 2058: goto tr3344;
-               case 2107: goto tr3345;
+               case 9: goto st1105;
+               case 32: goto st1105;
+               case 40: goto tr3378;
+               case 41: goto tr3379;
+               case 2058: goto tr3381;
+               case 2107: goto tr3382;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3343;
-       goto tr3327;
-tr3343:
+               goto tr3380;
+       goto tr3364;
+tr3380:
        {
                s->buffer_length = 0;
        }
@@ -86821,8 +87422,8 @@ tr3343:
                        p--; {goto st307;}
                }
        }
-       goto st1079;
-tr3349:
+       goto st1106;
+tr3386:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -86831,11 +87432,11 @@ tr3349:
                        p--; {goto st307;}
                }
        }
-       goto st1079;
-st1079:
+       goto st1106;
+st1106:
        if ( ++p == pe )
-               goto _test_eof1079;
-case 1079:
+               goto _test_eof1106;
+case 1106:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -86849,17 +87450,17 @@ case 1079:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3346;
-               case 32: goto tr3346;
-               case 40: goto tr3347;
-               case 41: goto tr3348;
-               case 2058: goto tr3350;
-               case 2107: goto tr3351;
+               case 9: goto tr3383;
+               case 32: goto tr3383;
+               case 40: goto tr3384;
+               case 41: goto tr3385;
+               case 2058: goto tr3387;
+               case 2107: goto tr3388;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3349;
-       goto tr3327;
-tr3353:
+               goto tr3386;
+       goto tr3364;
+tr3390:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -86867,8 +87468,8 @@ tr3353:
                }
                s->multiline = true;
        }
-       goto st1080;
-tr3354:
+       goto st1107;
+tr3391:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -86876,13 +87477,13 @@ tr3354:
                }
                s->multiline = false;
        }
-       goto st1080;
-tr3356:
+       goto st1107;
+tr3393:
        {
                s->line_counter++;
        }
-       goto st1080;
-tr3387:
+       goto st1107;
+tr3424:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -86892,15 +87493,15 @@ tr3387:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1080; goto _out;}
+                               {p++; cs = 1107; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1080;
-tr3346:
+       goto st1107;
+tr3383:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -86937,8 +87538,8 @@ tr3346:
                        p--; {goto st307;}
                }
        }
-       goto st1080;
-tr3347:
+       goto st1107;
+tr3384:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -86982,8 +87583,8 @@ tr3347:
                }
                s->multiline = true;
        }
-       goto st1080;
-tr3348:
+       goto st1107;
+tr3385:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -87027,8 +87628,8 @@ tr3348:
                }
                s->multiline = false;
        }
-       goto st1080;
-tr3350:
+       goto st1107;
+tr3387:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -87068,11 +87669,11 @@ tr3350:
        {
                s->line_counter++;
        }
-       goto st1080;
-st1080:
+       goto st1107;
+st1107:
        if ( ++p == pe )
-               goto _test_eof1080;
-case 1080:
+               goto _test_eof1107;
+case 1107:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -87086,17 +87687,17 @@ case 1080:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1080;
-               case 32: goto st1080;
-               case 40: goto tr3353;
-               case 41: goto tr3354;
-               case 2058: goto tr3356;
-               case 2107: goto tr3357;
+               case 9: goto st1107;
+               case 32: goto st1107;
+               case 40: goto tr3390;
+               case 41: goto tr3391;
+               case 2058: goto tr3393;
+               case 2107: goto tr3394;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3355;
-       goto tr2327;
-tr3355:
+               goto tr3392;
+       goto tr2364;
+tr3392:
        {
                s->number64 = 0;
        }
@@ -87114,8 +87715,8 @@ tr3355:
                        p--; {goto st307;}
                }
        }
-       goto st1081;
-tr3361:
+       goto st1108;
+tr3398:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -87130,11 +87731,11 @@ tr3361:
                        p--; {goto st307;}
                }
        }
-       goto st1081;
-st1081:
+       goto st1108;
+st1108:
        if ( ++p == pe )
-               goto _test_eof1081;
-case 1081:
+               goto _test_eof1108;
+case 1108:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -87148,17 +87749,17 @@ case 1081:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3358;
-               case 32: goto tr3358;
-               case 40: goto tr3359;
-               case 41: goto tr3360;
-               case 2058: goto tr3362;
-               case 2107: goto tr3363;
+               case 9: goto tr3395;
+               case 32: goto tr3395;
+               case 40: goto tr3396;
+               case 41: goto tr3397;
+               case 2058: goto tr3399;
+               case 2107: goto tr3400;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3361;
-       goto tr2327;
-tr3365:
+               goto tr3398;
+       goto tr2364;
+tr3402:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -87166,8 +87767,8 @@ tr3365:
                }
                s->multiline = true;
        }
-       goto st1082;
-tr3366:
+       goto st1109;
+tr3403:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -87175,13 +87776,13 @@ tr3366:
                }
                s->multiline = false;
        }
-       goto st1082;
-tr3368:
+       goto st1109;
+tr3405:
        {
                s->line_counter++;
        }
-       goto st1082;
-tr3385:
+       goto st1109;
+tr3422:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -87191,15 +87792,15 @@ tr3385:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1082; goto _out;}
+                               {p++; cs = 1109; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1082;
-tr3358:
+       goto st1109;
+tr3395:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -87210,8 +87811,8 @@ tr3358:
                        p--; {goto st307;}
                }
        }
-       goto st1082;
-tr3359:
+       goto st1109;
+tr3396:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -87229,8 +87830,8 @@ tr3359:
                }
                s->multiline = true;
        }
-       goto st1082;
-tr3360:
+       goto st1109;
+tr3397:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -87248,8 +87849,8 @@ tr3360:
                }
                s->multiline = false;
        }
-       goto st1082;
-tr3362:
+       goto st1109;
+tr3399:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -87263,11 +87864,11 @@ tr3362:
        {
                s->line_counter++;
        }
-       goto st1082;
-st1082:
+       goto st1109;
+st1109:
        if ( ++p == pe )
-               goto _test_eof1082;
-case 1082:
+               goto _test_eof1109;
+case 1109:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -87281,35 +87882,35 @@ case 1082:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1082;
-               case 32: goto st1082;
-               case 40: goto tr3365;
-               case 41: goto tr3366;
-               case 42: goto tr3367;
-               case 92: goto tr3367;
-               case 95: goto tr3367;
-               case 2058: goto tr3368;
-               case 2107: goto tr3369;
+               case 9: goto st1109;
+               case 32: goto st1109;
+               case 40: goto tr3402;
+               case 41: goto tr3403;
+               case 42: goto tr3404;
+               case 92: goto tr3404;
+               case 95: goto tr3404;
+               case 2058: goto tr3405;
+               case 2107: goto tr3406;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr3367;
+                       goto tr3404;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr3367;
+                       goto tr3404;
        } else
-               goto tr3367;
+               goto tr3404;
        goto tr75;
-tr3367:
+tr3404:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 1083;goto st309;} }
-       goto st1083;
-st1083:
+       { p--; {stack[top++] = 1110;goto st309;} }
+       goto st1110;
+st1110:
        if ( ++p == pe )
-               goto _test_eof1083;
-case 1083:
+               goto _test_eof1110;
+case 1110:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -87323,15 +87924,15 @@ case 1083:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3370;
-               case 32: goto tr3370;
-               case 40: goto tr3371;
-               case 41: goto tr3372;
-               case 2058: goto tr3373;
-               case 2107: goto tr3374;
+               case 9: goto tr3407;
+               case 32: goto tr3407;
+               case 40: goto tr3408;
+               case 41: goto tr3409;
+               case 2058: goto tr3410;
+               case 2107: goto tr3411;
        }
        goto tr75;
-tr3376:
+tr3413:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -87339,8 +87940,8 @@ tr3376:
                }
                s->multiline = true;
        }
-       goto st1084;
-tr3377:
+       goto st1111;
+tr3414:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -87348,13 +87949,13 @@ tr3377:
                }
                s->multiline = false;
        }
-       goto st1084;
-tr3379:
+       goto st1111;
+tr3416:
        {
                s->line_counter++;
        }
-       goto st1084;
-tr3383:
+       goto st1111;
+tr3420:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -87364,20 +87965,20 @@ tr3383:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1084; goto _out;}
+                               {p++; cs = 1111; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1084;
-tr3370:
+       goto st1111;
+tr3407:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       goto st1084;
-tr3371:
+       goto st1111;
+tr3408:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -87388,8 +87989,8 @@ tr3371:
                }
                s->multiline = true;
        }
-       goto st1084;
-tr3372:
+       goto st1111;
+tr3409:
        {
                rdata_tail += s->dname_tmp_length;
        }
@@ -87400,19 +88001,19 @@ tr3372:
                }
                s->multiline = false;
        }
-       goto st1084;
-tr3373:
+       goto st1111;
+tr3410:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->line_counter++;
        }
-       goto st1084;
-st1084:
+       goto st1111;
+st1111:
        if ( ++p == pe )
-               goto _test_eof1084;
-case 1084:
+               goto _test_eof1111;
+case 1111:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -87426,30 +88027,30 @@ case 1084:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1084;
-               case 32: goto st1084;
-               case 40: goto tr3376;
-               case 41: goto tr3377;
-               case 43: goto tr3378;
-               case 2058: goto tr3379;
-               case 2107: goto tr3380;
+               case 9: goto st1111;
+               case 32: goto st1111;
+               case 40: goto tr3413;
+               case 41: goto tr3414;
+               case 43: goto tr3415;
+               case 2058: goto tr3416;
+               case 2107: goto tr3417;
        }
        if ( _widec < 65 ) {
                if ( 47 <= _widec && _widec <= 57 )
-                       goto tr3378;
+                       goto tr3415;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr3378;
+                       goto tr3415;
        } else
-               goto tr3378;
+               goto tr3415;
        goto tr75;
-tr3378:
-       { p--; {stack[top++] = 1085;goto st369;} }
-       goto st1085;
-st1085:
+tr3415:
+       { p--; {stack[top++] = 1112;goto st369;} }
+       goto st1112;
+st1112:
        if ( ++p == pe )
-               goto _test_eof1085;
-case 1085:
+               goto _test_eof1112;
+case 1112:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -87463,44 +88064,44 @@ case 1085:
  !s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 2570: goto tr3381;
-               case 2619: goto tr3381;
+               case 2570: goto tr3418;
+               case 2619: goto tr3418;
        }
        goto tr75;
-tr3381:
+tr3418:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1473;
-st1473:
+       goto st1500;
+st1500:
        if ( ++p == pe )
-               goto _test_eof1473;
-case 1473:
+               goto _test_eof1500;
+case 1500:
        goto st0;
-tr3380:
+tr3417:
        {
                s->buffer_length = 0;
        }
-       goto st1086;
-tr3382:
+       goto st1113;
+tr3419:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1086;
-tr3374:
+       goto st1113;
+tr3411:
        {
                rdata_tail += s->dname_tmp_length;
        }
        {
                s->buffer_length = 0;
        }
-       goto st1086;
-st1086:
+       goto st1113;
+st1113:
        if ( ++p == pe )
-               goto _test_eof1086;
-case 1086:
+               goto _test_eof1113;
+case 1113:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -87520,23 +88121,23 @@ case 1086:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3383;
+               goto tr3420;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3382;
+               goto tr3419;
        goto tr75;
-tr3369:
+tr3406:
        {
                s->buffer_length = 0;
        }
-       goto st1087;
-tr3384:
+       goto st1114;
+tr3421:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1087;
-tr3363:
+       goto st1114;
+tr3400:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -87550,11 +88151,11 @@ tr3363:
        {
                s->buffer_length = 0;
        }
-       goto st1087;
-st1087:
+       goto st1114;
+st1114:
        if ( ++p == pe )
-               goto _test_eof1087;
-case 1087:
+               goto _test_eof1114;
+case 1114:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -87574,23 +88175,23 @@ case 1087:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3385;
+               goto tr3422;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3384;
+               goto tr3421;
        goto tr75;
-tr3357:
+tr3394:
        {
                s->buffer_length = 0;
        }
-       goto st1088;
-tr3386:
+       goto st1115;
+tr3423:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1088;
-tr3351:
+       goto st1115;
+tr3388:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -87630,11 +88231,11 @@ tr3351:
        {
                s->buffer_length = 0;
        }
-       goto st1088;
-st1088:
+       goto st1115;
+st1115:
        if ( ++p == pe )
-               goto _test_eof1088;
-case 1088:
+               goto _test_eof1115;
+case 1115:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -87654,23 +88255,23 @@ case 1088:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3387;
+               goto tr3424;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3386;
+               goto tr3423;
        goto tr75;
-tr3345:
+tr3382:
        {
                s->buffer_length = 0;
        }
-       goto st1089;
-tr3388:
+       goto st1116;
+tr3425:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1089;
-tr3339:
+       goto st1116;
+tr3376:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -87710,11 +88311,11 @@ tr3339:
        {
                s->buffer_length = 0;
        }
-       goto st1089;
-st1089:
+       goto st1116;
+st1116:
        if ( ++p == pe )
-               goto _test_eof1089;
-case 1089:
+               goto _test_eof1116;
+case 1116:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -87734,23 +88335,23 @@ case 1089:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3389;
+               goto tr3426;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3388;
+               goto tr3425;
        goto tr75;
-tr3333:
+tr3370:
        {
                s->buffer_length = 0;
        }
-       goto st1090;
-tr3390:
+       goto st1117;
+tr3427:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1090;
-tr3326:
+       goto st1117;
+tr3363:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -87764,11 +88365,11 @@ tr3326:
        {
                s->buffer_length = 0;
        }
-       goto st1090;
-st1090:
+       goto st1117;
+st1117:
        if ( ++p == pe )
-               goto _test_eof1090;
-case 1090:
+               goto _test_eof1117;
+case 1117:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -87788,23 +88389,23 @@ case 1090:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3391;
+               goto tr3428;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3390;
+               goto tr3427;
        goto tr75;
-tr3320:
+tr3357:
        {
                s->buffer_length = 0;
        }
-       goto st1091;
-tr3392:
+       goto st1118;
+tr3429:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1091;
-tr3314:
+       goto st1118;
+tr3351:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -87817,11 +88418,11 @@ tr3314:
        {
                s->buffer_length = 0;
        }
-       goto st1091;
-st1091:
+       goto st1118;
+st1118:
        if ( ++p == pe )
-               goto _test_eof1091;
-case 1091:
+               goto _test_eof1118;
+case 1118:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -87841,26 +88442,26 @@ case 1091:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3393;
+               goto tr3430;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3392;
+               goto tr3429;
        goto tr75;
-tr3307:
+tr3344:
        {
                s->buffer_length = 0;
        }
-       goto st1092;
-tr3394:
+       goto st1119;
+tr3431:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1092;
-st1092:
+       goto st1119;
+st1119:
        if ( ++p == pe )
-               goto _test_eof1092;
-case 1092:
+               goto _test_eof1119;
+case 1119:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -87880,23 +88481,23 @@ case 1092:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3395;
+               goto tr3432;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3394;
+               goto tr3431;
        goto tr75;
-tr3302:
+tr3339:
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3396:
+       goto st1120;
+tr3433:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1093;
-tr3763:
+       goto st1120;
+tr3800:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -87910,299 +88511,299 @@ tr3763:
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3296:
+       goto st1120;
+tr3333:
        { type_num(KNOT_RRTYPE_A, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3404:
+       goto st1120;
+tr3441:
        { type_num(KNOT_RRTYPE_AAAA, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3412:
+       goto st1120;
+tr3449:
        { type_num(KNOT_RRTYPE_AFSDB, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3418:
+       goto st1120;
+tr3455:
        { type_num(KNOT_RRTYPE_APL, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3429:
+       goto st1120;
+tr3466:
        { type_num(KNOT_RRTYPE_CAA, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3440:
+       goto st1120;
+tr3477:
        { type_num(KNOT_RRTYPE_CDNSKEY, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3445:
+       goto st1120;
+tr3482:
        { type_num(KNOT_RRTYPE_CDS, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3452:
+       goto st1120;
+tr3489:
        { type_num(KNOT_RRTYPE_CERT, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3460:
+       goto st1120;
+tr3497:
        { type_num(KNOT_RRTYPE_CNAME, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3468:
+       goto st1120;
+tr3505:
        { type_num(KNOT_RRTYPE_CSYNC, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3479:
+       goto st1120;
+tr3516:
        { type_num(KNOT_RRTYPE_DHCID, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3488:
+       goto st1120;
+tr3525:
        { type_num(KNOT_RRTYPE_DNAME, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3496:
+       goto st1120;
+tr3533:
        { type_num(KNOT_RRTYPE_DNSKEY, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3501:
+       goto st1120;
+tr3538:
        { type_num(KNOT_RRTYPE_DS, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3511:
+       goto st1120;
+tr3548:
        { type_num(KNOT_RRTYPE_EUI48, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3517:
+       goto st1120;
+tr3554:
        { type_num(KNOT_RRTYPE_EUI64, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3527:
+       goto st1120;
+tr3564:
        { type_num(KNOT_RRTYPE_HINFO, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3535:
+       goto st1120;
+tr3572:
        { type_num(KNOT_RRTYPE_HTTPS, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3547:
+       goto st1120;
+tr3584:
        { type_num(KNOT_RRTYPE_IPSECKEY, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3555:
+       goto st1120;
+tr3592:
        { type_num(KNOT_RRTYPE_KEY, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3560:
+       goto st1120;
+tr3597:
        { type_num(KNOT_RRTYPE_KX, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3570:
+       goto st1120;
+tr3607:
        { type_num(KNOT_RRTYPE_L32, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3576:
+       goto st1120;
+tr3613:
        { type_num(KNOT_RRTYPE_L64, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3582:
+       goto st1120;
+tr3619:
        { type_num(KNOT_RRTYPE_LOC, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3587:
+       goto st1120;
+tr3624:
        { type_num(KNOT_RRTYPE_LP, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3597:
+       goto st1120;
+tr3634:
        { type_num(KNOT_RRTYPE_MINFO, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3602:
+       goto st1120;
+tr3639:
        { type_num(KNOT_RRTYPE_MX, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3613:
+       goto st1120;
+tr3650:
        { type_num(KNOT_RRTYPE_NAPTR, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3619:
+       goto st1120;
+tr3656:
        { type_num(KNOT_RRTYPE_NID, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3625:
+       goto st1120;
+tr3662:
        { type_num(KNOT_RRTYPE_NS, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3632:
+       goto st1120;
+tr3669:
        { type_num(KNOT_RRTYPE_NSEC, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3638:
+       goto st1120;
+tr3675:
        { type_num(KNOT_RRTYPE_NSEC3, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3647:
+       goto st1120;
+tr3684:
        { type_num(KNOT_RRTYPE_NSEC3PARAM, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3661:
+       goto st1120;
+tr3698:
        { type_num(KNOT_RRTYPE_OPENPGPKEY, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3668:
+       goto st1120;
+tr3705:
        { type_num(KNOT_RRTYPE_PTR, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3676:
+       goto st1120;
+tr3713:
        { type_num(KNOT_RRTYPE_RP, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3684:
+       goto st1120;
+tr3721:
        { type_num(KNOT_RRTYPE_RRSIG, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3689:
+       goto st1120;
+tr3726:
        { type_num(KNOT_RRTYPE_RT, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3704:
+       goto st1120;
+tr3741:
        { type_num(KNOT_RRTYPE_SMIMEA, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3710:
+       goto st1120;
+tr3747:
        { type_num(KNOT_RRTYPE_SOA, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3716:
+       goto st1120;
+tr3753:
        { type_num(KNOT_RRTYPE_SPF, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3722:
+       goto st1120;
+tr3759:
        { type_num(KNOT_RRTYPE_SRV, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3730:
+       goto st1120;
+tr3767:
        { type_num(KNOT_RRTYPE_SSHFP, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3737:
+       goto st1120;
+tr3774:
        { type_num(KNOT_RRTYPE_SVCB, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3747:
+       goto st1120;
+tr3784:
        { type_num(KNOT_RRTYPE_TLSA, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3753:
+       goto st1120;
+tr3790:
        { type_num(KNOT_RRTYPE_TXT, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3770:
+       goto st1120;
+tr3807:
        { type_num(KNOT_RRTYPE_URI, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-tr3780:
+       goto st1120;
+tr3817:
        { type_num(KNOT_RRTYPE_ZONEMD, &rdata_tail); }
        {
                s->buffer_length = 0;
        }
-       goto st1093;
-st1093:
+       goto st1120;
+st1120:
        if ( ++p == pe )
-               goto _test_eof1093;
-case 1093:
+               goto _test_eof1120;
+case 1120:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -88222,32 +88823,32 @@ case 1093:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3397;
+               goto tr3434;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3396;
+               goto tr3433;
        goto tr75;
-st1094:
+st1121:
        if ( ++p == pe )
-               goto _test_eof1094;
-case 1094:
+               goto _test_eof1121;
+case 1121:
        switch( (*p) ) {
-               case 65: goto st1095;
-               case 97: goto st1095;
+               case 65: goto st1122;
+               case 97: goto st1122;
        }
-       goto tr3271;
-st1095:
+       goto tr3308;
+st1122:
        if ( ++p == pe )
-               goto _test_eof1095;
-case 1095:
+               goto _test_eof1122;
+case 1122:
        switch( (*p) ) {
-               case 65: goto st1096;
-               case 97: goto st1096;
+               case 65: goto st1123;
+               case 97: goto st1123;
        }
-       goto tr3271;
-st1096:
+       goto tr3308;
+st1123:
        if ( ++p == pe )
-               goto _test_eof1096;
-case 1096:
+               goto _test_eof1123;
+case 1123:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88261,45 +88862,45 @@ case 1096:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3400;
-               case 32: goto tr3400;
-               case 40: goto tr3401;
-               case 41: goto tr3402;
-               case 2058: goto tr3403;
-               case 2107: goto tr3404;
+               case 9: goto tr3437;
+               case 32: goto tr3437;
+               case 40: goto tr3438;
+               case 41: goto tr3439;
+               case 2058: goto tr3440;
+               case 2107: goto tr3441;
        }
-       goto tr3271;
-st1097:
+       goto tr3308;
+st1124:
        if ( ++p == pe )
-               goto _test_eof1097;
-case 1097:
+               goto _test_eof1124;
+case 1124:
        switch( (*p) ) {
-               case 83: goto st1098;
-               case 115: goto st1098;
+               case 83: goto st1125;
+               case 115: goto st1125;
        }
-       goto tr3271;
-st1098:
+       goto tr3308;
+st1125:
        if ( ++p == pe )
-               goto _test_eof1098;
-case 1098:
+               goto _test_eof1125;
+case 1125:
        switch( (*p) ) {
-               case 68: goto st1099;
-               case 100: goto st1099;
+               case 68: goto st1126;
+               case 100: goto st1126;
        }
-       goto tr3271;
-st1099:
+       goto tr3308;
+st1126:
        if ( ++p == pe )
-               goto _test_eof1099;
-case 1099:
+               goto _test_eof1126;
+case 1126:
        switch( (*p) ) {
-               case 66: goto st1100;
-               case 98: goto st1100;
+               case 66: goto st1127;
+               case 98: goto st1127;
        }
-       goto tr3271;
-st1100:
+       goto tr3308;
+st1127:
        if ( ++p == pe )
-               goto _test_eof1100;
-case 1100:
+               goto _test_eof1127;
+case 1127:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88313,27 +88914,27 @@ case 1100:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3408;
-               case 32: goto tr3408;
-               case 40: goto tr3409;
-               case 41: goto tr3410;
-               case 2058: goto tr3411;
-               case 2107: goto tr3412;
+               case 9: goto tr3445;
+               case 32: goto tr3445;
+               case 40: goto tr3446;
+               case 41: goto tr3447;
+               case 2058: goto tr3448;
+               case 2107: goto tr3449;
        }
-       goto tr3271;
-st1101:
+       goto tr3308;
+st1128:
        if ( ++p == pe )
-               goto _test_eof1101;
-case 1101:
+               goto _test_eof1128;
+case 1128:
        switch( (*p) ) {
-               case 76: goto st1102;
-               case 108: goto st1102;
+               case 76: goto st1129;
+               case 108: goto st1129;
        }
-       goto tr3271;
-st1102:
+       goto tr3308;
+st1129:
        if ( ++p == pe )
-               goto _test_eof1102;
-case 1102:
+               goto _test_eof1129;
+case 1129:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88347,44 +88948,44 @@ case 1102:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3414;
-               case 32: goto tr3414;
-               case 40: goto tr3415;
-               case 41: goto tr3416;
-               case 2058: goto tr3417;
-               case 2107: goto tr3418;
+               case 9: goto tr3451;
+               case 32: goto tr3451;
+               case 40: goto tr3452;
+               case 41: goto tr3453;
+               case 2058: goto tr3454;
+               case 2107: goto tr3455;
        }
-       goto tr3271;
-st1103:
+       goto tr3308;
+st1130:
        if ( ++p == pe )
-               goto _test_eof1103;
-case 1103:
+               goto _test_eof1130;
+case 1130:
        switch( (*p) ) {
-               case 65: goto st1104;
-               case 68: goto st1106;
-               case 69: goto st1113;
-               case 78: goto st1116;
-               case 83: goto st1120;
-               case 97: goto st1104;
-               case 100: goto st1106;
-               case 101: goto st1113;
-               case 110: goto st1116;
-               case 115: goto st1120;
-       }
-       goto tr3271;
-st1104:
+               case 65: goto st1131;
+               case 68: goto st1133;
+               case 69: goto st1140;
+               case 78: goto st1143;
+               case 83: goto st1147;
+               case 97: goto st1131;
+               case 100: goto st1133;
+               case 101: goto st1140;
+               case 110: goto st1143;
+               case 115: goto st1147;
+       }
+       goto tr3308;
+st1131:
        if ( ++p == pe )
-               goto _test_eof1104;
-case 1104:
+               goto _test_eof1131;
+case 1131:
        switch( (*p) ) {
-               case 65: goto st1105;
-               case 97: goto st1105;
+               case 65: goto st1132;
+               case 97: goto st1132;
        }
-       goto tr3271;
-st1105:
+       goto tr3308;
+st1132:
        if ( ++p == pe )
-               goto _test_eof1105;
-case 1105:
+               goto _test_eof1132;
+case 1132:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88398,65 +88999,65 @@ case 1105:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3425;
-               case 32: goto tr3425;
-               case 40: goto tr3426;
-               case 41: goto tr3427;
-               case 2058: goto tr3428;
-               case 2107: goto tr3429;
+               case 9: goto tr3462;
+               case 32: goto tr3462;
+               case 40: goto tr3463;
+               case 41: goto tr3464;
+               case 2058: goto tr3465;
+               case 2107: goto tr3466;
        }
-       goto tr3271;
-st1106:
+       goto tr3308;
+st1133:
        if ( ++p == pe )
-               goto _test_eof1106;
-case 1106:
+               goto _test_eof1133;
+case 1133:
        switch( (*p) ) {
-               case 78: goto st1107;
-               case 83: goto st1112;
-               case 110: goto st1107;
-               case 115: goto st1112;
+               case 78: goto st1134;
+               case 83: goto st1139;
+               case 110: goto st1134;
+               case 115: goto st1139;
        }
-       goto tr3271;
-st1107:
+       goto tr3308;
+st1134:
        if ( ++p == pe )
-               goto _test_eof1107;
-case 1107:
+               goto _test_eof1134;
+case 1134:
        switch( (*p) ) {
-               case 83: goto st1108;
-               case 115: goto st1108;
+               case 83: goto st1135;
+               case 115: goto st1135;
        }
-       goto tr3271;
-st1108:
+       goto tr3308;
+st1135:
        if ( ++p == pe )
-               goto _test_eof1108;
-case 1108:
+               goto _test_eof1135;
+case 1135:
        switch( (*p) ) {
-               case 75: goto st1109;
-               case 107: goto st1109;
+               case 75: goto st1136;
+               case 107: goto st1136;
        }
-       goto tr3271;
-st1109:
+       goto tr3308;
+st1136:
        if ( ++p == pe )
-               goto _test_eof1109;
-case 1109:
+               goto _test_eof1136;
+case 1136:
        switch( (*p) ) {
-               case 69: goto st1110;
-               case 101: goto st1110;
+               case 69: goto st1137;
+               case 101: goto st1137;
        }
-       goto tr3271;
-st1110:
+       goto tr3308;
+st1137:
        if ( ++p == pe )
-               goto _test_eof1110;
-case 1110:
+               goto _test_eof1137;
+case 1137:
        switch( (*p) ) {
-               case 89: goto st1111;
-               case 121: goto st1111;
+               case 89: goto st1138;
+               case 121: goto st1138;
        }
-       goto tr3271;
-st1111:
+       goto tr3308;
+st1138:
        if ( ++p == pe )
-               goto _test_eof1111;
-case 1111:
+               goto _test_eof1138;
+case 1138:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88470,18 +89071,18 @@ case 1111:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3436;
-               case 32: goto tr3436;
-               case 40: goto tr3437;
-               case 41: goto tr3438;
-               case 2058: goto tr3439;
-               case 2107: goto tr3440;
+               case 9: goto tr3473;
+               case 32: goto tr3473;
+               case 40: goto tr3474;
+               case 41: goto tr3475;
+               case 2058: goto tr3476;
+               case 2107: goto tr3477;
        }
-       goto tr3271;
-st1112:
+       goto tr3308;
+st1139:
        if ( ++p == pe )
-               goto _test_eof1112;
-case 1112:
+               goto _test_eof1139;
+case 1139:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88495,36 +89096,36 @@ case 1112:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3441;
-               case 32: goto tr3441;
-               case 40: goto tr3442;
-               case 41: goto tr3443;
-               case 2058: goto tr3444;
-               case 2107: goto tr3445;
+               case 9: goto tr3478;
+               case 32: goto tr3478;
+               case 40: goto tr3479;
+               case 41: goto tr3480;
+               case 2058: goto tr3481;
+               case 2107: goto tr3482;
        }
-       goto tr3271;
-st1113:
+       goto tr3308;
+st1140:
        if ( ++p == pe )
-               goto _test_eof1113;
-case 1113:
+               goto _test_eof1140;
+case 1140:
        switch( (*p) ) {
-               case 82: goto st1114;
-               case 114: goto st1114;
+               case 82: goto st1141;
+               case 114: goto st1141;
        }
-       goto tr3271;
-st1114:
+       goto tr3308;
+st1141:
        if ( ++p == pe )
-               goto _test_eof1114;
-case 1114:
+               goto _test_eof1141;
+case 1141:
        switch( (*p) ) {
-               case 84: goto st1115;
-               case 116: goto st1115;
+               case 84: goto st1142;
+               case 116: goto st1142;
        }
-       goto tr3271;
-st1115:
+       goto tr3308;
+st1142:
        if ( ++p == pe )
-               goto _test_eof1115;
-case 1115:
+               goto _test_eof1142;
+case 1142:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88538,45 +89139,45 @@ case 1115:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3448;
-               case 32: goto tr3448;
-               case 40: goto tr3449;
-               case 41: goto tr3450;
-               case 2058: goto tr3451;
-               case 2107: goto tr3452;
+               case 9: goto tr3485;
+               case 32: goto tr3485;
+               case 40: goto tr3486;
+               case 41: goto tr3487;
+               case 2058: goto tr3488;
+               case 2107: goto tr3489;
        }
-       goto tr3271;
-st1116:
+       goto tr3308;
+st1143:
        if ( ++p == pe )
-               goto _test_eof1116;
-case 1116:
+               goto _test_eof1143;
+case 1143:
        switch( (*p) ) {
-               case 65: goto st1117;
-               case 97: goto st1117;
+               case 65: goto st1144;
+               case 97: goto st1144;
        }
-       goto tr3271;
-st1117:
+       goto tr3308;
+st1144:
        if ( ++p == pe )
-               goto _test_eof1117;
-case 1117:
+               goto _test_eof1144;
+case 1144:
        switch( (*p) ) {
-               case 77: goto st1118;
-               case 109: goto st1118;
+               case 77: goto st1145;
+               case 109: goto st1145;
        }
-       goto tr3271;
-st1118:
+       goto tr3308;
+st1145:
        if ( ++p == pe )
-               goto _test_eof1118;
-case 1118:
+               goto _test_eof1145;
+case 1145:
        switch( (*p) ) {
-               case 69: goto st1119;
-               case 101: goto st1119;
+               case 69: goto st1146;
+               case 101: goto st1146;
        }
-       goto tr3271;
-st1119:
+       goto tr3308;
+st1146:
        if ( ++p == pe )
-               goto _test_eof1119;
-case 1119:
+               goto _test_eof1146;
+case 1146:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88590,45 +89191,45 @@ case 1119:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3456;
-               case 32: goto tr3456;
-               case 40: goto tr3457;
-               case 41: goto tr3458;
-               case 2058: goto tr3459;
-               case 2107: goto tr3460;
+               case 9: goto tr3493;
+               case 32: goto tr3493;
+               case 40: goto tr3494;
+               case 41: goto tr3495;
+               case 2058: goto tr3496;
+               case 2107: goto tr3497;
        }
-       goto tr3271;
-st1120:
+       goto tr3308;
+st1147:
        if ( ++p == pe )
-               goto _test_eof1120;
-case 1120:
+               goto _test_eof1147;
+case 1147:
        switch( (*p) ) {
-               case 89: goto st1121;
-               case 121: goto st1121;
+               case 89: goto st1148;
+               case 121: goto st1148;
        }
-       goto tr3271;
-st1121:
+       goto tr3308;
+st1148:
        if ( ++p == pe )
-               goto _test_eof1121;
-case 1121:
+               goto _test_eof1148;
+case 1148:
        switch( (*p) ) {
-               case 78: goto st1122;
-               case 110: goto st1122;
+               case 78: goto st1149;
+               case 110: goto st1149;
        }
-       goto tr3271;
-st1122:
+       goto tr3308;
+st1149:
        if ( ++p == pe )
-               goto _test_eof1122;
-case 1122:
+               goto _test_eof1149;
+case 1149:
        switch( (*p) ) {
-               case 67: goto st1123;
-               case 99: goto st1123;
+               case 67: goto st1150;
+               case 99: goto st1150;
        }
-       goto tr3271;
-st1123:
+       goto tr3308;
+st1150:
        if ( ++p == pe )
-               goto _test_eof1123;
-case 1123:
+               goto _test_eof1150;
+case 1150:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88642,58 +89243,58 @@ case 1123:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3464;
-               case 32: goto tr3464;
-               case 40: goto tr3465;
-               case 41: goto tr3466;
-               case 2058: goto tr3467;
-               case 2107: goto tr3468;
+               case 9: goto tr3501;
+               case 32: goto tr3501;
+               case 40: goto tr3502;
+               case 41: goto tr3503;
+               case 2058: goto tr3504;
+               case 2107: goto tr3505;
        }
-       goto tr3271;
-st1124:
+       goto tr3308;
+st1151:
        if ( ++p == pe )
-               goto _test_eof1124;
-case 1124:
+               goto _test_eof1151;
+case 1151:
        switch( (*p) ) {
-               case 72: goto st1125;
-               case 78: goto st1129;
-               case 83: goto st1137;
-               case 104: goto st1125;
-               case 110: goto st1129;
-               case 115: goto st1137;
+               case 72: goto st1152;
+               case 78: goto st1156;
+               case 83: goto st1164;
+               case 104: goto st1152;
+               case 110: goto st1156;
+               case 115: goto st1164;
        }
-       goto tr3271;
-st1125:
+       goto tr3308;
+st1152:
        if ( ++p == pe )
-               goto _test_eof1125;
-case 1125:
+               goto _test_eof1152;
+case 1152:
        switch( (*p) ) {
-               case 67: goto st1126;
-               case 99: goto st1126;
+               case 67: goto st1153;
+               case 99: goto st1153;
        }
-       goto tr3271;
-st1126:
+       goto tr3308;
+st1153:
        if ( ++p == pe )
-               goto _test_eof1126;
-case 1126:
+               goto _test_eof1153;
+case 1153:
        switch( (*p) ) {
-               case 73: goto st1127;
-               case 105: goto st1127;
+               case 73: goto st1154;
+               case 105: goto st1154;
        }
-       goto tr3271;
-st1127:
+       goto tr3308;
+st1154:
        if ( ++p == pe )
-               goto _test_eof1127;
-case 1127:
+               goto _test_eof1154;
+case 1154:
        switch( (*p) ) {
-               case 68: goto st1128;
-               case 100: goto st1128;
+               case 68: goto st1155;
+               case 100: goto st1155;
        }
-       goto tr3271;
-st1128:
+       goto tr3308;
+st1155:
        if ( ++p == pe )
-               goto _test_eof1128;
-case 1128:
+               goto _test_eof1155;
+case 1155:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88707,47 +89308,47 @@ case 1128:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3475;
-               case 32: goto tr3475;
-               case 40: goto tr3476;
-               case 41: goto tr3477;
-               case 2058: goto tr3478;
-               case 2107: goto tr3479;
+               case 9: goto tr3512;
+               case 32: goto tr3512;
+               case 40: goto tr3513;
+               case 41: goto tr3514;
+               case 2058: goto tr3515;
+               case 2107: goto tr3516;
        }
-       goto tr3271;
-st1129:
+       goto tr3308;
+st1156:
        if ( ++p == pe )
-               goto _test_eof1129;
-case 1129:
+               goto _test_eof1156;
+case 1156:
        switch( (*p) ) {
-               case 65: goto st1130;
-               case 83: goto st1133;
-               case 97: goto st1130;
-               case 115: goto st1133;
+               case 65: goto st1157;
+               case 83: goto st1160;
+               case 97: goto st1157;
+               case 115: goto st1160;
        }
-       goto tr3271;
-st1130:
+       goto tr3308;
+st1157:
        if ( ++p == pe )
-               goto _test_eof1130;
-case 1130:
+               goto _test_eof1157;
+case 1157:
        switch( (*p) ) {
-               case 77: goto st1131;
-               case 109: goto st1131;
+               case 77: goto st1158;
+               case 109: goto st1158;
        }
-       goto tr3271;
-st1131:
-       if ( ++p == pe )
-               goto _test_eof1131;
-case 1131:
+       goto tr3308;
+st1158:
+       if ( ++p == pe )
+               goto _test_eof1158;
+case 1158:
        switch( (*p) ) {
-               case 69: goto st1132;
-               case 101: goto st1132;
+               case 69: goto st1159;
+               case 101: goto st1159;
        }
-       goto tr3271;
-st1132:
+       goto tr3308;
+st1159:
        if ( ++p == pe )
-               goto _test_eof1132;
-case 1132:
+               goto _test_eof1159;
+case 1159:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88761,45 +89362,45 @@ case 1132:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3484;
-               case 32: goto tr3484;
-               case 40: goto tr3485;
-               case 41: goto tr3486;
-               case 2058: goto tr3487;
-               case 2107: goto tr3488;
+               case 9: goto tr3521;
+               case 32: goto tr3521;
+               case 40: goto tr3522;
+               case 41: goto tr3523;
+               case 2058: goto tr3524;
+               case 2107: goto tr3525;
        }
-       goto tr3271;
-st1133:
+       goto tr3308;
+st1160:
        if ( ++p == pe )
-               goto _test_eof1133;
-case 1133:
+               goto _test_eof1160;
+case 1160:
        switch( (*p) ) {
-               case 75: goto st1134;
-               case 107: goto st1134;
+               case 75: goto st1161;
+               case 107: goto st1161;
        }
-       goto tr3271;
-st1134:
+       goto tr3308;
+st1161:
        if ( ++p == pe )
-               goto _test_eof1134;
-case 1134:
+               goto _test_eof1161;
+case 1161:
        switch( (*p) ) {
-               case 69: goto st1135;
-               case 101: goto st1135;
+               case 69: goto st1162;
+               case 101: goto st1162;
        }
-       goto tr3271;
-st1135:
+       goto tr3308;
+st1162:
        if ( ++p == pe )
-               goto _test_eof1135;
-case 1135:
+               goto _test_eof1162;
+case 1162:
        switch( (*p) ) {
-               case 89: goto st1136;
-               case 121: goto st1136;
+               case 89: goto st1163;
+               case 121: goto st1163;
        }
-       goto tr3271;
-st1136:
+       goto tr3308;
+st1163:
        if ( ++p == pe )
-               goto _test_eof1136;
-case 1136:
+               goto _test_eof1163;
+case 1163:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88813,18 +89414,18 @@ case 1136:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3492;
-               case 32: goto tr3492;
-               case 40: goto tr3493;
-               case 41: goto tr3494;
-               case 2058: goto tr3495;
-               case 2107: goto tr3496;
+               case 9: goto tr3529;
+               case 32: goto tr3529;
+               case 40: goto tr3530;
+               case 41: goto tr3531;
+               case 2058: goto tr3532;
+               case 2107: goto tr3533;
        }
-       goto tr3271;
-st1137:
+       goto tr3308;
+st1164:
        if ( ++p == pe )
-               goto _test_eof1137;
-case 1137:
+               goto _test_eof1164;
+case 1164:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88838,52 +89439,52 @@ case 1137:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3497;
-               case 32: goto tr3497;
-               case 40: goto tr3498;
-               case 41: goto tr3499;
-               case 2058: goto tr3500;
-               case 2107: goto tr3501;
+               case 9: goto tr3534;
+               case 32: goto tr3534;
+               case 40: goto tr3535;
+               case 41: goto tr3536;
+               case 2058: goto tr3537;
+               case 2107: goto tr3538;
        }
-       goto tr3271;
-st1138:
+       goto tr3308;
+st1165:
        if ( ++p == pe )
-               goto _test_eof1138;
-case 1138:
+               goto _test_eof1165;
+case 1165:
        switch( (*p) ) {
-               case 85: goto st1139;
-               case 117: goto st1139;
+               case 85: goto st1166;
+               case 117: goto st1166;
        }
-       goto tr3271;
-st1139:
+       goto tr3308;
+st1166:
        if ( ++p == pe )
-               goto _test_eof1139;
-case 1139:
+               goto _test_eof1166;
+case 1166:
        switch( (*p) ) {
-               case 73: goto st1140;
-               case 105: goto st1140;
+               case 73: goto st1167;
+               case 105: goto st1167;
        }
-       goto tr3271;
-st1140:
+       goto tr3308;
+st1167:
        if ( ++p == pe )
-               goto _test_eof1140;
-case 1140:
+               goto _test_eof1167;
+case 1167:
        switch( (*p) ) {
-               case 52: goto st1141;
-               case 54: goto st1143;
+               case 52: goto st1168;
+               case 54: goto st1170;
        }
-       goto tr3271;
-st1141:
+       goto tr3308;
+st1168:
        if ( ++p == pe )
-               goto _test_eof1141;
-case 1141:
+               goto _test_eof1168;
+case 1168:
        if ( (*p) == 56 )
-               goto st1142;
-       goto tr3271;
-st1142:
+               goto st1169;
+       goto tr3308;
+st1169:
        if ( ++p == pe )
-               goto _test_eof1142;
-case 1142:
+               goto _test_eof1169;
+case 1169:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88897,25 +89498,25 @@ case 1142:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3507;
-               case 32: goto tr3507;
-               case 40: goto tr3508;
-               case 41: goto tr3509;
-               case 2058: goto tr3510;
-               case 2107: goto tr3511;
+               case 9: goto tr3544;
+               case 32: goto tr3544;
+               case 40: goto tr3545;
+               case 41: goto tr3546;
+               case 2058: goto tr3547;
+               case 2107: goto tr3548;
        }
-       goto tr3271;
-st1143:
+       goto tr3308;
+st1170:
        if ( ++p == pe )
-               goto _test_eof1143;
-case 1143:
+               goto _test_eof1170;
+case 1170:
        if ( (*p) == 52 )
-               goto st1144;
-       goto tr3271;
-st1144:
+               goto st1171;
+       goto tr3308;
+st1171:
        if ( ++p == pe )
-               goto _test_eof1144;
-case 1144:
+               goto _test_eof1171;
+case 1171:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88929,56 +89530,56 @@ case 1144:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3513;
-               case 32: goto tr3513;
-               case 40: goto tr3514;
-               case 41: goto tr3515;
-               case 2058: goto tr3516;
-               case 2107: goto tr3517;
+               case 9: goto tr3550;
+               case 32: goto tr3550;
+               case 40: goto tr3551;
+               case 41: goto tr3552;
+               case 2058: goto tr3553;
+               case 2107: goto tr3554;
        }
-       goto tr3271;
-st1145:
+       goto tr3308;
+st1172:
        if ( ++p == pe )
-               goto _test_eof1145;
-case 1145:
+               goto _test_eof1172;
+case 1172:
        switch( (*p) ) {
-               case 73: goto st1146;
-               case 84: goto st1150;
-               case 105: goto st1146;
-               case 116: goto st1150;
+               case 73: goto st1173;
+               case 84: goto st1177;
+               case 105: goto st1173;
+               case 116: goto st1177;
        }
-       goto tr3271;
-st1146:
+       goto tr3308;
+st1173:
        if ( ++p == pe )
-               goto _test_eof1146;
-case 1146:
+               goto _test_eof1173;
+case 1173:
        switch( (*p) ) {
-               case 78: goto st1147;
-               case 110: goto st1147;
+               case 78: goto st1174;
+               case 110: goto st1174;
        }
-       goto tr3271;
-st1147:
+       goto tr3308;
+st1174:
        if ( ++p == pe )
-               goto _test_eof1147;
-case 1147:
+               goto _test_eof1174;
+case 1174:
        switch( (*p) ) {
-               case 70: goto st1148;
-               case 102: goto st1148;
+               case 70: goto st1175;
+               case 102: goto st1175;
        }
-       goto tr3271;
-st1148:
+       goto tr3308;
+st1175:
        if ( ++p == pe )
-               goto _test_eof1148;
-case 1148:
+               goto _test_eof1175;
+case 1175:
        switch( (*p) ) {
-               case 79: goto st1149;
-               case 111: goto st1149;
+               case 79: goto st1176;
+               case 111: goto st1176;
        }
-       goto tr3271;
-st1149:
+       goto tr3308;
+st1176:
        if ( ++p == pe )
-               goto _test_eof1149;
-case 1149:
+               goto _test_eof1176;
+case 1176:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -88992,45 +89593,45 @@ case 1149:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3523;
-               case 32: goto tr3523;
-               case 40: goto tr3524;
-               case 41: goto tr3525;
-               case 2058: goto tr3526;
-               case 2107: goto tr3527;
+               case 9: goto tr3560;
+               case 32: goto tr3560;
+               case 40: goto tr3561;
+               case 41: goto tr3562;
+               case 2058: goto tr3563;
+               case 2107: goto tr3564;
        }
-       goto tr3271;
-st1150:
+       goto tr3308;
+st1177:
        if ( ++p == pe )
-               goto _test_eof1150;
-case 1150:
+               goto _test_eof1177;
+case 1177:
        switch( (*p) ) {
-               case 84: goto st1151;
-               case 116: goto st1151;
+               case 84: goto st1178;
+               case 116: goto st1178;
        }
-       goto tr3271;
-st1151:
+       goto tr3308;
+st1178:
        if ( ++p == pe )
-               goto _test_eof1151;
-case 1151:
+               goto _test_eof1178;
+case 1178:
        switch( (*p) ) {
-               case 80: goto st1152;
-               case 112: goto st1152;
+               case 80: goto st1179;
+               case 112: goto st1179;
        }
-       goto tr3271;
-st1152:
+       goto tr3308;
+st1179:
        if ( ++p == pe )
-               goto _test_eof1152;
-case 1152:
+               goto _test_eof1179;
+case 1179:
        switch( (*p) ) {
-               case 83: goto st1153;
-               case 115: goto st1153;
+               case 83: goto st1180;
+               case 115: goto st1180;
        }
-       goto tr3271;
-st1153:
+       goto tr3308;
+st1180:
        if ( ++p == pe )
-               goto _test_eof1153;
-case 1153:
+               goto _test_eof1180;
+case 1180:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89044,81 +89645,81 @@ case 1153:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3531;
-               case 32: goto tr3531;
-               case 40: goto tr3532;
-               case 41: goto tr3533;
-               case 2058: goto tr3534;
-               case 2107: goto tr3535;
+               case 9: goto tr3568;
+               case 32: goto tr3568;
+               case 40: goto tr3569;
+               case 41: goto tr3570;
+               case 2058: goto tr3571;
+               case 2107: goto tr3572;
        }
-       goto tr3271;
-st1154:
+       goto tr3308;
+st1181:
        if ( ++p == pe )
-               goto _test_eof1154;
-case 1154:
+               goto _test_eof1181;
+case 1181:
        switch( (*p) ) {
-               case 80: goto st1155;
-               case 112: goto st1155;
+               case 80: goto st1182;
+               case 112: goto st1182;
        }
-       goto tr3271;
-st1155:
+       goto tr3308;
+st1182:
        if ( ++p == pe )
-               goto _test_eof1155;
-case 1155:
+               goto _test_eof1182;
+case 1182:
        switch( (*p) ) {
-               case 83: goto st1156;
-               case 115: goto st1156;
+               case 83: goto st1183;
+               case 115: goto st1183;
        }
-       goto tr3271;
-st1156:
+       goto tr3308;
+st1183:
        if ( ++p == pe )
-               goto _test_eof1156;
-case 1156:
+               goto _test_eof1183;
+case 1183:
        switch( (*p) ) {
-               case 69: goto st1157;
-               case 101: goto st1157;
+               case 69: goto st1184;
+               case 101: goto st1184;
        }
-       goto tr3271;
-st1157:
+       goto tr3308;
+st1184:
        if ( ++p == pe )
-               goto _test_eof1157;
-case 1157:
+               goto _test_eof1184;
+case 1184:
        switch( (*p) ) {
-               case 67: goto st1158;
-               case 99: goto st1158;
+               case 67: goto st1185;
+               case 99: goto st1185;
        }
-       goto tr3271;
-st1158:
+       goto tr3308;
+st1185:
        if ( ++p == pe )
-               goto _test_eof1158;
-case 1158:
+               goto _test_eof1185;
+case 1185:
        switch( (*p) ) {
-               case 75: goto st1159;
-               case 107: goto st1159;
+               case 75: goto st1186;
+               case 107: goto st1186;
        }
-       goto tr3271;
-st1159:
+       goto tr3308;
+st1186:
        if ( ++p == pe )
-               goto _test_eof1159;
-case 1159:
+               goto _test_eof1186;
+case 1186:
        switch( (*p) ) {
-               case 69: goto st1160;
-               case 101: goto st1160;
+               case 69: goto st1187;
+               case 101: goto st1187;
        }
-       goto tr3271;
-st1160:
+       goto tr3308;
+st1187:
        if ( ++p == pe )
-               goto _test_eof1160;
-case 1160:
+               goto _test_eof1187;
+case 1187:
        switch( (*p) ) {
-               case 89: goto st1161;
-               case 121: goto st1161;
+               case 89: goto st1188;
+               case 121: goto st1188;
        }
-       goto tr3271;
-st1161:
+       goto tr3308;
+st1188:
        if ( ++p == pe )
-               goto _test_eof1161;
-case 1161:
+               goto _test_eof1188;
+case 1188:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89132,38 +89733,38 @@ case 1161:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3543;
-               case 32: goto tr3543;
-               case 40: goto tr3544;
-               case 41: goto tr3545;
-               case 2058: goto tr3546;
-               case 2107: goto tr3547;
+               case 9: goto tr3580;
+               case 32: goto tr3580;
+               case 40: goto tr3581;
+               case 41: goto tr3582;
+               case 2058: goto tr3583;
+               case 2107: goto tr3584;
        }
-       goto tr3271;
-st1162:
+       goto tr3308;
+st1189:
        if ( ++p == pe )
-               goto _test_eof1162;
-case 1162:
+               goto _test_eof1189;
+case 1189:
        switch( (*p) ) {
-               case 69: goto st1163;
-               case 88: goto st1165;
-               case 101: goto st1163;
-               case 120: goto st1165;
+               case 69: goto st1190;
+               case 88: goto st1192;
+               case 101: goto st1190;
+               case 120: goto st1192;
        }
-       goto tr3271;
-st1163:
+       goto tr3308;
+st1190:
        if ( ++p == pe )
-               goto _test_eof1163;
-case 1163:
+               goto _test_eof1190;
+case 1190:
        switch( (*p) ) {
-               case 89: goto st1164;
-               case 121: goto st1164;
+               case 89: goto st1191;
+               case 121: goto st1191;
        }
-       goto tr3271;
-st1164:
+       goto tr3308;
+st1191:
        if ( ++p == pe )
-               goto _test_eof1164;
-case 1164:
+               goto _test_eof1191;
+case 1191:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89177,18 +89778,18 @@ case 1164:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3551;
-               case 32: goto tr3551;
-               case 40: goto tr3552;
-               case 41: goto tr3553;
-               case 2058: goto tr3554;
-               case 2107: goto tr3555;
+               case 9: goto tr3588;
+               case 32: goto tr3588;
+               case 40: goto tr3589;
+               case 41: goto tr3590;
+               case 2058: goto tr3591;
+               case 2107: goto tr3592;
        }
-       goto tr3271;
-st1165:
+       goto tr3308;
+st1192:
        if ( ++p == pe )
-               goto _test_eof1165;
-case 1165:
+               goto _test_eof1192;
+case 1192:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89202,38 +89803,38 @@ case 1165:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3556;
-               case 32: goto tr3556;
-               case 40: goto tr3557;
-               case 41: goto tr3558;
-               case 2058: goto tr3559;
-               case 2107: goto tr3560;
+               case 9: goto tr3593;
+               case 32: goto tr3593;
+               case 40: goto tr3594;
+               case 41: goto tr3595;
+               case 2058: goto tr3596;
+               case 2107: goto tr3597;
        }
-       goto tr3271;
-st1166:
+       goto tr3308;
+st1193:
        if ( ++p == pe )
-               goto _test_eof1166;
-case 1166:
+               goto _test_eof1193;
+case 1193:
        switch( (*p) ) {
-               case 51: goto st1167;
-               case 54: goto st1169;
-               case 79: goto st1171;
-               case 80: goto st1173;
-               case 111: goto st1171;
-               case 112: goto st1173;
+               case 51: goto st1194;
+               case 54: goto st1196;
+               case 79: goto st1198;
+               case 80: goto st1200;
+               case 111: goto st1198;
+               case 112: goto st1200;
        }
-       goto tr3271;
-st1167:
+       goto tr3308;
+st1194:
        if ( ++p == pe )
-               goto _test_eof1167;
-case 1167:
+               goto _test_eof1194;
+case 1194:
        if ( (*p) == 50 )
-               goto st1168;
-       goto tr3271;
-st1168:
+               goto st1195;
+       goto tr3308;
+st1195:
        if ( ++p == pe )
-               goto _test_eof1168;
-case 1168:
+               goto _test_eof1195;
+case 1195:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89247,25 +89848,25 @@ case 1168:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3566;
-               case 32: goto tr3566;
-               case 40: goto tr3567;
-               case 41: goto tr3568;
-               case 2058: goto tr3569;
-               case 2107: goto tr3570;
+               case 9: goto tr3603;
+               case 32: goto tr3603;
+               case 40: goto tr3604;
+               case 41: goto tr3605;
+               case 2058: goto tr3606;
+               case 2107: goto tr3607;
        }
-       goto tr3271;
-st1169:
+       goto tr3308;
+st1196:
        if ( ++p == pe )
-               goto _test_eof1169;
-case 1169:
+               goto _test_eof1196;
+case 1196:
        if ( (*p) == 52 )
-               goto st1170;
-       goto tr3271;
-st1170:
+               goto st1197;
+       goto tr3308;
+st1197:
        if ( ++p == pe )
-               goto _test_eof1170;
-case 1170:
+               goto _test_eof1197;
+case 1197:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89279,27 +89880,27 @@ case 1170:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3572;
-               case 32: goto tr3572;
-               case 40: goto tr3573;
-               case 41: goto tr3574;
-               case 2058: goto tr3575;
-               case 2107: goto tr3576;
+               case 9: goto tr3609;
+               case 32: goto tr3609;
+               case 40: goto tr3610;
+               case 41: goto tr3611;
+               case 2058: goto tr3612;
+               case 2107: goto tr3613;
        }
-       goto tr3271;
-st1171:
+       goto tr3308;
+st1198:
        if ( ++p == pe )
-               goto _test_eof1171;
-case 1171:
+               goto _test_eof1198;
+case 1198:
        switch( (*p) ) {
-               case 67: goto st1172;
-               case 99: goto st1172;
+               case 67: goto st1199;
+               case 99: goto st1199;
        }
-       goto tr3271;
-st1172:
+       goto tr3308;
+st1199:
        if ( ++p == pe )
-               goto _test_eof1172;
-case 1172:
+               goto _test_eof1199;
+case 1199:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89313,18 +89914,18 @@ case 1172:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3578;
-               case 32: goto tr3578;
-               case 40: goto tr3579;
-               case 41: goto tr3580;
-               case 2058: goto tr3581;
-               case 2107: goto tr3582;
+               case 9: goto tr3615;
+               case 32: goto tr3615;
+               case 40: goto tr3616;
+               case 41: goto tr3617;
+               case 2058: goto tr3618;
+               case 2107: goto tr3619;
        }
-       goto tr3271;
-st1173:
+       goto tr3308;
+st1200:
        if ( ++p == pe )
-               goto _test_eof1173;
-case 1173:
+               goto _test_eof1200;
+case 1200:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89338,56 +89939,56 @@ case 1173:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3583;
-               case 32: goto tr3583;
-               case 40: goto tr3584;
-               case 41: goto tr3585;
-               case 2058: goto tr3586;
-               case 2107: goto tr3587;
+               case 9: goto tr3620;
+               case 32: goto tr3620;
+               case 40: goto tr3621;
+               case 41: goto tr3622;
+               case 2058: goto tr3623;
+               case 2107: goto tr3624;
        }
-       goto tr3271;
-st1174:
+       goto tr3308;
+st1201:
        if ( ++p == pe )
-               goto _test_eof1174;
-case 1174:
+               goto _test_eof1201;
+case 1201:
        switch( (*p) ) {
-               case 73: goto st1175;
-               case 88: goto st1179;
-               case 105: goto st1175;
-               case 120: goto st1179;
+               case 73: goto st1202;
+               case 88: goto st1206;
+               case 105: goto st1202;
+               case 120: goto st1206;
        }
-       goto tr3271;
-st1175:
+       goto tr3308;
+st1202:
        if ( ++p == pe )
-               goto _test_eof1175;
-case 1175:
+               goto _test_eof1202;
+case 1202:
        switch( (*p) ) {
-               case 78: goto st1176;
-               case 110: goto st1176;
+               case 78: goto st1203;
+               case 110: goto st1203;
        }
-       goto tr3271;
-st1176:
+       goto tr3308;
+st1203:
        if ( ++p == pe )
-               goto _test_eof1176;
-case 1176:
+               goto _test_eof1203;
+case 1203:
        switch( (*p) ) {
-               case 70: goto st1177;
-               case 102: goto st1177;
+               case 70: goto st1204;
+               case 102: goto st1204;
        }
-       goto tr3271;
-st1177:
+       goto tr3308;
+st1204:
        if ( ++p == pe )
-               goto _test_eof1177;
-case 1177:
+               goto _test_eof1204;
+case 1204:
        switch( (*p) ) {
-               case 79: goto st1178;
-               case 111: goto st1178;
+               case 79: goto st1205;
+               case 111: goto st1205;
        }
-       goto tr3271;
-st1178:
+       goto tr3308;
+st1205:
        if ( ++p == pe )
-               goto _test_eof1178;
-case 1178:
+               goto _test_eof1205;
+case 1205:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89401,18 +90002,18 @@ case 1178:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3593;
-               case 32: goto tr3593;
-               case 40: goto tr3594;
-               case 41: goto tr3595;
-               case 2058: goto tr3596;
-               case 2107: goto tr3597;
+               case 9: goto tr3630;
+               case 32: goto tr3630;
+               case 40: goto tr3631;
+               case 41: goto tr3632;
+               case 2058: goto tr3633;
+               case 2107: goto tr3634;
        }
-       goto tr3271;
-st1179:
+       goto tr3308;
+st1206:
        if ( ++p == pe )
-               goto _test_eof1179;
-case 1179:
+               goto _test_eof1206;
+case 1206:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89426,58 +90027,58 @@ case 1179:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3598;
-               case 32: goto tr3598;
-               case 40: goto tr3599;
-               case 41: goto tr3600;
-               case 2058: goto tr3601;
-               case 2107: goto tr3602;
+               case 9: goto tr3635;
+               case 32: goto tr3635;
+               case 40: goto tr3636;
+               case 41: goto tr3637;
+               case 2058: goto tr3638;
+               case 2107: goto tr3639;
        }
-       goto tr3271;
-st1180:
+       goto tr3308;
+st1207:
        if ( ++p == pe )
-               goto _test_eof1180;
-case 1180:
+               goto _test_eof1207;
+case 1207:
        switch( (*p) ) {
-               case 65: goto st1181;
-               case 73: goto st1185;
-               case 83: goto st1187;
-               case 97: goto st1181;
-               case 105: goto st1185;
-               case 115: goto st1187;
+               case 65: goto st1208;
+               case 73: goto st1212;
+               case 83: goto st1214;
+               case 97: goto st1208;
+               case 105: goto st1212;
+               case 115: goto st1214;
        }
-       goto tr3271;
-st1181:
+       goto tr3308;
+st1208:
        if ( ++p == pe )
-               goto _test_eof1181;
-case 1181:
+               goto _test_eof1208;
+case 1208:
        switch( (*p) ) {
-               case 80: goto st1182;
-               case 112: goto st1182;
+               case 80: goto st1209;
+               case 112: goto st1209;
        }
-       goto tr3271;
-st1182:
+       goto tr3308;
+st1209:
        if ( ++p == pe )
-               goto _test_eof1182;
-case 1182:
+               goto _test_eof1209;
+case 1209:
        switch( (*p) ) {
-               case 84: goto st1183;
-               case 116: goto st1183;
+               case 84: goto st1210;
+               case 116: goto st1210;
        }
-       goto tr3271;
-st1183:
+       goto tr3308;
+st1210:
        if ( ++p == pe )
-               goto _test_eof1183;
-case 1183:
+               goto _test_eof1210;
+case 1210:
        switch( (*p) ) {
-               case 82: goto st1184;
-               case 114: goto st1184;
+               case 82: goto st1211;
+               case 114: goto st1211;
        }
-       goto tr3271;
-st1184:
+       goto tr3308;
+st1211:
        if ( ++p == pe )
-               goto _test_eof1184;
-case 1184:
+               goto _test_eof1211;
+case 1211:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89491,27 +90092,27 @@ case 1184:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3609;
-               case 32: goto tr3609;
-               case 40: goto tr3610;
-               case 41: goto tr3611;
-               case 2058: goto tr3612;
-               case 2107: goto tr3613;
+               case 9: goto tr3646;
+               case 32: goto tr3646;
+               case 40: goto tr3647;
+               case 41: goto tr3648;
+               case 2058: goto tr3649;
+               case 2107: goto tr3650;
        }
-       goto tr3271;
-st1185:
+       goto tr3308;
+st1212:
        if ( ++p == pe )
-               goto _test_eof1185;
-case 1185:
+               goto _test_eof1212;
+case 1212:
        switch( (*p) ) {
-               case 68: goto st1186;
-               case 100: goto st1186;
+               case 68: goto st1213;
+               case 100: goto st1213;
        }
-       goto tr3271;
-st1186:
+       goto tr3308;
+st1213:
        if ( ++p == pe )
-               goto _test_eof1186;
-case 1186:
+               goto _test_eof1213;
+case 1213:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89525,18 +90126,18 @@ case 1186:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3615;
-               case 32: goto tr3615;
-               case 40: goto tr3616;
-               case 41: goto tr3617;
-               case 2058: goto tr3618;
-               case 2107: goto tr3619;
+               case 9: goto tr3652;
+               case 32: goto tr3652;
+               case 40: goto tr3653;
+               case 41: goto tr3654;
+               case 2058: goto tr3655;
+               case 2107: goto tr3656;
        }
-       goto tr3271;
-st1187:
+       goto tr3308;
+st1214:
        if ( ++p == pe )
-               goto _test_eof1187;
-case 1187:
+               goto _test_eof1214;
+case 1214:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89550,29 +90151,29 @@ case 1187:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3620;
-               case 32: goto tr3620;
-               case 40: goto tr3621;
-               case 41: goto tr3622;
-               case 69: goto st1188;
-               case 101: goto st1188;
-               case 2058: goto tr3624;
-               case 2107: goto tr3625;
+               case 9: goto tr3657;
+               case 32: goto tr3657;
+               case 40: goto tr3658;
+               case 41: goto tr3659;
+               case 69: goto st1215;
+               case 101: goto st1215;
+               case 2058: goto tr3661;
+               case 2107: goto tr3662;
        }
-       goto tr3271;
-st1188:
+       goto tr3308;
+st1215:
        if ( ++p == pe )
-               goto _test_eof1188;
-case 1188:
+               goto _test_eof1215;
+case 1215:
        switch( (*p) ) {
-               case 67: goto st1189;
-               case 99: goto st1189;
+               case 67: goto st1216;
+               case 99: goto st1216;
        }
-       goto tr3271;
-st1189:
+       goto tr3308;
+st1216:
        if ( ++p == pe )
-               goto _test_eof1189;
-case 1189:
+               goto _test_eof1216;
+case 1216:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89586,19 +90187,19 @@ case 1189:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3627;
-               case 32: goto tr3627;
-               case 40: goto tr3628;
-               case 41: goto tr3629;
-               case 51: goto st1190;
-               case 2058: goto tr3631;
-               case 2107: goto tr3632;
+               case 9: goto tr3664;
+               case 32: goto tr3664;
+               case 40: goto tr3665;
+               case 41: goto tr3666;
+               case 51: goto st1217;
+               case 2058: goto tr3668;
+               case 2107: goto tr3669;
        }
-       goto tr3271;
-st1190:
+       goto tr3308;
+st1217:
        if ( ++p == pe )
-               goto _test_eof1190;
-case 1190:
+               goto _test_eof1217;
+case 1217:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89612,56 +90213,56 @@ case 1190:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3633;
-               case 32: goto tr3633;
-               case 40: goto tr3634;
-               case 41: goto tr3635;
-               case 80: goto st1191;
-               case 112: goto st1191;
-               case 2058: goto tr3637;
-               case 2107: goto tr3638;
+               case 9: goto tr3670;
+               case 32: goto tr3670;
+               case 40: goto tr3671;
+               case 41: goto tr3672;
+               case 80: goto st1218;
+               case 112: goto st1218;
+               case 2058: goto tr3674;
+               case 2107: goto tr3675;
        }
-       goto tr3271;
-st1191:
+       goto tr3308;
+st1218:
        if ( ++p == pe )
-               goto _test_eof1191;
-case 1191:
+               goto _test_eof1218;
+case 1218:
        switch( (*p) ) {
-               case 65: goto st1192;
-               case 97: goto st1192;
+               case 65: goto st1219;
+               case 97: goto st1219;
        }
-       goto tr3271;
-st1192:
+       goto tr3308;
+st1219:
        if ( ++p == pe )
-               goto _test_eof1192;
-case 1192:
+               goto _test_eof1219;
+case 1219:
        switch( (*p) ) {
-               case 82: goto st1193;
-               case 114: goto st1193;
+               case 82: goto st1220;
+               case 114: goto st1220;
        }
-       goto tr3271;
-st1193:
+       goto tr3308;
+st1220:
        if ( ++p == pe )
-               goto _test_eof1193;
-case 1193:
+               goto _test_eof1220;
+case 1220:
        switch( (*p) ) {
-               case 65: goto st1194;
-               case 97: goto st1194;
+               case 65: goto st1221;
+               case 97: goto st1221;
        }
-       goto tr3271;
-st1194:
+       goto tr3308;
+st1221:
        if ( ++p == pe )
-               goto _test_eof1194;
-case 1194:
+               goto _test_eof1221;
+case 1221:
        switch( (*p) ) {
-               case 77: goto st1195;
-               case 109: goto st1195;
+               case 77: goto st1222;
+               case 109: goto st1222;
        }
-       goto tr3271;
-st1195:
+       goto tr3308;
+st1222:
        if ( ++p == pe )
-               goto _test_eof1195;
-case 1195:
+               goto _test_eof1222;
+case 1222:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89675,99 +90276,99 @@ case 1195:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3643;
-               case 32: goto tr3643;
-               case 40: goto tr3644;
-               case 41: goto tr3645;
-               case 2058: goto tr3646;
-               case 2107: goto tr3647;
+               case 9: goto tr3680;
+               case 32: goto tr3680;
+               case 40: goto tr3681;
+               case 41: goto tr3682;
+               case 2058: goto tr3683;
+               case 2107: goto tr3684;
        }
-       goto tr3271;
-st1196:
+       goto tr3308;
+st1223:
        if ( ++p == pe )
-               goto _test_eof1196;
-case 1196:
+               goto _test_eof1223;
+case 1223:
        switch( (*p) ) {
-               case 80: goto st1197;
-               case 112: goto st1197;
+               case 80: goto st1224;
+               case 112: goto st1224;
        }
-       goto tr3271;
-st1197:
+       goto tr3308;
+st1224:
        if ( ++p == pe )
-               goto _test_eof1197;
-case 1197:
+               goto _test_eof1224;
+case 1224:
        switch( (*p) ) {
-               case 69: goto st1198;
-               case 101: goto st1198;
+               case 69: goto st1225;
+               case 101: goto st1225;
        }
-       goto tr3271;
-st1198:
+       goto tr3308;
+st1225:
        if ( ++p == pe )
-               goto _test_eof1198;
-case 1198:
+               goto _test_eof1225;
+case 1225:
        switch( (*p) ) {
-               case 78: goto st1199;
-               case 110: goto st1199;
+               case 78: goto st1226;
+               case 110: goto st1226;
        }
-       goto tr3271;
-st1199:
+       goto tr3308;
+st1226:
        if ( ++p == pe )
-               goto _test_eof1199;
-case 1199:
+               goto _test_eof1226;
+case 1226:
        switch( (*p) ) {
-               case 80: goto st1200;
-               case 112: goto st1200;
+               case 80: goto st1227;
+               case 112: goto st1227;
        }
-       goto tr3271;
-st1200:
+       goto tr3308;
+st1227:
        if ( ++p == pe )
-               goto _test_eof1200;
-case 1200:
+               goto _test_eof1227;
+case 1227:
        switch( (*p) ) {
-               case 71: goto st1201;
-               case 103: goto st1201;
+               case 71: goto st1228;
+               case 103: goto st1228;
        }
-       goto tr3271;
-st1201:
+       goto tr3308;
+st1228:
        if ( ++p == pe )
-               goto _test_eof1201;
-case 1201:
+               goto _test_eof1228;
+case 1228:
        switch( (*p) ) {
-               case 80: goto st1202;
-               case 112: goto st1202;
+               case 80: goto st1229;
+               case 112: goto st1229;
        }
-       goto tr3271;
-st1202:
+       goto tr3308;
+st1229:
        if ( ++p == pe )
-               goto _test_eof1202;
-case 1202:
+               goto _test_eof1229;
+case 1229:
        switch( (*p) ) {
-               case 75: goto st1203;
-               case 107: goto st1203;
+               case 75: goto st1230;
+               case 107: goto st1230;
        }
-       goto tr3271;
-st1203:
+       goto tr3308;
+st1230:
        if ( ++p == pe )
-               goto _test_eof1203;
-case 1203:
+               goto _test_eof1230;
+case 1230:
        switch( (*p) ) {
-               case 69: goto st1204;
-               case 101: goto st1204;
+               case 69: goto st1231;
+               case 101: goto st1231;
        }
-       goto tr3271;
-st1204:
+       goto tr3308;
+st1231:
        if ( ++p == pe )
-               goto _test_eof1204;
-case 1204:
+               goto _test_eof1231;
+case 1231:
        switch( (*p) ) {
-               case 89: goto st1205;
-               case 121: goto st1205;
+               case 89: goto st1232;
+               case 121: goto st1232;
        }
-       goto tr3271;
-st1205:
+       goto tr3308;
+st1232:
        if ( ++p == pe )
-               goto _test_eof1205;
-case 1205:
+               goto _test_eof1232;
+case 1232:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89781,36 +90382,36 @@ case 1205:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3657;
-               case 32: goto tr3657;
-               case 40: goto tr3658;
-               case 41: goto tr3659;
-               case 2058: goto tr3660;
-               case 2107: goto tr3661;
+               case 9: goto tr3694;
+               case 32: goto tr3694;
+               case 40: goto tr3695;
+               case 41: goto tr3696;
+               case 2058: goto tr3697;
+               case 2107: goto tr3698;
        }
-       goto tr3271;
-st1206:
+       goto tr3308;
+st1233:
        if ( ++p == pe )
-               goto _test_eof1206;
-case 1206:
+               goto _test_eof1233;
+case 1233:
        switch( (*p) ) {
-               case 84: goto st1207;
-               case 116: goto st1207;
+               case 84: goto st1234;
+               case 116: goto st1234;
        }
-       goto tr3271;
-st1207:
+       goto tr3308;
+st1234:
        if ( ++p == pe )
-               goto _test_eof1207;
-case 1207:
+               goto _test_eof1234;
+case 1234:
        switch( (*p) ) {
-               case 82: goto st1208;
-               case 114: goto st1208;
+               case 82: goto st1235;
+               case 114: goto st1235;
        }
-       goto tr3271;
-st1208:
+       goto tr3308;
+st1235:
        if ( ++p == pe )
-               goto _test_eof1208;
-case 1208:
+               goto _test_eof1235;
+case 1235:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89824,31 +90425,31 @@ case 1208:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3664;
-               case 32: goto tr3664;
-               case 40: goto tr3665;
-               case 41: goto tr3666;
-               case 2058: goto tr3667;
-               case 2107: goto tr3668;
+               case 9: goto tr3701;
+               case 32: goto tr3701;
+               case 40: goto tr3702;
+               case 41: goto tr3703;
+               case 2058: goto tr3704;
+               case 2107: goto tr3705;
        }
-       goto tr3271;
-st1209:
+       goto tr3308;
+st1236:
        if ( ++p == pe )
-               goto _test_eof1209;
-case 1209:
+               goto _test_eof1236;
+case 1236:
        switch( (*p) ) {
-               case 80: goto st1210;
-               case 82: goto st1211;
-               case 84: goto st1215;
-               case 112: goto st1210;
-               case 114: goto st1211;
-               case 116: goto st1215;
+               case 80: goto st1237;
+               case 82: goto st1238;
+               case 84: goto st1242;
+               case 112: goto st1237;
+               case 114: goto st1238;
+               case 116: goto st1242;
        }
-       goto tr3271;
-st1210:
+       goto tr3308;
+st1237:
        if ( ++p == pe )
-               goto _test_eof1210;
-case 1210:
+               goto _test_eof1237;
+case 1237:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89862,45 +90463,45 @@ case 1210:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3672;
-               case 32: goto tr3672;
-               case 40: goto tr3673;
-               case 41: goto tr3674;
-               case 2058: goto tr3675;
-               case 2107: goto tr3676;
+               case 9: goto tr3709;
+               case 32: goto tr3709;
+               case 40: goto tr3710;
+               case 41: goto tr3711;
+               case 2058: goto tr3712;
+               case 2107: goto tr3713;
        }
-       goto tr3271;
-st1211:
+       goto tr3308;
+st1238:
        if ( ++p == pe )
-               goto _test_eof1211;
-case 1211:
+               goto _test_eof1238;
+case 1238:
        switch( (*p) ) {
-               case 83: goto st1212;
-               case 115: goto st1212;
+               case 83: goto st1239;
+               case 115: goto st1239;
        }
-       goto tr3271;
-st1212:
+       goto tr3308;
+st1239:
        if ( ++p == pe )
-               goto _test_eof1212;
-case 1212:
+               goto _test_eof1239;
+case 1239:
        switch( (*p) ) {
-               case 73: goto st1213;
-               case 105: goto st1213;
+               case 73: goto st1240;
+               case 105: goto st1240;
        }
-       goto tr3271;
-st1213:
+       goto tr3308;
+st1240:
        if ( ++p == pe )
-               goto _test_eof1213;
-case 1213:
+               goto _test_eof1240;
+case 1240:
        switch( (*p) ) {
-               case 71: goto st1214;
-               case 103: goto st1214;
+               case 71: goto st1241;
+               case 103: goto st1241;
        }
-       goto tr3271;
-st1214:
+       goto tr3308;
+st1241:
        if ( ++p == pe )
-               goto _test_eof1214;
-case 1214:
+               goto _test_eof1241;
+case 1241:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89914,18 +90515,18 @@ case 1214:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3680;
-               case 32: goto tr3680;
-               case 40: goto tr3681;
-               case 41: goto tr3682;
-               case 2058: goto tr3683;
-               case 2107: goto tr3684;
+               case 9: goto tr3717;
+               case 32: goto tr3717;
+               case 40: goto tr3718;
+               case 41: goto tr3719;
+               case 2058: goto tr3720;
+               case 2107: goto tr3721;
        }
-       goto tr3271;
-st1215:
+       goto tr3308;
+st1242:
        if ( ++p == pe )
-               goto _test_eof1215;
-case 1215:
+               goto _test_eof1242;
+case 1242:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -89939,73 +90540,73 @@ case 1215:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3685;
-               case 32: goto tr3685;
-               case 40: goto tr3686;
-               case 41: goto tr3687;
-               case 2058: goto tr3688;
-               case 2107: goto tr3689;
+               case 9: goto tr3722;
+               case 32: goto tr3722;
+               case 40: goto tr3723;
+               case 41: goto tr3724;
+               case 2058: goto tr3725;
+               case 2107: goto tr3726;
        }
-       goto tr3271;
-st1216:
+       goto tr3308;
+st1243:
        if ( ++p == pe )
-               goto _test_eof1216;
-case 1216:
+               goto _test_eof1243;
+case 1243:
        switch( (*p) ) {
-               case 77: goto st1217;
-               case 79: goto st1222;
-               case 80: goto st1224;
-               case 82: goto st1226;
-               case 83: goto st1228;
-               case 86: goto st1232;
-               case 109: goto st1217;
-               case 111: goto st1222;
-               case 112: goto st1224;
-               case 114: goto st1226;
-               case 115: goto st1228;
-               case 118: goto st1232;
+               case 77: goto st1244;
+               case 79: goto st1249;
+               case 80: goto st1251;
+               case 82: goto st1253;
+               case 83: goto st1255;
+               case 86: goto st1259;
+               case 109: goto st1244;
+               case 111: goto st1249;
+               case 112: goto st1251;
+               case 114: goto st1253;
+               case 115: goto st1255;
+               case 118: goto st1259;
        }
-       goto tr3271;
-st1217:
+       goto tr3308;
+st1244:
        if ( ++p == pe )
-               goto _test_eof1217;
-case 1217:
+               goto _test_eof1244;
+case 1244:
        switch( (*p) ) {
-               case 73: goto st1218;
-               case 105: goto st1218;
+               case 73: goto st1245;
+               case 105: goto st1245;
        }
-       goto tr3271;
-st1218:
+       goto tr3308;
+st1245:
        if ( ++p == pe )
-               goto _test_eof1218;
-case 1218:
+               goto _test_eof1245;
+case 1245:
        switch( (*p) ) {
-               case 77: goto st1219;
-               case 109: goto st1219;
+               case 77: goto st1246;
+               case 109: goto st1246;
        }
-       goto tr3271;
-st1219:
+       goto tr3308;
+st1246:
        if ( ++p == pe )
-               goto _test_eof1219;
-case 1219:
+               goto _test_eof1246;
+case 1246:
        switch( (*p) ) {
-               case 69: goto st1220;
-               case 101: goto st1220;
+               case 69: goto st1247;
+               case 101: goto st1247;
        }
-       goto tr3271;
-st1220:
+       goto tr3308;
+st1247:
        if ( ++p == pe )
-               goto _test_eof1220;
-case 1220:
+               goto _test_eof1247;
+case 1247:
        switch( (*p) ) {
-               case 65: goto st1221;
-               case 97: goto st1221;
+               case 65: goto st1248;
+               case 97: goto st1248;
        }
-       goto tr3271;
-st1221:
+       goto tr3308;
+st1248:
        if ( ++p == pe )
-               goto _test_eof1221;
-case 1221:
+               goto _test_eof1248;
+case 1248:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90019,27 +90620,27 @@ case 1221:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3700;
-               case 32: goto tr3700;
-               case 40: goto tr3701;
-               case 41: goto tr3702;
-               case 2058: goto tr3703;
-               case 2107: goto tr3704;
+               case 9: goto tr3737;
+               case 32: goto tr3737;
+               case 40: goto tr3738;
+               case 41: goto tr3739;
+               case 2058: goto tr3740;
+               case 2107: goto tr3741;
        }
-       goto tr3271;
-st1222:
+       goto tr3308;
+st1249:
        if ( ++p == pe )
-               goto _test_eof1222;
-case 1222:
+               goto _test_eof1249;
+case 1249:
        switch( (*p) ) {
-               case 65: goto st1223;
-               case 97: goto st1223;
+               case 65: goto st1250;
+               case 97: goto st1250;
        }
-       goto tr3271;
-st1223:
+       goto tr3308;
+st1250:
        if ( ++p == pe )
-               goto _test_eof1223;
-case 1223:
+               goto _test_eof1250;
+case 1250:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90053,27 +90654,27 @@ case 1223:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3706;
-               case 32: goto tr3706;
-               case 40: goto tr3707;
-               case 41: goto tr3708;
-               case 2058: goto tr3709;
-               case 2107: goto tr3710;
+               case 9: goto tr3743;
+               case 32: goto tr3743;
+               case 40: goto tr3744;
+               case 41: goto tr3745;
+               case 2058: goto tr3746;
+               case 2107: goto tr3747;
        }
-       goto tr3271;
-st1224:
+       goto tr3308;
+st1251:
        if ( ++p == pe )
-               goto _test_eof1224;
-case 1224:
+               goto _test_eof1251;
+case 1251:
        switch( (*p) ) {
-               case 70: goto st1225;
-               case 102: goto st1225;
+               case 70: goto st1252;
+               case 102: goto st1252;
        }
-       goto tr3271;
-st1225:
+       goto tr3308;
+st1252:
        if ( ++p == pe )
-               goto _test_eof1225;
-case 1225:
+               goto _test_eof1252;
+case 1252:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90087,27 +90688,27 @@ case 1225:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3712;
-               case 32: goto tr3712;
-               case 40: goto tr3713;
-               case 41: goto tr3714;
-               case 2058: goto tr3715;
-               case 2107: goto tr3716;
+               case 9: goto tr3749;
+               case 32: goto tr3749;
+               case 40: goto tr3750;
+               case 41: goto tr3751;
+               case 2058: goto tr3752;
+               case 2107: goto tr3753;
        }
-       goto tr3271;
-st1226:
+       goto tr3308;
+st1253:
        if ( ++p == pe )
-               goto _test_eof1226;
-case 1226:
+               goto _test_eof1253;
+case 1253:
        switch( (*p) ) {
-               case 86: goto st1227;
-               case 118: goto st1227;
+               case 86: goto st1254;
+               case 118: goto st1254;
        }
-       goto tr3271;
-st1227:
+       goto tr3308;
+st1254:
        if ( ++p == pe )
-               goto _test_eof1227;
-case 1227:
+               goto _test_eof1254;
+case 1254:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90121,45 +90722,45 @@ case 1227:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3718;
-               case 32: goto tr3718;
-               case 40: goto tr3719;
-               case 41: goto tr3720;
-               case 2058: goto tr3721;
-               case 2107: goto tr3722;
+               case 9: goto tr3755;
+               case 32: goto tr3755;
+               case 40: goto tr3756;
+               case 41: goto tr3757;
+               case 2058: goto tr3758;
+               case 2107: goto tr3759;
        }
-       goto tr3271;
-st1228:
+       goto tr3308;
+st1255:
        if ( ++p == pe )
-               goto _test_eof1228;
-case 1228:
+               goto _test_eof1255;
+case 1255:
        switch( (*p) ) {
-               case 72: goto st1229;
-               case 104: goto st1229;
+               case 72: goto st1256;
+               case 104: goto st1256;
        }
-       goto tr3271;
-st1229:
+       goto tr3308;
+st1256:
        if ( ++p == pe )
-               goto _test_eof1229;
-case 1229:
+               goto _test_eof1256;
+case 1256:
        switch( (*p) ) {
-               case 70: goto st1230;
-               case 102: goto st1230;
+               case 70: goto st1257;
+               case 102: goto st1257;
        }
-       goto tr3271;
-st1230:
+       goto tr3308;
+st1257:
        if ( ++p == pe )
-               goto _test_eof1230;
-case 1230:
+               goto _test_eof1257;
+case 1257:
        switch( (*p) ) {
-               case 80: goto st1231;
-               case 112: goto st1231;
+               case 80: goto st1258;
+               case 112: goto st1258;
        }
-       goto tr3271;
-st1231:
+       goto tr3308;
+st1258:
        if ( ++p == pe )
-               goto _test_eof1231;
-case 1231:
+               goto _test_eof1258;
+case 1258:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90173,36 +90774,36 @@ case 1231:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3726;
-               case 32: goto tr3726;
-               case 40: goto tr3727;
-               case 41: goto tr3728;
-               case 2058: goto tr3729;
-               case 2107: goto tr3730;
+               case 9: goto tr3763;
+               case 32: goto tr3763;
+               case 40: goto tr3764;
+               case 41: goto tr3765;
+               case 2058: goto tr3766;
+               case 2107: goto tr3767;
        }
-       goto tr3271;
-st1232:
+       goto tr3308;
+st1259:
        if ( ++p == pe )
-               goto _test_eof1232;
-case 1232:
+               goto _test_eof1259;
+case 1259:
        switch( (*p) ) {
-               case 67: goto st1233;
-               case 99: goto st1233;
+               case 67: goto st1260;
+               case 99: goto st1260;
        }
-       goto tr3271;
-st1233:
+       goto tr3308;
+st1260:
        if ( ++p == pe )
-               goto _test_eof1233;
-case 1233:
+               goto _test_eof1260;
+case 1260:
        switch( (*p) ) {
-               case 66: goto st1234;
-               case 98: goto st1234;
+               case 66: goto st1261;
+               case 98: goto st1261;
        }
-       goto tr3271;
-st1234:
+       goto tr3308;
+st1261:
        if ( ++p == pe )
-               goto _test_eof1234;
-case 1234:
+               goto _test_eof1261;
+case 1261:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90216,49 +90817,49 @@ case 1234:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3733;
-               case 32: goto tr3733;
-               case 40: goto tr3734;
-               case 41: goto tr3735;
-               case 2058: goto tr3736;
-               case 2107: goto tr3737;
+               case 9: goto tr3770;
+               case 32: goto tr3770;
+               case 40: goto tr3771;
+               case 41: goto tr3772;
+               case 2058: goto tr3773;
+               case 2107: goto tr3774;
        }
-       goto tr3271;
-st1235:
+       goto tr3308;
+st1262:
        if ( ++p == pe )
-               goto _test_eof1235;
-case 1235:
+               goto _test_eof1262;
+case 1262:
        switch( (*p) ) {
-               case 76: goto st1236;
-               case 88: goto st1239;
-               case 89: goto st1241;
-               case 108: goto st1236;
-               case 120: goto st1239;
-               case 121: goto st1241;
+               case 76: goto st1263;
+               case 88: goto st1266;
+               case 89: goto st1268;
+               case 108: goto st1263;
+               case 120: goto st1266;
+               case 121: goto st1268;
        }
-       goto tr3271;
-st1236:
+       goto tr3308;
+st1263:
        if ( ++p == pe )
-               goto _test_eof1236;
-case 1236:
+               goto _test_eof1263;
+case 1263:
        switch( (*p) ) {
-               case 83: goto st1237;
-               case 115: goto st1237;
+               case 83: goto st1264;
+               case 115: goto st1264;
        }
-       goto tr3271;
-st1237:
+       goto tr3308;
+st1264:
        if ( ++p == pe )
-               goto _test_eof1237;
-case 1237:
+               goto _test_eof1264;
+case 1264:
        switch( (*p) ) {
-               case 65: goto st1238;
-               case 97: goto st1238;
+               case 65: goto st1265;
+               case 97: goto st1265;
        }
-       goto tr3271;
-st1238:
+       goto tr3308;
+st1265:
        if ( ++p == pe )
-               goto _test_eof1238;
-case 1238:
+               goto _test_eof1265;
+case 1265:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90272,27 +90873,27 @@ case 1238:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3743;
-               case 32: goto tr3743;
-               case 40: goto tr3744;
-               case 41: goto tr3745;
-               case 2058: goto tr3746;
-               case 2107: goto tr3747;
+               case 9: goto tr3780;
+               case 32: goto tr3780;
+               case 40: goto tr3781;
+               case 41: goto tr3782;
+               case 2058: goto tr3783;
+               case 2107: goto tr3784;
        }
-       goto tr3271;
-st1239:
+       goto tr3308;
+st1266:
        if ( ++p == pe )
-               goto _test_eof1239;
-case 1239:
+               goto _test_eof1266;
+case 1266:
        switch( (*p) ) {
-               case 84: goto st1240;
-               case 116: goto st1240;
+               case 84: goto st1267;
+               case 116: goto st1267;
        }
-       goto tr3271;
-st1240:
+       goto tr3308;
+st1267:
        if ( ++p == pe )
-               goto _test_eof1240;
-case 1240:
+               goto _test_eof1267;
+case 1267:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90306,40 +90907,40 @@ case 1240:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3749;
-               case 32: goto tr3749;
-               case 40: goto tr3750;
-               case 41: goto tr3751;
-               case 2058: goto tr3752;
-               case 2107: goto tr3753;
+               case 9: goto tr3786;
+               case 32: goto tr3786;
+               case 40: goto tr3787;
+               case 41: goto tr3788;
+               case 2058: goto tr3789;
+               case 2107: goto tr3790;
        }
-       goto tr3271;
-st1241:
+       goto tr3308;
+st1268:
        if ( ++p == pe )
-               goto _test_eof1241;
-case 1241:
+               goto _test_eof1268;
+case 1268:
        switch( (*p) ) {
-               case 80: goto st1242;
-               case 112: goto st1242;
+               case 80: goto st1269;
+               case 112: goto st1269;
        }
-       goto tr3271;
-st1242:
+       goto tr3308;
+st1269:
        if ( ++p == pe )
-               goto _test_eof1242;
-case 1242:
+               goto _test_eof1269;
+case 1269:
        switch( (*p) ) {
-               case 69: goto st1243;
-               case 101: goto st1243;
+               case 69: goto st1270;
+               case 101: goto st1270;
        }
-       goto tr3271;
-st1243:
+       goto tr3308;
+st1270:
        if ( ++p == pe )
-               goto _test_eof1243;
-case 1243:
+               goto _test_eof1270;
+case 1270:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr3757;
-       goto tr3756;
-tr3757:
+               goto tr3794;
+       goto tr3793;
+tr3794:
        {
                s->number64 = 0;
        }
@@ -90357,8 +90958,8 @@ tr3757:
                        p--; {goto st307;}
                }
        }
-       goto st1244;
-tr3761:
+       goto st1271;
+tr3798:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -90373,11 +90974,11 @@ tr3761:
                        p--; {goto st307;}
                }
        }
-       goto st1244;
-st1244:
+       goto st1271;
+st1271:
        if ( ++p == pe )
-               goto _test_eof1244;
-case 1244:
+               goto _test_eof1271;
+case 1271:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90391,38 +90992,38 @@ case 1244:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3758;
-               case 32: goto tr3758;
-               case 40: goto tr3759;
-               case 41: goto tr3760;
-               case 2058: goto tr3762;
-               case 2107: goto tr3763;
+               case 9: goto tr3795;
+               case 32: goto tr3795;
+               case 40: goto tr3796;
+               case 41: goto tr3797;
+               case 2058: goto tr3799;
+               case 2107: goto tr3800;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3761;
-       goto tr3756;
-st1245:
+               goto tr3798;
+       goto tr3793;
+st1272:
        if ( ++p == pe )
-               goto _test_eof1245;
-case 1245:
+               goto _test_eof1272;
+case 1272:
        switch( (*p) ) {
-               case 82: goto st1246;
-               case 114: goto st1246;
+               case 82: goto st1273;
+               case 114: goto st1273;
        }
-       goto tr3271;
-st1246:
+       goto tr3308;
+st1273:
        if ( ++p == pe )
-               goto _test_eof1246;
-case 1246:
+               goto _test_eof1273;
+case 1273:
        switch( (*p) ) {
-               case 73: goto st1247;
-               case 105: goto st1247;
+               case 73: goto st1274;
+               case 105: goto st1274;
        }
-       goto tr3271;
-st1247:
+       goto tr3308;
+st1274:
        if ( ++p == pe )
-               goto _test_eof1247;
-case 1247:
+               goto _test_eof1274;
+case 1274:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90436,63 +91037,63 @@ case 1247:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3766;
-               case 32: goto tr3766;
-               case 40: goto tr3767;
-               case 41: goto tr3768;
-               case 2058: goto tr3769;
-               case 2107: goto tr3770;
+               case 9: goto tr3803;
+               case 32: goto tr3803;
+               case 40: goto tr3804;
+               case 41: goto tr3805;
+               case 2058: goto tr3806;
+               case 2107: goto tr3807;
        }
-       goto tr3271;
-st1248:
+       goto tr3308;
+st1275:
        if ( ++p == pe )
-               goto _test_eof1248;
-case 1248:
+               goto _test_eof1275;
+case 1275:
        switch( (*p) ) {
-               case 79: goto st1249;
-               case 111: goto st1249;
+               case 79: goto st1276;
+               case 111: goto st1276;
        }
-       goto tr3271;
-st1249:
+       goto tr3308;
+st1276:
        if ( ++p == pe )
-               goto _test_eof1249;
-case 1249:
+               goto _test_eof1276;
+case 1276:
        switch( (*p) ) {
-               case 78: goto st1250;
-               case 110: goto st1250;
+               case 78: goto st1277;
+               case 110: goto st1277;
        }
-       goto tr3271;
-st1250:
+       goto tr3308;
+st1277:
        if ( ++p == pe )
-               goto _test_eof1250;
-case 1250:
+               goto _test_eof1277;
+case 1277:
        switch( (*p) ) {
-               case 69: goto st1251;
-               case 101: goto st1251;
+               case 69: goto st1278;
+               case 101: goto st1278;
        }
-       goto tr3271;
-st1251:
+       goto tr3308;
+st1278:
        if ( ++p == pe )
-               goto _test_eof1251;
-case 1251:
+               goto _test_eof1278;
+case 1278:
        switch( (*p) ) {
-               case 77: goto st1252;
-               case 109: goto st1252;
+               case 77: goto st1279;
+               case 109: goto st1279;
        }
-       goto tr3271;
-st1252:
+       goto tr3308;
+st1279:
        if ( ++p == pe )
-               goto _test_eof1252;
-case 1252:
+               goto _test_eof1279;
+case 1279:
        switch( (*p) ) {
-               case 68: goto st1253;
-               case 100: goto st1253;
+               case 68: goto st1280;
+               case 100: goto st1280;
        }
-       goto tr3271;
-st1253:
+       goto tr3308;
+st1280:
        if ( ++p == pe )
-               goto _test_eof1253;
-case 1253:
+               goto _test_eof1280;
+case 1280:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90506,90 +91107,90 @@ case 1253:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3776;
-               case 32: goto tr3776;
-               case 40: goto tr3777;
-               case 41: goto tr3778;
-               case 2058: goto tr3779;
-               case 2107: goto tr3780;
+               case 9: goto tr3813;
+               case 32: goto tr3813;
+               case 40: goto tr3814;
+               case 41: goto tr3815;
+               case 2058: goto tr3816;
+               case 2107: goto tr3817;
        }
-       goto tr3271;
-st1254:
+       goto tr3308;
+st1281:
        if ( ++p == pe )
-               goto _test_eof1254;
-case 1254:
+               goto _test_eof1281;
+case 1281:
        switch( (*p) ) {
-               case 42: goto tr3781;
-               case 92: goto tr3781;
-               case 95: goto tr3781;
+               case 42: goto tr3818;
+               case 92: goto tr3818;
+               case 95: goto tr3818;
        }
        if ( (*p) < 64 ) {
                if ( 45 <= (*p) && (*p) <= 57 )
-                       goto tr3781;
+                       goto tr3818;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr3781;
+                       goto tr3818;
        } else
-               goto tr3781;
+               goto tr3818;
        goto tr75;
-tr3781:
+tr3818:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 1255;goto st309;} }
-       goto st1255;
-st1255:
+       { p--; {stack[top++] = 1282;goto st309;} }
+       goto st1282;
+st1282:
        if ( ++p == pe )
-               goto _test_eof1255;
-case 1255:
+               goto _test_eof1282;
+case 1282:
        switch( (*p) ) {
-               case 32: goto tr3782;
-               case 59: goto tr3782;
+               case 32: goto tr3819;
+               case 59: goto tr3819;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr3782;
+                       goto tr3819;
        } else if ( (*p) >= 9 )
-               goto tr3782;
+               goto tr3819;
        goto tr75;
-tr3782:
+tr3819:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       { p--; {stack[top++] = 1256;goto st376;} }
-       goto st1256;
-st1256:
+       { p--; {stack[top++] = 1283;goto st376;} }
+       goto st1283;
+st1283:
        if ( ++p == pe )
-               goto _test_eof1256;
-case 1256:
+               goto _test_eof1283;
+case 1283:
        switch( (*p) ) {
-               case 32: goto tr3783;
-               case 59: goto tr3783;
+               case 32: goto tr3820;
+               case 59: goto tr3820;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr3783;
+                       goto tr3820;
        } else if ( (*p) >= 9 )
-               goto tr3783;
+               goto tr3820;
        goto tr75;
-tr3783:
+tr3820:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1474;
-st1474:
+       goto st1501;
+st1501:
        if ( ++p == pe )
-               goto _test_eof1474;
-case 1474:
+               goto _test_eof1501;
+case 1501:
        goto st0;
-st1257:
+st1284:
        if ( ++p == pe )
-               goto _test_eof1257;
-case 1257:
+               goto _test_eof1284;
+case 1284:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr3784;
-       goto tr2327;
-tr3784:
+               goto tr3821;
+       goto tr2364;
+tr3821:
        {
                s->number64 = 0;
        }
@@ -90607,8 +91208,8 @@ tr3784:
                        p--; {goto st307;}
                }
        }
-       goto st1258;
-tr3788:
+       goto st1285;
+tr3825:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -90623,11 +91224,11 @@ tr3788:
                        p--; {goto st307;}
                }
        }
-       goto st1258;
-st1258:
+       goto st1285;
+st1285:
        if ( ++p == pe )
-               goto _test_eof1258;
-case 1258:
+               goto _test_eof1285;
+case 1285:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90641,17 +91242,17 @@ case 1258:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3785;
-               case 32: goto tr3785;
-               case 40: goto tr3786;
-               case 41: goto tr3787;
-               case 2058: goto tr3789;
-               case 2107: goto tr3790;
+               case 9: goto tr3822;
+               case 32: goto tr3822;
+               case 40: goto tr3823;
+               case 41: goto tr3824;
+               case 2058: goto tr3826;
+               case 2107: goto tr3827;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3788;
-       goto tr2327;
-tr3792:
+               goto tr3825;
+       goto tr2364;
+tr3829:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -90659,8 +91260,8 @@ tr3792:
                }
                s->multiline = true;
        }
-       goto st1259;
-tr3793:
+       goto st1286;
+tr3830:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -90668,13 +91269,13 @@ tr3793:
                }
                s->multiline = false;
        }
-       goto st1259;
-tr3795:
+       goto st1286;
+tr3832:
        {
                s->line_counter++;
        }
-       goto st1259;
-tr3821:
+       goto st1286;
+tr3858:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -90684,15 +91285,15 @@ tr3821:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1259; goto _out;}
+                               {p++; cs = 1286; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1259;
-tr3785:
+       goto st1286;
+tr3822:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -90703,8 +91304,8 @@ tr3785:
                        p--; {goto st307;}
                }
        }
-       goto st1259;
-tr3786:
+       goto st1286;
+tr3823:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -90722,8 +91323,8 @@ tr3786:
                }
                s->multiline = true;
        }
-       goto st1259;
-tr3787:
+       goto st1286;
+tr3824:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -90741,8 +91342,8 @@ tr3787:
                }
                s->multiline = false;
        }
-       goto st1259;
-tr3789:
+       goto st1286;
+tr3826:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -90756,11 +91357,11 @@ tr3789:
        {
                s->line_counter++;
        }
-       goto st1259;
-st1259:
+       goto st1286;
+st1286:
        if ( ++p == pe )
-               goto _test_eof1259;
-case 1259:
+               goto _test_eof1286;
+case 1286:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90774,17 +91375,17 @@ case 1259:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1259;
-               case 32: goto st1259;
-               case 40: goto tr3792;
-               case 41: goto tr3793;
-               case 2058: goto tr3795;
-               case 2107: goto tr3796;
+               case 9: goto st1286;
+               case 32: goto st1286;
+               case 40: goto tr3829;
+               case 41: goto tr3830;
+               case 2058: goto tr3832;
+               case 2107: goto tr3833;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3794;
-       goto tr2327;
-tr3794:
+               goto tr3831;
+       goto tr2364;
+tr3831:
        {
                s->number64 = 0;
        }
@@ -90802,8 +91403,8 @@ tr3794:
                        p--; {goto st307;}
                }
        }
-       goto st1260;
-tr3800:
+       goto st1287;
+tr3837:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -90818,11 +91419,11 @@ tr3800:
                        p--; {goto st307;}
                }
        }
-       goto st1260;
-st1260:
+       goto st1287;
+st1287:
        if ( ++p == pe )
-               goto _test_eof1260;
-case 1260:
+               goto _test_eof1287;
+case 1287:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90836,17 +91437,17 @@ case 1260:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3797;
-               case 32: goto tr3797;
-               case 40: goto tr3798;
-               case 41: goto tr3799;
-               case 2058: goto tr3801;
-               case 2107: goto tr3802;
+               case 9: goto tr3834;
+               case 32: goto tr3834;
+               case 40: goto tr3835;
+               case 41: goto tr3836;
+               case 2058: goto tr3838;
+               case 2107: goto tr3839;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3800;
-       goto tr2327;
-tr3804:
+               goto tr3837;
+       goto tr2364;
+tr3841:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -90854,8 +91455,8 @@ tr3804:
                }
                s->multiline = true;
        }
-       goto st1261;
-tr3805:
+       goto st1288;
+tr3842:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -90863,13 +91464,13 @@ tr3805:
                }
                s->multiline = false;
        }
-       goto st1261;
-tr3807:
+       goto st1288;
+tr3844:
        {
                s->line_counter++;
        }
-       goto st1261;
-tr3819:
+       goto st1288;
+tr3856:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -90879,15 +91480,15 @@ tr3819:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1261; goto _out;}
+                               {p++; cs = 1288; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1261;
-tr3797:
+       goto st1288;
+tr3834:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -90897,8 +91498,8 @@ tr3797:
                        p--; {goto st307;}
                }
        }
-       goto st1261;
-tr3798:
+       goto st1288;
+tr3835:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -90915,8 +91516,8 @@ tr3798:
                }
                s->multiline = true;
        }
-       goto st1261;
-tr3799:
+       goto st1288;
+tr3836:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -90933,8 +91534,8 @@ tr3799:
                }
                s->multiline = false;
        }
-       goto st1261;
-tr3801:
+       goto st1288;
+tr3838:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -90947,11 +91548,11 @@ tr3801:
        {
                s->line_counter++;
        }
-       goto st1261;
-st1261:
+       goto st1288;
+st1288:
        if ( ++p == pe )
-               goto _test_eof1261;
-case 1261:
+               goto _test_eof1288;
+case 1288:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -90965,29 +91566,29 @@ case 1261:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1261;
-               case 32: goto st1261;
-               case 40: goto tr3804;
-               case 41: goto tr3805;
-               case 2058: goto tr3807;
-               case 2107: goto tr3808;
+               case 9: goto st1288;
+               case 32: goto st1288;
+               case 40: goto tr3841;
+               case 41: goto tr3842;
+               case 2058: goto tr3844;
+               case 2107: goto tr3845;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3806;
+                       goto tr3843;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr3806;
+                       goto tr3843;
        } else
-               goto tr3806;
+               goto tr3843;
        goto tr75;
-tr3806:
-       { p--; {stack[top++] = 1262;goto st699;} }
-       goto st1262;
-st1262:
+tr3843:
+       { p--; {stack[top++] = 1289;goto st726;} }
+       goto st1289;
+st1289:
        if ( ++p == pe )
-               goto _test_eof1262;
-case 1262:
+               goto _test_eof1289;
+case 1289:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91001,15 +91602,15 @@ case 1262:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1263;
-               case 32: goto st1263;
-               case 40: goto tr3810;
-               case 41: goto tr3811;
-               case 2058: goto tr3812;
-               case 2107: goto tr3813;
+               case 9: goto st1290;
+               case 32: goto st1290;
+               case 40: goto tr3847;
+               case 41: goto tr3848;
+               case 2058: goto tr3849;
+               case 2107: goto tr3850;
        }
        goto tr75;
-tr3810:
+tr3847:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -91017,8 +91618,8 @@ tr3810:
                }
                s->multiline = true;
        }
-       goto st1263;
-tr3811:
+       goto st1290;
+tr3848:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -91026,13 +91627,13 @@ tr3811:
                }
                s->multiline = false;
        }
-       goto st1263;
-tr3812:
+       goto st1290;
+tr3849:
        {
                s->line_counter++;
        }
-       goto st1263;
-tr3817:
+       goto st1290;
+tr3854:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -91042,18 +91643,18 @@ tr3817:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1263; goto _out;}
+                               {p++; cs = 1290; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1263;
-st1263:
+       goto st1290;
+st1290:
        if ( ++p == pe )
-               goto _test_eof1263;
-case 1263:
+               goto _test_eof1290;
+case 1290:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91067,30 +91668,30 @@ case 1263:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1263;
-               case 32: goto st1263;
-               case 40: goto tr3810;
-               case 41: goto tr3811;
-               case 43: goto tr3814;
-               case 2058: goto tr3812;
-               case 2107: goto tr3813;
+               case 9: goto st1290;
+               case 32: goto st1290;
+               case 40: goto tr3847;
+               case 41: goto tr3848;
+               case 43: goto tr3851;
+               case 2058: goto tr3849;
+               case 2107: goto tr3850;
        }
        if ( _widec < 65 ) {
                if ( 47 <= _widec && _widec <= 57 )
-                       goto tr3814;
+                       goto tr3851;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr3814;
+                       goto tr3851;
        } else
-               goto tr3814;
+               goto tr3851;
        goto tr75;
-tr3814:
-       { p--; {stack[top++] = 1264;goto st369;} }
-       goto st1264;
-st1264:
+tr3851:
+       { p--; {stack[top++] = 1291;goto st369;} }
+       goto st1291;
+st1291:
        if ( ++p == pe )
-               goto _test_eof1264;
-case 1264:
+               goto _test_eof1291;
+case 1291:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91104,36 +91705,36 @@ case 1264:
  !s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 2570: goto tr3815;
-               case 2619: goto tr3815;
+               case 2570: goto tr3852;
+               case 2619: goto tr3852;
        }
        goto tr75;
-tr3815:
+tr3852:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1475;
-st1475:
+       goto st1502;
+st1502:
        if ( ++p == pe )
-               goto _test_eof1475;
-case 1475:
+               goto _test_eof1502;
+case 1502:
        goto st0;
-tr3813:
+tr3850:
        {
                s->buffer_length = 0;
        }
-       goto st1265;
-tr3816:
+       goto st1292;
+tr3853:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1265;
-st1265:
+       goto st1292;
+st1292:
        if ( ++p == pe )
-               goto _test_eof1265;
-case 1265:
+               goto _test_eof1292;
+case 1292:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -91153,23 +91754,23 @@ case 1265:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3817;
+               goto tr3854;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3816;
+               goto tr3853;
        goto tr75;
-tr3808:
+tr3845:
        {
                s->buffer_length = 0;
        }
-       goto st1266;
-tr3818:
+       goto st1293;
+tr3855:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1266;
-tr3802:
+       goto st1293;
+tr3839:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91182,11 +91783,11 @@ tr3802:
        {
                s->buffer_length = 0;
        }
-       goto st1266;
-st1266:
+       goto st1293;
+st1293:
        if ( ++p == pe )
-               goto _test_eof1266;
-case 1266:
+               goto _test_eof1293;
+case 1293:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -91206,23 +91807,23 @@ case 1266:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3819;
+               goto tr3856;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3818;
+               goto tr3855;
        goto tr75;
-tr3796:
+tr3833:
        {
                s->buffer_length = 0;
        }
-       goto st1267;
-tr3820:
+       goto st1294;
+tr3857:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1267;
-tr3790:
+       goto st1294;
+tr3827:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -91236,11 +91837,11 @@ tr3790:
        {
                s->buffer_length = 0;
        }
-       goto st1267;
-st1267:
+       goto st1294;
+st1294:
        if ( ++p == pe )
-               goto _test_eof1267;
-case 1267:
+               goto _test_eof1294;
+case 1294:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -91260,32 +91861,32 @@ case 1267:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3821;
+               goto tr3858;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3820;
+               goto tr3857;
        goto tr75;
-st1268:
+st1295:
        if ( ++p == pe )
-               goto _test_eof1268;
-case 1268:
+               goto _test_eof1295;
+case 1295:
        if ( (*p) == 43 )
-               goto tr3822;
+               goto tr3859;
        if ( (*p) < 65 ) {
                if ( 47 <= (*p) && (*p) <= 57 )
-                       goto tr3822;
+                       goto tr3859;
        } else if ( (*p) > 90 ) {
                if ( 97 <= (*p) && (*p) <= 122 )
-                       goto tr3822;
+                       goto tr3859;
        } else
-               goto tr3822;
+               goto tr3859;
        goto tr75;
-tr3822:
-       { p--; {stack[top++] = 1269;goto st369;} }
-       goto st1269;
-st1269:
+tr3859:
+       { p--; {stack[top++] = 1296;goto st369;} }
+       goto st1296;
+st1296:
        if ( ++p == pe )
-               goto _test_eof1269;
-case 1269:
+               goto _test_eof1296;
+case 1296:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91299,28 +91900,28 @@ case 1269:
  !s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 2570: goto tr3823;
-               case 2619: goto tr3823;
+               case 2570: goto tr3860;
+               case 2619: goto tr3860;
        }
        goto tr75;
-tr3823:
+tr3860:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1476;
-st1476:
+       goto st1503;
+st1503:
        if ( ++p == pe )
-               goto _test_eof1476;
-case 1476:
+               goto _test_eof1503;
+case 1503:
        goto st0;
-st1270:
+st1297:
        if ( ++p == pe )
-               goto _test_eof1270;
-case 1270:
+               goto _test_eof1297;
+case 1297:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr3824;
-       goto tr2327;
-tr3824:
+               goto tr3861;
+       goto tr2364;
+tr3861:
        {
                s->number64 = 0;
        }
@@ -91338,8 +91939,8 @@ tr3824:
                        p--; {goto st307;}
                }
        }
-       goto st1271;
-tr3828:
+       goto st1298;
+tr3865:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -91354,11 +91955,11 @@ tr3828:
                        p--; {goto st307;}
                }
        }
-       goto st1271;
-st1271:
+       goto st1298;
+st1298:
        if ( ++p == pe )
-               goto _test_eof1271;
-case 1271:
+               goto _test_eof1298;
+case 1298:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91372,17 +91973,17 @@ case 1271:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3825;
-               case 32: goto tr3825;
-               case 40: goto tr3826;
-               case 41: goto tr3827;
-               case 2058: goto tr3829;
-               case 2107: goto tr3830;
+               case 9: goto tr3862;
+               case 32: goto tr3862;
+               case 40: goto tr3863;
+               case 41: goto tr3864;
+               case 2058: goto tr3866;
+               case 2107: goto tr3867;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3828;
-       goto tr2327;
-tr3832:
+               goto tr3865;
+       goto tr2364;
+tr3869:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -91390,8 +91991,8 @@ tr3832:
                }
                s->multiline = true;
        }
-       goto st1272;
-tr3833:
+       goto st1299;
+tr3870:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -91399,13 +92000,13 @@ tr3833:
                }
                s->multiline = false;
        }
-       goto st1272;
-tr3835:
+       goto st1299;
+tr3872:
        {
                s->line_counter++;
        }
-       goto st1272;
-tr3899:
+       goto st1299;
+tr3936:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -91415,15 +92016,15 @@ tr3899:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1272; goto _out;}
+                               {p++; cs = 1299; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1272;
-tr3825:
+       goto st1299;
+tr3862:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91433,8 +92034,8 @@ tr3825:
                        p--; {goto st307;}
                }
        }
-       goto st1272;
-tr3826:
+       goto st1299;
+tr3863:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91451,8 +92052,8 @@ tr3826:
                }
                s->multiline = true;
        }
-       goto st1272;
-tr3827:
+       goto st1299;
+tr3864:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91469,8 +92070,8 @@ tr3827:
                }
                s->multiline = false;
        }
-       goto st1272;
-tr3829:
+       goto st1299;
+tr3866:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91483,11 +92084,11 @@ tr3829:
        {
                s->line_counter++;
        }
-       goto st1272;
-st1272:
+       goto st1299;
+st1299:
        if ( ++p == pe )
-               goto _test_eof1272;
-case 1272:
+               goto _test_eof1299;
+case 1299:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91501,17 +92102,17 @@ case 1272:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1272;
-               case 32: goto st1272;
-               case 40: goto tr3832;
-               case 41: goto tr3833;
-               case 2058: goto tr3835;
-               case 2107: goto tr3836;
+               case 9: goto st1299;
+               case 32: goto st1299;
+               case 40: goto tr3869;
+               case 41: goto tr3870;
+               case 2058: goto tr3872;
+               case 2107: goto tr3873;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3834;
-       goto tr2327;
-tr3834:
+               goto tr3871;
+       goto tr2364;
+tr3871:
        {
                s->number64 = 0;
        }
@@ -91529,8 +92130,8 @@ tr3834:
                        p--; {goto st307;}
                }
        }
-       goto st1273;
-tr3840:
+       goto st1300;
+tr3877:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -91545,11 +92146,11 @@ tr3840:
                        p--; {goto st307;}
                }
        }
-       goto st1273;
-st1273:
+       goto st1300;
+st1300:
        if ( ++p == pe )
-               goto _test_eof1273;
-case 1273:
+               goto _test_eof1300;
+case 1300:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91563,17 +92164,17 @@ case 1273:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3837;
-               case 32: goto tr3837;
-               case 40: goto tr3838;
-               case 41: goto tr3839;
-               case 2058: goto tr3841;
-               case 2107: goto tr3842;
+               case 9: goto tr3874;
+               case 32: goto tr3874;
+               case 40: goto tr3875;
+               case 41: goto tr3876;
+               case 2058: goto tr3878;
+               case 2107: goto tr3879;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3840;
-       goto tr2327;
-tr3844:
+               goto tr3877;
+       goto tr2364;
+tr3881:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -91581,8 +92182,8 @@ tr3844:
                }
                s->multiline = true;
        }
-       goto st1274;
-tr3845:
+       goto st1301;
+tr3882:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -91590,13 +92191,13 @@ tr3845:
                }
                s->multiline = false;
        }
-       goto st1274;
-tr3847:
+       goto st1301;
+tr3884:
        {
                s->line_counter++;
        }
-       goto st1274;
-tr3897:
+       goto st1301;
+tr3934:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -91606,15 +92207,15 @@ tr3897:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1274; goto _out;}
+                               {p++; cs = 1301; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1274;
-tr3837:
+       goto st1301;
+tr3874:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91624,8 +92225,8 @@ tr3837:
                        p--; {goto st307;}
                }
        }
-       goto st1274;
-tr3838:
+       goto st1301;
+tr3875:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91642,8 +92243,8 @@ tr3838:
                }
                s->multiline = true;
        }
-       goto st1274;
-tr3839:
+       goto st1301;
+tr3876:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91660,8 +92261,8 @@ tr3839:
                }
                s->multiline = false;
        }
-       goto st1274;
-tr3841:
+       goto st1301;
+tr3878:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -91674,11 +92275,11 @@ tr3841:
        {
                s->line_counter++;
        }
-       goto st1274;
-st1274:
+       goto st1301;
+st1301:
        if ( ++p == pe )
-               goto _test_eof1274;
-case 1274:
+               goto _test_eof1301;
+case 1301:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91692,17 +92293,17 @@ case 1274:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1274;
-               case 32: goto st1274;
-               case 40: goto tr3844;
-               case 41: goto tr3845;
-               case 2058: goto tr3847;
-               case 2107: goto tr3848;
+               case 9: goto st1301;
+               case 32: goto st1301;
+               case 40: goto tr3881;
+               case 41: goto tr3882;
+               case 2058: goto tr3884;
+               case 2107: goto tr3885;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3846;
-       goto tr2327;
-tr3846:
+               goto tr3883;
+       goto tr2364;
+tr3883:
        {
                s->number64 = 0;
        }
@@ -91720,8 +92321,8 @@ tr3846:
                        p--; {goto st307;}
                }
        }
-       goto st1275;
-tr3852:
+       goto st1302;
+tr3889:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -91736,11 +92337,11 @@ tr3852:
                        p--; {goto st307;}
                }
        }
-       goto st1275;
-st1275:
+       goto st1302;
+st1302:
        if ( ++p == pe )
-               goto _test_eof1275;
-case 1275:
+               goto _test_eof1302;
+case 1302:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91754,17 +92355,17 @@ case 1275:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3849;
-               case 32: goto tr3849;
-               case 40: goto tr3850;
-               case 41: goto tr3851;
-               case 2058: goto tr3853;
-               case 2107: goto tr3854;
+               case 9: goto tr3886;
+               case 32: goto tr3886;
+               case 40: goto tr3887;
+               case 41: goto tr3888;
+               case 2058: goto tr3890;
+               case 2107: goto tr3891;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3852;
-       goto tr2327;
-tr3856:
+               goto tr3889;
+       goto tr2364;
+tr3893:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -91772,8 +92373,8 @@ tr3856:
                }
                s->multiline = true;
        }
-       goto st1276;
-tr3857:
+       goto st1303;
+tr3894:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -91781,13 +92382,13 @@ tr3857:
                }
                s->multiline = false;
        }
-       goto st1276;
-tr3860:
+       goto st1303;
+tr3897:
        {
                s->line_counter++;
        }
-       goto st1276;
-tr3895:
+       goto st1303;
+tr3932:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -91797,15 +92398,15 @@ tr3895:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1276; goto _out;}
+                               {p++; cs = 1303; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1276;
-tr3849:
+       goto st1303;
+tr3886:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -91816,8 +92417,8 @@ tr3849:
                        p--; {goto st307;}
                }
        }
-       goto st1276;
-tr3850:
+       goto st1303;
+tr3887:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -91835,8 +92436,8 @@ tr3850:
                }
                s->multiline = true;
        }
-       goto st1276;
-tr3851:
+       goto st1303;
+tr3888:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -91854,8 +92455,8 @@ tr3851:
                }
                s->multiline = false;
        }
-       goto st1276;
-tr3853:
+       goto st1303;
+tr3890:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -91869,11 +92470,11 @@ tr3853:
        {
                s->line_counter++;
        }
-       goto st1276;
-st1276:
+       goto st1303;
+st1303:
        if ( ++p == pe )
-               goto _test_eof1276;
-case 1276:
+               goto _test_eof1303;
+case 1303:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91887,24 +92488,24 @@ case 1276:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1276;
-               case 32: goto st1276;
-               case 40: goto tr3856;
-               case 41: goto tr3857;
-               case 45: goto tr3858;
-               case 2058: goto tr3860;
-               case 2107: goto tr3861;
+               case 9: goto st1303;
+               case 32: goto st1303;
+               case 40: goto tr3893;
+               case 41: goto tr3894;
+               case 45: goto tr3895;
+               case 2058: goto tr3897;
+               case 2107: goto tr3898;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3859;
+                       goto tr3896;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3859;
+                       goto tr3896;
        } else
-               goto tr3859;
-       goto tr2998;
-tr3858:
+               goto tr3896;
+       goto tr3035;
+tr3895:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -91913,11 +92514,11 @@ tr3858:
                        p--; {goto st307;}
                }
        }
-       goto st1277;
-st1277:
+       goto st1304;
+st1304:
        if ( ++p == pe )
-               goto _test_eof1277;
-case 1277:
+               goto _test_eof1304;
+case 1304:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -91931,15 +92532,15 @@ case 1277:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3862;
-               case 32: goto tr3862;
-               case 40: goto tr3863;
-               case 41: goto tr3864;
-               case 2058: goto tr3865;
-               case 2107: goto tr3866;
+               case 9: goto tr3899;
+               case 32: goto tr3899;
+               case 40: goto tr3900;
+               case 41: goto tr3901;
+               case 2058: goto tr3902;
+               case 2107: goto tr3903;
        }
-       goto tr2998;
-tr3869:
+       goto tr3035;
+tr3906:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -91947,8 +92548,8 @@ tr3869:
                }
                s->multiline = true;
        }
-       goto st1278;
-tr3870:
+       goto st1305;
+tr3907:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -91956,13 +92557,13 @@ tr3870:
                }
                s->multiline = false;
        }
-       goto st1278;
-tr3872:
+       goto st1305;
+tr3909:
        {
                s->line_counter++;
        }
-       goto st1278;
-tr3891:
+       goto st1305;
+tr3928:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -91972,15 +92573,15 @@ tr3891:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1278; goto _out;}
+                               {p++; cs = 1305; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1278;
-tr3862:
+       goto st1305;
+tr3899:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -91994,8 +92595,8 @@ tr3862:
                        p--; {goto st307;}
                }
        }
-       goto st1278;
-tr3863:
+       goto st1305;
+tr3900:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -92016,8 +92617,8 @@ tr3863:
                }
                s->multiline = true;
        }
-       goto st1278;
-tr3864:
+       goto st1305;
+tr3901:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -92038,8 +92639,8 @@ tr3864:
                }
                s->multiline = false;
        }
-       goto st1278;
-tr3865:
+       goto st1305;
+tr3902:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -92056,11 +92657,11 @@ tr3865:
        {
                s->line_counter++;
        }
-       goto st1278;
-st1278:
+       goto st1305;
+st1305:
        if ( ++p == pe )
-               goto _test_eof1278;
-case 1278:
+               goto _test_eof1305;
+case 1305:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -92074,23 +92675,23 @@ case 1278:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1278;
-               case 32: goto st1278;
-               case 40: goto tr3869;
-               case 41: goto tr3870;
-               case 2058: goto tr3872;
-               case 2107: goto tr3873;
+               case 9: goto st1305;
+               case 32: goto st1305;
+               case 40: goto tr3906;
+               case 41: goto tr3907;
+               case 2058: goto tr3909;
+               case 2107: goto tr3910;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3871;
+                       goto tr3908;
        } else if ( _widec > 86 ) {
                if ( 97 <= _widec && _widec <= 118 )
-                       goto tr3871;
+                       goto tr3908;
        } else
-               goto tr3871;
-       goto tr3867;
-tr3871:
+               goto tr3908;
+       goto tr3904;
+tr3908:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -92107,8 +92708,8 @@ tr3871:
                        p--; {goto st307;}
                }
        }
-       goto st1279;
-tr3886:
+       goto st1306;
+tr3923:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_base32hex_to_num[(uint8_t)(*p)];
@@ -92117,21 +92718,21 @@ tr3886:
                        p--; {goto st307;}
                }
        }
-       goto st1279;
-st1279:
+       goto st1306;
+st1306:
        if ( ++p == pe )
-               goto _test_eof1279;
-case 1279:
+               goto _test_eof1306;
+case 1306:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3874;
+                       goto tr3911;
        } else if ( (*p) > 86 ) {
                if ( 97 <= (*p) && (*p) <= 118 )
-                       goto tr3874;
+                       goto tr3911;
        } else
-               goto tr3874;
-       goto tr3867;
-tr3874:
+               goto tr3911;
+       goto tr3904;
+tr3911:
        {
                *(rdata_tail++) += second_left_base32hex_to_num[(uint8_t)(*p)];
 
@@ -92142,41 +92743,41 @@ tr3874:
                        p--; {goto st307;}
                }
        }
-       goto st1280;
-st1280:
+       goto st1307;
+st1307:
        if ( ++p == pe )
-               goto _test_eof1280;
-case 1280:
+               goto _test_eof1307;
+case 1307:
        if ( (*p) == 61 )
-               goto st1291;
+               goto st1318;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3875;
+                       goto tr3912;
        } else if ( (*p) > 86 ) {
                if ( 97 <= (*p) && (*p) <= 118 )
-                       goto tr3875;
+                       goto tr3912;
        } else
-               goto tr3875;
-       goto tr3867;
-tr3875:
+               goto tr3912;
+       goto tr3904;
+tr3912:
        {
                *rdata_tail += third_base32hex_to_num[(uint8_t)(*p)];
        }
-       goto st1281;
-st1281:
+       goto st1308;
+st1308:
        if ( ++p == pe )
-               goto _test_eof1281;
-case 1281:
+               goto _test_eof1308;
+case 1308:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3877;
+                       goto tr3914;
        } else if ( (*p) > 86 ) {
                if ( 97 <= (*p) && (*p) <= 118 )
-                       goto tr3877;
+                       goto tr3914;
        } else
-               goto tr3877;
-       goto tr3867;
-tr3877:
+               goto tr3914;
+       goto tr3904;
+tr3914:
        {
                *(rdata_tail++) += fourth_left_base32hex_to_num[(uint8_t)(*p)];
 
@@ -92187,23 +92788,23 @@ tr3877:
                        p--; {goto st307;}
                }
        }
-       goto st1282;
-st1282:
+       goto st1309;
+st1309:
        if ( ++p == pe )
-               goto _test_eof1282;
-case 1282:
+               goto _test_eof1309;
+case 1309:
        if ( (*p) == 61 )
-               goto st1290;
+               goto st1317;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3878;
+                       goto tr3915;
        } else if ( (*p) > 86 ) {
                if ( 97 <= (*p) && (*p) <= 118 )
-                       goto tr3878;
+                       goto tr3915;
        } else
-               goto tr3878;
-       goto tr3867;
-tr3878:
+               goto tr3915;
+       goto tr3904;
+tr3915:
        {
                *(rdata_tail++) += fifth_left_base32hex_to_num[(uint8_t)(*p)];
 
@@ -92214,41 +92815,41 @@ tr3878:
                        p--; {goto st307;}
                }
        }
-       goto st1283;
-st1283:
+       goto st1310;
+st1310:
        if ( ++p == pe )
-               goto _test_eof1283;
-case 1283:
+               goto _test_eof1310;
+case 1310:
        if ( (*p) == 61 )
-               goto st1288;
+               goto st1315;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3880;
+                       goto tr3917;
        } else if ( (*p) > 86 ) {
                if ( 97 <= (*p) && (*p) <= 118 )
-                       goto tr3880;
+                       goto tr3917;
        } else
-               goto tr3880;
-       goto tr3867;
-tr3880:
+               goto tr3917;
+       goto tr3904;
+tr3917:
        {
                *rdata_tail += sixth_base32hex_to_num[(uint8_t)(*p)];
        }
-       goto st1284;
-st1284:
+       goto st1311;
+st1311:
        if ( ++p == pe )
-               goto _test_eof1284;
-case 1284:
+               goto _test_eof1311;
+case 1311:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3882;
+                       goto tr3919;
        } else if ( (*p) > 86 ) {
                if ( 97 <= (*p) && (*p) <= 118 )
-                       goto tr3882;
+                       goto tr3919;
        } else
-               goto tr3882;
-       goto tr3867;
-tr3882:
+               goto tr3919;
+       goto tr3904;
+tr3919:
        {
                *(rdata_tail++) += seventh_left_base32hex_to_num[(uint8_t)(*p)];
 
@@ -92259,51 +92860,51 @@ tr3882:
                        p--; {goto st307;}
                }
        }
-       goto st1285;
-st1285:
+       goto st1312;
+st1312:
        if ( ++p == pe )
-               goto _test_eof1285;
-case 1285:
+               goto _test_eof1312;
+case 1312:
        if ( (*p) == 61 )
-               goto st1286;
+               goto st1313;
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3883;
+                       goto tr3920;
        } else if ( (*p) > 86 ) {
                if ( 97 <= (*p) && (*p) <= 118 )
-                       goto tr3883;
+                       goto tr3920;
        } else
-               goto tr3883;
-       goto tr3867;
-tr3883:
+               goto tr3920;
+       goto tr3904;
+tr3920:
        {
                *(rdata_tail++) += eighth_base32hex_to_num[(uint8_t)(*p)];
        }
-       goto st1286;
-st1286:
+       goto st1313;
+st1313:
        if ( ++p == pe )
-               goto _test_eof1286;
-case 1286:
+               goto _test_eof1313;
+case 1313:
        switch( (*p) ) {
-               case 32: goto tr3885;
-               case 59: goto tr3885;
+               case 32: goto tr3922;
+               case 59: goto tr3922;
        }
        if ( (*p) < 48 ) {
                if ( (*p) > 10 ) {
                        if ( 40 <= (*p) && (*p) <= 41 )
-                               goto tr3885;
+                               goto tr3922;
                } else if ( (*p) >= 9 )
-                       goto tr3885;
+                       goto tr3922;
        } else if ( (*p) > 57 ) {
                if ( (*p) > 86 ) {
                        if ( 97 <= (*p) && (*p) <= 118 )
-                               goto tr3886;
+                               goto tr3923;
                } else if ( (*p) >= 65 )
-                       goto tr3886;
+                       goto tr3923;
        } else
-               goto tr3886;
-       goto tr3867;
-tr3885:
+               goto tr3923;
+       goto tr3904;
+tr3922:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -92317,80 +92918,80 @@ tr3885:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 1287;goto st376;} }
-       goto st1287;
-st1287:
+       { p--; {stack[top++] = 1314;goto st376;} }
+       goto st1314;
+st1314:
        if ( ++p == pe )
-               goto _test_eof1287;
-case 1287:
+               goto _test_eof1314;
+case 1314:
        switch( (*p) ) {
-               case 32: goto tr3887;
-               case 59: goto tr3887;
+               case 32: goto tr3924;
+               case 59: goto tr3924;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr3887;
+                       goto tr3924;
        } else if ( (*p) >= 9 )
-               goto tr3887;
+               goto tr3924;
        goto tr75;
-tr3887:
+tr3924:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1477;
-st1477:
+       goto st1504;
+st1504:
        if ( ++p == pe )
-               goto _test_eof1477;
-case 1477:
+               goto _test_eof1504;
+case 1504:
        goto st0;
-st1288:
+st1315:
        if ( ++p == pe )
-               goto _test_eof1288;
-case 1288:
+               goto _test_eof1315;
+case 1315:
        if ( (*p) == 61 )
-               goto st1289;
-       goto tr3867;
-st1289:
+               goto st1316;
+       goto tr3904;
+st1316:
        if ( ++p == pe )
-               goto _test_eof1289;
-case 1289:
+               goto _test_eof1316;
+case 1316:
        if ( (*p) == 61 )
-               goto st1286;
-       goto tr3867;
-st1290:
+               goto st1313;
+       goto tr3904;
+st1317:
        if ( ++p == pe )
-               goto _test_eof1290;
-case 1290:
+               goto _test_eof1317;
+case 1317:
        if ( (*p) == 61 )
-               goto st1288;
-       goto tr3867;
-st1291:
+               goto st1315;
+       goto tr3904;
+st1318:
        if ( ++p == pe )
-               goto _test_eof1291;
-case 1291:
+               goto _test_eof1318;
+case 1318:
        if ( (*p) == 61 )
-               goto st1292;
-       goto tr3867;
-st1292:
+               goto st1319;
+       goto tr3904;
+st1319:
        if ( ++p == pe )
-               goto _test_eof1292;
-case 1292:
+               goto _test_eof1319;
+case 1319:
        if ( (*p) == 61 )
-               goto st1290;
-       goto tr3867;
-tr3873:
+               goto st1317;
+       goto tr3904;
+tr3910:
        {
                s->buffer_length = 0;
        }
-       goto st1293;
-tr3890:
+       goto st1320;
+tr3927:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1293;
-tr3866:
+       goto st1320;
+tr3903:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -92407,11 +93008,11 @@ tr3866:
        {
                s->buffer_length = 0;
        }
-       goto st1293;
-st1293:
+       goto st1320;
+st1320:
        if ( ++p == pe )
-               goto _test_eof1293;
-case 1293:
+               goto _test_eof1320;
+case 1320:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -92431,11 +93032,11 @@ case 1293:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3891;
+               goto tr3928;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3890;
+               goto tr3927;
        goto tr75;
-tr3893:
+tr3930:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -92444,8 +93045,8 @@ tr3893:
                        p--; {goto st307;}
                }
        }
-       goto st1294;
-tr3859:
+       goto st1321;
+tr3896:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -92462,30 +93063,30 @@ tr3859:
                        p--; {goto st307;}
                }
        }
-       goto st1294;
-st1294:
+       goto st1321;
+st1321:
        if ( ++p == pe )
-               goto _test_eof1294;
-case 1294:
+               goto _test_eof1321;
+case 1321:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3892;
+                       goto tr3929;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr3892;
+                       goto tr3929;
        } else
-               goto tr3892;
-       goto tr2998;
-tr3892:
+               goto tr3929;
+       goto tr3035;
+tr3929:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1295;
-st1295:
+       goto st1322;
+st1322:
        if ( ++p == pe )
-               goto _test_eof1295;
-case 1295:
+               goto _test_eof1322;
+case 1322:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -92499,35 +93100,35 @@ case 1295:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3862;
-               case 32: goto tr3862;
-               case 40: goto tr3863;
-               case 41: goto tr3864;
-               case 2058: goto tr3865;
-               case 2107: goto tr3866;
+               case 9: goto tr3899;
+               case 32: goto tr3899;
+               case 40: goto tr3900;
+               case 41: goto tr3901;
+               case 2058: goto tr3902;
+               case 2107: goto tr3903;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3893;
+                       goto tr3930;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3893;
+                       goto tr3930;
        } else
-               goto tr3893;
-       goto tr2998;
-tr3861:
+               goto tr3930;
+       goto tr3035;
+tr3898:
        {
                s->buffer_length = 0;
        }
-       goto st1296;
-tr3894:
+       goto st1323;
+tr3931:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1296;
-tr3854:
+       goto st1323;
+tr3891:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -92541,11 +93142,11 @@ tr3854:
        {
                s->buffer_length = 0;
        }
-       goto st1296;
-st1296:
+       goto st1323;
+st1323:
        if ( ++p == pe )
-               goto _test_eof1296;
-case 1296:
+               goto _test_eof1323;
+case 1323:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -92565,23 +93166,23 @@ case 1296:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3895;
+               goto tr3932;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3894;
+               goto tr3931;
        goto tr75;
-tr3848:
+tr3885:
        {
                s->buffer_length = 0;
        }
-       goto st1297;
-tr3896:
+       goto st1324;
+tr3933:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1297;
-tr3842:
+       goto st1324;
+tr3879:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -92594,11 +93195,11 @@ tr3842:
        {
                s->buffer_length = 0;
        }
-       goto st1297;
-st1297:
+       goto st1324;
+st1324:
        if ( ++p == pe )
-               goto _test_eof1297;
-case 1297:
+               goto _test_eof1324;
+case 1324:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -92618,23 +93219,23 @@ case 1297:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3897;
+               goto tr3934;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3896;
+               goto tr3933;
        goto tr75;
-tr3836:
+tr3873:
        {
                s->buffer_length = 0;
        }
-       goto st1298;
-tr3898:
+       goto st1325;
+tr3935:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1298;
-tr3830:
+       goto st1325;
+tr3867:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -92647,11 +93248,11 @@ tr3830:
        {
                s->buffer_length = 0;
        }
-       goto st1298;
-st1298:
+       goto st1325;
+st1325:
        if ( ++p == pe )
-               goto _test_eof1298;
-case 1298:
+               goto _test_eof1325;
+case 1325:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -92671,18 +93272,18 @@ case 1298:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3899;
+               goto tr3936;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3898;
+               goto tr3935;
        goto tr75;
-st1299:
+st1326:
        if ( ++p == pe )
-               goto _test_eof1299;
-case 1299:
+               goto _test_eof1326;
+case 1326:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr3900;
-       goto tr2327;
-tr3900:
+               goto tr3937;
+       goto tr2364;
+tr3937:
        {
                s->number64 = 0;
        }
@@ -92700,8 +93301,8 @@ tr3900:
                        p--; {goto st307;}
                }
        }
-       goto st1300;
-tr3904:
+       goto st1327;
+tr3941:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -92716,11 +93317,11 @@ tr3904:
                        p--; {goto st307;}
                }
        }
-       goto st1300;
-st1300:
+       goto st1327;
+st1327:
        if ( ++p == pe )
-               goto _test_eof1300;
-case 1300:
+               goto _test_eof1327;
+case 1327:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -92734,17 +93335,17 @@ case 1300:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3901;
-               case 32: goto tr3901;
-               case 40: goto tr3902;
-               case 41: goto tr3903;
-               case 2058: goto tr3905;
-               case 2107: goto tr3906;
+               case 9: goto tr3938;
+               case 32: goto tr3938;
+               case 40: goto tr3939;
+               case 41: goto tr3940;
+               case 2058: goto tr3942;
+               case 2107: goto tr3943;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3904;
-       goto tr2327;
-tr3908:
+               goto tr3941;
+       goto tr2364;
+tr3945:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -92752,8 +93353,8 @@ tr3908:
                }
                s->multiline = true;
        }
-       goto st1301;
-tr3909:
+       goto st1328;
+tr3946:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -92761,13 +93362,13 @@ tr3909:
                }
                s->multiline = false;
        }
-       goto st1301;
-tr3911:
+       goto st1328;
+tr3948:
        {
                s->line_counter++;
        }
-       goto st1301;
-tr3946:
+       goto st1328;
+tr3983:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -92777,15 +93378,15 @@ tr3946:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1301; goto _out;}
+                               {p++; cs = 1328; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1301;
-tr3901:
+       goto st1328;
+tr3938:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -92795,8 +93396,8 @@ tr3901:
                        p--; {goto st307;}
                }
        }
-       goto st1301;
-tr3902:
+       goto st1328;
+tr3939:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -92813,8 +93414,8 @@ tr3902:
                }
                s->multiline = true;
        }
-       goto st1301;
-tr3903:
+       goto st1328;
+tr3940:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -92831,8 +93432,8 @@ tr3903:
                }
                s->multiline = false;
        }
-       goto st1301;
-tr3905:
+       goto st1328;
+tr3942:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -92845,11 +93446,11 @@ tr3905:
        {
                s->line_counter++;
        }
-       goto st1301;
-st1301:
+       goto st1328;
+st1328:
        if ( ++p == pe )
-               goto _test_eof1301;
-case 1301:
+               goto _test_eof1328;
+case 1328:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -92863,17 +93464,17 @@ case 1301:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1301;
-               case 32: goto st1301;
-               case 40: goto tr3908;
-               case 41: goto tr3909;
-               case 2058: goto tr3911;
-               case 2107: goto tr3912;
+               case 9: goto st1328;
+               case 32: goto st1328;
+               case 40: goto tr3945;
+               case 41: goto tr3946;
+               case 2058: goto tr3948;
+               case 2107: goto tr3949;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3910;
-       goto tr2327;
-tr3910:
+               goto tr3947;
+       goto tr2364;
+tr3947:
        {
                s->number64 = 0;
        }
@@ -92891,8 +93492,8 @@ tr3910:
                        p--; {goto st307;}
                }
        }
-       goto st1302;
-tr3916:
+       goto st1329;
+tr3953:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -92907,11 +93508,11 @@ tr3916:
                        p--; {goto st307;}
                }
        }
-       goto st1302;
-st1302:
+       goto st1329;
+st1329:
        if ( ++p == pe )
-               goto _test_eof1302;
-case 1302:
+               goto _test_eof1329;
+case 1329:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -92925,17 +93526,17 @@ case 1302:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3913;
-               case 32: goto tr3913;
-               case 40: goto tr3914;
-               case 41: goto tr3915;
-               case 2058: goto tr3917;
-               case 2107: goto tr3918;
+               case 9: goto tr3950;
+               case 32: goto tr3950;
+               case 40: goto tr3951;
+               case 41: goto tr3952;
+               case 2058: goto tr3954;
+               case 2107: goto tr3955;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3916;
-       goto tr2327;
-tr3920:
+               goto tr3953;
+       goto tr2364;
+tr3957:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -92943,8 +93544,8 @@ tr3920:
                }
                s->multiline = true;
        }
-       goto st1303;
-tr3921:
+       goto st1330;
+tr3958:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -92952,13 +93553,13 @@ tr3921:
                }
                s->multiline = false;
        }
-       goto st1303;
-tr3923:
+       goto st1330;
+tr3960:
        {
                s->line_counter++;
        }
-       goto st1303;
-tr3944:
+       goto st1330;
+tr3981:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -92968,15 +93569,15 @@ tr3944:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1303; goto _out;}
+                               {p++; cs = 1330; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1303;
-tr3913:
+       goto st1330;
+tr3950:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -92986,8 +93587,8 @@ tr3913:
                        p--; {goto st307;}
                }
        }
-       goto st1303;
-tr3914:
+       goto st1330;
+tr3951:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93004,8 +93605,8 @@ tr3914:
                }
                s->multiline = true;
        }
-       goto st1303;
-tr3915:
+       goto st1330;
+tr3952:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93022,8 +93623,8 @@ tr3915:
                }
                s->multiline = false;
        }
-       goto st1303;
-tr3917:
+       goto st1330;
+tr3954:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93036,11 +93637,11 @@ tr3917:
        {
                s->line_counter++;
        }
-       goto st1303;
-st1303:
+       goto st1330;
+st1330:
        if ( ++p == pe )
-               goto _test_eof1303;
-case 1303:
+               goto _test_eof1330;
+case 1330:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -93054,17 +93655,17 @@ case 1303:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1303;
-               case 32: goto st1303;
-               case 40: goto tr3920;
-               case 41: goto tr3921;
-               case 2058: goto tr3923;
-               case 2107: goto tr3924;
+               case 9: goto st1330;
+               case 32: goto st1330;
+               case 40: goto tr3957;
+               case 41: goto tr3958;
+               case 2058: goto tr3960;
+               case 2107: goto tr3961;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3922;
-       goto tr2327;
-tr3922:
+               goto tr3959;
+       goto tr2364;
+tr3959:
        {
                s->number64 = 0;
        }
@@ -93082,8 +93683,8 @@ tr3922:
                        p--; {goto st307;}
                }
        }
-       goto st1304;
-tr3928:
+       goto st1331;
+tr3965:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -93098,11 +93699,11 @@ tr3928:
                        p--; {goto st307;}
                }
        }
-       goto st1304;
-st1304:
+       goto st1331;
+st1331:
        if ( ++p == pe )
-               goto _test_eof1304;
-case 1304:
+               goto _test_eof1331;
+case 1331:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -93116,17 +93717,17 @@ case 1304:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3925;
-               case 32: goto tr3925;
-               case 40: goto tr3926;
-               case 41: goto tr3927;
-               case 2058: goto tr3929;
-               case 2107: goto tr3930;
+               case 9: goto tr3962;
+               case 32: goto tr3962;
+               case 40: goto tr3963;
+               case 41: goto tr3964;
+               case 2058: goto tr3966;
+               case 2107: goto tr3967;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3928;
-       goto tr2327;
-tr3932:
+               goto tr3965;
+       goto tr2364;
+tr3969:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -93134,8 +93735,8 @@ tr3932:
                }
                s->multiline = true;
        }
-       goto st1305;
-tr3933:
+       goto st1332;
+tr3970:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -93143,13 +93744,13 @@ tr3933:
                }
                s->multiline = false;
        }
-       goto st1305;
-tr3936:
+       goto st1332;
+tr3973:
        {
                s->line_counter++;
        }
-       goto st1305;
-tr3942:
+       goto st1332;
+tr3979:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -93159,15 +93760,15 @@ tr3942:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1305; goto _out;}
+                               {p++; cs = 1332; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1305;
-tr3925:
+       goto st1332;
+tr3962:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -93178,8 +93779,8 @@ tr3925:
                        p--; {goto st307;}
                }
        }
-       goto st1305;
-tr3926:
+       goto st1332;
+tr3963:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -93197,8 +93798,8 @@ tr3926:
                }
                s->multiline = true;
        }
-       goto st1305;
-tr3927:
+       goto st1332;
+tr3964:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -93216,8 +93817,8 @@ tr3927:
                }
                s->multiline = false;
        }
-       goto st1305;
-tr3929:
+       goto st1332;
+tr3966:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -93231,11 +93832,11 @@ tr3929:
        {
                s->line_counter++;
        }
-       goto st1305;
-st1305:
+       goto st1332;
+st1332:
        if ( ++p == pe )
-               goto _test_eof1305;
-case 1305:
+               goto _test_eof1332;
+case 1332:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -93249,24 +93850,24 @@ case 1305:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1305;
-               case 32: goto st1305;
-               case 40: goto tr3932;
-               case 41: goto tr3933;
-               case 45: goto tr3934;
-               case 2058: goto tr3936;
-               case 2107: goto tr3937;
+               case 9: goto st1332;
+               case 32: goto st1332;
+               case 40: goto tr3969;
+               case 41: goto tr3970;
+               case 45: goto tr3971;
+               case 2058: goto tr3973;
+               case 2107: goto tr3974;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3935;
+                       goto tr3972;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3935;
+                       goto tr3972;
        } else
-               goto tr3935;
-       goto tr2998;
-tr3934:
+               goto tr3972;
+       goto tr3035;
+tr3971:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -93275,22 +93876,22 @@ tr3934:
                        p--; {goto st307;}
                }
        }
-       goto st1306;
-st1306:
+       goto st1333;
+st1333:
        if ( ++p == pe )
-               goto _test_eof1306;
-case 1306:
+               goto _test_eof1333;
+case 1333:
        switch( (*p) ) {
-               case 32: goto tr3938;
-               case 59: goto tr3938;
+               case 32: goto tr3975;
+               case 59: goto tr3975;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr3938;
+                       goto tr3975;
        } else if ( (*p) >= 9 )
-               goto tr3938;
-       goto tr2998;
-tr3938:
+               goto tr3975;
+       goto tr3035;
+tr3975:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -93307,13 +93908,13 @@ tr3938:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1478;
-st1478:
+       goto st1505;
+st1505:
        if ( ++p == pe )
-               goto _test_eof1478;
-case 1478:
+               goto _test_eof1505;
+case 1505:
        goto st0;
-tr3940:
+tr3977:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -93322,8 +93923,8 @@ tr3940:
                        p--; {goto st307;}
                }
        }
-       goto st1307;
-tr3935:
+       goto st1334;
+tr3972:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -93340,62 +93941,62 @@ tr3935:
                        p--; {goto st307;}
                }
        }
-       goto st1307;
-st1307:
+       goto st1334;
+st1334:
        if ( ++p == pe )
-               goto _test_eof1307;
-case 1307:
+               goto _test_eof1334;
+case 1334:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3939;
+                       goto tr3976;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr3939;
+                       goto tr3976;
        } else
-               goto tr3939;
-       goto tr2998;
-tr3939:
+               goto tr3976;
+       goto tr3035;
+tr3976:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1308;
-st1308:
+       goto st1335;
+st1335:
        if ( ++p == pe )
-               goto _test_eof1308;
-case 1308:
+               goto _test_eof1335;
+case 1335:
        switch( (*p) ) {
-               case 32: goto tr3938;
-               case 59: goto tr3938;
+               case 32: goto tr3975;
+               case 59: goto tr3975;
        }
        if ( (*p) < 48 ) {
                if ( (*p) > 10 ) {
                        if ( 40 <= (*p) && (*p) <= 41 )
-                               goto tr3938;
+                               goto tr3975;
                } else if ( (*p) >= 9 )
-                       goto tr3938;
+                       goto tr3975;
        } else if ( (*p) > 57 ) {
                if ( (*p) > 70 ) {
                        if ( 97 <= (*p) && (*p) <= 102 )
-                               goto tr3940;
+                               goto tr3977;
                } else if ( (*p) >= 65 )
-                       goto tr3940;
+                       goto tr3977;
        } else
-               goto tr3940;
-       goto tr2998;
-tr3937:
+               goto tr3977;
+       goto tr3035;
+tr3974:
        {
                s->buffer_length = 0;
        }
-       goto st1309;
-tr3941:
+       goto st1336;
+tr3978:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1309;
-tr3930:
+       goto st1336;
+tr3967:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -93409,11 +94010,11 @@ tr3930:
        {
                s->buffer_length = 0;
        }
-       goto st1309;
-st1309:
+       goto st1336;
+st1336:
        if ( ++p == pe )
-               goto _test_eof1309;
-case 1309:
+               goto _test_eof1336;
+case 1336:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -93433,23 +94034,23 @@ case 1309:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3942;
+               goto tr3979;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3941;
+               goto tr3978;
        goto tr75;
-tr3924:
+tr3961:
        {
                s->buffer_length = 0;
        }
-       goto st1310;
-tr3943:
+       goto st1337;
+tr3980:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1310;
-tr3918:
+       goto st1337;
+tr3955:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93462,11 +94063,11 @@ tr3918:
        {
                s->buffer_length = 0;
        }
-       goto st1310;
-st1310:
+       goto st1337;
+st1337:
        if ( ++p == pe )
-               goto _test_eof1310;
-case 1310:
+               goto _test_eof1337;
+case 1337:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -93486,23 +94087,23 @@ case 1310:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3944;
+               goto tr3981;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3943;
+               goto tr3980;
        goto tr75;
-tr3912:
+tr3949:
        {
                s->buffer_length = 0;
        }
-       goto st1311;
-tr3945:
+       goto st1338;
+tr3982:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1311;
-tr3906:
+       goto st1338;
+tr3943:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93515,11 +94116,11 @@ tr3906:
        {
                s->buffer_length = 0;
        }
-       goto st1311;
-st1311:
+       goto st1338;
+st1338:
        if ( ++p == pe )
-               goto _test_eof1311;
-case 1311:
+               goto _test_eof1338;
+case 1338:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -93539,18 +94140,18 @@ case 1311:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3946;
+               goto tr3983;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3945;
+               goto tr3982;
        goto tr75;
-st1312:
+st1339:
        if ( ++p == pe )
-               goto _test_eof1312;
-case 1312:
+               goto _test_eof1339;
+case 1339:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr3947;
-       goto tr2327;
-tr3947:
+               goto tr3984;
+       goto tr2364;
+tr3984:
        {
                s->number64 = 0;
        }
@@ -93568,8 +94169,8 @@ tr3947:
                        p--; {goto st307;}
                }
        }
-       goto st1313;
-tr3951:
+       goto st1340;
+tr3988:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -93584,11 +94185,11 @@ tr3951:
                        p--; {goto st307;}
                }
        }
-       goto st1313;
-st1313:
+       goto st1340;
+st1340:
        if ( ++p == pe )
-               goto _test_eof1313;
-case 1313:
+               goto _test_eof1340;
+case 1340:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -93602,17 +94203,17 @@ case 1313:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3948;
-               case 32: goto tr3948;
-               case 40: goto tr3949;
-               case 41: goto tr3950;
-               case 2058: goto tr3952;
-               case 2107: goto tr3953;
+               case 9: goto tr3985;
+               case 32: goto tr3985;
+               case 40: goto tr3986;
+               case 41: goto tr3987;
+               case 2058: goto tr3989;
+               case 2107: goto tr3990;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3951;
-       goto tr2327;
-tr3955:
+               goto tr3988;
+       goto tr2364;
+tr3992:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -93620,8 +94221,8 @@ tr3955:
                }
                s->multiline = true;
        }
-       goto st1314;
-tr3956:
+       goto st1341;
+tr3993:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -93629,13 +94230,13 @@ tr3956:
                }
                s->multiline = false;
        }
-       goto st1314;
-tr3958:
+       goto st1341;
+tr3995:
        {
                s->line_counter++;
        }
-       goto st1314;
-tr4000:
+       goto st1341;
+tr4037:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -93645,15 +94246,15 @@ tr4000:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1314; goto _out;}
+                               {p++; cs = 1341; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1314;
-tr3948:
+       goto st1341;
+tr3985:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93663,8 +94264,8 @@ tr3948:
                        p--; {goto st307;}
                }
        }
-       goto st1314;
-tr3949:
+       goto st1341;
+tr3986:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93681,8 +94282,8 @@ tr3949:
                }
                s->multiline = true;
        }
-       goto st1314;
-tr3950:
+       goto st1341;
+tr3987:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93699,8 +94300,8 @@ tr3950:
                }
                s->multiline = false;
        }
-       goto st1314;
-tr3952:
+       goto st1341;
+tr3989:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93713,11 +94314,11 @@ tr3952:
        {
                s->line_counter++;
        }
-       goto st1314;
-st1314:
+       goto st1341;
+st1341:
        if ( ++p == pe )
-               goto _test_eof1314;
-case 1314:
+               goto _test_eof1341;
+case 1341:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -93731,17 +94332,17 @@ case 1314:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1314;
-               case 32: goto st1314;
-               case 40: goto tr3955;
-               case 41: goto tr3956;
-               case 2058: goto tr3958;
-               case 2107: goto tr3959;
+               case 9: goto st1341;
+               case 32: goto st1341;
+               case 40: goto tr3992;
+               case 41: goto tr3993;
+               case 2058: goto tr3995;
+               case 2107: goto tr3996;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3957;
-       goto tr2327;
-tr3957:
+               goto tr3994;
+       goto tr2364;
+tr3994:
        {
                s->number64 = 0;
        }
@@ -93759,8 +94360,8 @@ tr3957:
                        p--; {goto st307;}
                }
        }
-       goto st1315;
-tr3963:
+       goto st1342;
+tr4000:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -93775,11 +94376,11 @@ tr3963:
                        p--; {goto st307;}
                }
        }
-       goto st1315;
-st1315:
+       goto st1342;
+st1342:
        if ( ++p == pe )
-               goto _test_eof1315;
-case 1315:
+               goto _test_eof1342;
+case 1342:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -93793,17 +94394,17 @@ case 1315:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3960;
-               case 32: goto tr3960;
-               case 40: goto tr3961;
-               case 41: goto tr3962;
-               case 2058: goto tr3964;
-               case 2107: goto tr3965;
+               case 9: goto tr3997;
+               case 32: goto tr3997;
+               case 40: goto tr3998;
+               case 41: goto tr3999;
+               case 2058: goto tr4001;
+               case 2107: goto tr4002;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3963;
-       goto tr2327;
-tr3967:
+               goto tr4000;
+       goto tr2364;
+tr4004:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -93811,8 +94412,8 @@ tr3967:
                }
                s->multiline = true;
        }
-       goto st1316;
-tr3968:
+       goto st1343;
+tr4005:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -93820,13 +94421,13 @@ tr3968:
                }
                s->multiline = false;
        }
-       goto st1316;
-tr3970:
+       goto st1343;
+tr4007:
        {
                s->line_counter++;
        }
-       goto st1316;
-tr3998:
+       goto st1343;
+tr4035:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -93836,15 +94437,15 @@ tr3998:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1316; goto _out;}
+                               {p++; cs = 1343; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1316;
-tr3960:
+       goto st1343;
+tr3997:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93854,8 +94455,8 @@ tr3960:
                        p--; {goto st307;}
                }
        }
-       goto st1316;
-tr3961:
+       goto st1343;
+tr3998:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93872,8 +94473,8 @@ tr3961:
                }
                s->multiline = true;
        }
-       goto st1316;
-tr3962:
+       goto st1343;
+tr3999:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93890,8 +94491,8 @@ tr3962:
                }
                s->multiline = false;
        }
-       goto st1316;
-tr3964:
+       goto st1343;
+tr4001:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -93904,11 +94505,11 @@ tr3964:
        {
                s->line_counter++;
        }
-       goto st1316;
-st1316:
+       goto st1343;
+st1343:
        if ( ++p == pe )
-               goto _test_eof1316;
-case 1316:
+               goto _test_eof1343;
+case 1343:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -93922,17 +94523,17 @@ case 1316:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1316;
-               case 32: goto st1316;
-               case 40: goto tr3967;
-               case 41: goto tr3968;
-               case 2058: goto tr3970;
-               case 2107: goto tr3971;
+               case 9: goto st1343;
+               case 32: goto st1343;
+               case 40: goto tr4004;
+               case 41: goto tr4005;
+               case 2058: goto tr4007;
+               case 2107: goto tr4008;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3969;
-       goto tr2327;
-tr3969:
+               goto tr4006;
+       goto tr2364;
+tr4006:
        {
                s->number64 = 0;
        }
@@ -93950,8 +94551,8 @@ tr3969:
                        p--; {goto st307;}
                }
        }
-       goto st1317;
-tr3975:
+       goto st1344;
+tr4012:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -93966,11 +94567,11 @@ tr3975:
                        p--; {goto st307;}
                }
        }
-       goto st1317;
-st1317:
+       goto st1344;
+st1344:
        if ( ++p == pe )
-               goto _test_eof1317;
-case 1317:
+               goto _test_eof1344;
+case 1344:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -93984,17 +94585,17 @@ case 1317:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr3972;
-               case 32: goto tr3972;
-               case 40: goto tr3973;
-               case 41: goto tr3974;
-               case 2058: goto tr3976;
-               case 2107: goto tr3977;
+               case 9: goto tr4009;
+               case 32: goto tr4009;
+               case 40: goto tr4010;
+               case 41: goto tr4011;
+               case 2058: goto tr4013;
+               case 2107: goto tr4014;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr3975;
-       goto tr2327;
-tr3979:
+               goto tr4012;
+       goto tr2364;
+tr4016:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -94002,8 +94603,8 @@ tr3979:
                }
                s->multiline = true;
        }
-       goto st1318;
-tr3980:
+       goto st1345;
+tr4017:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -94011,13 +94612,13 @@ tr3980:
                }
                s->multiline = false;
        }
-       goto st1318;
-tr3982:
+       goto st1345;
+tr4019:
        {
                s->line_counter++;
        }
-       goto st1318;
-tr3996:
+       goto st1345;
+tr4033:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -94027,15 +94628,15 @@ tr3996:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1318; goto _out;}
+                               {p++; cs = 1345; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1318;
-tr3972:
+       goto st1345;
+tr4009:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -94045,8 +94646,8 @@ tr3972:
                        p--; {goto st307;}
                }
        }
-       goto st1318;
-tr3973:
+       goto st1345;
+tr4010:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -94063,8 +94664,8 @@ tr3973:
                }
                s->multiline = true;
        }
-       goto st1318;
-tr3974:
+       goto st1345;
+tr4011:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -94081,8 +94682,8 @@ tr3974:
                }
                s->multiline = false;
        }
-       goto st1318;
-tr3976:
+       goto st1345;
+tr4013:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -94095,11 +94696,11 @@ tr3976:
        {
                s->line_counter++;
        }
-       goto st1318;
-st1318:
+       goto st1345;
+st1345:
        if ( ++p == pe )
-               goto _test_eof1318;
-case 1318:
+               goto _test_eof1345;
+case 1345:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -94113,23 +94714,23 @@ case 1318:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1318;
-               case 32: goto st1318;
-               case 40: goto tr3979;
-               case 41: goto tr3980;
-               case 2058: goto tr3982;
-               case 2107: goto tr3983;
+               case 9: goto st1345;
+               case 32: goto st1345;
+               case 40: goto tr4016;
+               case 41: goto tr4017;
+               case 2058: goto tr4019;
+               case 2107: goto tr4020;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3981;
+                       goto tr4018;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3981;
+                       goto tr4018;
        } else
-               goto tr3981;
-       goto tr2998;
-tr3981:
+               goto tr4018;
+       goto tr3035;
+tr4018:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -94138,21 +94739,21 @@ tr3981:
                        p--; {goto st307;}
                }
        }
-       goto st1319;
-st1319:
+       goto st1346;
+st1346:
        if ( ++p == pe )
-               goto _test_eof1319;
-case 1319:
+               goto _test_eof1346;
+case 1346:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr3984;
+                       goto tr4021;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr3984;
+                       goto tr4021;
        } else
-               goto tr3984;
-       goto tr2998;
-tr3986:
+               goto tr4021;
+       goto tr3035;
+tr4023:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -94160,8 +94761,8 @@ tr3986:
                }
                s->multiline = true;
        }
-       goto st1320;
-tr3987:
+       goto st1347;
+tr4024:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -94169,13 +94770,13 @@ tr3987:
                }
                s->multiline = false;
        }
-       goto st1320;
-tr3988:
+       goto st1347;
+tr4025:
        {
                s->line_counter++;
        }
-       goto st1320;
-tr3994:
+       goto st1347;
+tr4031:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -94185,24 +94786,24 @@ tr3994:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1320; goto _out;}
+                               {p++; cs = 1347; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1320;
-tr3984:
+       goto st1347;
+tr4021:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1320;
-st1320:
+       goto st1347;
+st1347:
        if ( ++p == pe )
-               goto _test_eof1320;
-case 1320:
+               goto _test_eof1347;
+case 1347:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -94220,42 +94821,42 @@ case 1320:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st1320;
-               case 32: goto st1320;
-               case 40: goto tr3986;
-               case 41: goto tr3987;
-               case 3082: goto tr3988;
-               case 3131: goto tr3989;
-               case 3338: goto tr3990;
-               case 3387: goto tr3990;
-               case 3594: goto tr3991;
-               case 3643: goto tr3992;
+               case 9: goto st1347;
+               case 32: goto st1347;
+               case 40: goto tr4023;
+               case 41: goto tr4024;
+               case 3082: goto tr4025;
+               case 3131: goto tr4026;
+               case 3338: goto tr4027;
+               case 3387: goto tr4027;
+               case 3594: goto tr4028;
+               case 3643: goto tr4029;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3981;
+                       goto tr4018;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3981;
+                       goto tr4018;
        } else
-               goto tr3981;
-       goto tr2998;
-tr3989:
+               goto tr4018;
+       goto tr3035;
+tr4026:
        {
                s->buffer_length = 0;
        }
-       goto st1321;
-tr3993:
+       goto st1348;
+tr4030:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1321;
-st1321:
+       goto st1348;
+st1348:
        if ( ++p == pe )
-               goto _test_eof1321;
-case 1321:
+               goto _test_eof1348;
+case 1348:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -94275,32 +94876,32 @@ case 1321:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3994;
+               goto tr4031;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3993;
-       goto tr2998;
-tr3990:
+               goto tr4030;
+       goto tr3035;
+tr4027:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1479;
-st1479:
+       goto st1506;
+st1506:
        if ( ++p == pe )
-               goto _test_eof1479;
-case 1479:
+               goto _test_eof1506;
+case 1506:
        goto st0;
-tr3991:
+tr4028:
        {
                s->line_counter++;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1480;
-st1480:
+       goto st1507;
+st1507:
        if ( ++p == pe )
-               goto _test_eof1480;
-case 1480:
+               goto _test_eof1507;
+case 1507:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -94318,38 +94919,38 @@ case 1480:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st1320;
-               case 32: goto st1320;
-               case 40: goto tr3986;
-               case 41: goto tr3987;
-               case 3082: goto tr3988;
-               case 3131: goto tr3989;
-               case 3338: goto tr3990;
-               case 3387: goto tr3990;
-               case 3594: goto tr3991;
-               case 3643: goto tr3992;
+               case 9: goto st1347;
+               case 32: goto st1347;
+               case 40: goto tr4023;
+               case 41: goto tr4024;
+               case 3082: goto tr4025;
+               case 3131: goto tr4026;
+               case 3338: goto tr4027;
+               case 3387: goto tr4027;
+               case 3594: goto tr4028;
+               case 3643: goto tr4029;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr3981;
+                       goto tr4018;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr3981;
+                       goto tr4018;
        } else
-               goto tr3981;
-       goto tr2998;
-tr3992:
+               goto tr4018;
+       goto tr3035;
+tr4029:
        {
                s->buffer_length = 0;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1481;
-st1481:
+       goto st1508;
+st1508:
        if ( ++p == pe )
-               goto _test_eof1481;
-case 1481:
+               goto _test_eof1508;
+case 1508:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -94369,23 +94970,23 @@ case 1481:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3994;
+               goto tr4031;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3993;
-       goto tr2998;
-tr3983:
+               goto tr4030;
+       goto tr3035;
+tr4020:
        {
                s->buffer_length = 0;
        }
-       goto st1322;
-tr3995:
+       goto st1349;
+tr4032:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1322;
-tr3977:
+       goto st1349;
+tr4014:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -94398,11 +94999,11 @@ tr3977:
        {
                s->buffer_length = 0;
        }
-       goto st1322;
-st1322:
+       goto st1349;
+st1349:
        if ( ++p == pe )
-               goto _test_eof1322;
-case 1322:
+               goto _test_eof1349;
+case 1349:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -94422,23 +95023,23 @@ case 1322:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3996;
+               goto tr4033;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3995;
+               goto tr4032;
        goto tr75;
-tr3971:
+tr4008:
        {
                s->buffer_length = 0;
        }
-       goto st1323;
-tr3997:
+       goto st1350;
+tr4034:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1323;
-tr3965:
+       goto st1350;
+tr4002:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -94451,11 +95052,11 @@ tr3965:
        {
                s->buffer_length = 0;
        }
-       goto st1323;
-st1323:
+       goto st1350;
+st1350:
        if ( ++p == pe )
-               goto _test_eof1323;
-case 1323:
+               goto _test_eof1350;
+case 1350:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -94475,23 +95076,23 @@ case 1323:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr3998;
+               goto tr4035;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3997;
+               goto tr4034;
        goto tr75;
-tr3959:
+tr3996:
        {
                s->buffer_length = 0;
        }
-       goto st1324;
-tr3999:
+       goto st1351;
+tr4036:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1324;
-tr3953:
+       goto st1351;
+tr3990:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -94504,11 +95105,11 @@ tr3953:
        {
                s->buffer_length = 0;
        }
-       goto st1324;
-st1324:
+       goto st1351;
+st1351:
        if ( ++p == pe )
-               goto _test_eof1324;
-case 1324:
+               goto _test_eof1351;
+case 1351:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -94528,18 +95129,18 @@ case 1324:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4000;
+               goto tr4037;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr3999;
+               goto tr4036;
        goto tr75;
-st1325:
+st1352:
        if ( ++p == pe )
-               goto _test_eof1325;
-case 1325:
+               goto _test_eof1352;
+case 1352:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr4001;
-       goto tr2327;
-tr4001:
+               goto tr4038;
+       goto tr2364;
+tr4038:
        {
                s->number64 = 0;
        }
@@ -94557,8 +95158,8 @@ tr4001:
                        p--; {goto st307;}
                }
        }
-       goto st1326;
-tr4005:
+       goto st1353;
+tr4042:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -94573,11 +95174,11 @@ tr4005:
                        p--; {goto st307;}
                }
        }
-       goto st1326;
-st1326:
+       goto st1353;
+st1353:
        if ( ++p == pe )
-               goto _test_eof1326;
-case 1326:
+               goto _test_eof1353;
+case 1353:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -94591,17 +95192,17 @@ case 1326:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4002;
-               case 32: goto tr4002;
-               case 40: goto tr4003;
-               case 41: goto tr4004;
-               case 2058: goto tr4006;
-               case 2107: goto tr4007;
+               case 9: goto tr4039;
+               case 32: goto tr4039;
+               case 40: goto tr4040;
+               case 41: goto tr4041;
+               case 2058: goto tr4043;
+               case 2107: goto tr4044;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4005;
-       goto tr2327;
-tr4009:
+               goto tr4042;
+       goto tr2364;
+tr4046:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -94609,8 +95210,8 @@ tr4009:
                }
                s->multiline = true;
        }
-       goto st1327;
-tr4010:
+       goto st1354;
+tr4047:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -94618,13 +95219,13 @@ tr4010:
                }
                s->multiline = false;
        }
-       goto st1327;
-tr4012:
+       goto st1354;
+tr4049:
        {
                s->line_counter++;
        }
-       goto st1327;
-tr4018:
+       goto st1354;
+tr4055:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -94634,15 +95235,15 @@ tr4018:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1327; goto _out;}
+                               {p++; cs = 1354; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1327;
-tr4002:
+       goto st1354;
+tr4039:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -94653,8 +95254,8 @@ tr4002:
                        p--; {goto st307;}
                }
        }
-       goto st1327;
-tr4003:
+       goto st1354;
+tr4040:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -94672,8 +95273,8 @@ tr4003:
                }
                s->multiline = true;
        }
-       goto st1327;
-tr4004:
+       goto st1354;
+tr4041:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -94691,8 +95292,8 @@ tr4004:
                }
                s->multiline = false;
        }
-       goto st1327;
-tr4006:
+       goto st1354;
+tr4043:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -94706,11 +95307,11 @@ tr4006:
        {
                s->line_counter++;
        }
-       goto st1327;
-st1327:
+       goto st1354;
+st1354:
        if ( ++p == pe )
-               goto _test_eof1327;
-case 1327:
+               goto _test_eof1354;
+case 1354:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -94724,17 +95325,17 @@ case 1327:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1327;
-               case 32: goto st1327;
-               case 40: goto tr4009;
-               case 41: goto tr4010;
-               case 2058: goto tr4012;
-               case 2107: goto tr4013;
+               case 9: goto st1354;
+               case 32: goto st1354;
+               case 40: goto tr4046;
+               case 41: goto tr4047;
+               case 2058: goto tr4049;
+               case 2107: goto tr4050;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4011;
-       goto tr2327;
-tr4011:
+               goto tr4048;
+       goto tr2364;
+tr4048:
        {
                s->number64 = 0;
        }
@@ -94752,8 +95353,8 @@ tr4011:
                        p--; {goto st307;}
                }
        }
-       goto st1328;
-tr4015:
+       goto st1355;
+tr4052:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -94768,25 +95369,25 @@ tr4015:
                        p--; {goto st307;}
                }
        }
-       goto st1328;
-st1328:
+       goto st1355;
+st1355:
        if ( ++p == pe )
-               goto _test_eof1328;
-case 1328:
+               goto _test_eof1355;
+case 1355:
        switch( (*p) ) {
-               case 32: goto tr4014;
-               case 59: goto tr4014;
+               case 32: goto tr4051;
+               case 59: goto tr4051;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr4014;
+                       goto tr4051;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4015;
+                       goto tr4052;
        } else
-               goto tr4014;
-       goto tr2327;
-tr4014:
+               goto tr4051;
+       goto tr2364;
+tr4051:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -94797,45 +95398,45 @@ tr4014:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 1329;goto st376;} }
-       goto st1329;
-st1329:
+       { p--; {stack[top++] = 1356;goto st376;} }
+       goto st1356;
+st1356:
        if ( ++p == pe )
-               goto _test_eof1329;
-case 1329:
+               goto _test_eof1356;
+case 1356:
        switch( (*p) ) {
-               case 32: goto tr4016;
-               case 59: goto tr4016;
+               case 32: goto tr4053;
+               case 59: goto tr4053;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr4016;
+                       goto tr4053;
        } else if ( (*p) >= 9 )
-               goto tr4016;
+               goto tr4053;
        goto tr75;
-tr4016:
+tr4053:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1482;
-st1482:
+       goto st1509;
+st1509:
        if ( ++p == pe )
-               goto _test_eof1482;
-case 1482:
+               goto _test_eof1509;
+case 1509:
        goto st0;
-tr4013:
+tr4050:
        {
                s->buffer_length = 0;
        }
-       goto st1330;
-tr4017:
+       goto st1357;
+tr4054:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1330;
-tr4007:
+       goto st1357;
+tr4044:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -94849,11 +95450,11 @@ tr4007:
        {
                s->buffer_length = 0;
        }
-       goto st1330;
-st1330:
+       goto st1357;
+st1357:
        if ( ++p == pe )
-               goto _test_eof1330;
-case 1330:
+               goto _test_eof1357;
+case 1357:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -94873,18 +95474,18 @@ case 1330:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4018;
+               goto tr4055;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4017;
+               goto tr4054;
        goto tr75;
-st1331:
+st1358:
        if ( ++p == pe )
-               goto _test_eof1331;
-case 1331:
+               goto _test_eof1358;
+case 1358:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr4019;
-       goto tr2327;
-tr4019:
+               goto tr4056;
+       goto tr2364;
+tr4056:
        {
                s->number64 = 0;
        }
@@ -94902,8 +95503,8 @@ tr4019:
                        p--; {goto st307;}
                }
        }
-       goto st1332;
-tr4023:
+       goto st1359;
+tr4060:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -94918,11 +95519,11 @@ tr4023:
                        p--; {goto st307;}
                }
        }
-       goto st1332;
-st1332:
+       goto st1359;
+st1359:
        if ( ++p == pe )
-               goto _test_eof1332;
-case 1332:
+               goto _test_eof1359;
+case 1359:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -94936,17 +95537,17 @@ case 1332:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4020;
-               case 32: goto tr4020;
-               case 40: goto tr4021;
-               case 41: goto tr4022;
-               case 2058: goto tr4024;
-               case 2107: goto tr4025;
+               case 9: goto tr4057;
+               case 32: goto tr4057;
+               case 40: goto tr4058;
+               case 41: goto tr4059;
+               case 2058: goto tr4061;
+               case 2107: goto tr4062;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4023;
-       goto tr2327;
-tr4027:
+               goto tr4060;
+       goto tr2364;
+tr4064:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -94954,8 +95555,8 @@ tr4027:
                }
                s->multiline = true;
        }
-       goto st1333;
-tr4028:
+       goto st1360;
+tr4065:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -94963,13 +95564,13 @@ tr4028:
                }
                s->multiline = false;
        }
-       goto st1333;
-tr4030:
+       goto st1360;
+tr4067:
        {
                s->line_counter++;
        }
-       goto st1333;
-tr4072:
+       goto st1360;
+tr4109:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -94979,15 +95580,15 @@ tr4072:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1333; goto _out;}
+                               {p++; cs = 1360; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1333;
-tr4020:
+       goto st1360;
+tr4057:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -94998,8 +95599,8 @@ tr4020:
                        p--; {goto st307;}
                }
        }
-       goto st1333;
-tr4021:
+       goto st1360;
+tr4058:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -95017,8 +95618,8 @@ tr4021:
                }
                s->multiline = true;
        }
-       goto st1333;
-tr4022:
+       goto st1360;
+tr4059:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -95036,8 +95637,8 @@ tr4022:
                }
                s->multiline = false;
        }
-       goto st1333;
-tr4024:
+       goto st1360;
+tr4061:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -95051,11 +95652,11 @@ tr4024:
        {
                s->line_counter++;
        }
-       goto st1333;
-st1333:
+       goto st1360;
+st1360:
        if ( ++p == pe )
-               goto _test_eof1333;
-case 1333:
+               goto _test_eof1360;
+case 1360:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -95069,17 +95670,17 @@ case 1333:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1333;
-               case 32: goto st1333;
-               case 40: goto tr4027;
-               case 41: goto tr4028;
-               case 2058: goto tr4030;
-               case 2107: goto tr4031;
+               case 9: goto st1360;
+               case 32: goto st1360;
+               case 40: goto tr4064;
+               case 41: goto tr4065;
+               case 2058: goto tr4067;
+               case 2107: goto tr4068;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4029;
-       goto tr2327;
-tr4029:
+               goto tr4066;
+       goto tr2364;
+tr4066:
        {
                s->number64 = 0;
        }
@@ -95097,8 +95698,8 @@ tr4029:
                        p--; {goto st307;}
                }
        }
-       goto st1334;
-tr4035:
+       goto st1361;
+tr4072:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -95113,11 +95714,11 @@ tr4035:
                        p--; {goto st307;}
                }
        }
-       goto st1334;
-st1334:
+       goto st1361;
+st1361:
        if ( ++p == pe )
-               goto _test_eof1334;
-case 1334:
+               goto _test_eof1361;
+case 1361:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -95131,17 +95732,17 @@ case 1334:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4032;
-               case 32: goto tr4032;
-               case 40: goto tr4033;
-               case 41: goto tr4034;
-               case 2058: goto tr4036;
-               case 2107: goto tr4037;
+               case 9: goto tr4069;
+               case 32: goto tr4069;
+               case 40: goto tr4070;
+               case 41: goto tr4071;
+               case 2058: goto tr4073;
+               case 2107: goto tr4074;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4035;
-       goto tr2327;
-tr4039:
+               goto tr4072;
+       goto tr2364;
+tr4076:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -95149,8 +95750,8 @@ tr4039:
                }
                s->multiline = true;
        }
-       goto st1335;
-tr4040:
+       goto st1362;
+tr4077:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -95158,13 +95759,13 @@ tr4040:
                }
                s->multiline = false;
        }
-       goto st1335;
-tr4042:
+       goto st1362;
+tr4079:
        {
                s->line_counter++;
        }
-       goto st1335;
-tr4070:
+       goto st1362;
+tr4107:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -95174,15 +95775,15 @@ tr4070:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1335; goto _out;}
+                               {p++; cs = 1362; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1335;
-tr4032:
+       goto st1362;
+tr4069:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95192,8 +95793,8 @@ tr4032:
                        p--; {goto st307;}
                }
        }
-       goto st1335;
-tr4033:
+       goto st1362;
+tr4070:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95210,8 +95811,8 @@ tr4033:
                }
                s->multiline = true;
        }
-       goto st1335;
-tr4034:
+       goto st1362;
+tr4071:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95228,8 +95829,8 @@ tr4034:
                }
                s->multiline = false;
        }
-       goto st1335;
-tr4036:
+       goto st1362;
+tr4073:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95242,11 +95843,11 @@ tr4036:
        {
                s->line_counter++;
        }
-       goto st1335;
-st1335:
+       goto st1362;
+st1362:
        if ( ++p == pe )
-               goto _test_eof1335;
-case 1335:
+               goto _test_eof1362;
+case 1362:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -95260,17 +95861,17 @@ case 1335:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1335;
-               case 32: goto st1335;
-               case 40: goto tr4039;
-               case 41: goto tr4040;
-               case 2058: goto tr4042;
-               case 2107: goto tr4043;
+               case 9: goto st1362;
+               case 32: goto st1362;
+               case 40: goto tr4076;
+               case 41: goto tr4077;
+               case 2058: goto tr4079;
+               case 2107: goto tr4080;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4041;
-       goto tr2327;
-tr4041:
+               goto tr4078;
+       goto tr2364;
+tr4078:
        {
                s->number64 = 0;
        }
@@ -95288,8 +95889,8 @@ tr4041:
                        p--; {goto st307;}
                }
        }
-       goto st1336;
-tr4047:
+       goto st1363;
+tr4084:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -95304,11 +95905,11 @@ tr4047:
                        p--; {goto st307;}
                }
        }
-       goto st1336;
-st1336:
+       goto st1363;
+st1363:
        if ( ++p == pe )
-               goto _test_eof1336;
-case 1336:
+               goto _test_eof1363;
+case 1363:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -95322,17 +95923,17 @@ case 1336:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4044;
-               case 32: goto tr4044;
-               case 40: goto tr4045;
-               case 41: goto tr4046;
-               case 2058: goto tr4048;
-               case 2107: goto tr4049;
+               case 9: goto tr4081;
+               case 32: goto tr4081;
+               case 40: goto tr4082;
+               case 41: goto tr4083;
+               case 2058: goto tr4085;
+               case 2107: goto tr4086;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4047;
-       goto tr2327;
-tr4051:
+               goto tr4084;
+       goto tr2364;
+tr4088:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -95340,8 +95941,8 @@ tr4051:
                }
                s->multiline = true;
        }
-       goto st1337;
-tr4052:
+       goto st1364;
+tr4089:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -95349,13 +95950,13 @@ tr4052:
                }
                s->multiline = false;
        }
-       goto st1337;
-tr4054:
+       goto st1364;
+tr4091:
        {
                s->line_counter++;
        }
-       goto st1337;
-tr4068:
+       goto st1364;
+tr4105:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -95365,15 +95966,15 @@ tr4068:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1337; goto _out;}
+                               {p++; cs = 1364; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1337;
-tr4044:
+       goto st1364;
+tr4081:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95383,8 +95984,8 @@ tr4044:
                        p--; {goto st307;}
                }
        }
-       goto st1337;
-tr4045:
+       goto st1364;
+tr4082:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95401,8 +96002,8 @@ tr4045:
                }
                s->multiline = true;
        }
-       goto st1337;
-tr4046:
+       goto st1364;
+tr4083:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95419,8 +96020,8 @@ tr4046:
                }
                s->multiline = false;
        }
-       goto st1337;
-tr4048:
+       goto st1364;
+tr4085:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95433,11 +96034,11 @@ tr4048:
        {
                s->line_counter++;
        }
-       goto st1337;
-st1337:
+       goto st1364;
+st1364:
        if ( ++p == pe )
-               goto _test_eof1337;
-case 1337:
+               goto _test_eof1364;
+case 1364:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -95451,23 +96052,23 @@ case 1337:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1337;
-               case 32: goto st1337;
-               case 40: goto tr4051;
-               case 41: goto tr4052;
-               case 2058: goto tr4054;
-               case 2107: goto tr4055;
+               case 9: goto st1364;
+               case 32: goto st1364;
+               case 40: goto tr4088;
+               case 41: goto tr4089;
+               case 2058: goto tr4091;
+               case 2107: goto tr4092;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr4053;
+                       goto tr4090;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr4053;
+                       goto tr4090;
        } else
-               goto tr4053;
-       goto tr2998;
-tr4053:
+               goto tr4090;
+       goto tr3035;
+tr4090:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -95476,21 +96077,21 @@ tr4053:
                        p--; {goto st307;}
                }
        }
-       goto st1338;
-st1338:
+       goto st1365;
+st1365:
        if ( ++p == pe )
-               goto _test_eof1338;
-case 1338:
+               goto _test_eof1365;
+case 1365:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4056;
+                       goto tr4093;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4056;
+                       goto tr4093;
        } else
-               goto tr4056;
-       goto tr2998;
-tr4058:
+               goto tr4093;
+       goto tr3035;
+tr4095:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -95498,8 +96099,8 @@ tr4058:
                }
                s->multiline = true;
        }
-       goto st1339;
-tr4059:
+       goto st1366;
+tr4096:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -95507,13 +96108,13 @@ tr4059:
                }
                s->multiline = false;
        }
-       goto st1339;
-tr4060:
+       goto st1366;
+tr4097:
        {
                s->line_counter++;
        }
-       goto st1339;
-tr4066:
+       goto st1366;
+tr4103:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -95523,24 +96124,24 @@ tr4066:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1339; goto _out;}
+                               {p++; cs = 1366; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1339;
-tr4056:
+       goto st1366;
+tr4093:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1339;
-st1339:
+       goto st1366;
+st1366:
        if ( ++p == pe )
-               goto _test_eof1339;
-case 1339:
+               goto _test_eof1366;
+case 1366:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -95558,42 +96159,42 @@ case 1339:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st1339;
-               case 32: goto st1339;
-               case 40: goto tr4058;
-               case 41: goto tr4059;
-               case 3082: goto tr4060;
-               case 3131: goto tr4061;
-               case 3338: goto tr4062;
-               case 3387: goto tr4062;
-               case 3594: goto tr4063;
-               case 3643: goto tr4064;
+               case 9: goto st1366;
+               case 32: goto st1366;
+               case 40: goto tr4095;
+               case 41: goto tr4096;
+               case 3082: goto tr4097;
+               case 3131: goto tr4098;
+               case 3338: goto tr4099;
+               case 3387: goto tr4099;
+               case 3594: goto tr4100;
+               case 3643: goto tr4101;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr4053;
+                       goto tr4090;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr4053;
+                       goto tr4090;
        } else
-               goto tr4053;
-       goto tr2998;
-tr4061:
+               goto tr4090;
+       goto tr3035;
+tr4098:
        {
                s->buffer_length = 0;
        }
-       goto st1340;
-tr4065:
+       goto st1367;
+tr4102:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1340;
-st1340:
+       goto st1367;
+st1367:
        if ( ++p == pe )
-               goto _test_eof1340;
-case 1340:
+               goto _test_eof1367;
+case 1367:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -95613,32 +96214,32 @@ case 1340:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4066;
+               goto tr4103;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4065;
-       goto tr2998;
-tr4062:
+               goto tr4102;
+       goto tr3035;
+tr4099:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1483;
-st1483:
+       goto st1510;
+st1510:
        if ( ++p == pe )
-               goto _test_eof1483;
-case 1483:
+               goto _test_eof1510;
+case 1510:
        goto st0;
-tr4063:
+tr4100:
        {
                s->line_counter++;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1484;
-st1484:
+       goto st1511;
+st1511:
        if ( ++p == pe )
-               goto _test_eof1484;
-case 1484:
+               goto _test_eof1511;
+case 1511:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -95656,38 +96257,38 @@ case 1484:
  !s->multiline  ) _widec += 512;
        }
        switch( _widec ) {
-               case 9: goto st1339;
-               case 32: goto st1339;
-               case 40: goto tr4058;
-               case 41: goto tr4059;
-               case 3082: goto tr4060;
-               case 3131: goto tr4061;
-               case 3338: goto tr4062;
-               case 3387: goto tr4062;
-               case 3594: goto tr4063;
-               case 3643: goto tr4064;
+               case 9: goto st1366;
+               case 32: goto st1366;
+               case 40: goto tr4095;
+               case 41: goto tr4096;
+               case 3082: goto tr4097;
+               case 3131: goto tr4098;
+               case 3338: goto tr4099;
+               case 3387: goto tr4099;
+               case 3594: goto tr4100;
+               case 3643: goto tr4101;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr4053;
+                       goto tr4090;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr4053;
+                       goto tr4090;
        } else
-               goto tr4053;
-       goto tr2998;
-tr4064:
+               goto tr4090;
+       goto tr3035;
+tr4101:
        {
                s->buffer_length = 0;
        }
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1485;
-st1485:
+       goto st1512;
+st1512:
        if ( ++p == pe )
-               goto _test_eof1485;
-case 1485:
+               goto _test_eof1512;
+case 1512:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -95707,23 +96308,23 @@ case 1485:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4066;
+               goto tr4103;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4065;
-       goto tr2998;
-tr4055:
+               goto tr4102;
+       goto tr3035;
+tr4092:
        {
                s->buffer_length = 0;
        }
-       goto st1341;
-tr4067:
+       goto st1368;
+tr4104:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1341;
-tr4049:
+       goto st1368;
+tr4086:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95736,11 +96337,11 @@ tr4049:
        {
                s->buffer_length = 0;
        }
-       goto st1341;
-st1341:
+       goto st1368;
+st1368:
        if ( ++p == pe )
-               goto _test_eof1341;
-case 1341:
+               goto _test_eof1368;
+case 1368:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -95760,23 +96361,23 @@ case 1341:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4068;
+               goto tr4105;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4067;
+               goto tr4104;
        goto tr75;
-tr4043:
+tr4080:
        {
                s->buffer_length = 0;
        }
-       goto st1342;
-tr4069:
+       goto st1369;
+tr4106:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1342;
-tr4037:
+       goto st1369;
+tr4074:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -95789,11 +96390,11 @@ tr4037:
        {
                s->buffer_length = 0;
        }
-       goto st1342;
-st1342:
+       goto st1369;
+st1369:
        if ( ++p == pe )
-               goto _test_eof1342;
-case 1342:
+               goto _test_eof1369;
+case 1369:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -95813,23 +96414,23 @@ case 1342:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4070;
+               goto tr4107;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4069;
+               goto tr4106;
        goto tr75;
-tr4031:
+tr4068:
        {
                s->buffer_length = 0;
        }
-       goto st1343;
-tr4071:
+       goto st1370;
+tr4108:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1343;
-tr4025:
+       goto st1370;
+tr4062:
        {
                if (s->number64 <= UINT32_MAX) {
                        uint32_t num32 = htonl((uint32_t)s->number64);
@@ -95843,11 +96444,11 @@ tr4025:
        {
                s->buffer_length = 0;
        }
-       goto st1343;
-st1343:
+       goto st1370;
+st1370:
        if ( ++p == pe )
-               goto _test_eof1343;
-case 1343:
+               goto _test_eof1370;
+case 1370:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -95867,18 +96468,18 @@ case 1343:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4072;
+               goto tr4109;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4071;
+               goto tr4108;
        goto tr75;
-st1344:
+st1371:
        if ( ++p == pe )
-               goto _test_eof1344;
-case 1344:
+               goto _test_eof1371;
+case 1371:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr4073;
-       goto tr2327;
-tr4073:
+               goto tr4110;
+       goto tr2364;
+tr4110:
        {
                s->number64 = 0;
        }
@@ -95896,8 +96497,8 @@ tr4073:
                        p--; {goto st307;}
                }
        }
-       goto st1345;
-tr4077:
+       goto st1372;
+tr4114:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -95912,11 +96513,11 @@ tr4077:
                        p--; {goto st307;}
                }
        }
-       goto st1345;
-st1345:
+       goto st1372;
+st1372:
        if ( ++p == pe )
-               goto _test_eof1345;
-case 1345:
+               goto _test_eof1372;
+case 1372:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -95930,17 +96531,17 @@ case 1345:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4074;
-               case 32: goto tr4074;
-               case 40: goto tr4075;
-               case 41: goto tr4076;
-               case 2058: goto tr4078;
-               case 2107: goto tr4079;
+               case 9: goto tr4111;
+               case 32: goto tr4111;
+               case 40: goto tr4112;
+               case 41: goto tr4113;
+               case 2058: goto tr4115;
+               case 2107: goto tr4116;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4077;
-       goto tr2327;
-tr4081:
+               goto tr4114;
+       goto tr2364;
+tr4118:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -95948,8 +96549,8 @@ tr4081:
                }
                s->multiline = true;
        }
-       goto st1346;
-tr4082:
+       goto st1373;
+tr4119:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -95957,13 +96558,13 @@ tr4082:
                }
                s->multiline = false;
        }
-       goto st1346;
-tr4084:
+       goto st1373;
+tr4121:
        {
                s->line_counter++;
        }
-       goto st1346;
-tr4089:
+       goto st1373;
+tr4126:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -95973,15 +96574,15 @@ tr4089:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1346; goto _out;}
+                               {p++; cs = 1373; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1346;
-tr4074:
+       goto st1373;
+tr4111:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -95992,8 +96593,8 @@ tr4074:
                        p--; {goto st307;}
                }
        }
-       goto st1346;
-tr4075:
+       goto st1373;
+tr4112:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96011,8 +96612,8 @@ tr4075:
                }
                s->multiline = true;
        }
-       goto st1346;
-tr4076:
+       goto st1373;
+tr4113:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96030,8 +96631,8 @@ tr4076:
                }
                s->multiline = false;
        }
-       goto st1346;
-tr4078:
+       goto st1373;
+tr4115:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96045,11 +96646,11 @@ tr4078:
        {
                s->line_counter++;
        }
-       goto st1346;
-st1346:
+       goto st1373;
+st1373:
        if ( ++p == pe )
-               goto _test_eof1346;
-case 1346:
+               goto _test_eof1373;
+case 1373:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -96063,18 +96664,18 @@ case 1346:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1346;
-               case 32: goto st1346;
-               case 40: goto tr4081;
-               case 41: goto tr4082;
-               case 46: goto tr4083;
-               case 2058: goto tr4084;
-               case 2107: goto tr4085;
+               case 9: goto st1373;
+               case 32: goto st1373;
+               case 40: goto tr4118;
+               case 41: goto tr4119;
+               case 46: goto tr4120;
+               case 2058: goto tr4121;
+               case 2107: goto tr4122;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4083;
-       goto tr2304;
-tr4087:
+               goto tr4120;
+       goto tr2341;
+tr4124:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
@@ -96083,8 +96684,8 @@ tr4087:
                        p--; {goto st307;}
                }
        }
-       goto st1347;
-tr4083:
+       goto st1374;
+tr4120:
        {
                s->buffer_length = 0;
        }
@@ -96096,26 +96697,26 @@ tr4083:
                        p--; {goto st307;}
                }
        }
-       goto st1347;
-st1347:
+       goto st1374;
+st1374:
        if ( ++p == pe )
-               goto _test_eof1347;
-case 1347:
+               goto _test_eof1374;
+case 1374:
        switch( (*p) ) {
-               case 32: goto tr4086;
-               case 46: goto tr4087;
-               case 59: goto tr4086;
+               case 32: goto tr4123;
+               case 46: goto tr4124;
+               case 59: goto tr4123;
        }
        if ( (*p) < 40 ) {
                if ( 9 <= (*p) && (*p) <= 10 )
-                       goto tr4086;
+                       goto tr4123;
        } else if ( (*p) > 41 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4087;
+                       goto tr4124;
        } else
-               goto tr4086;
-       goto tr2304;
-tr4086:
+               goto tr4123;
+       goto tr2341;
+tr4123:
        {
                s->buffer[s->buffer_length] = 0;
 
@@ -96135,25 +96736,25 @@ tr4086:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1486;
-st1486:
+       goto st1513;
+st1513:
        if ( ++p == pe )
-               goto _test_eof1486;
-case 1486:
+               goto _test_eof1513;
+case 1513:
        goto st0;
-tr4085:
+tr4122:
        {
                s->buffer_length = 0;
        }
-       goto st1348;
-tr4088:
+       goto st1375;
+tr4125:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1348;
-tr4079:
+       goto st1375;
+tr4116:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96167,11 +96768,11 @@ tr4079:
        {
                s->buffer_length = 0;
        }
-       goto st1348;
-st1348:
+       goto st1375;
+st1375:
        if ( ++p == pe )
-               goto _test_eof1348;
-case 1348:
+               goto _test_eof1375;
+case 1375:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -96191,18 +96792,18 @@ case 1348:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4089;
+               goto tr4126;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4088;
+               goto tr4125;
        goto tr75;
-st1349:
+st1376:
        if ( ++p == pe )
-               goto _test_eof1349;
-case 1349:
+               goto _test_eof1376;
+case 1376:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr4090;
-       goto tr2327;
-tr4090:
+               goto tr4127;
+       goto tr2364;
+tr4127:
        {
                s->number64 = 0;
        }
@@ -96220,8 +96821,8 @@ tr4090:
                        p--; {goto st307;}
                }
        }
-       goto st1350;
-tr4094:
+       goto st1377;
+tr4131:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -96236,11 +96837,11 @@ tr4094:
                        p--; {goto st307;}
                }
        }
-       goto st1350;
-st1350:
+       goto st1377;
+st1377:
        if ( ++p == pe )
-               goto _test_eof1350;
-case 1350:
+               goto _test_eof1377;
+case 1377:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -96254,17 +96855,17 @@ case 1350:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4091;
-               case 32: goto tr4091;
-               case 40: goto tr4092;
-               case 41: goto tr4093;
-               case 2058: goto tr4095;
-               case 2107: goto tr4096;
+               case 9: goto tr4128;
+               case 32: goto tr4128;
+               case 40: goto tr4129;
+               case 41: goto tr4130;
+               case 2058: goto tr4132;
+               case 2107: goto tr4133;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4094;
-       goto tr2327;
-tr4098:
+               goto tr4131;
+       goto tr2364;
+tr4135:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -96272,8 +96873,8 @@ tr4098:
                }
                s->multiline = true;
        }
-       goto st1351;
-tr4099:
+       goto st1378;
+tr4136:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -96281,13 +96882,13 @@ tr4099:
                }
                s->multiline = false;
        }
-       goto st1351;
-tr4101:
+       goto st1378;
+tr4138:
        {
                s->line_counter++;
        }
-       goto st1351;
-tr4115:
+       goto st1378;
+tr4152:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -96297,15 +96898,15 @@ tr4115:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1351; goto _out;}
+                               {p++; cs = 1378; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1351;
-tr4091:
+       goto st1378;
+tr4128:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96316,8 +96917,8 @@ tr4091:
                        p--; {goto st307;}
                }
        }
-       goto st1351;
-tr4092:
+       goto st1378;
+tr4129:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96335,8 +96936,8 @@ tr4092:
                }
                s->multiline = true;
        }
-       goto st1351;
-tr4093:
+       goto st1378;
+tr4130:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96354,8 +96955,8 @@ tr4093:
                }
                s->multiline = false;
        }
-       goto st1351;
-tr4095:
+       goto st1378;
+tr4132:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96369,11 +96970,11 @@ tr4095:
        {
                s->line_counter++;
        }
-       goto st1351;
-st1351:
+       goto st1378;
+st1378:
        if ( ++p == pe )
-               goto _test_eof1351;
-case 1351:
+               goto _test_eof1378;
+case 1378:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -96387,23 +96988,23 @@ case 1351:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1351;
-               case 32: goto st1351;
-               case 40: goto tr4098;
-               case 41: goto tr4099;
-               case 2058: goto tr4101;
-               case 2107: goto tr4102;
+               case 9: goto st1378;
+               case 32: goto st1378;
+               case 40: goto tr4135;
+               case 41: goto tr4136;
+               case 2058: goto tr4138;
+               case 2107: goto tr4139;
        }
        if ( _widec < 65 ) {
                if ( 48 <= _widec && _widec <= 57 )
-                       goto tr4100;
+                       goto tr4137;
        } else if ( _widec > 70 ) {
                if ( 97 <= _widec && _widec <= 102 )
-                       goto tr4100;
+                       goto tr4137;
        } else
-               goto tr4100;
-       goto tr2998;
-tr4100:
+               goto tr4137;
+       goto tr3035;
+tr4137:
        {
                s->item_length = 0;
        }
@@ -96415,40 +97016,40 @@ tr4100:
                        p--; {goto st307;}
                }
        }
-       goto st1352;
-st1352:
+       goto st1379;
+st1379:
        if ( ++p == pe )
-               goto _test_eof1352;
-case 1352:
+               goto _test_eof1379;
+case 1379:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4103;
+                       goto tr4140;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4103;
+                       goto tr4140;
        } else
-               goto tr4103;
-       goto tr2998;
-tr4103:
+               goto tr4140;
+       goto tr3035;
+tr4140:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1353;
-st1353:
+       goto st1380;
+st1380:
        if ( ++p == pe )
-               goto _test_eof1353;
-case 1353:
+               goto _test_eof1380;
+case 1380:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4104;
+                       goto tr4141;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4104;
+                       goto tr4141;
        } else
-               goto tr4104;
-       goto tr2998;
-tr4104:
+               goto tr4141;
+       goto tr3035;
+tr4141:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -96457,52 +97058,52 @@ tr4104:
                        p--; {goto st307;}
                }
        }
-       goto st1354;
-st1354:
+       goto st1381;
+st1381:
        if ( ++p == pe )
-               goto _test_eof1354;
-case 1354:
+               goto _test_eof1381;
+case 1381:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4105;
+                       goto tr4142;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4105;
+                       goto tr4142;
        } else
-               goto tr4105;
-       goto tr2998;
-tr4105:
+               goto tr4142;
+       goto tr3035;
+tr4142:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1355;
-st1355:
+       goto st1382;
+st1382:
        if ( ++p == pe )
-               goto _test_eof1355;
-case 1355:
+               goto _test_eof1382;
+case 1382:
        if ( (*p) == 58 )
-               goto tr4107;
-       goto tr4106;
-tr4107:
+               goto tr4144;
+       goto tr4143;
+tr4144:
        {
                s->item_length++;
        }
-       goto st1356;
-st1356:
+       goto st1383;
+st1383:
        if ( ++p == pe )
-               goto _test_eof1356;
-case 1356:
+               goto _test_eof1383;
+case 1383:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4108;
+                       goto tr4145;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4108;
+                       goto tr4145;
        } else
-               goto tr4108;
-       goto tr2998;
-tr4108:
+               goto tr4145;
+       goto tr3035;
+tr4145:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -96511,40 +97112,40 @@ tr4108:
                        p--; {goto st307;}
                }
        }
-       goto st1357;
-st1357:
+       goto st1384;
+st1384:
        if ( ++p == pe )
-               goto _test_eof1357;
-case 1357:
+               goto _test_eof1384;
+case 1384:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4109;
+                       goto tr4146;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4109;
-       } else
-               goto tr4109;
-       goto tr2998;
-tr4109:
+                       goto tr4146;
+       } else
+               goto tr4146;
+       goto tr3035;
+tr4146:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1358;
-st1358:
+       goto st1385;
+st1385:
        if ( ++p == pe )
-               goto _test_eof1358;
-case 1358:
+               goto _test_eof1385;
+case 1385:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4110;
+                       goto tr4147;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4110;
+                       goto tr4147;
        } else
-               goto tr4110;
-       goto tr2998;
-tr4110:
+               goto tr4147;
+       goto tr3035;
+tr4147:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -96553,42 +97154,42 @@ tr4110:
                        p--; {goto st307;}
                }
        }
-       goto st1359;
-st1359:
+       goto st1386;
+st1386:
        if ( ++p == pe )
-               goto _test_eof1359;
-case 1359:
+               goto _test_eof1386;
+case 1386:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4111;
+                       goto tr4148;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4111;
+                       goto tr4148;
        } else
-               goto tr4111;
-       goto tr2998;
-tr4111:
+               goto tr4148;
+       goto tr3035;
+tr4148:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1360;
-st1360:
+       goto st1387;
+st1387:
        if ( ++p == pe )
-               goto _test_eof1360;
-case 1360:
+               goto _test_eof1387;
+case 1387:
        switch( (*p) ) {
-               case 32: goto tr4113;
-               case 58: goto tr4107;
-               case 59: goto tr4113;
+               case 32: goto tr4150;
+               case 58: goto tr4144;
+               case 59: goto tr4150;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr4113;
+                       goto tr4150;
        } else if ( (*p) >= 9 )
-               goto tr4113;
-       goto tr4112;
-tr4113:
+               goto tr4150;
+       goto tr4149;
+tr4150:
        {
                s->item_length++;
        }
@@ -96601,25 +97202,25 @@ tr4113:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1487;
-st1487:
+       goto st1514;
+st1514:
        if ( ++p == pe )
-               goto _test_eof1487;
-case 1487:
+               goto _test_eof1514;
+case 1514:
        goto st0;
-tr4102:
+tr4139:
        {
                s->buffer_length = 0;
        }
-       goto st1361;
-tr4114:
+       goto st1388;
+tr4151:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1361;
-tr4096:
+       goto st1388;
+tr4133:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -96633,11 +97234,11 @@ tr4096:
        {
                s->buffer_length = 0;
        }
-       goto st1361;
-st1361:
+       goto st1388;
+st1388:
        if ( ++p == pe )
-               goto _test_eof1361;
-case 1361:
+               goto _test_eof1388;
+case 1388:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -96657,24 +97258,24 @@ case 1361:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4115;
+               goto tr4152;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4114;
+               goto tr4151;
        goto tr75;
-st1362:
+st1389:
        if ( ++p == pe )
-               goto _test_eof1362;
-case 1362:
+               goto _test_eof1389;
+case 1389:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4116;
+                       goto tr4153;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4116;
+                       goto tr4153;
        } else
-               goto tr4116;
-       goto tr2998;
-tr4116:
+               goto tr4153;
+       goto tr3035;
+tr4153:
        {
                s->item_length = 0;
        }
@@ -96686,52 +97287,52 @@ tr4116:
                        p--; {goto st307;}
                }
        }
-       goto st1363;
-st1363:
+       goto st1390;
+st1390:
        if ( ++p == pe )
-               goto _test_eof1363;
-case 1363:
+               goto _test_eof1390;
+case 1390:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4117;
+                       goto tr4154;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4117;
+                       goto tr4154;
        } else
-               goto tr4117;
-       goto tr2998;
-tr4117:
+               goto tr4154;
+       goto tr3035;
+tr4154:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1364;
-st1364:
+       goto st1391;
+st1391:
        if ( ++p == pe )
-               goto _test_eof1364;
-case 1364:
+               goto _test_eof1391;
+case 1391:
        if ( (*p) == 45 )
-               goto tr4119;
-       goto tr4118;
-tr4119:
+               goto tr4156;
+       goto tr4155;
+tr4156:
        {
                s->item_length++;
        }
-       goto st1365;
-st1365:
+       goto st1392;
+st1392:
        if ( ++p == pe )
-               goto _test_eof1365;
-case 1365:
+               goto _test_eof1392;
+case 1392:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4120;
+                       goto tr4157;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4120;
+                       goto tr4157;
        } else
-               goto tr4120;
-       goto tr2998;
-tr4120:
+               goto tr4157;
+       goto tr3035;
+tr4157:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -96740,42 +97341,42 @@ tr4120:
                        p--; {goto st307;}
                }
        }
-       goto st1366;
-st1366:
+       goto st1393;
+st1393:
        if ( ++p == pe )
-               goto _test_eof1366;
-case 1366:
+               goto _test_eof1393;
+case 1393:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4121;
+                       goto tr4158;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4121;
+                       goto tr4158;
        } else
-               goto tr4121;
-       goto tr2998;
-tr4121:
+               goto tr4158;
+       goto tr3035;
+tr4158:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1367;
-st1367:
+       goto st1394;
+st1394:
        if ( ++p == pe )
-               goto _test_eof1367;
-case 1367:
+               goto _test_eof1394;
+case 1394:
        switch( (*p) ) {
-               case 32: goto tr4122;
-               case 45: goto tr4119;
-               case 59: goto tr4122;
+               case 32: goto tr4159;
+               case 45: goto tr4156;
+               case 59: goto tr4159;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr4122;
+                       goto tr4159;
        } else if ( (*p) >= 9 )
-               goto tr4122;
-       goto tr4118;
-tr4122:
+               goto tr4159;
+       goto tr4155;
+tr4159:
        {
                s->item_length++;
        }
@@ -96788,26 +97389,26 @@ tr4122:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1488;
-st1488:
+       goto st1515;
+st1515:
        if ( ++p == pe )
-               goto _test_eof1488;
-case 1488:
+               goto _test_eof1515;
+case 1515:
        goto st0;
-st1368:
+st1395:
        if ( ++p == pe )
-               goto _test_eof1368;
-case 1368:
+               goto _test_eof1395;
+case 1395:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4123;
+                       goto tr4160;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4123;
+                       goto tr4160;
        } else
-               goto tr4123;
-       goto tr2998;
-tr4123:
+               goto tr4160;
+       goto tr3035;
+tr4160:
        {
                s->item_length = 0;
        }
@@ -96819,52 +97420,52 @@ tr4123:
                        p--; {goto st307;}
                }
        }
-       goto st1369;
-st1369:
+       goto st1396;
+st1396:
        if ( ++p == pe )
-               goto _test_eof1369;
-case 1369:
+               goto _test_eof1396;
+case 1396:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4124;
+                       goto tr4161;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4124;
+                       goto tr4161;
        } else
-               goto tr4124;
-       goto tr2998;
-tr4124:
+               goto tr4161;
+       goto tr3035;
+tr4161:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1370;
-st1370:
+       goto st1397;
+st1397:
        if ( ++p == pe )
-               goto _test_eof1370;
-case 1370:
+               goto _test_eof1397;
+case 1397:
        if ( (*p) == 45 )
-               goto tr4125;
-       goto tr4118;
-tr4125:
+               goto tr4162;
+       goto tr4155;
+tr4162:
        {
                s->item_length++;
        }
-       goto st1371;
-st1371:
+       goto st1398;
+st1398:
        if ( ++p == pe )
-               goto _test_eof1371;
-case 1371:
+               goto _test_eof1398;
+case 1398:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4126;
+                       goto tr4163;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4126;
+                       goto tr4163;
        } else
-               goto tr4126;
-       goto tr2998;
-tr4126:
+               goto tr4163;
+       goto tr3035;
+tr4163:
        {
                if (rdata_tail <= rdata_stop) {
                        *rdata_tail = first_hex_to_num[(uint8_t)(*p)];
@@ -96873,42 +97474,42 @@ tr4126:
                        p--; {goto st307;}
                }
        }
-       goto st1372;
-st1372:
+       goto st1399;
+st1399:
        if ( ++p == pe )
-               goto _test_eof1372;
-case 1372:
+               goto _test_eof1399;
+case 1399:
        if ( (*p) < 65 ) {
                if ( 48 <= (*p) && (*p) <= 57 )
-                       goto tr4127;
+                       goto tr4164;
        } else if ( (*p) > 70 ) {
                if ( 97 <= (*p) && (*p) <= 102 )
-                       goto tr4127;
+                       goto tr4164;
        } else
-               goto tr4127;
-       goto tr2998;
-tr4127:
+               goto tr4164;
+       goto tr3035;
+tr4164:
        {
                *rdata_tail += second_hex_to_num[(uint8_t)(*p)];
                rdata_tail++;
        }
-       goto st1373;
-st1373:
+       goto st1400;
+st1400:
        if ( ++p == pe )
-               goto _test_eof1373;
-case 1373:
+               goto _test_eof1400;
+case 1400:
        switch( (*p) ) {
-               case 32: goto tr4128;
-               case 45: goto tr4125;
-               case 59: goto tr4128;
+               case 32: goto tr4165;
+               case 45: goto tr4162;
+               case 59: goto tr4165;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr4128;
+                       goto tr4165;
        } else if ( (*p) >= 9 )
-               goto tr4128;
-       goto tr4118;
-tr4128:
+               goto tr4165;
+       goto tr4155;
+tr4165:
        {
                s->item_length++;
        }
@@ -96921,20 +97522,20 @@ tr4128:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1489;
-st1489:
+       goto st1516;
+st1516:
        if ( ++p == pe )
-               goto _test_eof1489;
-case 1489:
+               goto _test_eof1516;
+case 1516:
        goto st0;
-st1374:
+st1401:
        if ( ++p == pe )
-               goto _test_eof1374;
-case 1374:
+               goto _test_eof1401;
+case 1401:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr4129;
-       goto tr2327;
-tr4129:
+               goto tr4166;
+       goto tr2364;
+tr4166:
        {
                s->number64 = 0;
        }
@@ -96952,8 +97553,8 @@ tr4129:
                        p--; {goto st307;}
                }
        }
-       goto st1375;
-tr4133:
+       goto st1402;
+tr4170:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -96968,11 +97569,11 @@ tr4133:
                        p--; {goto st307;}
                }
        }
-       goto st1375;
-st1375:
+       goto st1402;
+st1402:
        if ( ++p == pe )
-               goto _test_eof1375;
-case 1375:
+               goto _test_eof1402;
+case 1402:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -96986,17 +97587,17 @@ case 1375:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4130;
-               case 32: goto tr4130;
-               case 40: goto tr4131;
-               case 41: goto tr4132;
-               case 2058: goto tr4134;
-               case 2107: goto tr4135;
+               case 9: goto tr4167;
+               case 32: goto tr4167;
+               case 40: goto tr4168;
+               case 41: goto tr4169;
+               case 2058: goto tr4171;
+               case 2107: goto tr4172;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4133;
-       goto tr2327;
-tr4137:
+               goto tr4170;
+       goto tr2364;
+tr4174:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -97004,8 +97605,8 @@ tr4137:
                }
                s->multiline = true;
        }
-       goto st1376;
-tr4138:
+       goto st1403;
+tr4175:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -97013,13 +97614,13 @@ tr4138:
                }
                s->multiline = false;
        }
-       goto st1376;
-tr4140:
+       goto st1403;
+tr4177:
        {
                s->line_counter++;
        }
-       goto st1376;
-tr4158:
+       goto st1403;
+tr4195:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -97029,15 +97630,15 @@ tr4158:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1376; goto _out;}
+                               {p++; cs = 1403; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1376;
-tr4130:
+       goto st1403;
+tr4167:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97048,8 +97649,8 @@ tr4130:
                        p--; {goto st307;}
                }
        }
-       goto st1376;
-tr4131:
+       goto st1403;
+tr4168:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97067,8 +97668,8 @@ tr4131:
                }
                s->multiline = true;
        }
-       goto st1376;
-tr4132:
+       goto st1403;
+tr4169:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97086,8 +97687,8 @@ tr4132:
                }
                s->multiline = false;
        }
-       goto st1376;
-tr4134:
+       goto st1403;
+tr4171:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97101,11 +97702,11 @@ tr4134:
        {
                s->line_counter++;
        }
-       goto st1376;
-st1376:
+       goto st1403;
+st1403:
        if ( ++p == pe )
-               goto _test_eof1376;
-case 1376:
+               goto _test_eof1403;
+case 1403:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -97119,17 +97720,17 @@ case 1376:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1376;
-               case 32: goto st1376;
-               case 40: goto tr4137;
-               case 41: goto tr4138;
-               case 2058: goto tr4140;
-               case 2107: goto tr4141;
+               case 9: goto st1403;
+               case 32: goto st1403;
+               case 40: goto tr4174;
+               case 41: goto tr4175;
+               case 2058: goto tr4177;
+               case 2107: goto tr4178;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4139;
-       goto tr2327;
-tr4139:
+               goto tr4176;
+       goto tr2364;
+tr4176:
        {
                s->number64 = 0;
        }
@@ -97147,8 +97748,8 @@ tr4139:
                        p--; {goto st307;}
                }
        }
-       goto st1377;
-tr4145:
+       goto st1404;
+tr4182:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -97163,11 +97764,11 @@ tr4145:
                        p--; {goto st307;}
                }
        }
-       goto st1377;
-st1377:
+       goto st1404;
+st1404:
        if ( ++p == pe )
-               goto _test_eof1377;
-case 1377:
+               goto _test_eof1404;
+case 1404:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -97181,17 +97782,17 @@ case 1377:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4142;
-               case 32: goto tr4142;
-               case 40: goto tr4143;
-               case 41: goto tr4144;
-               case 2058: goto tr4146;
-               case 2107: goto tr4147;
+               case 9: goto tr4179;
+               case 32: goto tr4179;
+               case 40: goto tr4180;
+               case 41: goto tr4181;
+               case 2058: goto tr4183;
+               case 2107: goto tr4184;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4145;
-       goto tr2327;
-tr4150:
+               goto tr4182;
+       goto tr2364;
+tr4187:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -97199,8 +97800,8 @@ tr4150:
                }
                s->multiline = true;
        }
-       goto st1378;
-tr4151:
+       goto st1405;
+tr4188:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -97208,13 +97809,13 @@ tr4151:
                }
                s->multiline = false;
        }
-       goto st1378;
-tr4152:
+       goto st1405;
+tr4189:
        {
                s->line_counter++;
        }
-       goto st1378;
-tr4156:
+       goto st1405;
+tr4193:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -97224,15 +97825,15 @@ tr4156:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1378; goto _out;}
+                               {p++; cs = 1405; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1378;
-tr4142:
+       goto st1405;
+tr4179:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97243,8 +97844,8 @@ tr4142:
                        p--; {goto st307;}
                }
        }
-       goto st1378;
-tr4143:
+       goto st1405;
+tr4180:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97262,8 +97863,8 @@ tr4143:
                }
                s->multiline = true;
        }
-       goto st1378;
-tr4144:
+       goto st1405;
+tr4181:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97281,8 +97882,8 @@ tr4144:
                }
                s->multiline = false;
        }
-       goto st1378;
-tr4146:
+       goto st1405;
+tr4183:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97296,11 +97897,11 @@ tr4146:
        {
                s->line_counter++;
        }
-       goto st1378;
-st1378:
+       goto st1405;
+st1405:
        if ( ++p == pe )
-               goto _test_eof1378;
-case 1378:
+               goto _test_eof1405;
+case 1405:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -97314,62 +97915,62 @@ case 1378:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1378;
-               case 32: goto st1378;
-               case 40: goto tr4150;
-               case 41: goto tr4151;
-               case 2058: goto tr4152;
-               case 2107: goto tr4153;
+               case 9: goto st1405;
+               case 32: goto st1405;
+               case 40: goto tr4187;
+               case 41: goto tr4188;
+               case 2058: goto tr4189;
+               case 2107: goto tr4190;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr4148;
+                       goto tr4185;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr4148;
+                       goto tr4185;
        } else
-               goto tr4148;
+               goto tr4185;
        goto tr75;
-tr4148:
-       { p--; {stack[top++] = 1379;goto st318;} }
-       goto st1379;
-st1379:
+tr4185:
+       { p--; {stack[top++] = 1406;goto st318;} }
+       goto st1406;
+st1406:
        if ( ++p == pe )
-               goto _test_eof1379;
-case 1379:
+               goto _test_eof1406;
+case 1406:
        switch( (*p) ) {
-               case 32: goto tr4154;
-               case 59: goto tr4154;
+               case 32: goto tr4191;
+               case 59: goto tr4191;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr4154;
+                       goto tr4191;
        } else if ( (*p) >= 9 )
-               goto tr4154;
+               goto tr4191;
        goto tr75;
-tr4154:
+tr4191:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1490;
-st1490:
+       goto st1517;
+st1517:
        if ( ++p == pe )
-               goto _test_eof1490;
-case 1490:
+               goto _test_eof1517;
+case 1517:
        goto st0;
-tr4153:
+tr4190:
        {
                s->buffer_length = 0;
        }
-       goto st1380;
-tr4155:
+       goto st1407;
+tr4192:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1380;
-tr4147:
+       goto st1407;
+tr4184:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97383,11 +97984,11 @@ tr4147:
        {
                s->buffer_length = 0;
        }
-       goto st1380;
-st1380:
+       goto st1407;
+st1407:
        if ( ++p == pe )
-               goto _test_eof1380;
-case 1380:
+               goto _test_eof1407;
+case 1407:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -97407,23 +98008,23 @@ case 1380:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4156;
+               goto tr4193;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4155;
+               goto tr4192;
        goto tr75;
-tr4141:
+tr4178:
        {
                s->buffer_length = 0;
        }
-       goto st1381;
-tr4157:
+       goto st1408;
+tr4194:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1381;
-tr4135:
+       goto st1408;
+tr4172:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -97437,11 +98038,11 @@ tr4135:
        {
                s->buffer_length = 0;
        }
-       goto st1381;
-st1381:
+       goto st1408;
+st1408:
        if ( ++p == pe )
-               goto _test_eof1381;
-case 1381:
+               goto _test_eof1408;
+case 1408:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -97461,18 +98062,18 @@ case 1381:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4158;
+               goto tr4195;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4157;
+               goto tr4194;
        goto tr75;
-st1382:
+st1409:
        if ( ++p == pe )
-               goto _test_eof1382;
-case 1382:
+               goto _test_eof1409;
+case 1409:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr4159;
-       goto tr2327;
-tr4159:
+               goto tr4196;
+       goto tr2364;
+tr4196:
        {
                s->number64 = 0;
        }
@@ -97490,8 +98091,8 @@ tr4159:
                        p--; {goto st307;}
                }
        }
-       goto st1383;
-tr4163:
+       goto st1410;
+tr4200:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -97506,11 +98107,11 @@ tr4163:
                        p--; {goto st307;}
                }
        }
-       goto st1383;
-st1383:
+       goto st1410;
+st1410:
        if ( ++p == pe )
-               goto _test_eof1383;
-case 1383:
+               goto _test_eof1410;
+case 1410:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -97524,17 +98125,17 @@ case 1383:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4160;
-               case 32: goto tr4160;
-               case 40: goto tr4161;
-               case 41: goto tr4162;
-               case 2058: goto tr4164;
-               case 2107: goto tr4165;
+               case 9: goto tr4197;
+               case 32: goto tr4197;
+               case 40: goto tr4198;
+               case 41: goto tr4199;
+               case 2058: goto tr4201;
+               case 2107: goto tr4202;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4163;
-       goto tr2327;
-tr4168:
+               goto tr4200;
+       goto tr2364;
+tr4205:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -97542,8 +98143,8 @@ tr4168:
                }
                s->multiline = true;
        }
-       goto st1384;
-tr4169:
+       goto st1411;
+tr4206:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -97551,13 +98152,13 @@ tr4169:
                }
                s->multiline = false;
        }
-       goto st1384;
-tr4170:
+       goto st1411;
+tr4207:
        {
                s->line_counter++;
        }
-       goto st1384;
-tr4187:
+       goto st1411;
+tr4224:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -97567,15 +98168,15 @@ tr4187:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1384; goto _out;}
+                               {p++; cs = 1411; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1384;
-tr4160:
+       goto st1411;
+tr4197:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -97585,8 +98186,8 @@ tr4160:
                        p--; {goto st307;}
                }
        }
-       goto st1384;
-tr4161:
+       goto st1411;
+tr4198:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -97603,8 +98204,8 @@ tr4161:
                }
                s->multiline = true;
        }
-       goto st1384;
-tr4162:
+       goto st1411;
+tr4199:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -97621,8 +98222,8 @@ tr4162:
                }
                s->multiline = false;
        }
-       goto st1384;
-tr4164:
+       goto st1411;
+tr4201:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -97635,11 +98236,11 @@ tr4164:
        {
                s->line_counter++;
        }
-       goto st1384;
-st1384:
+       goto st1411;
+st1411:
        if ( ++p == pe )
-               goto _test_eof1384;
-case 1384:
+               goto _test_eof1411;
+case 1411:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -97653,23 +98254,23 @@ case 1384:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1384;
-               case 32: goto st1384;
-               case 40: goto tr4168;
-               case 41: goto tr4169;
-               case 2058: goto tr4170;
-               case 2107: goto tr4171;
+               case 9: goto st1411;
+               case 32: goto st1411;
+               case 40: goto tr4205;
+               case 41: goto tr4206;
+               case 2058: goto tr4207;
+               case 2107: goto tr4208;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr4166;
+                       goto tr4203;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr4166;
+                       goto tr4203;
        } else
-               goto tr4166;
+               goto tr4203;
        goto tr75;
-tr4166:
+tr4203:
        {
                if (rdata_tail <= rdata_stop) {
                        s->item_length_location = rdata_tail++;
@@ -97678,12 +98279,12 @@ tr4166:
                        p--; {goto st307;}
                }
        }
-       { p--; {stack[top++] = 1385;goto st318;} }
-       goto st1385;
-st1385:
+       { p--; {stack[top++] = 1412;goto st318;} }
+       goto st1412;
+st1412:
        if ( ++p == pe )
-               goto _test_eof1385;
-case 1385:
+               goto _test_eof1412;
+case 1412:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -97697,15 +98298,15 @@ case 1385:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4172;
-               case 32: goto tr4172;
-               case 40: goto tr4173;
-               case 41: goto tr4174;
-               case 2058: goto tr4175;
-               case 2107: goto tr4176;
+               case 9: goto tr4209;
+               case 32: goto tr4209;
+               case 40: goto tr4210;
+               case 41: goto tr4211;
+               case 2058: goto tr4212;
+               case 2107: goto tr4213;
        }
        goto tr75;
-tr4179:
+tr4216:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -97713,8 +98314,8 @@ tr4179:
                }
                s->multiline = true;
        }
-       goto st1386;
-tr4180:
+       goto st1413;
+tr4217:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -97722,13 +98323,13 @@ tr4180:
                }
                s->multiline = false;
        }
-       goto st1386;
-tr4181:
+       goto st1413;
+tr4218:
        {
                s->line_counter++;
        }
-       goto st1386;
-tr4185:
+       goto st1413;
+tr4222:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -97738,15 +98339,15 @@ tr4185:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1386; goto _out;}
+                               {p++; cs = 1413; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1386;
-tr4172:
+       goto st1413;
+tr4209:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -97760,8 +98361,8 @@ tr4172:
                        p--; {goto st307;}
                }
        }
-       goto st1386;
-tr4173:
+       goto st1413;
+tr4210:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -97782,8 +98383,8 @@ tr4173:
                }
                s->multiline = true;
        }
-       goto st1386;
-tr4174:
+       goto st1413;
+tr4211:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -97804,8 +98405,8 @@ tr4174:
                }
                s->multiline = false;
        }
-       goto st1386;
-tr4175:
+       goto st1413;
+tr4212:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -97822,11 +98423,11 @@ tr4175:
        {
                s->line_counter++;
        }
-       goto st1386;
-st1386:
+       goto st1413;
+st1413:
        if ( ++p == pe )
-               goto _test_eof1386;
-case 1386:
+               goto _test_eof1413;
+case 1413:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -97840,62 +98441,62 @@ case 1386:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1386;
-               case 32: goto st1386;
-               case 40: goto tr4179;
-               case 41: goto tr4180;
-               case 2058: goto tr4181;
-               case 2107: goto tr4182;
+               case 9: goto st1413;
+               case 32: goto st1413;
+               case 40: goto tr4216;
+               case 41: goto tr4217;
+               case 2058: goto tr4218;
+               case 2107: goto tr4219;
        }
        if ( _widec < 11 ) {
                if ( _widec <= 8 )
-                       goto tr4177;
+                       goto tr4214;
        } else if ( _widec > 58 ) {
                if ( 60 <= _widec )
-                       goto tr4177;
+                       goto tr4214;
        } else
-               goto tr4177;
+               goto tr4214;
        goto tr75;
-tr4177:
-       { p--; {stack[top++] = 1387;goto st318;} }
-       goto st1387;
-st1387:
+tr4214:
+       { p--; {stack[top++] = 1414;goto st318;} }
+       goto st1414;
+st1414:
        if ( ++p == pe )
-               goto _test_eof1387;
-case 1387:
+               goto _test_eof1414;
+case 1414:
        switch( (*p) ) {
-               case 32: goto tr4183;
-               case 59: goto tr4183;
+               case 32: goto tr4220;
+               case 59: goto tr4220;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr4183;
+                       goto tr4220;
        } else if ( (*p) >= 9 )
-               goto tr4183;
+               goto tr4220;
        goto tr75;
-tr4183:
+tr4220:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1491;
-st1491:
+       goto st1518;
+st1518:
        if ( ++p == pe )
-               goto _test_eof1491;
-case 1491:
+               goto _test_eof1518;
+case 1518:
        goto st0;
-tr4182:
+tr4219:
        {
                s->buffer_length = 0;
        }
-       goto st1388;
-tr4184:
+       goto st1415;
+tr4221:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1388;
-tr4176:
+       goto st1415;
+tr4213:
        {
                s->item_length = rdata_tail - s->item_length_location - 1;
                if (s->comma_list && s->item_length == 0) {
@@ -97912,11 +98513,11 @@ tr4176:
        {
                s->buffer_length = 0;
        }
-       goto st1388;
-st1388:
+       goto st1415;
+st1415:
        if ( ++p == pe )
-               goto _test_eof1388;
-case 1388:
+               goto _test_eof1415;
+case 1415:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -97936,23 +98537,23 @@ case 1388:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4185;
+               goto tr4222;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4184;
+               goto tr4221;
        goto tr75;
-tr4171:
+tr4208:
        {
                s->buffer_length = 0;
        }
-       goto st1389;
-tr4186:
+       goto st1416;
+tr4223:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1389;
-tr4165:
+       goto st1416;
+tr4202:
        {
                if (s->number64 <= UINT8_MAX) {
                        *rdata_tail = (uint8_t)(s->number64);
@@ -97965,11 +98566,11 @@ tr4165:
        {
                s->buffer_length = 0;
        }
-       goto st1389;
-st1389:
+       goto st1416;
+st1416:
        if ( ++p == pe )
-               goto _test_eof1389;
-case 1389:
+               goto _test_eof1416;
+case 1416:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -97989,18 +98590,18 @@ case 1389:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4187;
+               goto tr4224;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4186;
+               goto tr4223;
        goto tr75;
-st1390:
+st1417:
        if ( ++p == pe )
-               goto _test_eof1390;
-case 1390:
+               goto _test_eof1417;
+case 1417:
        if ( 48 <= (*p) && (*p) <= 57 )
-               goto tr4188;
-       goto tr2327;
-tr4188:
+               goto tr4225;
+       goto tr2364;
+tr4225:
        {
                s->number64 = 0;
        }
@@ -98018,8 +98619,8 @@ tr4188:
                        p--; {goto st307;}
                }
        }
-       goto st1391;
-tr4192:
+       goto st1418;
+tr4229:
        {
                // Overflow check: 10*(s->number64) + fc - '0' <= UINT64_MAX
                if ((s->number64 < (UINT64_MAX / 10)) ||   // Dominant fast check.
@@ -98034,11 +98635,11 @@ tr4192:
                        p--; {goto st307;}
                }
        }
-       goto st1391;
-st1391:
+       goto st1418;
+st1418:
        if ( ++p == pe )
-               goto _test_eof1391;
-case 1391:
+               goto _test_eof1418;
+case 1418:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -98052,17 +98653,17 @@ case 1391:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto tr4189;
-               case 32: goto tr4189;
-               case 40: goto tr4190;
-               case 41: goto tr4191;
-               case 2058: goto tr4193;
-               case 2107: goto tr4194;
+               case 9: goto tr4226;
+               case 32: goto tr4226;
+               case 40: goto tr4227;
+               case 41: goto tr4228;
+               case 2058: goto tr4230;
+               case 2107: goto tr4231;
        }
        if ( 48 <= _widec && _widec <= 57 )
-               goto tr4192;
-       goto tr2327;
-tr4196:
+               goto tr4229;
+       goto tr2364;
+tr4233:
        {
                if (s->multiline == true) {
                        ERR(ZS_LEFT_PARENTHESIS);
@@ -98070,8 +98671,8 @@ tr4196:
                }
                s->multiline = true;
        }
-       goto st1392;
-tr4197:
+       goto st1419;
+tr4234:
        {
                if (s->multiline == false) {
                        ERR(ZS_RIGHT_PARENTHESIS);
@@ -98079,13 +98680,13 @@ tr4197:
                }
                s->multiline = false;
        }
-       goto st1392;
-tr4199:
+       goto st1419;
+tr4236:
        {
                s->line_counter++;
        }
-       goto st1392;
-tr4204:
+       goto st1419;
+tr4241:
        {
                s->buffer[s->buffer_length++] = 0;
 
@@ -98095,15 +98696,15 @@ tr4204:
 
                        // Stop if required from the callback.
                        if (s->state == ZS_STATE_STOP) {
-                               {p++; cs = 1392; goto _out;}
+                               {p++; cs = 1419; goto _out;}
                        }
                }
        }
        {
                s->line_counter++;
        }
-       goto st1392;
-tr4189:
+       goto st1419;
+tr4226:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -98114,8 +98715,8 @@ tr4189:
                        p--; {goto st307;}
                }
        }
-       goto st1392;
-tr4190:
+       goto st1419;
+tr4227:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -98133,8 +98734,8 @@ tr4190:
                }
                s->multiline = true;
        }
-       goto st1392;
-tr4191:
+       goto st1419;
+tr4228:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -98152,8 +98753,8 @@ tr4191:
                }
                s->multiline = false;
        }
-       goto st1392;
-tr4193:
+       goto st1419;
+tr4230:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -98167,11 +98768,11 @@ tr4193:
        {
                s->line_counter++;
        }
-       goto st1392;
-st1392:
+       goto st1419;
+st1419:
        if ( ++p == pe )
-               goto _test_eof1392;
-case 1392:
+               goto _test_eof1419;
+case 1419:
        _widec = (*p);
        if ( (*p) > 10 ) {
                if ( 59 <= (*p) && (*p) <= 59 ) {
@@ -98185,88 +98786,88 @@ case 1392:
  s->multiline  ) _widec += 256;
        }
        switch( _widec ) {
-               case 9: goto st1392;
-               case 32: goto st1392;
-               case 40: goto tr4196;
-               case 41: goto tr4197;
-               case 42: goto tr4198;
-               case 92: goto tr4198;
-               case 95: goto tr4198;
-               case 2058: goto tr4199;
-               case 2107: goto tr4200;
+               case 9: goto st1419;
+               case 32: goto st1419;
+               case 40: goto tr4233;
+               case 41: goto tr4234;
+               case 42: goto tr4235;
+               case 92: goto tr4235;
+               case 95: goto tr4235;
+               case 2058: goto tr4236;
+               case 2107: goto tr4237;
        }
        if ( _widec < 64 ) {
                if ( 45 <= _widec && _widec <= 57 )
-                       goto tr4198;
+                       goto tr4235;
        } else if ( _widec > 90 ) {
                if ( 97 <= _widec && _widec <= 122 )
-                       goto tr4198;
+                       goto tr4235;
        } else
-               goto tr4198;
+               goto tr4235;
        goto tr75;
-tr4198:
+tr4235:
        {
                s->dname = rdata_tail;
        }
-       { p--; {stack[top++] = 1393;goto st309;} }
-       goto st1393;
-st1393:
+       { p--; {stack[top++] = 1420;goto st309;} }
+       goto st1420;
+st1420:
        if ( ++p == pe )
-               goto _test_eof1393;
-case 1393:
+               goto _test_eof1420;
+case 1420:
        switch( (*p) ) {
-               case 32: goto tr4201;
-               case 59: goto tr4201;
+               case 32: goto tr4238;
+               case 59: goto tr4238;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr4201;
+                       goto tr4238;
        } else if ( (*p) >= 9 )
-               goto tr4201;
+               goto tr4238;
        goto tr75;
-tr4201:
+tr4238:
        {
                rdata_tail += s->dname_tmp_length;
        }
-       { p--; {stack[top++] = 1394;goto st603;} }
-       goto st1394;
-st1394:
+       { p--; {stack[top++] = 1421;goto st615;} }
+       goto st1421;
+st1421:
        if ( ++p == pe )
-               goto _test_eof1394;
-case 1394:
+               goto _test_eof1421;
+case 1421:
        switch( (*p) ) {
-               case 32: goto tr4202;
-               case 59: goto tr4202;
+               case 32: goto tr4239;
+               case 59: goto tr4239;
        }
        if ( (*p) > 10 ) {
                if ( 40 <= (*p) && (*p) <= 41 )
-                       goto tr4202;
+                       goto tr4239;
        } else if ( (*p) >= 9 )
-               goto tr4202;
+               goto tr4239;
        goto tr75;
-tr4202:
+tr4239:
        {
                p--; {cs = stack[--top];goto _again;}
        }
-       goto st1492;
-st1492:
+       goto st1519;
+st1519:
        if ( ++p == pe )
-               goto _test_eof1492;
-case 1492:
+               goto _test_eof1519;
+case 1519:
        goto st0;
-tr4200:
+tr4237:
        {
                s->buffer_length = 0;
        }
-       goto st1395;
-tr4203:
+       goto st1422;
+tr4240:
        {
                if (s->buffer_length < sizeof(s->buffer) - 1) {
                        s->buffer[s->buffer_length++] = (*p);
                }
        }
-       goto st1395;
-tr4194:
+       goto st1422;
+tr4231:
        {
                if (s->number64 <= UINT16_MAX) {
                        uint16_t num16 = htons((uint16_t)s->number64);
@@ -98280,11 +98881,11 @@ tr4194:
        {
                s->buffer_length = 0;
        }
-       goto st1395;
-st1395:
+       goto st1422;
+st1422:
        if ( ++p == pe )
-               goto _test_eof1395;
-case 1395:
+               goto _test_eof1422;
+case 1422:
        _widec = (*p);
        if ( (*p) < 10 ) {
                if ( (*p) <= 9 ) {
@@ -98304,12 +98905,12 @@ case 1395:
  s->multiline  ) _widec += 256;
        }
        if ( _widec == 2058 )
-               goto tr4204;
+               goto tr4241;
        if ( 1920 <= _widec && _widec <= 2175 )
-               goto tr4203;
+               goto tr4240;
        goto tr75;
        }
-       _test_eof1396: cs = 1396; goto _test_eof;
+       _test_eof1423: cs = 1423; goto _test_eof;
        _test_eof1: cs = 1; goto _test_eof;
        _test_eof2: cs = 2; goto _test_eof;
        _test_eof3: cs = 3; goto _test_eof;
@@ -98323,7 +98924,7 @@ case 1395:
        _test_eof11: cs = 11; goto _test_eof;
        _test_eof12: cs = 12; goto _test_eof;
        _test_eof13: cs = 13; goto _test_eof;
-       _test_eof1397: cs = 1397; goto _test_eof;
+       _test_eof1424: cs = 1424; goto _test_eof;
        _test_eof14: cs = 14; goto _test_eof;
        _test_eof15: cs = 15; goto _test_eof;
        _test_eof16: cs = 16; goto _test_eof;
@@ -98484,7 +99085,7 @@ case 1395:
        _test_eof171: cs = 171; goto _test_eof;
        _test_eof172: cs = 172; goto _test_eof;
        _test_eof173: cs = 173; goto _test_eof;
-       _test_eof1398: cs = 1398; goto _test_eof;
+       _test_eof1425: cs = 1425; goto _test_eof;
        _test_eof174: cs = 174; goto _test_eof;
        _test_eof175: cs = 175; goto _test_eof;
        _test_eof176: cs = 176; goto _test_eof;
@@ -98495,7 +99096,7 @@ case 1395:
        _test_eof181: cs = 181; goto _test_eof;
        _test_eof182: cs = 182; goto _test_eof;
        _test_eof183: cs = 183; goto _test_eof;
-       _test_eof1399: cs = 1399; goto _test_eof;
+       _test_eof1426: cs = 1426; goto _test_eof;
        _test_eof184: cs = 184; goto _test_eof;
        _test_eof185: cs = 185; goto _test_eof;
        _test_eof186: cs = 186; goto _test_eof;
@@ -98504,11 +99105,11 @@ case 1395:
        _test_eof189: cs = 189; goto _test_eof;
        _test_eof190: cs = 190; goto _test_eof;
        _test_eof191: cs = 191; goto _test_eof;
-       _test_eof1400: cs = 1400; goto _test_eof;
+       _test_eof1427: cs = 1427; goto _test_eof;
        _test_eof192: cs = 192; goto _test_eof;
        _test_eof193: cs = 193; goto _test_eof;
        _test_eof194: cs = 194; goto _test_eof;
-       _test_eof1401: cs = 1401; goto _test_eof;
+       _test_eof1428: cs = 1428; goto _test_eof;
        _test_eof195: cs = 195; goto _test_eof;
        _test_eof196: cs = 196; goto _test_eof;
        _test_eof197: cs = 197; goto _test_eof;
@@ -98520,12 +99121,12 @@ case 1395:
        _test_eof203: cs = 203; goto _test_eof;
        _test_eof204: cs = 204; goto _test_eof;
        _test_eof205: cs = 205; goto _test_eof;
-       _test_eof1402: cs = 1402; goto _test_eof;
+       _test_eof1429: cs = 1429; goto _test_eof;
        _test_eof206: cs = 206; goto _test_eof;
        _test_eof207: cs = 207; goto _test_eof;
        _test_eof208: cs = 208; goto _test_eof;
        _test_eof209: cs = 209; goto _test_eof;
-       _test_eof1403: cs = 1403; goto _test_eof;
+       _test_eof1430: cs = 1430; goto _test_eof;
        _test_eof210: cs = 210; goto _test_eof;
        _test_eof211: cs = 211; goto _test_eof;
        _test_eof212: cs = 212; goto _test_eof;
@@ -98544,7 +99145,7 @@ case 1395:
        _test_eof225: cs = 225; goto _test_eof;
        _test_eof226: cs = 226; goto _test_eof;
        _test_eof227: cs = 227; goto _test_eof;
-       _test_eof1404: cs = 1404; goto _test_eof;
+       _test_eof1431: cs = 1431; goto _test_eof;
        _test_eof228: cs = 228; goto _test_eof;
        _test_eof229: cs = 229; goto _test_eof;
        _test_eof230: cs = 230; goto _test_eof;
@@ -98561,7 +99162,7 @@ case 1395:
        _test_eof241: cs = 241; goto _test_eof;
        _test_eof242: cs = 242; goto _test_eof;
        _test_eof243: cs = 243; goto _test_eof;
-       _test_eof1405: cs = 1405; goto _test_eof;
+       _test_eof1432: cs = 1432; goto _test_eof;
        _test_eof244: cs = 244; goto _test_eof;
        _test_eof245: cs = 245; goto _test_eof;
        _test_eof246: cs = 246; goto _test_eof;
@@ -98625,13 +99226,13 @@ case 1395:
        _test_eof304: cs = 304; goto _test_eof;
        _test_eof305: cs = 305; goto _test_eof;
        _test_eof306: cs = 306; goto _test_eof;
-       _test_eof1406: cs = 1406; goto _test_eof;
+       _test_eof1433: cs = 1433; goto _test_eof;
        _test_eof307: cs = 307; goto _test_eof;
        _test_eof308: cs = 308; goto _test_eof;
-       _test_eof1407: cs = 1407; goto _test_eof;
+       _test_eof1434: cs = 1434; goto _test_eof;
        _test_eof309: cs = 309; goto _test_eof;
        _test_eof310: cs = 310; goto _test_eof;
-       _test_eof1408: cs = 1408; goto _test_eof;
+       _test_eof1435: cs = 1435; goto _test_eof;
        _test_eof311: cs = 311; goto _test_eof;
        _test_eof312: cs = 312; goto _test_eof;
        _test_eof313: cs = 313; goto _test_eof;
@@ -98641,8 +99242,8 @@ case 1395:
        _test_eof317: cs = 317; goto _test_eof;
        _test_eof318: cs = 318; goto _test_eof;
        _test_eof319: cs = 319; goto _test_eof;
-       _test_eof1409: cs = 1409; goto _test_eof;
-       _test_eof1410: cs = 1410; goto _test_eof;
+       _test_eof1436: cs = 1436; goto _test_eof;
+       _test_eof1437: cs = 1437; goto _test_eof;
        _test_eof320: cs = 320; goto _test_eof;
        _test_eof321: cs = 321; goto _test_eof;
        _test_eof322: cs = 322; goto _test_eof;
@@ -98658,7 +99259,7 @@ case 1395:
        _test_eof332: cs = 332; goto _test_eof;
        _test_eof333: cs = 333; goto _test_eof;
        _test_eof334: cs = 334; goto _test_eof;
-       _test_eof1411: cs = 1411; goto _test_eof;
+       _test_eof1438: cs = 1438; goto _test_eof;
        _test_eof335: cs = 335; goto _test_eof;
        _test_eof336: cs = 336; goto _test_eof;
        _test_eof337: cs = 337; goto _test_eof;
@@ -98669,7 +99270,7 @@ case 1395:
        _test_eof342: cs = 342; goto _test_eof;
        _test_eof343: cs = 343; goto _test_eof;
        _test_eof344: cs = 344; goto _test_eof;
-       _test_eof1412: cs = 1412; goto _test_eof;
+       _test_eof1439: cs = 1439; goto _test_eof;
        _test_eof345: cs = 345; goto _test_eof;
        _test_eof346: cs = 346; goto _test_eof;
        _test_eof347: cs = 347; goto _test_eof;
@@ -98684,7 +99285,7 @@ case 1395:
        _test_eof356: cs = 356; goto _test_eof;
        _test_eof357: cs = 357; goto _test_eof;
        _test_eof358: cs = 358; goto _test_eof;
-       _test_eof1413: cs = 1413; goto _test_eof;
+       _test_eof1440: cs = 1440; goto _test_eof;
        _test_eof359: cs = 359; goto _test_eof;
        _test_eof360: cs = 360; goto _test_eof;
        _test_eof361: cs = 361; goto _test_eof;
@@ -98692,7 +99293,7 @@ case 1395:
        _test_eof363: cs = 363; goto _test_eof;
        _test_eof364: cs = 364; goto _test_eof;
        _test_eof365: cs = 365; goto _test_eof;
-       _test_eof1414: cs = 1414; goto _test_eof;
+       _test_eof1441: cs = 1441; goto _test_eof;
        _test_eof366: cs = 366; goto _test_eof;
        _test_eof367: cs = 367; goto _test_eof;
        _test_eof368: cs = 368; goto _test_eof;
@@ -98702,9 +99303,9 @@ case 1395:
        _test_eof372: cs = 372; goto _test_eof;
        _test_eof373: cs = 373; goto _test_eof;
        _test_eof374: cs = 374; goto _test_eof;
-       _test_eof1415: cs = 1415; goto _test_eof;
-       _test_eof1416: cs = 1416; goto _test_eof;
-       _test_eof1417: cs = 1417; goto _test_eof;
+       _test_eof1442: cs = 1442; goto _test_eof;
+       _test_eof1443: cs = 1443; goto _test_eof;
+       _test_eof1444: cs = 1444; goto _test_eof;
        _test_eof375: cs = 375; goto _test_eof;
        _test_eof376: cs = 376; goto _test_eof;
        _test_eof377: cs = 377; goto _test_eof;
@@ -98713,12 +99314,12 @@ case 1395:
        _test_eof380: cs = 380; goto _test_eof;
        _test_eof381: cs = 381; goto _test_eof;
        _test_eof382: cs = 382; goto _test_eof;
-       _test_eof1418: cs = 1418; goto _test_eof;
-       _test_eof1419: cs = 1419; goto _test_eof;
+       _test_eof1445: cs = 1445; goto _test_eof;
+       _test_eof1446: cs = 1446; goto _test_eof;
        _test_eof383: cs = 383; goto _test_eof;
        _test_eof384: cs = 384; goto _test_eof;
        _test_eof385: cs = 385; goto _test_eof;
-       _test_eof1420: cs = 1420; goto _test_eof;
+       _test_eof1447: cs = 1447; goto _test_eof;
        _test_eof386: cs = 386; goto _test_eof;
        _test_eof387: cs = 387; goto _test_eof;
        _test_eof388: cs = 388; goto _test_eof;
@@ -98880,32 +99481,32 @@ case 1395:
        _test_eof544: cs = 544; goto _test_eof;
        _test_eof545: cs = 545; goto _test_eof;
        _test_eof546: cs = 546; goto _test_eof;
-       _test_eof1421: cs = 1421; goto _test_eof;
-       _test_eof1422: cs = 1422; goto _test_eof;
-       _test_eof1423: cs = 1423; goto _test_eof;
+       _test_eof1448: cs = 1448; goto _test_eof;
+       _test_eof1449: cs = 1449; goto _test_eof;
+       _test_eof1450: cs = 1450; goto _test_eof;
        _test_eof547: cs = 547; goto _test_eof;
        _test_eof548: cs = 548; goto _test_eof;
        _test_eof549: cs = 549; goto _test_eof;
        _test_eof550: cs = 550; goto _test_eof;
        _test_eof551: cs = 551; goto _test_eof;
-       _test_eof1424: cs = 1424; goto _test_eof;
+       _test_eof1451: cs = 1451; goto _test_eof;
        _test_eof552: cs = 552; goto _test_eof;
        _test_eof553: cs = 553; goto _test_eof;
        _test_eof554: cs = 554; goto _test_eof;
        _test_eof555: cs = 555; goto _test_eof;
-       _test_eof1425: cs = 1425; goto _test_eof;
-       _test_eof1426: cs = 1426; goto _test_eof;
-       _test_eof1427: cs = 1427; goto _test_eof;
+       _test_eof1452: cs = 1452; goto _test_eof;
+       _test_eof1453: cs = 1453; goto _test_eof;
+       _test_eof1454: cs = 1454; goto _test_eof;
        _test_eof556: cs = 556; goto _test_eof;
        _test_eof557: cs = 557; goto _test_eof;
-       _test_eof1428: cs = 1428; goto _test_eof;
+       _test_eof1455: cs = 1455; goto _test_eof;
        _test_eof558: cs = 558; goto _test_eof;
        _test_eof559: cs = 559; goto _test_eof;
        _test_eof560: cs = 560; goto _test_eof;
        _test_eof561: cs = 561; goto _test_eof;
        _test_eof562: cs = 562; goto _test_eof;
        _test_eof563: cs = 563; goto _test_eof;
-       _test_eof1429: cs = 1429; goto _test_eof;
+       _test_eof1456: cs = 1456; goto _test_eof;
        _test_eof564: cs = 564; goto _test_eof;
        _test_eof565: cs = 565; goto _test_eof;
        _test_eof566: cs = 566; goto _test_eof;
@@ -98954,8 +99555,6 @@ case 1395:
        _test_eof609: cs = 609; goto _test_eof;
        _test_eof610: cs = 610; goto _test_eof;
        _test_eof611: cs = 611; goto _test_eof;
-       _test_eof1430: cs = 1430; goto _test_eof;
-       _test_eof1431: cs = 1431; goto _test_eof;
        _test_eof612: cs = 612; goto _test_eof;
        _test_eof613: cs = 613; goto _test_eof;
        _test_eof614: cs = 614; goto _test_eof;
@@ -98966,9 +99565,10 @@ case 1395:
        _test_eof619: cs = 619; goto _test_eof;
        _test_eof620: cs = 620; goto _test_eof;
        _test_eof621: cs = 621; goto _test_eof;
-       _test_eof1432: cs = 1432; goto _test_eof;
        _test_eof622: cs = 622; goto _test_eof;
        _test_eof623: cs = 623; goto _test_eof;
+       _test_eof1457: cs = 1457; goto _test_eof;
+       _test_eof1458: cs = 1458; goto _test_eof;
        _test_eof624: cs = 624; goto _test_eof;
        _test_eof625: cs = 625; goto _test_eof;
        _test_eof626: cs = 626; goto _test_eof;
@@ -98978,6 +99578,7 @@ case 1395:
        _test_eof630: cs = 630; goto _test_eof;
        _test_eof631: cs = 631; goto _test_eof;
        _test_eof632: cs = 632; goto _test_eof;
+       _test_eof1459: cs = 1459; goto _test_eof;
        _test_eof633: cs = 633; goto _test_eof;
        _test_eof634: cs = 634; goto _test_eof;
        _test_eof635: cs = 635; goto _test_eof;
@@ -99046,7 +99647,6 @@ case 1395:
        _test_eof698: cs = 698; goto _test_eof;
        _test_eof699: cs = 699; goto _test_eof;
        _test_eof700: cs = 700; goto _test_eof;
-       _test_eof1433: cs = 1433; goto _test_eof;
        _test_eof701: cs = 701; goto _test_eof;
        _test_eof702: cs = 702; goto _test_eof;
        _test_eof703: cs = 703; goto _test_eof;
@@ -99074,6 +99674,7 @@ case 1395:
        _test_eof725: cs = 725; goto _test_eof;
        _test_eof726: cs = 726; goto _test_eof;
        _test_eof727: cs = 727; goto _test_eof;
+       _test_eof1460: cs = 1460; goto _test_eof;
        _test_eof728: cs = 728; goto _test_eof;
        _test_eof729: cs = 729; goto _test_eof;
        _test_eof730: cs = 730; goto _test_eof;
@@ -99151,7 +99752,6 @@ case 1395:
        _test_eof802: cs = 802; goto _test_eof;
        _test_eof803: cs = 803; goto _test_eof;
        _test_eof804: cs = 804; goto _test_eof;
-       _test_eof1434: cs = 1434; goto _test_eof;
        _test_eof805: cs = 805; goto _test_eof;
        _test_eof806: cs = 806; goto _test_eof;
        _test_eof807: cs = 807; goto _test_eof;
@@ -99179,6 +99779,7 @@ case 1395:
        _test_eof829: cs = 829; goto _test_eof;
        _test_eof830: cs = 830; goto _test_eof;
        _test_eof831: cs = 831; goto _test_eof;
+       _test_eof1461: cs = 1461; goto _test_eof;
        _test_eof832: cs = 832; goto _test_eof;
        _test_eof833: cs = 833; goto _test_eof;
        _test_eof834: cs = 834; goto _test_eof;
@@ -99193,10 +99794,8 @@ case 1395:
        _test_eof843: cs = 843; goto _test_eof;
        _test_eof844: cs = 844; goto _test_eof;
        _test_eof845: cs = 845; goto _test_eof;
-       _test_eof1435: cs = 1435; goto _test_eof;
        _test_eof846: cs = 846; goto _test_eof;
        _test_eof847: cs = 847; goto _test_eof;
-       _test_eof1436: cs = 1436; goto _test_eof;
        _test_eof848: cs = 848; goto _test_eof;
        _test_eof849: cs = 849; goto _test_eof;
        _test_eof850: cs = 850; goto _test_eof;
@@ -99211,7 +99810,6 @@ case 1395:
        _test_eof859: cs = 859; goto _test_eof;
        _test_eof860: cs = 860; goto _test_eof;
        _test_eof861: cs = 861; goto _test_eof;
-       _test_eof1437: cs = 1437; goto _test_eof;
        _test_eof862: cs = 862; goto _test_eof;
        _test_eof863: cs = 863; goto _test_eof;
        _test_eof864: cs = 864; goto _test_eof;
@@ -99223,8 +99821,10 @@ case 1395:
        _test_eof870: cs = 870; goto _test_eof;
        _test_eof871: cs = 871; goto _test_eof;
        _test_eof872: cs = 872; goto _test_eof;
+       _test_eof1462: cs = 1462; goto _test_eof;
        _test_eof873: cs = 873; goto _test_eof;
        _test_eof874: cs = 874; goto _test_eof;
+       _test_eof1463: cs = 1463; goto _test_eof;
        _test_eof875: cs = 875; goto _test_eof;
        _test_eof876: cs = 876; goto _test_eof;
        _test_eof877: cs = 877; goto _test_eof;
@@ -99234,30 +99834,24 @@ case 1395:
        _test_eof881: cs = 881; goto _test_eof;
        _test_eof882: cs = 882; goto _test_eof;
        _test_eof883: cs = 883; goto _test_eof;
-       _test_eof1438: cs = 1438; goto _test_eof;
        _test_eof884: cs = 884; goto _test_eof;
        _test_eof885: cs = 885; goto _test_eof;
        _test_eof886: cs = 886; goto _test_eof;
        _test_eof887: cs = 887; goto _test_eof;
        _test_eof888: cs = 888; goto _test_eof;
-       _test_eof1439: cs = 1439; goto _test_eof;
+       _test_eof1464: cs = 1464; goto _test_eof;
        _test_eof889: cs = 889; goto _test_eof;
        _test_eof890: cs = 890; goto _test_eof;
        _test_eof891: cs = 891; goto _test_eof;
        _test_eof892: cs = 892; goto _test_eof;
        _test_eof893: cs = 893; goto _test_eof;
-       _test_eof1440: cs = 1440; goto _test_eof;
        _test_eof894: cs = 894; goto _test_eof;
        _test_eof895: cs = 895; goto _test_eof;
        _test_eof896: cs = 896; goto _test_eof;
        _test_eof897: cs = 897; goto _test_eof;
        _test_eof898: cs = 898; goto _test_eof;
-       _test_eof1441: cs = 1441; goto _test_eof;
-       _test_eof1442: cs = 1442; goto _test_eof;
-       _test_eof1443: cs = 1443; goto _test_eof;
        _test_eof899: cs = 899; goto _test_eof;
        _test_eof900: cs = 900; goto _test_eof;
-       _test_eof1444: cs = 1444; goto _test_eof;
        _test_eof901: cs = 901; goto _test_eof;
        _test_eof902: cs = 902; goto _test_eof;
        _test_eof903: cs = 903; goto _test_eof;
@@ -99268,43 +99862,41 @@ case 1395:
        _test_eof908: cs = 908; goto _test_eof;
        _test_eof909: cs = 909; goto _test_eof;
        _test_eof910: cs = 910; goto _test_eof;
+       _test_eof1465: cs = 1465; goto _test_eof;
        _test_eof911: cs = 911; goto _test_eof;
        _test_eof912: cs = 912; goto _test_eof;
        _test_eof913: cs = 913; goto _test_eof;
        _test_eof914: cs = 914; goto _test_eof;
        _test_eof915: cs = 915; goto _test_eof;
+       _test_eof1466: cs = 1466; goto _test_eof;
        _test_eof916: cs = 916; goto _test_eof;
        _test_eof917: cs = 917; goto _test_eof;
        _test_eof918: cs = 918; goto _test_eof;
        _test_eof919: cs = 919; goto _test_eof;
        _test_eof920: cs = 920; goto _test_eof;
+       _test_eof1467: cs = 1467; goto _test_eof;
        _test_eof921: cs = 921; goto _test_eof;
        _test_eof922: cs = 922; goto _test_eof;
        _test_eof923: cs = 923; goto _test_eof;
        _test_eof924: cs = 924; goto _test_eof;
        _test_eof925: cs = 925; goto _test_eof;
+       _test_eof1468: cs = 1468; goto _test_eof;
+       _test_eof1469: cs = 1469; goto _test_eof;
+       _test_eof1470: cs = 1470; goto _test_eof;
        _test_eof926: cs = 926; goto _test_eof;
        _test_eof927: cs = 927; goto _test_eof;
-       _test_eof1445: cs = 1445; goto _test_eof;
-       _test_eof1446: cs = 1446; goto _test_eof;
-       _test_eof1447: cs = 1447; goto _test_eof;
+       _test_eof1471: cs = 1471; goto _test_eof;
        _test_eof928: cs = 928; goto _test_eof;
        _test_eof929: cs = 929; goto _test_eof;
        _test_eof930: cs = 930; goto _test_eof;
-       _test_eof1448: cs = 1448; goto _test_eof;
-       _test_eof1449: cs = 1449; goto _test_eof;
        _test_eof931: cs = 931; goto _test_eof;
        _test_eof932: cs = 932; goto _test_eof;
        _test_eof933: cs = 933; goto _test_eof;
        _test_eof934: cs = 934; goto _test_eof;
-       _test_eof1450: cs = 1450; goto _test_eof;
-       _test_eof1451: cs = 1451; goto _test_eof;
        _test_eof935: cs = 935; goto _test_eof;
        _test_eof936: cs = 936; goto _test_eof;
        _test_eof937: cs = 937; goto _test_eof;
        _test_eof938: cs = 938; goto _test_eof;
-       _test_eof1452: cs = 1452; goto _test_eof;
-       _test_eof1453: cs = 1453; goto _test_eof;
        _test_eof939: cs = 939; goto _test_eof;
        _test_eof940: cs = 940; goto _test_eof;
        _test_eof941: cs = 941; goto _test_eof;
@@ -99321,18 +99913,26 @@ case 1395:
        _test_eof952: cs = 952; goto _test_eof;
        _test_eof953: cs = 953; goto _test_eof;
        _test_eof954: cs = 954; goto _test_eof;
+       _test_eof1472: cs = 1472; goto _test_eof;
+       _test_eof1473: cs = 1473; goto _test_eof;
+       _test_eof1474: cs = 1474; goto _test_eof;
        _test_eof955: cs = 955; goto _test_eof;
        _test_eof956: cs = 956; goto _test_eof;
        _test_eof957: cs = 957; goto _test_eof;
+       _test_eof1475: cs = 1475; goto _test_eof;
+       _test_eof1476: cs = 1476; goto _test_eof;
        _test_eof958: cs = 958; goto _test_eof;
        _test_eof959: cs = 959; goto _test_eof;
        _test_eof960: cs = 960; goto _test_eof;
        _test_eof961: cs = 961; goto _test_eof;
+       _test_eof1477: cs = 1477; goto _test_eof;
+       _test_eof1478: cs = 1478; goto _test_eof;
        _test_eof962: cs = 962; goto _test_eof;
        _test_eof963: cs = 963; goto _test_eof;
-       _test_eof1454: cs = 1454; goto _test_eof;
        _test_eof964: cs = 964; goto _test_eof;
        _test_eof965: cs = 965; goto _test_eof;
+       _test_eof1479: cs = 1479; goto _test_eof;
+       _test_eof1480: cs = 1480; goto _test_eof;
        _test_eof966: cs = 966; goto _test_eof;
        _test_eof967: cs = 967; goto _test_eof;
        _test_eof968: cs = 968; goto _test_eof;
@@ -99346,7 +99946,6 @@ case 1395:
        _test_eof976: cs = 976; goto _test_eof;
        _test_eof977: cs = 977; goto _test_eof;
        _test_eof978: cs = 978; goto _test_eof;
-       _test_eof1455: cs = 1455; goto _test_eof;
        _test_eof979: cs = 979; goto _test_eof;
        _test_eof980: cs = 980; goto _test_eof;
        _test_eof981: cs = 981; goto _test_eof;
@@ -99359,8 +99958,8 @@ case 1395:
        _test_eof988: cs = 988; goto _test_eof;
        _test_eof989: cs = 989; goto _test_eof;
        _test_eof990: cs = 990; goto _test_eof;
+       _test_eof1481: cs = 1481; goto _test_eof;
        _test_eof991: cs = 991; goto _test_eof;
-       _test_eof1456: cs = 1456; goto _test_eof;
        _test_eof992: cs = 992; goto _test_eof;
        _test_eof993: cs = 993; goto _test_eof;
        _test_eof994: cs = 994; goto _test_eof;
@@ -99372,12 +99971,10 @@ case 1395:
        _test_eof1000: cs = 1000; goto _test_eof;
        _test_eof1001: cs = 1001; goto _test_eof;
        _test_eof1002: cs = 1002; goto _test_eof;
-       _test_eof1457: cs = 1457; goto _test_eof;
-       _test_eof1458: cs = 1458; goto _test_eof;
        _test_eof1003: cs = 1003; goto _test_eof;
        _test_eof1004: cs = 1004; goto _test_eof;
        _test_eof1005: cs = 1005; goto _test_eof;
-       _test_eof1459: cs = 1459; goto _test_eof;
+       _test_eof1482: cs = 1482; goto _test_eof;
        _test_eof1006: cs = 1006; goto _test_eof;
        _test_eof1007: cs = 1007; goto _test_eof;
        _test_eof1008: cs = 1008; goto _test_eof;
@@ -99388,12 +99985,10 @@ case 1395:
        _test_eof1013: cs = 1013; goto _test_eof;
        _test_eof1014: cs = 1014; goto _test_eof;
        _test_eof1015: cs = 1015; goto _test_eof;
-       _test_eof1460: cs = 1460; goto _test_eof;
-       _test_eof1461: cs = 1461; goto _test_eof;
-       _test_eof1462: cs = 1462; goto _test_eof;
        _test_eof1016: cs = 1016; goto _test_eof;
        _test_eof1017: cs = 1017; goto _test_eof;
        _test_eof1018: cs = 1018; goto _test_eof;
+       _test_eof1483: cs = 1483; goto _test_eof;
        _test_eof1019: cs = 1019; goto _test_eof;
        _test_eof1020: cs = 1020; goto _test_eof;
        _test_eof1021: cs = 1021; goto _test_eof;
@@ -99402,33 +99997,29 @@ case 1395:
        _test_eof1024: cs = 1024; goto _test_eof;
        _test_eof1025: cs = 1025; goto _test_eof;
        _test_eof1026: cs = 1026; goto _test_eof;
-       _test_eof1463: cs = 1463; goto _test_eof;
-       _test_eof1464: cs = 1464; goto _test_eof;
-       _test_eof1465: cs = 1465; goto _test_eof;
        _test_eof1027: cs = 1027; goto _test_eof;
        _test_eof1028: cs = 1028; goto _test_eof;
        _test_eof1029: cs = 1029; goto _test_eof;
+       _test_eof1484: cs = 1484; goto _test_eof;
+       _test_eof1485: cs = 1485; goto _test_eof;
        _test_eof1030: cs = 1030; goto _test_eof;
        _test_eof1031: cs = 1031; goto _test_eof;
        _test_eof1032: cs = 1032; goto _test_eof;
+       _test_eof1486: cs = 1486; goto _test_eof;
        _test_eof1033: cs = 1033; goto _test_eof;
        _test_eof1034: cs = 1034; goto _test_eof;
        _test_eof1035: cs = 1035; goto _test_eof;
        _test_eof1036: cs = 1036; goto _test_eof;
        _test_eof1037: cs = 1037; goto _test_eof;
        _test_eof1038: cs = 1038; goto _test_eof;
-       _test_eof1466: cs = 1466; goto _test_eof;
        _test_eof1039: cs = 1039; goto _test_eof;
        _test_eof1040: cs = 1040; goto _test_eof;
        _test_eof1041: cs = 1041; goto _test_eof;
-       _test_eof1467: cs = 1467; goto _test_eof;
-       _test_eof1468: cs = 1468; goto _test_eof;
        _test_eof1042: cs = 1042; goto _test_eof;
-       _test_eof1469: cs = 1469; goto _test_eof;
-       _test_eof1470: cs = 1470; goto _test_eof;
+       _test_eof1487: cs = 1487; goto _test_eof;
+       _test_eof1488: cs = 1488; goto _test_eof;
+       _test_eof1489: cs = 1489; goto _test_eof;
        _test_eof1043: cs = 1043; goto _test_eof;
-       _test_eof1471: cs = 1471; goto _test_eof;
-       _test_eof1472: cs = 1472; goto _test_eof;
        _test_eof1044: cs = 1044; goto _test_eof;
        _test_eof1045: cs = 1045; goto _test_eof;
        _test_eof1046: cs = 1046; goto _test_eof;
@@ -99439,6 +100030,9 @@ case 1395:
        _test_eof1051: cs = 1051; goto _test_eof;
        _test_eof1052: cs = 1052; goto _test_eof;
        _test_eof1053: cs = 1053; goto _test_eof;
+       _test_eof1490: cs = 1490; goto _test_eof;
+       _test_eof1491: cs = 1491; goto _test_eof;
+       _test_eof1492: cs = 1492; goto _test_eof;
        _test_eof1054: cs = 1054; goto _test_eof;
        _test_eof1055: cs = 1055; goto _test_eof;
        _test_eof1056: cs = 1056; goto _test_eof;
@@ -99451,11 +100045,18 @@ case 1395:
        _test_eof1063: cs = 1063; goto _test_eof;
        _test_eof1064: cs = 1064; goto _test_eof;
        _test_eof1065: cs = 1065; goto _test_eof;
+       _test_eof1493: cs = 1493; goto _test_eof;
        _test_eof1066: cs = 1066; goto _test_eof;
        _test_eof1067: cs = 1067; goto _test_eof;
        _test_eof1068: cs = 1068; goto _test_eof;
+       _test_eof1494: cs = 1494; goto _test_eof;
+       _test_eof1495: cs = 1495; goto _test_eof;
        _test_eof1069: cs = 1069; goto _test_eof;
+       _test_eof1496: cs = 1496; goto _test_eof;
+       _test_eof1497: cs = 1497; goto _test_eof;
        _test_eof1070: cs = 1070; goto _test_eof;
+       _test_eof1498: cs = 1498; goto _test_eof;
+       _test_eof1499: cs = 1499; goto _test_eof;
        _test_eof1071: cs = 1071; goto _test_eof;
        _test_eof1072: cs = 1072; goto _test_eof;
        _test_eof1073: cs = 1073; goto _test_eof;
@@ -99471,7 +100072,6 @@ case 1395:
        _test_eof1083: cs = 1083; goto _test_eof;
        _test_eof1084: cs = 1084; goto _test_eof;
        _test_eof1085: cs = 1085; goto _test_eof;
-       _test_eof1473: cs = 1473; goto _test_eof;
        _test_eof1086: cs = 1086; goto _test_eof;
        _test_eof1087: cs = 1087; goto _test_eof;
        _test_eof1088: cs = 1088; goto _test_eof;
@@ -99499,6 +100099,7 @@ case 1395:
        _test_eof1110: cs = 1110; goto _test_eof;
        _test_eof1111: cs = 1111; goto _test_eof;
        _test_eof1112: cs = 1112; goto _test_eof;
+       _test_eof1500: cs = 1500; goto _test_eof;
        _test_eof1113: cs = 1113; goto _test_eof;
        _test_eof1114: cs = 1114; goto _test_eof;
        _test_eof1115: cs = 1115; goto _test_eof;
@@ -99643,7 +100244,6 @@ case 1395:
        _test_eof1254: cs = 1254; goto _test_eof;
        _test_eof1255: cs = 1255; goto _test_eof;
        _test_eof1256: cs = 1256; goto _test_eof;
-       _test_eof1474: cs = 1474; goto _test_eof;
        _test_eof1257: cs = 1257; goto _test_eof;
        _test_eof1258: cs = 1258; goto _test_eof;
        _test_eof1259: cs = 1259; goto _test_eof;
@@ -99652,13 +100252,11 @@ case 1395:
        _test_eof1262: cs = 1262; goto _test_eof;
        _test_eof1263: cs = 1263; goto _test_eof;
        _test_eof1264: cs = 1264; goto _test_eof;
-       _test_eof1475: cs = 1475; goto _test_eof;
        _test_eof1265: cs = 1265; goto _test_eof;
        _test_eof1266: cs = 1266; goto _test_eof;
        _test_eof1267: cs = 1267; goto _test_eof;
        _test_eof1268: cs = 1268; goto _test_eof;
        _test_eof1269: cs = 1269; goto _test_eof;
-       _test_eof1476: cs = 1476; goto _test_eof;
        _test_eof1270: cs = 1270; goto _test_eof;
        _test_eof1271: cs = 1271; goto _test_eof;
        _test_eof1272: cs = 1272; goto _test_eof;
@@ -99673,20 +100271,22 @@ case 1395:
        _test_eof1281: cs = 1281; goto _test_eof;
        _test_eof1282: cs = 1282; goto _test_eof;
        _test_eof1283: cs = 1283; goto _test_eof;
+       _test_eof1501: cs = 1501; goto _test_eof;
        _test_eof1284: cs = 1284; goto _test_eof;
        _test_eof1285: cs = 1285; goto _test_eof;
        _test_eof1286: cs = 1286; goto _test_eof;
        _test_eof1287: cs = 1287; goto _test_eof;
-       _test_eof1477: cs = 1477; goto _test_eof;
        _test_eof1288: cs = 1288; goto _test_eof;
        _test_eof1289: cs = 1289; goto _test_eof;
        _test_eof1290: cs = 1290; goto _test_eof;
        _test_eof1291: cs = 1291; goto _test_eof;
+       _test_eof1502: cs = 1502; goto _test_eof;
        _test_eof1292: cs = 1292; goto _test_eof;
        _test_eof1293: cs = 1293; goto _test_eof;
        _test_eof1294: cs = 1294; goto _test_eof;
        _test_eof1295: cs = 1295; goto _test_eof;
        _test_eof1296: cs = 1296; goto _test_eof;
+       _test_eof1503: cs = 1503; goto _test_eof;
        _test_eof1297: cs = 1297; goto _test_eof;
        _test_eof1298: cs = 1298; goto _test_eof;
        _test_eof1299: cs = 1299; goto _test_eof;
@@ -99697,7 +100297,6 @@ case 1395:
        _test_eof1304: cs = 1304; goto _test_eof;
        _test_eof1305: cs = 1305; goto _test_eof;
        _test_eof1306: cs = 1306; goto _test_eof;
-       _test_eof1478: cs = 1478; goto _test_eof;
        _test_eof1307: cs = 1307; goto _test_eof;
        _test_eof1308: cs = 1308; goto _test_eof;
        _test_eof1309: cs = 1309; goto _test_eof;
@@ -99706,6 +100305,7 @@ case 1395:
        _test_eof1312: cs = 1312; goto _test_eof;
        _test_eof1313: cs = 1313; goto _test_eof;
        _test_eof1314: cs = 1314; goto _test_eof;
+       _test_eof1504: cs = 1504; goto _test_eof;
        _test_eof1315: cs = 1315; goto _test_eof;
        _test_eof1316: cs = 1316; goto _test_eof;
        _test_eof1317: cs = 1317; goto _test_eof;
@@ -99713,9 +100313,6 @@ case 1395:
        _test_eof1319: cs = 1319; goto _test_eof;
        _test_eof1320: cs = 1320; goto _test_eof;
        _test_eof1321: cs = 1321; goto _test_eof;
-       _test_eof1479: cs = 1479; goto _test_eof;
-       _test_eof1480: cs = 1480; goto _test_eof;
-       _test_eof1481: cs = 1481; goto _test_eof;
        _test_eof1322: cs = 1322; goto _test_eof;
        _test_eof1323: cs = 1323; goto _test_eof;
        _test_eof1324: cs = 1324; goto _test_eof;
@@ -99724,11 +100321,11 @@ case 1395:
        _test_eof1327: cs = 1327; goto _test_eof;
        _test_eof1328: cs = 1328; goto _test_eof;
        _test_eof1329: cs = 1329; goto _test_eof;
-       _test_eof1482: cs = 1482; goto _test_eof;
        _test_eof1330: cs = 1330; goto _test_eof;
        _test_eof1331: cs = 1331; goto _test_eof;
        _test_eof1332: cs = 1332; goto _test_eof;
        _test_eof1333: cs = 1333; goto _test_eof;
+       _test_eof1505: cs = 1505; goto _test_eof;
        _test_eof1334: cs = 1334; goto _test_eof;
        _test_eof1335: cs = 1335; goto _test_eof;
        _test_eof1336: cs = 1336; goto _test_eof;
@@ -99736,9 +100333,6 @@ case 1395:
        _test_eof1338: cs = 1338; goto _test_eof;
        _test_eof1339: cs = 1339; goto _test_eof;
        _test_eof1340: cs = 1340; goto _test_eof;
-       _test_eof1483: cs = 1483; goto _test_eof;
-       _test_eof1484: cs = 1484; goto _test_eof;
-       _test_eof1485: cs = 1485; goto _test_eof;
        _test_eof1341: cs = 1341; goto _test_eof;
        _test_eof1342: cs = 1342; goto _test_eof;
        _test_eof1343: cs = 1343; goto _test_eof;
@@ -99746,8 +100340,10 @@ case 1395:
        _test_eof1345: cs = 1345; goto _test_eof;
        _test_eof1346: cs = 1346; goto _test_eof;
        _test_eof1347: cs = 1347; goto _test_eof;
-       _test_eof1486: cs = 1486; goto _test_eof;
        _test_eof1348: cs = 1348; goto _test_eof;
+       _test_eof1506: cs = 1506; goto _test_eof;
+       _test_eof1507: cs = 1507; goto _test_eof;
+       _test_eof1508: cs = 1508; goto _test_eof;
        _test_eof1349: cs = 1349; goto _test_eof;
        _test_eof1350: cs = 1350; goto _test_eof;
        _test_eof1351: cs = 1351; goto _test_eof;
@@ -99756,11 +100352,11 @@ case 1395:
        _test_eof1354: cs = 1354; goto _test_eof;
        _test_eof1355: cs = 1355; goto _test_eof;
        _test_eof1356: cs = 1356; goto _test_eof;
+       _test_eof1509: cs = 1509; goto _test_eof;
        _test_eof1357: cs = 1357; goto _test_eof;
        _test_eof1358: cs = 1358; goto _test_eof;
        _test_eof1359: cs = 1359; goto _test_eof;
        _test_eof1360: cs = 1360; goto _test_eof;
-       _test_eof1487: cs = 1487; goto _test_eof;
        _test_eof1361: cs = 1361; goto _test_eof;
        _test_eof1362: cs = 1362; goto _test_eof;
        _test_eof1363: cs = 1363; goto _test_eof;
@@ -99768,21 +100364,22 @@ case 1395:
        _test_eof1365: cs = 1365; goto _test_eof;
        _test_eof1366: cs = 1366; goto _test_eof;
        _test_eof1367: cs = 1367; goto _test_eof;
-       _test_eof1488: cs = 1488; goto _test_eof;
+       _test_eof1510: cs = 1510; goto _test_eof;
+       _test_eof1511: cs = 1511; goto _test_eof;
+       _test_eof1512: cs = 1512; goto _test_eof;
        _test_eof1368: cs = 1368; goto _test_eof;
        _test_eof1369: cs = 1369; goto _test_eof;
        _test_eof1370: cs = 1370; goto _test_eof;
        _test_eof1371: cs = 1371; goto _test_eof;
        _test_eof1372: cs = 1372; goto _test_eof;
        _test_eof1373: cs = 1373; goto _test_eof;
-       _test_eof1489: cs = 1489; goto _test_eof;
        _test_eof1374: cs = 1374; goto _test_eof;
+       _test_eof1513: cs = 1513; goto _test_eof;
        _test_eof1375: cs = 1375; goto _test_eof;
        _test_eof1376: cs = 1376; goto _test_eof;
        _test_eof1377: cs = 1377; goto _test_eof;
        _test_eof1378: cs = 1378; goto _test_eof;
        _test_eof1379: cs = 1379; goto _test_eof;
-       _test_eof1490: cs = 1490; goto _test_eof;
        _test_eof1380: cs = 1380; goto _test_eof;
        _test_eof1381: cs = 1381; goto _test_eof;
        _test_eof1382: cs = 1382; goto _test_eof;
@@ -99791,7 +100388,7 @@ case 1395:
        _test_eof1385: cs = 1385; goto _test_eof;
        _test_eof1386: cs = 1386; goto _test_eof;
        _test_eof1387: cs = 1387; goto _test_eof;
-       _test_eof1491: cs = 1491; goto _test_eof;
+       _test_eof1514: cs = 1514; goto _test_eof;
        _test_eof1388: cs = 1388; goto _test_eof;
        _test_eof1389: cs = 1389; goto _test_eof;
        _test_eof1390: cs = 1390; goto _test_eof;
@@ -99799,8 +100396,39 @@ case 1395:
        _test_eof1392: cs = 1392; goto _test_eof;
        _test_eof1393: cs = 1393; goto _test_eof;
        _test_eof1394: cs = 1394; goto _test_eof;
-       _test_eof1492: cs = 1492; goto _test_eof;
+       _test_eof1515: cs = 1515; goto _test_eof;
        _test_eof1395: cs = 1395; goto _test_eof;
+       _test_eof1396: cs = 1396; goto _test_eof;
+       _test_eof1397: cs = 1397; goto _test_eof;
+       _test_eof1398: cs = 1398; goto _test_eof;
+       _test_eof1399: cs = 1399; goto _test_eof;
+       _test_eof1400: cs = 1400; goto _test_eof;
+       _test_eof1516: cs = 1516; goto _test_eof;
+       _test_eof1401: cs = 1401; goto _test_eof;
+       _test_eof1402: cs = 1402; goto _test_eof;
+       _test_eof1403: cs = 1403; goto _test_eof;
+       _test_eof1404: cs = 1404; goto _test_eof;
+       _test_eof1405: cs = 1405; goto _test_eof;
+       _test_eof1406: cs = 1406; goto _test_eof;
+       _test_eof1517: cs = 1517; goto _test_eof;
+       _test_eof1407: cs = 1407; goto _test_eof;
+       _test_eof1408: cs = 1408; goto _test_eof;
+       _test_eof1409: cs = 1409; goto _test_eof;
+       _test_eof1410: cs = 1410; goto _test_eof;
+       _test_eof1411: cs = 1411; goto _test_eof;
+       _test_eof1412: cs = 1412; goto _test_eof;
+       _test_eof1413: cs = 1413; goto _test_eof;
+       _test_eof1414: cs = 1414; goto _test_eof;
+       _test_eof1518: cs = 1518; goto _test_eof;
+       _test_eof1415: cs = 1415; goto _test_eof;
+       _test_eof1416: cs = 1416; goto _test_eof;
+       _test_eof1417: cs = 1417; goto _test_eof;
+       _test_eof1418: cs = 1418; goto _test_eof;
+       _test_eof1419: cs = 1419; goto _test_eof;
+       _test_eof1420: cs = 1420; goto _test_eof;
+       _test_eof1421: cs = 1421; goto _test_eof;
+       _test_eof1519: cs = 1519; goto _test_eof;
+       _test_eof1422: cs = 1422; goto _test_eof;
 
        _test_eof: {}
        if ( p == eof )
@@ -99890,7 +100518,7 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1400:
+       case 1427:
        {
                NOERR;
        }
@@ -100117,18 +100745,6 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 603:
-       case 604:
-       case 605:
-       case 606:
-       case 607:
-       case 608:
-       case 609:
-       case 610:
-       case 611:
-       case 612:
-       case 613:
-       case 614:
        case 615:
        case 616:
        case 617:
@@ -100150,36 +100766,36 @@ goto st307;}
        case 633:
        case 634:
        case 635:
+       case 636:
+       case 637:
+       case 638:
+       case 639:
+       case 640:
+       case 641:
        case 642:
        case 643:
        case 644:
        case 645:
        case 646:
+       case 647:
+       case 648:
+       case 649:
+       case 650:
+       case 651:
+       case 652:
        case 653:
        case 654:
+       case 655:
+       case 656:
        case 657:
        case 658:
-       case 659:
-       case 660:
-       case 661:
-       case 662:
-       case 663:
-       case 664:
        case 665:
        case 666:
        case 667:
        case 668:
        case 669:
-       case 670:
-       case 671:
-       case 672:
-       case 673:
-       case 674:
-       case 675:
        case 676:
        case 677:
-       case 678:
-       case 679:
        case 680:
        case 681:
        case 682:
@@ -100193,8 +100809,35 @@ goto st307;}
        case 690:
        case 691:
        case 692:
+       case 693:
+       case 694:
+       case 695:
+       case 696:
        case 697:
        case 698:
+       case 699:
+       case 700:
+       case 701:
+       case 702:
+       case 703:
+       case 704:
+       case 705:
+       case 706:
+       case 707:
+       case 708:
+       case 709:
+       case 710:
+       case 711:
+       case 712:
+       case 713:
+       case 714:
+       case 715:
+       case 716:
+       case 717:
+       case 718:
+       case 719:
+       case 724:
+       case 725:
        {
                WARN(ZS_BAD_SVCB_PARAM);
                p--; {       if ( p == pe )
@@ -100225,13 +100868,13 @@ goto st307;}
        case 579:
        case 580:
        case 581:
+       case 582:
+       case 583:
        case 584:
        case 585:
        case 586:
        case 587:
        case 588:
-       case 589:
-       case 590:
        case 591:
        case 592:
        case 593:
@@ -100244,6 +100887,18 @@ goto st307;}
        case 600:
        case 601:
        case 602:
+       case 603:
+       case 604:
+       case 605:
+       case 606:
+       case 607:
+       case 608:
+       case 609:
+       case 610:
+       case 611:
+       case 612:
+       case 613:
+       case 614:
        {
                WARN(ZS_BAD_SVCB_MANDATORY);
                p--; {       if ( p == pe )
@@ -100251,33 +100906,6 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 699:
-       case 700:
-       case 701:
-       case 702:
-       case 703:
-       case 704:
-       case 705:
-       case 706:
-       case 707:
-       case 708:
-       case 709:
-       case 710:
-       case 711:
-       case 712:
-       case 713:
-       case 714:
-       case 715:
-       case 716:
-       case 717:
-       case 718:
-       case 719:
-       case 720:
-       case 721:
-       case 722:
-       case 723:
-       case 724:
-       case 725:
        case 726:
        case 727:
        case 728:
@@ -100355,13 +100983,6 @@ goto st307;}
        case 800:
        case 801:
        case 802:
-       {
-               WARN(ZS_BAD_ALGORITHM);
-               p--; {       if ( p == pe )
-               goto _test_eof307;
-goto st307;}
-       }
-       break;
        case 803:
        case 804:
        case 805:
@@ -100389,6 +101010,13 @@ goto st307;}
        case 827:
        case 828:
        case 829:
+       {
+               WARN(ZS_BAD_ALGORITHM);
+               p--; {       if ( p == pe )
+               goto _test_eof307;
+goto st307;}
+       }
+       break;
        case 830:
        case 831:
        case 832:
@@ -100403,6 +101031,33 @@ goto st307;}
        case 841:
        case 842:
        case 843:
+       case 844:
+       case 845:
+       case 846:
+       case 847:
+       case 848:
+       case 849:
+       case 850:
+       case 851:
+       case 852:
+       case 853:
+       case 854:
+       case 855:
+       case 856:
+       case 857:
+       case 858:
+       case 859:
+       case 860:
+       case 861:
+       case 862:
+       case 863:
+       case 864:
+       case 865:
+       case 866:
+       case 867:
+       case 868:
+       case 869:
+       case 870:
        {
                WARN(ZS_BAD_CERT_TYPE);
                p--; {       if ( p == pe )
@@ -100414,125 +101069,125 @@ goto st307;}
        case 9:
        case 10:
        case 282:
-       case 846:
-       case 847:
-       case 848:
-       case 849:
-       case 850:
-       case 851:
-       case 865:
-       case 869:
        case 873:
+       case 874:
+       case 875:
+       case 876:
        case 877:
        case 878:
-       case 879:
-       case 880:
-       case 881:
-       case 882:
-       case 883:
-       case 884:
-       case 885:
-       case 886:
-       case 887:
-       case 888:
-       case 889:
        case 892:
-       case 893:
-       case 894:
-       case 962:
-       case 963:
-       case 964:
-       case 965:
-       case 966:
-       case 971:
-       case 972:
-       case 973:
-       case 974:
-       case 975:
-       case 976:
-       case 977:
-       case 978:
-       case 979:
-       case 980:
-       case 981:
-       case 982:
-       case 983:
-       case 984:
-       case 985:
-       case 988:
+       case 896:
+       case 900:
+       case 904:
+       case 905:
+       case 906:
+       case 907:
+       case 908:
+       case 909:
+       case 910:
+       case 911:
+       case 912:
+       case 913:
+       case 914:
+       case 915:
+       case 916:
+       case 919:
+       case 920:
+       case 921:
        case 989:
        case 990:
        case 991:
        case 992:
        case 993:
-       case 994:
+       case 998:
+       case 999:
+       case 1000:
+       case 1001:
        case 1002:
+       case 1003:
+       case 1004:
+       case 1005:
+       case 1006:
+       case 1007:
        case 1008:
        case 1009:
+       case 1010:
+       case 1011:
+       case 1012:
+       case 1015:
        case 1016:
        case 1017:
        case 1018:
-       case 1027:
-       case 1028:
-       case 1067:
-       case 1070:
-       case 1071:
-       case 1082:
-       case 1083:
-       case 1084:
-       case 1085:
-       case 1086:
-       case 1087:
-       case 1088:
-       case 1089:
-       case 1090:
-       case 1091:
-       case 1092:
-       case 1093:
-       case 1254:
-       case 1255:
-       case 1256:
-       case 1261:
-       case 1262:
-       case 1263:
-       case 1264:
-       case 1265:
-       case 1266:
-       case 1267:
-       case 1268:
-       case 1269:
-       case 1287:
+       case 1019:
+       case 1020:
+       case 1021:
+       case 1029:
+       case 1035:
+       case 1036:
+       case 1043:
+       case 1044:
+       case 1045:
+       case 1054:
+       case 1055:
+       case 1094:
+       case 1097:
+       case 1098:
+       case 1109:
+       case 1110:
+       case 1111:
+       case 1112:
+       case 1113:
+       case 1114:
+       case 1115:
+       case 1116:
+       case 1117:
+       case 1118:
+       case 1119:
+       case 1120:
+       case 1281:
+       case 1282:
+       case 1283:
+       case 1288:
+       case 1289:
+       case 1290:
+       case 1291:
+       case 1292:
        case 1293:
+       case 1294:
+       case 1295:
        case 1296:
-       case 1297:
-       case 1298:
-       case 1309:
-       case 1310:
-       case 1311:
-       case 1322:
+       case 1314:
+       case 1320:
        case 1323:
        case 1324:
-       case 1329:
-       case 1330:
-       case 1341:
-       case 1342:
-       case 1343:
-       case 1348:
-       case 1361:
-       case 1378:
-       case 1379:
-       case 1380:
-       case 1381:
-       case 1384:
-       case 1385:
-       case 1386:
-       case 1387:
+       case 1325:
+       case 1336:
+       case 1337:
+       case 1338:
+       case 1349:
+       case 1350:
+       case 1351:
+       case 1356:
+       case 1357:
+       case 1368:
+       case 1369:
+       case 1370:
+       case 1375:
        case 1388:
-       case 1389:
-       case 1392:
-       case 1393:
-       case 1394:
-       case 1395:
+       case 1405:
+       case 1406:
+       case 1407:
+       case 1408:
+       case 1411:
+       case 1412:
+       case 1413:
+       case 1414:
+       case 1415:
+       case 1416:
+       case 1419:
+       case 1420:
+       case 1421:
+       case 1422:
        {
                WARN(ZS_BAD_RDATA);
                p--; {       if ( p == pe )
@@ -100829,12 +101484,12 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 655:
-       case 656:
-       case 693:
-       case 694:
-       case 695:
-       case 696:
+       case 678:
+       case 679:
+       case 720:
+       case 721:
+       case 722:
+       case 723:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {       if ( p == pe )
@@ -100848,8 +101503,8 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 582:
-       case 583:
+       case 589:
+       case 590:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {       if ( p == pe )
@@ -100863,86 +101518,86 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 852:
-       case 853:
-       case 854:
-       case 856:
-       case 858:
-       case 860:
-       case 890:
-       case 891:
-       case 956:
-       case 957:
-       case 958:
-       case 959:
-       case 960:
-       case 961:
-       case 967:
-       case 968:
-       case 969:
-       case 970:
+       case 879:
+       case 880:
+       case 881:
+       case 883:
+       case 885:
+       case 887:
+       case 917:
+       case 918:
+       case 983:
+       case 984:
+       case 985:
        case 986:
        case 987:
-       case 1006:
-       case 1007:
-       case 1010:
-       case 1011:
-       case 1019:
-       case 1020:
-       case 1021:
-       case 1022:
-       case 1029:
-       case 1030:
-       case 1072:
-       case 1073:
-       case 1074:
-       case 1075:
-       case 1080:
-       case 1081:
-       case 1257:
-       case 1258:
-       case 1259:
-       case 1260:
-       case 1270:
-       case 1271:
-       case 1272:
-       case 1273:
-       case 1274:
-       case 1275:
+       case 988:
+       case 994:
+       case 995:
+       case 996:
+       case 997:
+       case 1013:
+       case 1014:
+       case 1033:
+       case 1034:
+       case 1037:
+       case 1038:
+       case 1046:
+       case 1047:
+       case 1048:
+       case 1049:
+       case 1056:
+       case 1057:
+       case 1099:
+       case 1100:
+       case 1101:
+       case 1102:
+       case 1107:
+       case 1108:
+       case 1284:
+       case 1285:
+       case 1286:
+       case 1287:
+       case 1297:
+       case 1298:
        case 1299:
        case 1300:
        case 1301:
        case 1302:
-       case 1303:
-       case 1304:
-       case 1312:
-       case 1313:
-       case 1314:
-       case 1315:
-       case 1316:
-       case 1317:
-       case 1325:
        case 1326:
        case 1327:
        case 1328:
+       case 1329:
+       case 1330:
        case 1331:
-       case 1332:
-       case 1333:
-       case 1334:
-       case 1335:
-       case 1336:
+       case 1339:
+       case 1340:
+       case 1341:
+       case 1342:
+       case 1343:
        case 1344:
-       case 1345:
-       case 1349:
-       case 1350:
-       case 1374:
-       case 1375:
+       case 1352:
+       case 1353:
+       case 1354:
+       case 1355:
+       case 1358:
+       case 1359:
+       case 1360:
+       case 1361:
+       case 1362:
+       case 1363:
+       case 1371:
+       case 1372:
        case 1376:
        case 1377:
-       case 1382:
-       case 1383:
-       case 1390:
-       case 1391:
+       case 1401:
+       case 1402:
+       case 1403:
+       case 1404:
+       case 1409:
+       case 1410:
+       case 1417:
+       case 1418:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {       if ( p == pe )
@@ -100973,10 +101628,10 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1076:
-       case 1077:
-       case 1078:
-       case 1079:
+       case 1103:
+       case 1104:
+       case 1105:
+       case 1106:
        {
                WARN(ZS_BAD_TIMESTAMP_CHAR);
                p--; {       if ( p == pe )
@@ -101007,10 +101662,10 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 895:
-       case 896:
-       case 897:
-       case 898:
+       case 922:
+       case 923:
+       case 924:
+       case 925:
        {
                s->long_string = false;
        }
@@ -101051,18 +101706,18 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 636:
-       case 637:
-       case 638:
-       case 639:
-       case 640:
-       case 641:
-       case 647:
-       case 648:
-       case 649:
-       case 650:
-       case 651:
-       case 652:
+       case 659:
+       case 660:
+       case 661:
+       case 662:
+       case 663:
+       case 664:
+       case 670:
+       case 671:
+       case 672:
+       case 673:
+       case 674:
+       case 675:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {       if ( p == pe )
@@ -101076,12 +101731,12 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 844:
-       case 845:
-       case 899:
-       case 900:
-       case 1346:
-       case 1347:
+       case 871:
+       case 872:
+       case 926:
+       case 927:
+       case 1373:
+       case 1374:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {       if ( p == pe )
@@ -101095,12 +101750,12 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 995:
-       case 996:
-       case 997:
-       case 1000:
-       case 1001:
-       case 1003:
+       case 1022:
+       case 1023:
+       case 1024:
+       case 1027:
+       case 1028:
+       case 1030:
        {
                WARN(ZS_BAD_APL);
                p--; {       if ( p == pe )
@@ -101114,46 +101769,46 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1012:
-       case 1013:
-       case 1014:
-       case 1015:
-       case 1023:
-       case 1024:
-       case 1025:
-       case 1026:
-       case 1276:
-       case 1277:
-       case 1294:
-       case 1295:
-       case 1305:
-       case 1306:
-       case 1307:
-       case 1308:
-       case 1318:
-       case 1319:
-       case 1320:
+       case 1039:
+       case 1040:
+       case 1041:
+       case 1042:
+       case 1050:
+       case 1051:
+       case 1052:
+       case 1053:
+       case 1303:
+       case 1304:
        case 1321:
-       case 1337:
-       case 1338:
-       case 1339:
-       case 1340:
-       case 1351:
-       case 1352:
-       case 1353:
-       case 1354:
-       case 1356:
-       case 1357:
-       case 1358:
-       case 1359:
-       case 1362:
-       case 1363:
+       case 1322:
+       case 1332:
+       case 1333:
+       case 1334:
+       case 1335:
+       case 1345:
+       case 1346:
+       case 1347:
+       case 1348:
+       case 1364:
        case 1365:
        case 1366:
-       case 1368:
-       case 1369:
-       case 1371:
-       case 1372:
+       case 1367:
+       case 1378:
+       case 1379:
+       case 1380:
+       case 1381:
+       case 1383:
+       case 1384:
+       case 1385:
+       case 1386:
+       case 1389:
+       case 1390:
+       case 1392:
+       case 1393:
+       case 1395:
+       case 1396:
+       case 1398:
+       case 1399:
        {
                WARN(ZS_BAD_HEX_CHAR);
                p--; {       if ( p == pe )
@@ -101167,20 +101822,20 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1278:
-       case 1279:
-       case 1280:
-       case 1281:
-       case 1282:
-       case 1283:
-       case 1284:
-       case 1285:
-       case 1286:
-       case 1288:
-       case 1289:
-       case 1290:
-       case 1291:
-       case 1292:
+       case 1305:
+       case 1306:
+       case 1307:
+       case 1308:
+       case 1309:
+       case 1310:
+       case 1311:
+       case 1312:
+       case 1313:
+       case 1315:
+       case 1316:
+       case 1317:
+       case 1318:
+       case 1319:
        {
                WARN(ZS_BAD_BASE32HEX_CHAR);
                p--; {       if ( p == pe )
@@ -101194,21 +101849,21 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1031:
-       case 1032:
-       case 1035:
-       case 1044:
-       case 1045:
-       case 1046:
-       case 1051:
-       case 1052:
-       case 1053:
        case 1058:
        case 1059:
-       case 1060:
-       case 1063:
-       case 1065:
-       case 1066:
+       case 1062:
+       case 1071:
+       case 1072:
+       case 1073:
+       case 1078:
+       case 1079:
+       case 1080:
+       case 1085:
+       case 1086:
+       case 1087:
+       case 1090:
+       case 1092:
+       case 1093:
        {
                WARN(ZS_BAD_GATEWAY);
                p--; {       if ( p == pe )
@@ -101222,13 +101877,13 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1037:
-       case 1038:
-       case 1039:
-       case 1040:
-       case 1041:
-       case 1042:
-       case 1043:
+       case 1064:
+       case 1065:
+       case 1066:
+       case 1067:
+       case 1068:
+       case 1069:
+       case 1070:
        {
                WARN(ZS_BAD_GATEWAY_KEY);
                p--; {       if ( p == pe )
@@ -101242,35 +101897,8 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1068:
-       case 1069:
-       case 1094:
        case 1095:
        case 1096:
-       case 1097:
-       case 1098:
-       case 1099:
-       case 1100:
-       case 1101:
-       case 1102:
-       case 1103:
-       case 1104:
-       case 1105:
-       case 1106:
-       case 1107:
-       case 1108:
-       case 1109:
-       case 1110:
-       case 1111:
-       case 1112:
-       case 1113:
-       case 1114:
-       case 1115:
-       case 1116:
-       case 1117:
-       case 1118:
-       case 1119:
-       case 1120:
        case 1121:
        case 1122:
        case 1123:
@@ -101393,6 +102021,8 @@ goto st307;}
        case 1240:
        case 1241:
        case 1242:
+       case 1243:
+       case 1244:
        case 1245:
        case 1246:
        case 1247:
@@ -101402,6 +102032,31 @@ goto st307;}
        case 1251:
        case 1252:
        case 1253:
+       case 1254:
+       case 1255:
+       case 1256:
+       case 1257:
+       case 1258:
+       case 1259:
+       case 1260:
+       case 1261:
+       case 1262:
+       case 1263:
+       case 1264:
+       case 1265:
+       case 1266:
+       case 1267:
+       case 1268:
+       case 1269:
+       case 1272:
+       case 1273:
+       case 1274:
+       case 1275:
+       case 1276:
+       case 1277:
+       case 1278:
+       case 1279:
+       case 1280:
        {
                WARN(ZS_UNSUPPORTED_TYPE);
                p--; {       if ( p == pe )
@@ -101415,33 +102070,6 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 901:
-       case 902:
-       case 903:
-       case 904:
-       case 905:
-       case 906:
-       case 907:
-       case 908:
-       case 909:
-       case 910:
-       case 911:
-       case 912:
-       case 913:
-       case 914:
-       case 915:
-       case 916:
-       case 917:
-       case 918:
-       case 919:
-       case 920:
-       case 921:
-       case 922:
-       case 923:
-       case 924:
-       case 925:
-       case 926:
-       case 927:
        case 928:
        case 929:
        case 930:
@@ -101470,6 +102098,33 @@ goto st307;}
        case 953:
        case 954:
        case 955:
+       case 956:
+       case 957:
+       case 958:
+       case 959:
+       case 960:
+       case 961:
+       case 962:
+       case 963:
+       case 964:
+       case 965:
+       case 966:
+       case 967:
+       case 968:
+       case 969:
+       case 970:
+       case 971:
+       case 972:
+       case 973:
+       case 974:
+       case 975:
+       case 976:
+       case 977:
+       case 978:
+       case 979:
+       case 980:
+       case 981:
+       case 982:
        {
                WARN(ZS_BAD_LOC_DATA);
                p--; {       if ( p == pe )
@@ -101636,14 +102291,14 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1033:
-       case 1034:
-       case 1047:
-       case 1048:
-       case 1054:
-       case 1055:
+       case 1060:
        case 1061:
-       case 1062:
+       case 1074:
+       case 1075:
+       case 1081:
+       case 1082:
+       case 1088:
+       case 1089:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {       if ( p == pe )
@@ -101663,8 +102318,8 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1243:
-       case 1244:
+       case 1270:
+       case 1271:
        {
                WARN(ZS_BAD_NUMBER);
                p--; {       if ( p == pe )
@@ -101748,22 +102403,22 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 855:
-       case 857:
-       case 859:
-       case 861:
-       case 862:
-       case 863:
-       case 864:
-       case 866:
-       case 867:
-       case 868:
-       case 870:
-       case 871:
-       case 872:
-       case 874:
-       case 875:
-       case 876:
+       case 882:
+       case 884:
+       case 886:
+       case 888:
+       case 889:
+       case 890:
+       case 891:
+       case 893:
+       case 894:
+       case 895:
+       case 897:
+       case 898:
+       case 899:
+       case 901:
+       case 902:
+       case 903:
        {
                WARN(ZS_BAD_TIME_UNIT);
                p--; {       if ( p == pe )
@@ -101837,10 +102492,10 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 998:
-       case 999:
-       case 1004:
-       case 1005:
+       case 1025:
+       case 1026:
+       case 1031:
+       case 1032:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {       if ( p == pe )
@@ -101860,8 +102515,8 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1049:
-       case 1056:
+       case 1076:
+       case 1083:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {       if ( p == pe )
@@ -101908,7 +102563,7 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1355:
+       case 1382:
        {
                WARN(ZS_BAD_HEX_CHAR);
                p--; {       if ( p == pe )
@@ -101928,8 +102583,8 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1036:
-       case 1064:
+       case 1063:
+       case 1091:
        {
                WARN(ZS_BAD_GATEWAY);
                p--; {       if ( p == pe )
@@ -101949,10 +102604,10 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1364:
-       case 1367:
-       case 1370:
-       case 1373:
+       case 1391:
+       case 1394:
+       case 1397:
+       case 1400:
        {
                WARN(ZS_BAD_CHAR_DASH);
                p--; {       if ( p == pe )
@@ -101972,7 +102627,7 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1360:
+       case 1387:
        {
                WARN(ZS_BAD_CHAR_COLON);
                p--; {       if ( p == pe )
@@ -102176,8 +102831,8 @@ goto st307;}
 goto st307;}
        }
        break;
-       case 1050:
-       case 1057:
+       case 1077:
+       case 1084:
        {
                WARN(ZS_BAD_ADDRESS_CHAR);
                p--; {       if ( p == pe )
diff --git a/src/libzscanner/scanner.c.t0 b/src/libzscanner/scanner.c.t0
index b1b261609dd329058a3d2e0868f0d5c1cb29e092..de7c50bbc8855c690f87bac8eede3d240273f5e5 100644 (file)
--- a/src/libzscanner/scanner.c.t0
+++ b/src/libzscanner/scanner.c.t0
@@ -112,757 +112,761 @@ static const short _zone_scanner_actions[] = {
        125, 1, 126, 1, 128, 1, 129, 1,
        130, 1, 131, 1, 145, 1, 146, 1,
        148, 1, 149, 1, 150, 1, 151, 1,
-       159, 1, 160, 1, 161, 1, 162, 1,
-       163, 1, 164, 1, 165, 1, 166, 1,
-       167, 1, 168, 1, 169, 1, 170, 1,
-       171, 1, 172, 1, 173, 1, 174, 1,
-       175, 1, 176, 1, 177, 1, 178, 1,
-       179, 1, 180, 1, 181, 1, 182, 1,
-       183, 1, 184, 1, 185, 1, 186, 1,
-       187, 1, 188, 1, 189, 1, 190, 1,
-       191, 1, 192, 1, 193, 1, 194, 1,
-       195, 1, 196, 1, 197, 1, 198, 1,
-       199, 1, 200, 1, 201, 1, 202, 1,
-       203, 1, 204, 1, 205, 1, 206, 1,
-       207, 1, 208, 1, 209, 1, 210, 1,
-       211, 1, 212, 1, 213, 1, 214, 1,
-       215, 1, 216, 1, 217, 1, 218, 1,
-       219, 1, 220, 1, 221, 1, 222, 1,
-       223, 1, 224, 1, 225, 1, 226, 1,
-       227, 1, 228, 1, 229, 1, 230, 1,
-       231, 1, 232, 1, 233, 1, 234, 1,
-       235, 1, 236, 1, 237, 1, 238, 1,
-       239, 1, 240, 1, 241, 1, 242, 1,
-       243, 1, 244, 1, 245, 1, 246, 1,
-       247, 1, 248, 1, 249, 1, 250, 1,
-       251, 1, 252, 1, 253, 1, 254, 1,
-       255, 1, 256, 1, 258, 1, 260, 1,
-       261, 1, 262, 1, 263, 1, 270, 1,
-       271, 1, 276, 1, 278, 1, 283, 1,
-       286, 1, 288, 1, 289, 1, 290, 1,
-       291, 1, 296, 1, 297, 1, 299, 1,
-       300, 1, 301, 1, 302, 1, 304, 1,
-       305, 1, 306, 1, 307, 1, 309, 2,
-       0, 49, 2, 1, 0, 2, 1, 305,
-       2, 1, 358, 2, 2, 5, 2, 2,
-       7, 2, 3, 5, 2, 3, 7, 2,
-       4, 0, 2, 4, 5, 2, 4, 7,
-       2, 4, 305, 2, 5, 2, 2, 5,
-       3, 2, 5, 4, 2, 5, 7, 2,
-       6, 1, 2, 7, 1, 2, 7, 2,
-       2, 7, 3, 2, 7, 4, 2, 7,
-       5, 2, 7, 32, 2, 8, 73, 2,
-       8, 77, 2, 9, 10, 2, 11, 1,
-       2, 12, 1, 2, 13, 14, 2, 16,
-       17, 2, 18, 14, 2, 18, 15, 2,
-       19, 24, 2, 19, 77, 2, 19, 84,
-       2, 20, 0, 2, 20, 7, 2, 22,
-       0, 2, 23, 13, 2, 26, 69, 2,
-       26, 108, 2, 26, 119, 2, 27, 0,
-       2, 27, 1, 2, 27, 2, 2, 27,
-       3, 2, 27, 4, 2, 27, 259, 2,
-       28, 69, 2, 28, 113, 2, 29, 291,
-       2, 29, 295, 2, 30, 25, 2, 31,
-       1, 2, 31, 2, 2, 31, 3, 2,
-       31, 4, 2, 31, 7, 2, 31, 93,
-       2, 32, 7, 2, 33, 8, 2, 33,
-       304, 2, 33, 309, 2, 34, 25, 2,
-       35, 0, 2, 35, 1, 2, 35, 2,
-       2, 35, 3, 2, 35, 4, 2, 35,
-       259, 2, 35, 298, 2, 36, 41, 2,
-       37, 36, 2, 38, 73, 2, 38, 276,
-       2, 38, 288, 2, 38, 289, 2, 38,
-       304, 2, 38, 309, 2, 42, 264, 2,
-       42, 265, 2, 42, 266, 2, 42, 267,
-       2, 42, 268, 2, 42, 269, 2, 45,
-       0, 2, 45, 1, 2, 45, 2, 2,
-       45, 3, 2, 45, 4, 2, 46, 0,
-       2, 46, 1, 2, 46, 2, 2, 46,
-       3, 2, 46, 4, 2, 46, 259, 2,
-       46, 291, 2, 47, 0, 2, 47, 1,
-       2, 47, 2, 2, 47, 3, 2, 47,
-       4, 2, 48, 303, 2, 49, 1, 2,
-       49, 2, 2, 49, 3, 2, 49, 4,
-       2, 56, 7, 2, 56, 47, 2, 56,
-       93, 2, 57, 58, 2, 59, 1, 2,
-       59, 2, 2, 59, 3, 2, 59, 4,
-       2, 60, 304, 2, 62, 63, 2, 64,
-       65, 2, 66, 68, 2, 68, 0, 2,
-       68, 61, 2, 71, 0, 2, 71, 304,
-       2, 75, 23, 2, 79, 69, 2, 80,
-       7, 2, 81, 8, 2, 82, 23, 2,
-       84, 8, 2, 90, 91, 2, 92, 1,
-       2, 92, 2, 2, 92, 3, 2, 92,
-       4, 2, 93, 1, 2, 93, 2, 2,
-       93, 3, 2, 93, 4, 2, 93, 7,
-       2, 94, 95, 2, 96, 288, 2, 96,
-       304, 2, 97, 98, 2, 99, 100, 2,
-       101, 102, 2, 101, 103, 2, 101, 104,
-       2, 105, 106, 2, 107, 304, 2, 110,
-       304, 2, 111, 0, 2, 127, 304, 2,
-       129, 0, 2, 130, 0, 2, 131, 0,
-       2, 132, 0, 2, 133, 0, 2, 134,
-       0, 2, 135, 0, 2, 136, 0, 2,
-       137, 0, 2, 138, 0, 2, 139, 0,
-       2, 140, 0, 2, 141, 0, 2, 142,
-       0, 2, 143, 0, 2, 144, 0, 2,
-       146, 0, 2, 147, 0, 2, 148, 0,
-       2, 149, 0, 2, 150, 0, 2, 151,
-       0, 2, 152, 0, 2, 153, 0, 2,
-       154, 0, 2, 155, 0, 2, 156, 304,
-       2, 157, 304, 2, 158, 304, 2, 159,
-       1, 2, 159, 2, 2, 159, 3, 2,
-       159, 4, 2, 160, 1, 2, 160, 2,
-       2, 160, 3, 2, 160, 4, 2, 161,
-       1, 2, 161, 2, 2, 161, 3, 2,
-       161, 4, 2, 162, 1, 2, 162, 2,
-       2, 162, 3, 2, 162, 4, 2, 163,
-       1, 2, 163, 2, 2, 163, 3, 2,
-       163, 4, 2, 164, 1, 2, 164, 2,
-       2, 164, 3, 2, 164, 4, 2, 165,
-       1, 2, 165, 2, 2, 165, 3, 2,
-       165, 4, 2, 166, 1, 2, 166, 2,
-       2, 166, 3, 2, 166, 4, 2, 167,
-       1, 2, 167, 2, 2, 167, 3, 2,
-       167, 4, 2, 168, 1, 2, 168, 2,
-       2, 168, 3, 2, 168, 4, 2, 169,
-       1, 2, 169, 2, 2, 169, 3, 2,
-       169, 4, 2, 170, 1, 2, 170, 2,
-       2, 170, 3, 2, 170, 4, 2, 171,
-       1, 2, 171, 2, 2, 171, 3, 2,
-       171, 4, 2, 172, 1, 2, 172, 2,
-       2, 172, 3, 2, 172, 4, 2, 173,
-       1, 2, 173, 2, 2, 173, 3, 2,
-       173, 4, 2, 174, 1, 2, 174, 2,
-       2, 174, 3, 2, 174, 4, 2, 175,
-       1, 2, 175, 2, 2, 175, 3, 2,
-       175, 4, 2, 176, 1, 2, 176, 2,
-       2, 176, 3, 2, 176, 4, 2, 177,
-       1, 2, 177, 2, 2, 177, 3, 2,
-       177, 4, 2, 178, 1, 2, 178, 2,
-       2, 178, 3, 2, 178, 4, 2, 179,
-       1, 2, 179, 2, 2, 179, 3, 2,
-       179, 4, 2, 180, 1, 2, 180, 2,
-       2, 180, 3, 2, 180, 4, 2, 181,
-       1, 2, 181, 2, 2, 181, 3, 2,
-       181, 4, 2, 182, 1, 2, 182, 2,
-       2, 182, 3, 2, 182, 4, 2, 183,
-       1, 2, 183, 2, 2, 183, 3, 2,
-       183, 4, 2, 184, 1, 2, 184, 2,
-       2, 184, 3, 2, 184, 4, 2, 185,
-       1, 2, 185, 2, 2, 185, 3, 2,
-       185, 4, 2, 186, 1, 2, 186, 2,
-       2, 186, 3, 2, 186, 4, 2, 187,
-       1, 2, 187, 2, 2, 187, 3, 2,
-       187, 4, 2, 188, 1, 2, 188, 2,
-       2, 188, 3, 2, 188, 4, 2, 189,
-       1, 2, 189, 2, 2, 189, 3, 2,
-       189, 4, 2, 190, 1, 2, 190, 2,
-       2, 190, 3, 2, 190, 4, 2, 191,
-       1, 2, 191, 2, 2, 191, 3, 2,
-       191, 4, 2, 192, 1, 2, 192, 2,
-       2, 192, 3, 2, 192, 4, 2, 193,
-       1, 2, 193, 2, 2, 193, 3, 2,
-       193, 4, 2, 194, 1, 2, 194, 2,
-       2, 194, 3, 2, 194, 4, 2, 195,
-       1, 2, 195, 2, 2, 195, 3, 2,
-       195, 4, 2, 196, 1, 2, 196, 2,
-       2, 196, 3, 2, 196, 4, 2, 197,
-       1, 2, 197, 2, 2, 197, 3, 2,
-       197, 4, 2, 198, 1, 2, 198, 2,
-       2, 198, 3, 2, 198, 4, 2, 199,
-       1, 2, 199, 2, 2, 199, 3, 2,
-       199, 4, 2, 200, 1, 2, 200, 2,
-       2, 200, 3, 2, 200, 4, 2, 201,
-       1, 2, 201, 2, 2, 201, 3, 2,
-       201, 4, 2, 202, 1, 2, 202, 2,
-       2, 202, 3, 2, 202, 4, 2, 203,
-       1, 2, 203, 2, 2, 203, 3, 2,
-       203, 4, 2, 204, 1, 2, 204, 2,
-       2, 204, 3, 2, 204, 4, 2, 205,
-       1, 2, 205, 2, 2, 205, 3, 2,
-       205, 4, 2, 206, 1, 2, 206, 2,
-       2, 206, 3, 2, 206, 4, 2, 207,
-       1, 2, 207, 2, 2, 207, 3, 2,
-       207, 4, 2, 208, 1, 2, 208, 2,
-       2, 208, 3, 2, 208, 4, 2, 209,
-       1, 2, 209, 2, 2, 209, 3, 2,
-       209, 4, 2, 210, 1, 2, 210, 2,
-       2, 210, 3, 2, 210, 4, 2, 211,
-       1, 2, 211, 2, 2, 211, 3, 2,
-       211, 4, 2, 212, 1, 2, 212, 2,
-       2, 212, 3, 2, 212, 4, 2, 213,
-       1, 2, 213, 2, 2, 213, 3, 2,
-       213, 4, 2, 214, 1, 2, 214, 2,
-       2, 214, 3, 2, 214, 4, 2, 215,
-       1, 2, 215, 2, 2, 215, 3, 2,
-       215, 4, 2, 216, 1, 2, 216, 2,
-       2, 216, 3, 2, 216, 4, 2, 217,
-       1, 2, 217, 2, 2, 217, 3, 2,
-       217, 4, 2, 218, 1, 2, 218, 2,
-       2, 218, 3, 2, 218, 4, 2, 219,
-       1, 2, 219, 2, 2, 219, 3, 2,
-       219, 4, 2, 220, 1, 2, 220, 2,
-       2, 220, 3, 2, 220, 4, 2, 221,
-       1, 2, 221, 2, 2, 221, 3, 2,
-       221, 4, 2, 222, 1, 2, 222, 2,
-       2, 222, 3, 2, 222, 4, 2, 223,
-       1, 2, 223, 2, 2, 223, 3, 2,
-       223, 4, 2, 224, 1, 2, 224, 2,
-       2, 224, 3, 2, 224, 4, 2, 225,
-       1, 2, 225, 2, 2, 225, 3, 2,
-       225, 4, 2, 226, 1, 2, 226, 2,
-       2, 226, 3, 2, 226, 4, 2, 227,
-       1, 2, 227, 2, 2, 227, 3, 2,
-       227, 4, 2, 228, 1, 2, 228, 2,
-       2, 228, 3, 2, 228, 4, 2, 229,
-       1, 2, 229, 2, 2, 229, 3, 2,
-       229, 4, 2, 230, 1, 2, 230, 2,
-       2, 230, 3, 2, 230, 4, 2, 231,
-       1, 2, 231, 2, 2, 231, 3, 2,
-       231, 4, 2, 232, 1, 2, 232, 2,
-       2, 232, 3, 2, 232, 4, 2, 233,
-       1, 2, 233, 2, 2, 233, 3, 2,
-       233, 4, 2, 234, 1, 2, 234, 2,
-       2, 234, 3, 2, 234, 4, 2, 235,
-       1, 2, 235, 2, 2, 235, 3, 2,
-       235, 4, 2, 236, 1, 2, 236, 2,
-       2, 236, 3, 2, 236, 4, 2, 237,
-       1, 2, 237, 2, 2, 237, 3, 2,
-       237, 4, 2, 238, 1, 2, 238, 2,
-       2, 238, 3, 2, 238, 4, 2, 239,
-       1, 2, 239, 2, 2, 239, 3, 2,
-       239, 4, 2, 240, 1, 2, 240, 2,
-       2, 240, 3, 2, 240, 4, 2, 241,
-       1, 2, 241, 2, 2, 241, 3, 2,
-       241, 4, 2, 242, 1, 2, 242, 2,
-       2, 242, 3, 2, 242, 4, 2, 243,
-       1, 2, 243, 2, 2, 243, 3, 2,
-       243, 4, 2, 244, 1, 2, 244, 2,
-       2, 244, 3, 2, 244, 4, 2, 245,
-       1, 2, 245, 2, 2, 245, 3, 2,
-       245, 4, 2, 246, 1, 2, 246, 2,
-       2, 246, 3, 2, 246, 4, 2, 247,
-       1, 2, 247, 2, 2, 247, 3, 2,
-       247, 4, 2, 248, 1, 2, 248, 2,
-       2, 248, 3, 2, 248, 4, 2, 249,
-       1, 2, 249, 2, 2, 249, 3, 2,
-       249, 4, 2, 250, 1, 2, 250, 2,
-       2, 250, 3, 2, 250, 4, 2, 251,
-       1, 2, 251, 2, 2, 251, 3, 2,
-       251, 4, 2, 252, 1, 2, 252, 2,
-       2, 252, 3, 2, 252, 4, 2, 253,
-       1, 2, 253, 2, 2, 253, 3, 2,
-       253, 4, 2, 254, 1, 2, 254, 2,
-       2, 254, 3, 2, 254, 4, 2, 255,
-       1, 2, 255, 2, 2, 255, 3, 2,
-       255, 4, 2, 256, 1, 2, 256, 2,
-       2, 256, 3, 2, 256, 4, 2, 257,
-       0, 2, 260, 1, 2, 260, 2, 2,
-       260, 3, 2, 260, 4, 2, 261, 1,
-       2, 261, 2, 2, 261, 3, 2, 261,
-       4, 2, 262, 1, 2, 262, 2, 2,
-       262, 3, 2, 262, 4, 2, 263, 1,
-       2, 263, 2, 2, 263, 3, 2, 263,
-       4, 2, 270, 1, 2, 270, 2, 2,
-       270, 3, 2, 270, 4, 2, 271, 1,
-       2, 271, 2, 2, 271, 3, 2, 271,
-       4, 2, 274, 0, 2, 275, 304, 2,
-       277, 108, 2, 282, 108, 2, 286, 1,
-       2, 286, 2, 2, 286, 3, 2, 286,
-       4, 2, 287, 0, 2, 291, 1, 2,
-       291, 2, 2, 291, 3, 2, 291, 4,
-       2, 304, 8, 2, 305, 1, 2, 305,
-       4, 2, 308, 305, 2, 309, 8, 2,
-       309, 304, 2, 310, 303, 2, 311, 303,
-       2, 312, 303, 2, 313, 303, 2, 314,
-       303, 2, 315, 303, 2, 316, 303, 2,
-       317, 303, 2, 318, 303, 2, 319, 303,
-       2, 320, 303, 2, 321, 303, 2, 322,
-       303, 2, 323, 303, 2, 324, 303, 2,
-       325, 303, 2, 326, 303, 2, 327, 303,
-       2, 328, 303, 2, 329, 303, 2, 330,
-       303, 2, 331, 303, 2, 332, 303, 2,
-       333, 303, 2, 334, 303, 2, 335, 303,
-       2, 336, 303, 2, 337, 303, 2, 338,
-       303, 2, 339, 303, 2, 340, 303, 2,
-       341, 303, 2, 342, 303, 2, 343, 303,
-       2, 344, 303, 2, 345, 303, 2, 346,
-       303, 2, 347, 303, 2, 348, 303, 2,
-       349, 303, 2, 350, 303, 2, 351, 303,
-       2, 352, 303, 2, 353, 303, 2, 354,
-       303, 2, 355, 303, 2, 356, 303, 2,
-       357, 303, 2, 358, 1, 3, 0, 49,
-       1, 3, 0, 49, 2, 3, 0, 49,
-       3, 3, 0, 49, 4, 3, 1, 7,
-       358, 3, 1, 32, 7, 3, 1, 71,
-       0, 3, 1, 111, 0, 3, 1, 257,
-       0, 3, 1, 274, 0, 3, 1, 287,
-       0, 3, 1, 305, 358, 3, 2, 7,
-       32, 3, 2, 32, 7, 3, 3, 7,
-       32, 3, 3, 32, 7, 3, 4, 7,
-       32, 3, 4, 32, 7, 3, 4, 71,
-       0, 3, 4, 111, 0, 3, 4, 257,
-       0, 3, 4, 274, 0, 3, 4, 287,
-       0, 3, 4, 305, 7, 3, 5, 7,
-       2, 3, 5, 7, 3, 3, 5, 7,
-       4, 3, 6, 1, 358, 3, 6, 358,
-       1, 3, 7, 2, 5, 3, 7, 2,
-       32, 3, 7, 3, 5, 3, 7, 3,
-       32, 3, 7, 4, 5, 3, 7, 4,
-       32, 3, 7, 358, 1, 3, 9, 11,
-       1, 3, 15, 21, 0, 3, 20, 7,
-       2, 3, 20, 7, 3, 3, 20, 7,
-       4, 3, 20, 83, 7, 3, 23, 13,
-       14, 3, 27, 71, 0, 3, 27, 293,
-       29, 3, 28, 94, 95, 3, 29, 291,
-       1, 3, 29, 291, 2, 3, 29, 291,
-       3, 3, 29, 291, 4, 3, 29, 295,
-       291, 3, 31, 1, 93, 3, 31, 2,
-       7, 3, 31, 2, 93, 3, 31, 3,
-       7, 3, 31, 3, 93, 3, 31, 4,
-       7, 3, 31, 4, 93, 3, 31, 93,
-       7, 3, 31, 308, 305, 3, 31, 310,
-       303, 3, 32, 1, 7, 3, 32, 2,
-       7, 3, 32, 3, 7, 3, 32, 4,
-       7, 3, 33, 89, 8, 3, 33, 304,
-       8, 3, 33, 309, 8, 3, 33, 309,
-       304, 3, 35, 1, 0, 3, 35, 4,
-       0, 3, 37, 36, 305, 3, 38, 156,
-       304, 3, 38, 158, 304, 3, 38, 309,
-       8, 3, 38, 309, 304, 3, 40, 42,
-       264, 3, 40, 42, 265, 3, 40, 42,
-       266, 3, 40, 42, 267, 3, 40, 42,
-       268, 3, 40, 42, 269, 3, 42, 264,
-       1, 3, 42, 264, 2, 3, 42, 264,
-       3, 3, 42, 264, 4, 3, 42, 265,
-       1, 3, 42, 265, 2, 3, 42, 265,
-       3, 3, 42, 265, 4, 3, 42, 266,
-       1, 3, 42, 266, 2, 3, 42, 266,
-       3, 3, 42, 266, 4, 3, 42, 267,
-       1, 3, 42, 267, 2, 3, 42, 267,
-       3, 3, 42, 267, 4, 3, 42, 268,
-       1, 3, 42, 268, 2, 3, 42, 268,
-       3, 3, 42, 268, 4, 3, 42, 269,
-       1, 3, 42, 269, 2, 3, 42, 269,
-       3, 3, 42, 269, 4, 3, 46, 145,
-       291, 3, 46, 291, 1, 3, 46, 291,
-       2, 3, 46, 291, 3, 3, 46, 291,
-       4, 3, 48, 303, 1, 3, 48, 303,
-       2, 3, 48, 303, 3, 3, 48, 303,
-       4, 3, 48, 303, 305, 3, 50, 38,
-       73, 3, 50, 38, 304, 3, 50, 38,
-       309, 3, 55, 37, 36, 3, 56, 7,
-       2, 3, 56, 7, 3, 3, 56, 7,
-       4, 3, 56, 47, 0, 3, 56, 47,
-       1, 3, 56, 47, 2, 3, 56, 47,
-       3, 3, 56, 47, 4, 3, 56, 93,
-       1, 3, 56, 93, 2, 3, 56, 93,
-       3, 3, 56, 93, 4, 3, 66, 68,
-       0, 3, 66, 68, 61, 3, 67, 62,
-       63, 3, 68, 61, 0, 3, 70, 26,
-       69, 3, 72, 0, 1, 3, 75, 23,
-       13, 3, 76, 0, 1, 3, 80, 2,
-       7, 3, 80, 3, 7, 3, 80, 4,
-       7, 3, 80, 7, 4, 3, 82, 23,
-       13, 3, 85, 0, 1, 3, 88, 7,
-       1, 3, 88, 7, 4, 3, 88, 30,
-       25, 3, 88, 32, 7, 3, 90, 30,
-       25, 3, 90, 91, 305, 3, 93, 2,
-       7, 3, 93, 3, 7, 3, 93, 4,
-       7, 3, 96, 107, 304, 3, 96, 156,
-       304, 3, 97, 98, 0, 3, 97, 98,
-       1, 3, 97, 98, 2, 3, 97, 98,
-       3, 3, 97, 98, 4, 3, 97, 98,
-       29, 3, 99, 100, 0, 3, 99, 100,
-       1, 3, 99, 100, 2, 3, 99, 100,
-       3, 3, 99, 100, 4, 3, 99, 100,
-       29, 3, 105, 106, 0, 3, 105, 106,
-       1, 3, 105, 106, 2, 3, 105, 106,
-       3, 3, 105, 106, 4, 3, 110, 112,
-       276, 3, 110, 285, 304, 3, 147, 145,
-       291, 3, 156, 157, 304, 3, 207, 257,
-       0, 3, 208, 257, 0, 3, 209, 257,
-       0, 3, 210, 257, 0, 3, 211, 257,
-       0, 3, 212, 257, 0, 3, 213, 257,
-       0, 3, 214, 257, 0, 3, 215, 257,
-       0, 3, 216, 257, 0, 3, 217, 257,
-       0, 3, 218, 257, 0, 3, 219, 257,
-       0, 3, 220, 257, 0, 3, 221, 257,
-       0, 3, 222, 257, 0, 3, 223, 257,
-       0, 3, 224, 257, 0, 3, 225, 257,
-       0, 3, 226, 257, 0, 3, 227, 257,
-       0, 3, 228, 257, 0, 3, 229, 257,
-       0, 3, 230, 257, 0, 3, 231, 257,
-       0, 3, 232, 257, 0, 3, 233, 257,
-       0, 3, 234, 257, 0, 3, 235, 257,
-       0, 3, 236, 257, 0, 3, 237, 257,
-       0, 3, 238, 257, 0, 3, 239, 257,
-       0, 3, 240, 257, 0, 3, 241, 257,
-       0, 3, 242, 257, 0, 3, 243, 257,
-       0, 3, 244, 257, 0, 3, 245, 257,
-       0, 3, 246, 257, 0, 3, 247, 257,
-       0, 3, 248, 257, 0, 3, 249, 257,
-       0, 3, 250, 257, 0, 3, 251, 257,
-       0, 3, 252, 257, 0, 3, 253, 257,
-       0, 3, 254, 257, 0, 3, 255, 257,
-       0, 3, 256, 257, 0, 3, 273, 37,
-       36, 3, 278, 279, 0, 3, 278, 280,
-       0, 3, 281, 110, 304, 3, 283, 284,
-       0, 3, 285, 110, 304, 3, 286, 287,
-       0, 3, 291, 287, 0, 3, 294, 28,
-       297, 3, 304, 8, 89, 3, 305, 7,
-       1, 3, 305, 7, 4, 3, 305, 30,
-       25, 3, 305, 358, 1, 3, 307, 30,
-       25, 3, 309, 304, 8, 3, 310, 303,
-       1, 3, 310, 303, 2, 3, 310, 303,
-       3, 3, 310, 303, 4, 3, 310, 303,
-       7, 3, 310, 303, 305, 3, 311, 303,
-       1, 3, 311, 303, 2, 3, 311, 303,
-       3, 3, 311, 303, 4, 3, 311, 303,
-       305, 3, 312, 303, 1, 3, 312, 303,
-       2, 3, 312, 303, 3, 3, 312, 303,
-       4, 3, 312, 303, 305, 3, 313, 303,
-       1, 3, 313, 303, 2, 3, 313, 303,
-       3, 3, 313, 303, 4, 3, 313, 303,
-       305, 3, 314, 303, 1, 3, 314, 303,
-       2, 3, 314, 303, 3, 3, 314, 303,
-       4, 3, 314, 303, 305, 3, 315, 303,
-       1, 3, 315, 303, 2, 3, 315, 303,
-       3, 3, 315, 303, 4, 3, 315, 303,
-       305, 3, 316, 303, 1, 3, 316, 303,
-       2, 3, 316, 303, 3, 3, 316, 303,
-       4, 3, 316, 303, 305, 3, 317, 303,
-       1, 3, 317, 303, 2, 3, 317, 303,
-       3, 3, 317, 303, 4, 3, 317, 303,
-       305, 3, 318, 303, 1, 3, 318, 303,
-       2, 3, 318, 303, 3, 3, 318, 303,
-       4, 3, 318, 303, 305, 3, 319, 303,
-       1, 3, 319, 303, 2, 3, 319, 303,
-       3, 3, 319, 303, 4, 3, 319, 303,
-       305, 3, 320, 303, 1, 3, 320, 303,
-       2, 3, 320, 303, 3, 3, 320, 303,
-       4, 3, 320, 303, 305, 3, 321, 303,
-       1, 3, 321, 303, 2, 3, 321, 303,
-       3, 3, 321, 303, 4, 3, 321, 303,
-       305, 3, 322, 303, 1, 3, 322, 303,
-       2, 3, 322, 303, 3, 3, 322, 303,
-       4, 3, 322, 303, 305, 3, 323, 303,
-       1, 3, 323, 303, 2, 3, 323, 303,
-       3, 3, 323, 303, 4, 3, 323, 303,
-       305, 3, 324, 303, 1, 3, 324, 303,
-       2, 3, 324, 303, 3, 3, 324, 303,
-       4, 3, 324, 303, 305, 3, 325, 303,
-       1, 3, 325, 303, 2, 3, 325, 303,
-       3, 3, 325, 303, 4, 3, 325, 303,
-       305, 3, 326, 303, 1, 3, 326, 303,
-       2, 3, 326, 303, 3, 3, 326, 303,
-       4, 3, 326, 303, 305, 3, 327, 303,
-       1, 3, 327, 303, 2, 3, 327, 303,
-       3, 3, 327, 303, 4, 3, 327, 303,
-       305, 3, 328, 303, 1, 3, 328, 303,
-       2, 3, 328, 303, 3, 3, 328, 303,
-       4, 3, 328, 303, 305, 3, 329, 303,
-       1, 3, 329, 303, 2, 3, 329, 303,
-       3, 3, 329, 303, 4, 3, 329, 303,
-       305, 3, 330, 303, 1, 3, 330, 303,
-       2, 3, 330, 303, 3, 3, 330, 303,
-       4, 3, 330, 303, 305, 3, 331, 303,
-       1, 3, 331, 303, 2, 3, 331, 303,
-       3, 3, 331, 303, 4, 3, 331, 303,
-       305, 3, 332, 303, 1, 3, 332, 303,
-       2, 3, 332, 303, 3, 3, 332, 303,
-       4, 3, 332, 303, 305, 3, 333, 303,
-       1, 3, 333, 303, 2, 3, 333, 303,
-       3, 3, 333, 303, 4, 3, 333, 303,
-       305, 3, 334, 303, 1, 3, 334, 303,
-       2, 3, 334, 303, 3, 3, 334, 303,
-       4, 3, 334, 303, 305, 3, 335, 303,
-       1, 3, 335, 303, 2, 3, 335, 303,
-       3, 3, 335, 303, 4, 3, 335, 303,
-       305, 3, 336, 303, 1, 3, 336, 303,
-       2, 3, 336, 303, 3, 3, 336, 303,
-       4, 3, 336, 303, 305, 3, 337, 303,
-       1, 3, 337, 303, 2, 3, 337, 303,
-       3, 3, 337, 303, 4, 3, 337, 303,
-       305, 3, 338, 303, 1, 3, 338, 303,
-       2, 3, 338, 303, 3, 3, 338, 303,
-       4, 3, 338, 303, 305, 3, 339, 303,
-       1, 3, 339, 303, 2, 3, 339, 303,
-       3, 3, 339, 303, 4, 3, 339, 303,
-       305, 3, 340, 303, 1, 3, 340, 303,
-       2, 3, 340, 303, 3, 3, 340, 303,
-       4, 3, 340, 303, 305, 3, 341, 303,
-       1, 3, 341, 303, 2, 3, 341, 303,
-       3, 3, 341, 303, 4, 3, 341, 303,
-       305, 3, 342, 303, 1, 3, 342, 303,
-       2, 3, 342, 303, 3, 3, 342, 303,
-       4, 3, 342, 303, 305, 3, 343, 303,
-       1, 3, 343, 303, 2, 3, 343, 303,
-       3, 3, 343, 303, 4, 3, 343, 303,
-       305, 3, 344, 303, 1, 3, 344, 303,
-       2, 3, 344, 303, 3, 3, 344, 303,
-       4, 3, 344, 303, 305, 3, 345, 303,
-       1, 3, 345, 303, 2, 3, 345, 303,
-       3, 3, 345, 303, 4, 3, 345, 303,
-       305, 3, 346, 303, 1, 3, 346, 303,
-       2, 3, 346, 303, 3, 3, 346, 303,
-       4, 3, 346, 303, 305, 3, 347, 303,
-       1, 3, 347, 303, 2, 3, 347, 303,
-       3, 3, 347, 303, 4, 3, 347, 303,
-       305, 3, 348, 303, 1, 3, 348, 303,
-       2, 3, 348, 303, 3, 3, 348, 303,
-       4, 3, 348, 303, 305, 3, 349, 303,
-       1, 3, 349, 303, 2, 3, 349, 303,
-       3, 3, 349, 303, 4, 3, 349, 303,
-       305, 3, 350, 303, 1, 3, 350, 303,
-       2, 3, 350, 303, 3, 3, 350, 303,
-       4, 3, 350, 303, 305, 3, 351, 303,
-       1, 3, 351, 303, 2, 3, 351, 303,
-       3, 3, 351, 303, 4, 3, 351, 303,
-       305, 3, 352, 303, 1, 3, 352, 303,
-       2, 3, 352, 303, 3, 3, 352, 303,
-       4, 3, 352, 303, 305, 3, 353, 303,
-       1, 3, 353, 303, 2, 3, 353, 303,
-       3, 3, 353, 303, 4, 3, 353, 303,
-       305, 3, 354, 303, 1, 3, 354, 303,
-       2, 3, 354, 303, 3, 3, 354, 303,
-       4, 3, 354, 303, 305, 3, 355, 303,
-       1, 3, 355, 303, 2, 3, 355, 303,
-       3, 3, 355, 303, 4, 3, 355, 303,
-       305, 3, 356, 303, 1, 3, 356, 303,
-       2, 3, 356, 303, 3, 3, 356, 303,
-       4, 3, 356, 303, 305, 3, 357, 303,
-       1, 3, 357, 303, 2, 3, 357, 303,
-       3, 3, 357, 303, 4, 3, 357, 303,
-       305, 3, 358, 1, 6, 4, 1, 7,
-       358, 32, 4, 1, 305, 32, 7, 4,
-       4, 305, 7, 32, 4, 4, 305, 32,
-       7, 4, 6, 1, 7, 358, 4, 6,
-       1, 85, 0, 4, 6, 72, 0, 1,
-       4, 6, 76, 0, 1, 4, 6, 85,
-       0, 1, 4, 7, 6, 358, 1, 4,
-       7, 72, 0, 1, 4, 7, 358, 1,
-       6, 4, 7, 358, 1, 32, 4, 18,
-       15, 21, 0, 4, 20, 83, 7, 2,
-       4, 20, 83, 7, 3, 4, 20, 83,
-       7, 4, 4, 27, 1, 71, 0, 4,
-       27, 4, 71, 0, 4, 27, 293, 29,
-       291, 4, 29, 291, 287, 0, 4, 29,
-       295, 291, 1, 4, 29, 295, 291, 2,
-       4, 29, 295, 291, 3, 4, 29, 295,
-       291, 4, 4, 31, 1, 7, 358, 4,
-       31, 1, 308, 305, 4, 31, 1, 310,
-       303, 4, 31, 2, 93, 7, 4, 31,
-       2, 308, 305, 4, 31, 2, 310, 303,
-       4, 31, 3, 93, 7, 4, 31, 3,
-       308, 305, 4, 31, 3, 310, 303, 4,
-       31, 4, 93, 7, 4, 31, 4, 308,
-       305, 4, 31, 4, 310, 303, 4, 31,
-       310, 303, 7, 4, 33, 38, 309, 8,
-       4, 33, 50, 38, 309, 4, 33, 309,
-       304, 8, 4, 37, 36, 30, 25, 4,
-       38, 309, 304, 8, 4, 40, 37, 36,
-       41, 4, 40, 42, 264, 1, 4, 40,
-       42, 264, 2, 4, 40, 42, 264, 3,
-       4, 40, 42, 264, 4, 4, 40, 42,
-       265, 1, 4, 40, 42, 265, 2, 4,
-       40, 42, 265, 3, 4, 40, 42, 265,
-       4, 4, 40, 42, 266, 1, 4, 40,
-       42, 266, 2, 4, 40, 42, 266, 3,
-       4, 40, 42, 266, 4, 4, 40, 42,
-       267, 1, 4, 40, 42, 267, 2, 4,
-       40, 42, 267, 3, 4, 40, 42, 267,
-       4, 4, 40, 42, 268, 1, 4, 40,
-       42, 268, 2, 4, 40, 42, 268, 3,
-       4, 40, 42, 268, 4, 4, 40, 42,
-       269, 1, 4, 40, 42, 269, 2, 4,
-       40, 42, 269, 3, 4, 40, 42, 269,
-       4, 4, 42, 266, 274, 0, 4, 42,
-       267, 274, 0, 4, 42, 268, 274, 0,
-       4, 42, 269, 274, 0, 4, 43, 39,
-       37, 36, 4, 44, 39, 37, 36, 4,
-       46, 145, 291, 1, 4, 46, 145, 291,
-       2, 4, 46, 145, 291, 3, 4, 46,
-       145, 291, 4, 4, 46, 291, 287, 0,
-       4, 48, 303, 1, 305, 4, 48, 303,
-       4, 305, 4, 50, 38, 8, 73, 4,
-       56, 55, 37, 36, 4, 66, 68, 61,
-       0, 4, 75, 23, 13, 14, 4, 82,
-       23, 13, 14, 4, 88, 32, 1, 7,
-       4, 88, 32, 2, 7, 4, 88, 32,
-       3, 7, 4, 88, 32, 4, 7, 4,
-       90, 91, 30, 25, 4, 93, 1, 7,
-       358, 4, 96, 156, 157, 304, 4, 97,
-       98, 1, 0, 4, 97, 98, 4, 0,
-       4, 97, 98, 29, 291, 4, 99, 100,
-       1, 0, 4, 99, 100, 4, 0, 4,
-       99, 100, 29, 291, 4, 105, 106, 1,
-       0, 4, 105, 106, 4, 0, 4, 147,
-       145, 291, 1, 4, 147, 145, 291, 2,
-       4, 147, 145, 291, 3, 4, 147, 145,
-       291, 4, 4, 147, 296, 37, 36, 4,
-       207, 1, 257, 0, 4, 207, 4, 257,
-       0, 4, 208, 1, 257, 0, 4, 208,
-       4, 257, 0, 4, 209, 1, 257, 0,
-       4, 209, 4, 257, 0, 4, 210, 1,
-       257, 0, 4, 210, 4, 257, 0, 4,
-       211, 1, 257, 0, 4, 211, 4, 257,
-       0, 4, 212, 1, 257, 0, 4, 212,
-       4, 257, 0, 4, 213, 1, 257, 0,
-       4, 213, 4, 257, 0, 4, 214, 1,
-       257, 0, 4, 214, 4, 257, 0, 4,
-       215, 1, 257, 0, 4, 215, 4, 257,
-       0, 4, 216, 1, 257, 0, 4, 216,
-       4, 257, 0, 4, 217, 1, 257, 0,
-       4, 217, 4, 257, 0, 4, 218, 1,
-       257, 0, 4, 218, 4, 257, 0, 4,
-       219, 1, 257, 0, 4, 219, 4, 257,
-       0, 4, 220, 1, 257, 0, 4, 220,
-       4, 257, 0, 4, 221, 1, 257, 0,
-       4, 221, 4, 257, 0, 4, 222, 1,
-       257, 0, 4, 222, 4, 257, 0, 4,
-       223, 1, 257, 0, 4, 223, 4, 257,
-       0, 4, 224, 1, 257, 0, 4, 224,
-       4, 257, 0, 4, 225, 1, 257, 0,
-       4, 225, 4, 257, 0, 4, 226, 1,
-       257, 0, 4, 226, 4, 257, 0, 4,
-       227, 1, 257, 0, 4, 227, 4, 257,
-       0, 4, 228, 1, 257, 0, 4, 228,
-       4, 257, 0, 4, 229, 1, 257, 0,
-       4, 229, 4, 257, 0, 4, 230, 1,
-       257, 0, 4, 230, 4, 257, 0, 4,
-       231, 1, 257, 0, 4, 231, 4, 257,
-       0, 4, 232, 1, 257, 0, 4, 232,
-       4, 257, 0, 4, 233, 1, 257, 0,
-       4, 233, 4, 257, 0, 4, 234, 1,
-       257, 0, 4, 234, 4, 257, 0, 4,
-       235, 1, 257, 0, 4, 235, 4, 257,
-       0, 4, 236, 1, 257, 0, 4, 236,
-       4, 257, 0, 4, 237, 1, 257, 0,
-       4, 237, 4, 257, 0, 4, 238, 1,
-       257, 0, 4, 238, 4, 257, 0, 4,
-       239, 1, 257, 0, 4, 239, 4, 257,
-       0, 4, 240, 1, 257, 0, 4, 240,
-       4, 257, 0, 4, 241, 1, 257, 0,
-       4, 241, 4, 257, 0, 4, 242, 1,
-       257, 0, 4, 242, 4, 257, 0, 4,
-       243, 1, 257, 0, 4, 243, 4, 257,
-       0, 4, 244, 1, 257, 0, 4, 244,
-       4, 257, 0, 4, 245, 1, 257, 0,
-       4, 245, 4, 257, 0, 4, 246, 1,
-       257, 0, 4, 246, 4, 257, 0, 4,
-       247, 1, 257, 0, 4, 247, 4, 257,
-       0, 4, 248, 1, 257, 0, 4, 248,
-       4, 257, 0, 4, 249, 1, 257, 0,
-       4, 249, 4, 257, 0, 4, 250, 1,
-       257, 0, 4, 250, 4, 257, 0, 4,
-       251, 1, 257, 0, 4, 251, 4, 257,
-       0, 4, 252, 1, 257, 0, 4, 252,
-       4, 257, 0, 4, 253, 1, 257, 0,
-       4, 253, 4, 257, 0, 4, 254, 1,
-       257, 0, 4, 254, 4, 257, 0, 4,
-       255, 1, 257, 0, 4, 255, 4, 257,
-       0, 4, 256, 1, 257, 0, 4, 256,
-       4, 257, 0, 4, 286, 1, 287, 0,
-       4, 286, 4, 287, 0, 4, 291, 1,
-       287, 0, 4, 291, 4, 287, 0, 4,
-       292, 28, 26, 69, 4, 305, 7, 358,
-       1, 4, 310, 303, 1, 305, 4, 310,
-       303, 2, 7, 4, 310, 303, 3, 7,
-       4, 310, 303, 4, 7, 4, 310, 303,
-       4, 305, 4, 311, 303, 1, 305, 4,
-       311, 303, 4, 305, 4, 312, 303, 1,
-       305, 4, 312, 303, 4, 305, 4, 313,
-       303, 1, 305, 4, 313, 303, 4, 305,
-       4, 314, 303, 1, 305, 4, 314, 303,
-       4, 305, 4, 315, 303, 1, 305, 4,
-       315, 303, 4, 305, 4, 316, 303, 1,
-       305, 4, 316, 303, 4, 305, 4, 317,
-       303, 1, 305, 4, 317, 303, 4, 305,
-       4, 318, 303, 1, 305, 4, 318, 303,
-       4, 305, 4, 319, 303, 1, 305, 4,
-       319, 303, 4, 305, 4, 320, 303, 1,
-       305, 4, 320, 303, 4, 305, 4, 321,
-       303, 1, 305, 4, 321, 303, 4, 305,
-       4, 322, 303, 1, 305, 4, 322, 303,
-       4, 305, 4, 323, 303, 1, 305, 4,
-       323, 303, 4, 305, 4, 324, 303, 1,
-       305, 4, 324, 303, 4, 305, 4, 325,
-       303, 1, 305, 4, 325, 303, 4, 305,
-       4, 326, 303, 1, 305, 4, 326, 303,
-       4, 305, 4, 327, 303, 1, 305, 4,
-       327, 303, 4, 305, 4, 328, 303, 1,
-       305, 4, 328, 303, 4, 305, 4, 329,
-       303, 1, 305, 4, 329, 303, 4, 305,
-       4, 330, 303, 1, 305, 4, 330, 303,
-       4, 305, 4, 331, 303, 1, 305, 4,
-       331, 303, 4, 305, 4, 332, 303, 1,
-       305, 4, 332, 303, 4, 305, 4, 333,
-       303, 1, 305, 4, 333, 303, 4, 305,
-       4, 334, 303, 1, 305, 4, 334, 303,
-       4, 305, 4, 335, 303, 1, 305, 4,
-       335, 303, 4, 305, 4, 336, 303, 1,
-       305, 4, 336, 303, 4, 305, 4, 337,
-       303, 1, 305, 4, 337, 303, 4, 305,
-       4, 338, 303, 1, 305, 4, 338, 303,
-       4, 305, 4, 339, 303, 1, 305, 4,
-       339, 303, 4, 305, 4, 340, 303, 1,
-       305, 4, 340, 303, 4, 305, 4, 341,
-       303, 1, 305, 4, 341, 303, 4, 305,
-       4, 342, 303, 1, 305, 4, 342, 303,
-       4, 305, 4, 343, 303, 1, 305, 4,
-       343, 303, 4, 305, 4, 344, 303, 1,
-       305, 4, 344, 303, 4, 305, 4, 345,
-       303, 1, 305, 4, 345, 303, 4, 305,
-       4, 346, 303, 1, 305, 4, 346, 303,
-       4, 305, 4, 347, 303, 1, 305, 4,
-       347, 303, 4, 305, 4, 348, 303, 1,
-       305, 4, 348, 303, 4, 305, 4, 349,
-       303, 1, 305, 4, 349, 303, 4, 305,
-       4, 350, 303, 1, 305, 4, 350, 303,
-       4, 305, 4, 351, 303, 1, 305, 4,
-       351, 303, 4, 305, 4, 352, 303, 1,
-       305, 4, 352, 303, 4, 305, 4, 353,
-       303, 1, 305, 4, 353, 303, 4, 305,
-       4, 354, 303, 1, 305, 4, 354, 303,
-       4, 305, 4, 355, 303, 1, 305, 4,
-       355, 303, 4, 305, 4, 356, 303, 1,
-       305, 4, 356, 303, 4, 305, 4, 357,
-       303, 1, 305, 4, 357, 303, 4, 305,
-       5, 20, 7, 76, 0, 1, 5, 27,
-       293, 29, 291, 1, 5, 27, 293, 29,
-       291, 2, 5, 27, 293, 29, 291, 3,
-       5, 27, 293, 29, 291, 4, 5, 29,
-       291, 1, 287, 0, 5, 29, 291, 4,
-       287, 0, 5, 29, 295, 291, 287, 0,
-       5, 31, 1, 93, 7, 358, 5, 31,
-       1, 310, 303, 305, 5, 31, 2, 310,
-       303, 7, 5, 31, 3, 310, 303, 7,
-       5, 31, 4, 310, 303, 7, 5, 31,
-       4, 310, 303, 305, 5, 33, 38, 309,
-       304, 8, 5, 37, 36, 305, 30, 25,
-       5, 40, 42, 266, 274, 0, 5, 40,
-       42, 267, 274, 0, 5, 40, 42, 268,
-       274, 0, 5, 40, 42, 269, 274, 0,
-       5, 42, 266, 1, 274, 0, 5, 42,
-       266, 4, 274, 0, 5, 42, 267, 1,
-       274, 0, 5, 42, 267, 4, 274, 0,
-       5, 42, 268, 1, 274, 0, 5, 42,
-       268, 4, 274, 0, 5, 42, 269, 1,
-       274, 0, 5, 42, 269, 4, 274, 0,
-       5, 46, 145, 291, 287, 0, 5, 46,
-       291, 1, 287, 0, 5, 46, 291, 4,
-       287, 0, 5, 50, 38, 309, 304, 8,
-       5, 56, 7, 72, 0, 1, 5, 80,
-       7, 85, 0, 1, 5, 90, 91, 305,
-       30, 25, 5, 97, 98, 29, 291, 1,
-       5, 97, 98, 29, 291, 2, 5, 97,
-       98, 29, 291, 3, 5, 97, 98, 29,
-       291, 4, 5, 99, 100, 29, 291, 1,
-       5, 99, 100, 29, 291, 2, 5, 99,
-       100, 29, 291, 3, 5, 99, 100, 29,
-       291, 4, 5, 147, 145, 291, 287, 0,
+       152, 1, 159, 1, 160, 1, 161, 1,
+       162, 1, 163, 1, 164, 1, 165, 1,
+       166, 1, 167, 1, 168, 1, 169, 1,
+       170, 1, 171, 1, 172, 1, 173, 1,
+       174, 1, 175, 1, 176, 1, 177, 1,
+       178, 1, 179, 1, 180, 1, 181, 1,
+       182, 1, 183, 1, 184, 1, 185, 1,
+       186, 1, 187, 1, 188, 1, 189, 1,
+       190, 1, 191, 1, 192, 1, 193, 1,
+       194, 1, 195, 1, 196, 1, 197, 1,
+       198, 1, 199, 1, 200, 1, 201, 1,
+       202, 1, 203, 1, 204, 1, 205, 1,
+       206, 1, 207, 1, 208, 1, 209, 1,
+       210, 1, 211, 1, 212, 1, 213, 1,
+       214, 1, 215, 1, 216, 1, 217, 1,
+       218, 1, 219, 1, 220, 1, 221, 1,
+       222, 1, 223, 1, 224, 1, 225, 1,
+       226, 1, 227, 1, 228, 1, 229, 1,
+       230, 1, 231, 1, 232, 1, 233, 1,
+       234, 1, 235, 1, 236, 1, 237, 1,
+       238, 1, 239, 1, 240, 1, 241, 1,
+       242, 1, 243, 1, 244, 1, 245, 1,
+       246, 1, 247, 1, 248, 1, 249, 1,
+       250, 1, 251, 1, 252, 1, 253, 1,
+       254, 1, 255, 1, 256, 1, 258, 1,
+       260, 1, 261, 1, 262, 1, 263, 1,
+       270, 1, 271, 1, 276, 1, 278, 1,
+       283, 1, 286, 1, 288, 1, 289, 1,
+       290, 1, 291, 1, 296, 1, 297, 1,
+       299, 1, 300, 1, 301, 1, 302, 1,
+       304, 1, 305, 1, 306, 1, 307, 1,
+       309, 2, 0, 49, 2, 1, 0, 2,
+       1, 305, 2, 1, 358, 2, 2, 5,
+       2, 2, 7, 2, 3, 5, 2, 3,
+       7, 2, 4, 0, 2, 4, 5, 2,
+       4, 7, 2, 4, 305, 2, 5, 2,
+       2, 5, 3, 2, 5, 4, 2, 5,
+       7, 2, 6, 1, 2, 7, 1, 2,
+       7, 2, 2, 7, 3, 2, 7, 4,
+       2, 7, 5, 2, 7, 32, 2, 8,
+       73, 2, 8, 77, 2, 9, 10, 2,
+       11, 1, 2, 12, 1, 2, 13, 14,
+       2, 16, 17, 2, 18, 14, 2, 18,
+       15, 2, 19, 24, 2, 19, 77, 2,
+       19, 84, 2, 20, 0, 2, 20, 7,
+       2, 22, 0, 2, 23, 13, 2, 26,
+       69, 2, 26, 108, 2, 26, 119, 2,
+       27, 0, 2, 27, 1, 2, 27, 2,
+       2, 27, 3, 2, 27, 4, 2, 27,
+       259, 2, 28, 69, 2, 28, 113, 2,
+       29, 291, 2, 29, 295, 2, 30, 25,
+       2, 31, 1, 2, 31, 2, 2, 31,
+       3, 2, 31, 4, 2, 31, 7, 2,
+       31, 93, 2, 32, 7, 2, 33, 8,
+       2, 33, 304, 2, 33, 309, 2, 34,
+       25, 2, 35, 0, 2, 35, 1, 2,
+       35, 2, 2, 35, 3, 2, 35, 4,
+       2, 35, 259, 2, 35, 298, 2, 36,
+       41, 2, 37, 36, 2, 38, 73, 2,
+       38, 276, 2, 38, 288, 2, 38, 289,
+       2, 38, 304, 2, 38, 309, 2, 42,
+       264, 2, 42, 265, 2, 42, 266, 2,
+       42, 267, 2, 42, 268, 2, 42, 269,
+       2, 45, 0, 2, 45, 1, 2, 45,
+       2, 2, 45, 3, 2, 45, 4, 2,
+       46, 0, 2, 46, 1, 2, 46, 2,
+       2, 46, 3, 2, 46, 4, 2, 46,
+       259, 2, 46, 291, 2, 47, 0, 2,
+       47, 1, 2, 47, 2, 2, 47, 3,
+       2, 47, 4, 2, 48, 303, 2, 49,
+       1, 2, 49, 2, 2, 49, 3, 2,
+       49, 4, 2, 56, 7, 2, 56, 47,
+       2, 56, 93, 2, 57, 58, 2, 59,
+       1, 2, 59, 2, 2, 59, 3, 2,
+       59, 4, 2, 60, 304, 2, 62, 63,
+       2, 64, 65, 2, 66, 68, 2, 68,
+       0, 2, 68, 61, 2, 71, 0, 2,
+       71, 304, 2, 75, 23, 2, 79, 69,
+       2, 80, 7, 2, 81, 8, 2, 82,
+       23, 2, 84, 8, 2, 90, 91, 2,
+       92, 1, 2, 92, 2, 2, 92, 3,
+       2, 92, 4, 2, 93, 1, 2, 93,
+       2, 2, 93, 3, 2, 93, 4, 2,
+       93, 7, 2, 94, 95, 2, 96, 288,
+       2, 96, 304, 2, 97, 98, 2, 99,
+       100, 2, 101, 102, 2, 101, 103, 2,
+       101, 104, 2, 105, 106, 2, 107, 304,
+       2, 110, 304, 2, 111, 0, 2, 127,
+       304, 2, 129, 0, 2, 130, 0, 2,
+       131, 0, 2, 132, 0, 2, 133, 0,
+       2, 134, 0, 2, 135, 0, 2, 136,
+       0, 2, 137, 0, 2, 138, 0, 2,
+       139, 0, 2, 140, 0, 2, 141, 0,
+       2, 142, 0, 2, 143, 0, 2, 144,
+       0, 2, 146, 0, 2, 147, 0, 2,
+       148, 0, 2, 149, 0, 2, 150, 0,
+       2, 151, 0, 2, 152, 0, 2, 153,
+       0, 2, 154, 0, 2, 155, 0, 2,
+       156, 304, 2, 157, 304, 2, 158, 304,
+       2, 159, 1, 2, 159, 2, 2, 159,
+       3, 2, 159, 4, 2, 160, 1, 2,
+       160, 2, 2, 160, 3, 2, 160, 4,
+       2, 161, 1, 2, 161, 2, 2, 161,
+       3, 2, 161, 4, 2, 162, 1, 2,
+       162, 2, 2, 162, 3, 2, 162, 4,
+       2, 163, 1, 2, 163, 2, 2, 163,
+       3, 2, 163, 4, 2, 164, 1, 2,
+       164, 2, 2, 164, 3, 2, 164, 4,
+       2, 165, 1, 2, 165, 2, 2, 165,
+       3, 2, 165, 4, 2, 166, 1, 2,
+       166, 2, 2, 166, 3, 2, 166, 4,
+       2, 167, 1, 2, 167, 2, 2, 167,
+       3, 2, 167, 4, 2, 168, 1, 2,
+       168, 2, 2, 168, 3, 2, 168, 4,
+       2, 169, 1, 2, 169, 2, 2, 169,
+       3, 2, 169, 4, 2, 170, 1, 2,
+       170, 2, 2, 170, 3, 2, 170, 4,
+       2, 171, 1, 2, 171, 2, 2, 171,
+       3, 2, 171, 4, 2, 172, 1, 2,
+       172, 2, 2, 172, 3, 2, 172, 4,
+       2, 173, 1, 2, 173, 2, 2, 173,
+       3, 2, 173, 4, 2, 174, 1, 2,
+       174, 2, 2, 174, 3, 2, 174, 4,
+       2, 175, 1, 2, 175, 2, 2, 175,
+       3, 2, 175, 4, 2, 176, 1, 2,
+       176, 2, 2, 176, 3, 2, 176, 4,
+       2, 177, 1, 2, 177, 2, 2, 177,
+       3, 2, 177, 4, 2, 178, 1, 2,
+       178, 2, 2, 178, 3, 2, 178, 4,
+       2, 179, 1, 2, 179, 2, 2, 179,
+       3, 2, 179, 4, 2, 180, 1, 2,
+       180, 2, 2, 180, 3, 2, 180, 4,
+       2, 181, 1, 2, 181, 2, 2, 181,
+       3, 2, 181, 4, 2, 182, 1, 2,
+       182, 2, 2, 182, 3, 2, 182, 4,
+       2, 183, 1, 2, 183, 2, 2, 183,
+       3, 2, 183, 4, 2, 184, 1, 2,
+       184, 2, 2, 184, 3, 2, 184, 4,
+       2, 185, 1, 2, 185, 2, 2, 185,
+       3, 2, 185, 4, 2, 186, 1, 2,
+       186, 2, 2, 186, 3, 2, 186, 4,
+       2, 187, 1, 2, 187, 2, 2, 187,
+       3, 2, 187, 4, 2, 188, 1, 2,
+       188, 2, 2, 188, 3, 2, 188, 4,
+       2, 189, 1, 2, 189, 2, 2, 189,
+       3, 2, 189, 4, 2, 190, 1, 2,
+       190, 2, 2, 190, 3, 2, 190, 4,
+       2, 191, 1, 2, 191, 2, 2, 191,
+       3, 2, 191, 4, 2, 192, 1, 2,
+       192, 2, 2, 192, 3, 2, 192, 4,
+       2, 193, 1, 2, 193, 2, 2, 193,
+       3, 2, 193, 4, 2, 194, 1, 2,
+       194, 2, 2, 194, 3, 2, 194, 4,
+       2, 195, 1, 2, 195, 2, 2, 195,
+       3, 2, 195, 4, 2, 196, 1, 2,
+       196, 2, 2, 196, 3, 2, 196, 4,
+       2, 197, 1, 2, 197, 2, 2, 197,
+       3, 2, 197, 4, 2, 198, 1, 2,
+       198, 2, 2, 198, 3, 2, 198, 4,
+       2, 199, 1, 2, 199, 2, 2, 199,
+       3, 2, 199, 4, 2, 200, 1, 2,
+       200, 2, 2, 200, 3, 2, 200, 4,
+       2, 201, 1, 2, 201, 2, 2, 201,
+       3, 2, 201, 4, 2, 202, 1, 2,
+       202, 2, 2, 202, 3, 2, 202, 4,
+       2, 203, 1, 2, 203, 2, 2, 203,
+       3, 2, 203, 4, 2, 204, 1, 2,
+       204, 2, 2, 204, 3, 2, 204, 4,
+       2, 205, 1, 2, 205, 2, 2, 205,
+       3, 2, 205, 4, 2, 206, 1, 2,
+       206, 2, 2, 206, 3, 2, 206, 4,
+       2, 207, 1, 2, 207, 2, 2, 207,
+       3, 2, 207, 4, 2, 208, 1, 2,
+       208, 2, 2, 208, 3, 2, 208, 4,
+       2, 209, 1, 2, 209, 2, 2, 209,
+       3, 2, 209, 4, 2, 210, 1, 2,
+       210, 2, 2, 210, 3, 2, 210, 4,
+       2, 211, 1, 2, 211, 2, 2, 211,
+       3, 2, 211, 4, 2, 212, 1, 2,
+       212, 2, 2, 212, 3, 2, 212, 4,
+       2, 213, 1, 2, 213, 2, 2, 213,
+       3, 2, 213, 4, 2, 214, 1, 2,
+       214, 2, 2, 214, 3, 2, 214, 4,
+       2, 215, 1, 2, 215, 2, 2, 215,
+       3, 2, 215, 4, 2, 216, 1, 2,
+       216, 2, 2, 216, 3, 2, 216, 4,
+       2, 217, 1, 2, 217, 2, 2, 217,
+       3, 2, 217, 4, 2, 218, 1, 2,
+       218, 2, 2, 218, 3, 2, 218, 4,
+       2, 219, 1, 2, 219, 2, 2, 219,
+       3, 2, 219, 4, 2, 220, 1, 2,
+       220, 2, 2, 220, 3, 2, 220, 4,
+       2, 221, 1, 2, 221, 2, 2, 221,
+       3, 2, 221, 4, 2, 222, 1, 2,
+       222, 2, 2, 222, 3, 2, 222, 4,
+       2, 223, 1, 2, 223, 2, 2, 223,
+       3, 2, 223, 4, 2, 224, 1, 2,
+       224, 2, 2, 224, 3, 2, 224, 4,
+       2, 225, 1, 2, 225, 2, 2, 225,
+       3, 2, 225, 4, 2, 226, 1, 2,
+       226, 2, 2, 226, 3, 2, 226, 4,
+       2, 227, 1, 2, 227, 2, 2, 227,
+       3, 2, 227, 4, 2, 228, 1, 2,
+       228, 2, 2, 228, 3, 2, 228, 4,
+       2, 229, 1, 2, 229, 2, 2, 229,
+       3, 2, 229, 4, 2, 230, 1, 2,
+       230, 2, 2, 230, 3, 2, 230, 4,
+       2, 231, 1, 2, 231, 2, 2, 231,
+       3, 2, 231, 4, 2, 232, 1, 2,
+       232, 2, 2, 232, 3, 2, 232, 4,
+       2, 233, 1, 2, 233, 2, 2, 233,
+       3, 2, 233, 4, 2, 234, 1, 2,
+       234, 2, 2, 234, 3, 2, 234, 4,
+       2, 235, 1, 2, 235, 2, 2, 235,
+       3, 2, 235, 4, 2, 236, 1, 2,
+       236, 2, 2, 236, 3, 2, 236, 4,
+       2, 237, 1, 2, 237, 2, 2, 237,
+       3, 2, 237, 4, 2, 238, 1, 2,
+       238, 2, 2, 238, 3, 2, 238, 4,
+       2, 239, 1, 2, 239, 2, 2, 239,
+       3, 2, 239, 4, 2, 240, 1, 2,
+       240, 2, 2, 240, 3, 2, 240, 4,
+       2, 241, 1, 2, 241, 2, 2, 241,
+       3, 2, 241, 4, 2, 242, 1, 2,
+       242, 2, 2, 242, 3, 2, 242, 4,
+       2, 243, 1, 2, 243, 2, 2, 243,
+       3, 2, 243, 4, 2, 244, 1, 2,
+       244, 2, 2, 244, 3, 2, 244, 4,
+       2, 245, 1, 2, 245, 2, 2, 245,
+       3, 2, 245, 4, 2, 246, 1, 2,
+       246, 2, 2, 246, 3, 2, 246, 4,
+       2, 247, 1, 2, 247, 2, 2, 247,
+       3, 2, 247, 4, 2, 248, 1, 2,
+       248, 2, 2, 248, 3, 2, 248, 4,
+       2, 249, 1, 2, 249, 2, 2, 249,
+       3, 2, 249, 4, 2, 250, 1, 2,
+       250, 2, 2, 250, 3, 2, 250, 4,
+       2, 251, 1, 2, 251, 2, 2, 251,
+       3, 2, 251, 4, 2, 252, 1, 2,
+       252, 2, 2, 252, 3, 2, 252, 4,
+       2, 253, 1, 2, 253, 2, 2, 253,
+       3, 2, 253, 4, 2, 254, 1, 2,
+       254, 2, 2, 254, 3, 2, 254, 4,
+       2, 255, 1, 2, 255, 2, 2, 255,
+       3, 2, 255, 4, 2, 256, 1, 2,
+       256, 2, 2, 256, 3, 2, 256, 4,
+       2, 257, 0, 2, 260, 1, 2, 260,
+       2, 2, 260, 3, 2, 260, 4, 2,
+       261, 1, 2, 261, 2, 2, 261, 3,
+       2, 261, 4, 2, 262, 1, 2, 262,
+       2, 2, 262, 3, 2, 262, 4, 2,
+       263, 1, 2, 263, 2, 2, 263, 3,
+       2, 263, 4, 2, 270, 1, 2, 270,
+       2, 2, 270, 3, 2, 270, 4, 2,
+       271, 1, 2, 271, 2, 2, 271, 3,
+       2, 271, 4, 2, 274, 0, 2, 275,
+       304, 2, 277, 108, 2, 282, 108, 2,
+       286, 1, 2, 286, 2, 2, 286, 3,
+       2, 286, 4, 2, 287, 0, 2, 291,
+       1, 2, 291, 2, 2, 291, 3, 2,
+       291, 4, 2, 304, 8, 2, 305, 1,
+       2, 305, 4, 2, 308, 305, 2, 309,
+       8, 2, 309, 304, 2, 310, 303, 2,
+       311, 303, 2, 312, 303, 2, 313, 303,
+       2, 314, 303, 2, 315, 303, 2, 316,
+       303, 2, 317, 303, 2, 318, 303, 2,
+       319, 303, 2, 320, 303, 2, 321, 303,
+       2, 322, 303, 2, 323, 303, 2, 324,
+       303, 2, 325, 303, 2, 326, 303, 2,
+       327, 303, 2, 328, 303, 2, 329, 303,
+       2, 330, 303, 2, 331, 303, 2, 332,
+       303, 2, 333, 303, 2, 334, 303, 2,
+       335, 303, 2, 336, 303, 2, 337, 303,
+       2, 338, 303, 2, 339, 303, 2, 340,
+       303, 2, 341, 303, 2, 342, 303, 2,
+       343, 303, 2, 344, 303, 2, 345, 303,
+       2, 346, 303, 2, 347, 303, 2, 348,
+       303, 2, 349, 303, 2, 350, 303, 2,
+       351, 303, 2, 352, 303, 2, 353, 303,
+       2, 354, 303, 2, 355, 303, 2, 356,
+       303, 2, 357, 303, 2, 358, 1, 3,
+       0, 49, 1, 3, 0, 49, 2, 3,
+       0, 49, 3, 3, 0, 49, 4, 3,
+       1, 7, 358, 3, 1, 32, 7, 3,
+       1, 71, 0, 3, 1, 111, 0, 3,
+       1, 257, 0, 3, 1, 274, 0, 3,
+       1, 287, 0, 3, 1, 305, 358, 3,
+       2, 7, 32, 3, 2, 32, 7, 3,
+       3, 7, 32, 3, 3, 32, 7, 3,
+       4, 7, 32, 3, 4, 32, 7, 3,
+       4, 71, 0, 3, 4, 111, 0, 3,
+       4, 257, 0, 3, 4, 274, 0, 3,
+       4, 287, 0, 3, 4, 305, 7, 3,
+       5, 7, 2, 3, 5, 7, 3, 3,
+       5, 7, 4, 3, 6, 1, 358, 3,
+       6, 358, 1, 3, 7, 2, 5, 3,
+       7, 2, 32, 3, 7, 3, 5, 3,
+       7, 3, 32, 3, 7, 4, 5, 3,
+       7, 4, 32, 3, 7, 358, 1, 3,
+       9, 11, 1, 3, 15, 21, 0, 3,
+       20, 7, 2, 3, 20, 7, 3, 3,
+       20, 7, 4, 3, 20, 83, 7, 3,
+       23, 13, 14, 3, 27, 71, 0, 3,
+       27, 293, 29, 3, 28, 94, 95, 3,
+       29, 291, 1, 3, 29, 291, 2, 3,
+       29, 291, 3, 3, 29, 291, 4, 3,
+       29, 295, 291, 3, 31, 1, 93, 3,
+       31, 2, 7, 3, 31, 2, 93, 3,
+       31, 3, 7, 3, 31, 3, 93, 3,
+       31, 4, 7, 3, 31, 4, 93, 3,
+       31, 93, 7, 3, 31, 308, 305, 3,
+       31, 310, 303, 3, 32, 1, 7, 3,
+       32, 2, 7, 3, 32, 3, 7, 3,
+       32, 4, 7, 3, 33, 89, 8, 3,
+       33, 304, 8, 3, 33, 309, 8, 3,
+       33, 309, 304, 3, 35, 1, 0, 3,
+       35, 4, 0, 3, 37, 36, 305, 3,
+       38, 156, 304, 3, 38, 158, 304, 3,
+       38, 309, 8, 3, 38, 309, 304, 3,
+       40, 42, 264, 3, 40, 42, 265, 3,
+       40, 42, 266, 3, 40, 42, 267, 3,
+       40, 42, 268, 3, 40, 42, 269, 3,
+       42, 264, 1, 3, 42, 264, 2, 3,
+       42, 264, 3, 3, 42, 264, 4, 3,
+       42, 265, 1, 3, 42, 265, 2, 3,
+       42, 265, 3, 3, 42, 265, 4, 3,
+       42, 266, 1, 3, 42, 266, 2, 3,
+       42, 266, 3, 3, 42, 266, 4, 3,
+       42, 267, 1, 3, 42, 267, 2, 3,
+       42, 267, 3, 3, 42, 267, 4, 3,
+       42, 268, 1, 3, 42, 268, 2, 3,
+       42, 268, 3, 3, 42, 268, 4, 3,
+       42, 269, 1, 3, 42, 269, 2, 3,
+       42, 269, 3, 3, 42, 269, 4, 3,
+       46, 145, 291, 3, 46, 291, 1, 3,
+       46, 291, 2, 3, 46, 291, 3, 3,
+       46, 291, 4, 3, 48, 303, 1, 3,
+       48, 303, 2, 3, 48, 303, 3, 3,
+       48, 303, 4, 3, 48, 303, 305, 3,
+       50, 38, 73, 3, 50, 38, 304, 3,
+       50, 38, 309, 3, 55, 37, 36, 3,
+       56, 7, 2, 3, 56, 7, 3, 3,
+       56, 7, 4, 3, 56, 47, 0, 3,
+       56, 47, 1, 3, 56, 47, 2, 3,
+       56, 47, 3, 3, 56, 47, 4, 3,
+       56, 93, 1, 3, 56, 93, 2, 3,
+       56, 93, 3, 3, 56, 93, 4, 3,
+       66, 68, 0, 3, 66, 68, 61, 3,
+       67, 62, 63, 3, 68, 61, 0, 3,
+       70, 26, 69, 3, 72, 0, 1, 3,
+       75, 23, 13, 3, 76, 0, 1, 3,
+       80, 2, 7, 3, 80, 3, 7, 3,
+       80, 4, 7, 3, 80, 7, 4, 3,
+       82, 23, 13, 3, 85, 0, 1, 3,
+       88, 7, 1, 3, 88, 7, 4, 3,
+       88, 30, 25, 3, 88, 32, 7, 3,
+       90, 30, 25, 3, 90, 91, 305, 3,
+       93, 2, 7, 3, 93, 3, 7, 3,
+       93, 4, 7, 3, 96, 107, 304, 3,
+       96, 156, 304, 3, 97, 98, 0, 3,
+       97, 98, 1, 3, 97, 98, 2, 3,
+       97, 98, 3, 3, 97, 98, 4, 3,
+       97, 98, 29, 3, 99, 100, 0, 3,
+       99, 100, 1, 3, 99, 100, 2, 3,
+       99, 100, 3, 3, 99, 100, 4, 3,
+       99, 100, 29, 3, 105, 106, 0, 3,
+       105, 106, 1, 3, 105, 106, 2, 3,
+       105, 106, 3, 3, 105, 106, 4, 3,
+       110, 112, 276, 3, 110, 285, 304, 3,
+       147, 145, 291, 3, 153, 145, 291, 3,
+       156, 157, 304, 3, 207, 257, 0, 3,
+       208, 257, 0, 3, 209, 257, 0, 3,
+       210, 257, 0, 3, 211, 257, 0, 3,
+       212, 257, 0, 3, 213, 257, 0, 3,
+       214, 257, 0, 3, 215, 257, 0, 3,
+       216, 257, 0, 3, 217, 257, 0, 3,
+       218, 257, 0, 3, 219, 257, 0, 3,
+       220, 257, 0, 3, 221, 257, 0, 3,
+       222, 257, 0, 3, 223, 257, 0, 3,
+       224, 257, 0, 3, 225, 257, 0, 3,
+       226, 257, 0, 3, 227, 257, 0, 3,
+       228, 257, 0, 3, 229, 257, 0, 3,
+       230, 257, 0, 3, 231, 257, 0, 3,
+       232, 257, 0, 3, 233, 257, 0, 3,
+       234, 257, 0, 3, 235, 257, 0, 3,
+       236, 257, 0, 3, 237, 257, 0, 3,
+       238, 257, 0, 3, 239, 257, 0, 3,
+       240, 257, 0, 3, 241, 257, 0, 3,
+       242, 257, 0, 3, 243, 257, 0, 3,
+       244, 257, 0, 3, 245, 257, 0, 3,
+       246, 257, 0, 3, 247, 257, 0, 3,
+       248, 257, 0, 3, 249, 257, 0, 3,
+       250, 257, 0, 3, 251, 257, 0, 3,
+       252, 257, 0, 3, 253, 257, 0, 3,
+       254, 257, 0, 3, 255, 257, 0, 3,
+       256, 257, 0, 3, 273, 37, 36, 3,
+       278, 279, 0, 3, 278, 280, 0, 3,
+       281, 110, 304, 3, 283, 284, 0, 3,
+       285, 110, 304, 3, 286, 287, 0, 3,
+       291, 287, 0, 3, 294, 28, 297, 3,
+       304, 8, 89, 3, 305, 7, 1, 3,
+       305, 7, 4, 3, 305, 30, 25, 3,
+       305, 358, 1, 3, 307, 30, 25, 3,
+       309, 304, 8, 3, 310, 303, 1, 3,
+       310, 303, 2, 3, 310, 303, 3, 3,
+       310, 303, 4, 3, 310, 303, 7, 3,
+       310, 303, 305, 3, 311, 303, 1, 3,
+       311, 303, 2, 3, 311, 303, 3, 3,
+       311, 303, 4, 3, 311, 303, 305, 3,
+       312, 303, 1, 3, 312, 303, 2, 3,
+       312, 303, 3, 3, 312, 303, 4, 3,
+       312, 303, 305, 3, 313, 303, 1, 3,
+       313, 303, 2, 3, 313, 303, 3, 3,
+       313, 303, 4, 3, 313, 303, 305, 3,
+       314, 303, 1, 3, 314, 303, 2, 3,
+       314, 303, 3, 3, 314, 303, 4, 3,
+       314, 303, 305, 3, 315, 303, 1, 3,
+       315, 303, 2, 3, 315, 303, 3, 3,
+       315, 303, 4, 3, 315, 303, 305, 3,
+       316, 303, 1, 3, 316, 303, 2, 3,
+       316, 303, 3, 3, 316, 303, 4, 3,
+       316, 303, 305, 3, 317, 303, 1, 3,
+       317, 303, 2, 3, 317, 303, 3, 3,
+       317, 303, 4, 3, 317, 303, 305, 3,
+       318, 303, 1, 3, 318, 303, 2, 3,
+       318, 303, 3, 3, 318, 303, 4, 3,
+       318, 303, 305, 3, 319, 303, 1, 3,
+       319, 303, 2, 3, 319, 303, 3, 3,
+       319, 303, 4, 3, 319, 303, 305, 3,
+       320, 303, 1, 3, 320, 303, 2, 3,
+       320, 303, 3, 3, 320, 303, 4, 3,
+       320, 303, 305, 3, 321, 303, 1, 3,
+       321, 303, 2, 3, 321, 303, 3, 3,
+       321, 303, 4, 3, 321, 303, 305, 3,
+       322, 303, 1, 3, 322, 303, 2, 3,
+       322, 303, 3, 3, 322, 303, 4, 3,
+       322, 303, 305, 3, 323, 303, 1, 3,
+       323, 303, 2, 3, 323, 303, 3, 3,
+       323, 303, 4, 3, 323, 303, 305, 3,
+       324, 303, 1, 3, 324, 303, 2, 3,
+       324, 303, 3, 3, 324, 303, 4, 3,
+       324, 303, 305, 3, 325, 303, 1, 3,
+       325, 303, 2, 3, 325, 303, 3, 3,
+       325, 303, 4, 3, 325, 303, 305, 3,
+       326, 303, 1, 3, 326, 303, 2, 3,
+       326, 303, 3, 3, 326, 303, 4, 3,
+       326, 303, 305, 3, 327, 303, 1, 3,
+       327, 303, 2, 3, 327, 303, 3, 3,
+       327, 303, 4, 3, 327, 303, 305, 3,
+       328, 303, 1, 3, 328, 303, 2, 3,
+       328, 303, 3, 3, 328, 303, 4, 3,
+       328, 303, 305, 3, 329, 303, 1, 3,
+       329, 303, 2, 3, 329, 303, 3, 3,
+       329, 303, 4, 3, 329, 303, 305, 3,
+       330, 303, 1, 3, 330, 303, 2, 3,
+       330, 303, 3, 3, 330, 303, 4, 3,
+       330, 303, 305, 3, 331, 303, 1, 3,
+       331, 303, 2, 3, 331, 303, 3, 3,
+       331, 303, 4, 3, 331, 303, 305, 3,
+       332, 303, 1, 3, 332, 303, 2, 3,
+       332, 303, 3, 3, 332, 303, 4, 3,
+       332, 303, 305, 3, 333, 303, 1, 3,
+       333, 303, 2, 3, 333, 303, 3, 3,
+       333, 303, 4, 3, 333, 303, 305, 3,
+       334, 303, 1, 3, 334, 303, 2, 3,
+       334, 303, 3, 3, 334, 303, 4, 3,
+       334, 303, 305, 3, 335, 303, 1, 3,
+       335, 303, 2, 3, 335, 303, 3, 3,
+       335, 303, 4, 3, 335, 303, 305, 3,
+       336, 303, 1, 3, 336, 303, 2, 3,
+       336, 303, 3, 3, 336, 303, 4, 3,
+       336, 303, 305, 3, 337, 303, 1, 3,
+       337, 303, 2, 3, 337, 303, 3, 3,
+       337, 303, 4, 3, 337, 303, 305, 3,
+       338, 303, 1, 3, 338, 303, 2, 3,
+       338, 303, 3, 3, 338, 303, 4, 3,
+       338, 303, 305, 3, 339, 303, 1, 3,
+       339, 303, 2, 3, 339, 303, 3, 3,
+       339, 303, 4, 3, 339, 303, 305, 3,
+       340, 303, 1, 3, 340, 303, 2, 3,
+       340, 303, 3, 3, 340, 303, 4, 3,
+       340, 303, 305, 3, 341, 303, 1, 3,
+       341, 303, 2, 3, 341, 303, 3, 3,
+       341, 303, 4, 3, 341, 303, 305, 3,
+       342, 303, 1, 3, 342, 303, 2, 3,
+       342, 303, 3, 3, 342, 303, 4, 3,
+       342, 303, 305, 3, 343, 303, 1, 3,
+       343, 303, 2, 3, 343, 303, 3, 3,
+       343, 303, 4, 3, 343, 303, 305, 3,
+       344, 303, 1, 3, 344, 303, 2, 3,
+       344, 303, 3, 3, 344, 303, 4, 3,
+       344, 303, 305, 3, 345, 303, 1, 3,
+       345, 303, 2, 3, 345, 303, 3, 3,
+       345, 303, 4, 3, 345, 303, 305, 3,
+       346, 303, 1, 3, 346, 303, 2, 3,
+       346, 303, 3, 3, 346, 303, 4, 3,
+       346, 303, 305, 3, 347, 303, 1, 3,
+       347, 303, 2, 3, 347, 303, 3, 3,
+       347, 303, 4, 3, 347, 303, 305, 3,
+       348, 303, 1, 3, 348, 303, 2, 3,
+       348, 303, 3, 3, 348, 303, 4, 3,
+       348, 303, 305, 3, 349, 303, 1, 3,
+       349, 303, 2, 3, 349, 303, 3, 3,
+       349, 303, 4, 3, 349, 303, 305, 3,
+       350, 303, 1, 3, 350, 303, 2, 3,
+       350, 303, 3, 3, 350, 303, 4, 3,
+       350, 303, 305, 3, 351, 303, 1, 3,
+       351, 303, 2, 3, 351, 303, 3, 3,
+       351, 303, 4, 3, 351, 303, 305, 3,
+       352, 303, 1, 3, 352, 303, 2, 3,
+       352, 303, 3, 3, 352, 303, 4, 3,
+       352, 303, 305, 3, 353, 303, 1, 3,
+       353, 303, 2, 3, 353, 303, 3, 3,
+       353, 303, 4, 3, 353, 303, 305, 3,
+       354, 303, 1, 3, 354, 303, 2, 3,
+       354, 303, 3, 3, 354, 303, 4, 3,
+       354, 303, 305, 3, 355, 303, 1, 3,
+       355, 303, 2, 3, 355, 303, 3, 3,
+       355, 303, 4, 3, 355, 303, 305, 3,
+       356, 303, 1, 3, 356, 303, 2, 3,
+       356, 303, 3, 3, 356, 303, 4, 3,
+       356, 303, 305, 3, 357, 303, 1, 3,
+       357, 303, 2, 3, 357, 303, 3, 3,
+       357, 303, 4, 3, 357, 303, 305, 3,
+       358, 1, 6, 4, 1, 7, 358, 32,
+       4, 1, 305, 32, 7, 4, 4, 305,
+       7, 32, 4, 4, 305, 32, 7, 4,
+       6, 1, 7, 358, 4, 6, 1, 85,
+       0, 4, 6, 72, 0, 1, 4, 6,
+       76, 0, 1, 4, 6, 85, 0, 1,
+       4, 7, 6, 358, 1, 4, 7, 72,
+       0, 1, 4, 7, 358, 1, 6, 4,
+       7, 358, 1, 32, 4, 18, 15, 21,
+       0, 4, 20, 83, 7, 2, 4, 20,
+       83, 7, 3, 4, 20, 83, 7, 4,
+       4, 27, 1, 71, 0, 4, 27, 4,
+       71, 0, 4, 27, 293, 29, 291, 4,
+       29, 291, 287, 0, 4, 29, 295, 291,
+       1, 4, 29, 295, 291, 2, 4, 29,
+       295, 291, 3, 4, 29, 295, 291, 4,
+       4, 31, 1, 7, 358, 4, 31, 1,
+       308, 305, 4, 31, 1, 310, 303, 4,
+       31, 2, 93, 7, 4, 31, 2, 308,
+       305, 4, 31, 2, 310, 303, 4, 31,
+       3, 93, 7, 4, 31, 3, 308, 305,
+       4, 31, 3, 310, 303, 4, 31, 4,
+       93, 7, 4, 31, 4, 308, 305, 4,
+       31, 4, 310, 303, 4, 31, 310, 303,
+       7, 4, 33, 38, 309, 8, 4, 33,
+       50, 38, 309, 4, 33, 309, 304, 8,
+       4, 37, 36, 30, 25, 4, 38, 309,
+       304, 8, 4, 40, 37, 36, 41, 4,
+       40, 42, 264, 1, 4, 40, 42, 264,
+       2, 4, 40, 42, 264, 3, 4, 40,
+       42, 264, 4, 4, 40, 42, 265, 1,
+       4, 40, 42, 265, 2, 4, 40, 42,
+       265, 3, 4, 40, 42, 265, 4, 4,
+       40, 42, 266, 1, 4, 40, 42, 266,
+       2, 4, 40, 42, 266, 3, 4, 40,
+       42, 266, 4, 4, 40, 42, 267, 1,
+       4, 40, 42, 267, 2, 4, 40, 42,
+       267, 3, 4, 40, 42, 267, 4, 4,
+       40, 42, 268, 1, 4, 40, 42, 268,
+       2, 4, 40, 42, 268, 3, 4, 40,
+       42, 268, 4, 4, 40, 42, 269, 1,
+       4, 40, 42, 269, 2, 4, 40, 42,
+       269, 3, 4, 40, 42, 269, 4, 4,
+       42, 266, 274, 0, 4, 42, 267, 274,
+       0, 4, 42, 268, 274, 0, 4, 42,
+       269, 274, 0, 4, 43, 39, 37, 36,
+       4, 44, 39, 37, 36, 4, 46, 145,
+       291, 1, 4, 46, 145, 291, 2, 4,
+       46, 145, 291, 3, 4, 46, 145, 291,
+       4, 4, 46, 291, 287, 0, 4, 48,
+       303, 1, 305, 4, 48, 303, 4, 305,
+       4, 50, 38, 8, 73, 4, 56, 55,
+       37, 36, 4, 66, 68, 61, 0, 4,
+       75, 23, 13, 14, 4, 82, 23, 13,
+       14, 4, 88, 32, 1, 7, 4, 88,
+       32, 2, 7, 4, 88, 32, 3, 7,
+       4, 88, 32, 4, 7, 4, 90, 91,
+       30, 25, 4, 93, 1, 7, 358, 4,
+       96, 156, 157, 304, 4, 97, 98, 1,
+       0, 4, 97, 98, 4, 0, 4, 97,
+       98, 29, 291, 4, 99, 100, 1, 0,
+       4, 99, 100, 4, 0, 4, 99, 100,
+       29, 291, 4, 105, 106, 1, 0, 4,
+       105, 106, 4, 0, 4, 147, 145, 291,
+       1, 4, 147, 145, 291, 2, 4, 147,
+       145, 291, 3, 4, 147, 145, 291, 4,
+       4, 147, 296, 37, 36, 4, 153, 145,
+       291, 1, 4, 153, 145, 291, 2, 4,
+       153, 145, 291, 3, 4, 153, 145, 291,
+       4, 4, 207, 1, 257, 0, 4, 207,
+       4, 257, 0, 4, 208, 1, 257, 0,
+       4, 208, 4, 257, 0, 4, 209, 1,
+       257, 0, 4, 209, 4, 257, 0, 4,
+       210, 1, 257, 0, 4, 210, 4, 257,
+       0, 4, 211, 1, 257, 0, 4, 211,
+       4, 257, 0, 4, 212, 1, 257, 0,
+       4, 212, 4, 257, 0, 4, 213, 1,
+       257, 0, 4, 213, 4, 257, 0, 4,
+       214, 1, 257, 0, 4, 214, 4, 257,
+       0, 4, 215, 1, 257, 0, 4, 215,
+       4, 257, 0, 4, 216, 1, 257, 0,
+       4, 216, 4, 257, 0, 4, 217, 1,
+       257, 0, 4, 217, 4, 257, 0, 4,
+       218, 1, 257, 0, 4, 218, 4, 257,
+       0, 4, 219, 1, 257, 0, 4, 219,
+       4, 257, 0, 4, 220, 1, 257, 0,
+       4, 220, 4, 257, 0, 4, 221, 1,
+       257, 0, 4, 221, 4, 257, 0, 4,
+       222, 1, 257, 0, 4, 222, 4, 257,
+       0, 4, 223, 1, 257, 0, 4, 223,
+       4, 257, 0, 4, 224, 1, 257, 0,
+       4, 224, 4, 257, 0, 4, 225, 1,
+       257, 0, 4, 225, 4, 257, 0, 4,
+       226, 1, 257, 0, 4, 226, 4, 257,
+       0, 4, 227, 1, 257, 0, 4, 227,
+       4, 257, 0, 4, 228, 1, 257, 0,
+       4, 228, 4, 257, 0, 4, 229, 1,
+       257, 0, 4, 229, 4, 257, 0, 4,
+       230, 1, 257, 0, 4, 230, 4, 257,
+       0, 4, 231, 1, 257, 0, 4, 231,
+       4, 257, 0, 4, 232, 1, 257, 0,
+       4, 232, 4, 257, 0, 4, 233, 1,
+       257, 0, 4, 233, 4, 257, 0, 4,
+       234, 1, 257, 0, 4, 234, 4, 257,
+       0, 4, 235, 1, 257, 0, 4, 235,
+       4, 257, 0, 4, 236, 1, 257, 0,
+       4, 236, 4, 257, 0, 4, 237, 1,
+       257, 0, 4, 237, 4, 257, 0, 4,
+       238, 1, 257, 0, 4, 238, 4, 257,
+       0, 4, 239, 1, 257, 0, 4, 239,
+       4, 257, 0, 4, 240, 1, 257, 0,
+       4, 240, 4, 257, 0, 4, 241, 1,
+       257, 0, 4, 241, 4, 257, 0, 4,
+       242, 1, 257, 0, 4, 242, 4, 257,
+       0, 4, 243, 1, 257, 0, 4, 243,
+       4, 257, 0, 4, 244, 1, 257, 0,
+       4, 244, 4, 257, 0, 4, 245, 1,
+       257, 0, 4, 245, 4, 257, 0, 4,
+       246, 1, 257, 0, 4, 246, 4, 257,
+       0, 4, 247, 1, 257, 0, 4, 247,
+       4, 257, 0, 4, 248, 1, 257, 0,
+       4, 248, 4, 257, 0, 4, 249, 1,
+       257, 0, 4, 249, 4, 257, 0, 4,
+       250, 1, 257, 0, 4, 250, 4, 257,
+       0, 4, 251, 1, 257, 0, 4, 251,
+       4, 257, 0, 4, 252, 1, 257, 0,
+       4, 252, 4, 257, 0, 4, 253, 1,
+       257, 0, 4, 253, 4, 257, 0, 4,
+       254, 1, 257, 0, 4, 254, 4, 257,
+       0, 4, 255, 1, 257, 0, 4, 255,
+       4, 257, 0, 4, 256, 1, 257, 0,
+       4, 256, 4, 257, 0, 4, 286, 1,
+       287, 0, 4, 286, 4, 287, 0, 4,
+       291, 1, 287, 0, 4, 291, 4, 287,
+       0, 4, 292, 28, 26, 69, 4, 305,
+       7, 358, 1, 4, 310, 303, 1, 305,
+       4, 310, 303, 2, 7, 4, 310, 303,
+       3, 7, 4, 310, 303, 4, 7, 4,
+       310, 303, 4, 305, 4, 311, 303, 1,
+       305, 4, 311, 303, 4, 305, 4, 312,
+       303, 1, 305, 4, 312, 303, 4, 305,
+       4, 313, 303, 1, 305, 4, 313, 303,
+       4, 305, 4, 314, 303, 1, 305, 4,
+       314, 303, 4, 305, 4, 315, 303, 1,
+       305, 4, 315, 303, 4, 305, 4, 316,
+       303, 1, 305, 4, 316, 303, 4, 305,
+       4, 317, 303, 1, 305, 4, 317, 303,
+       4, 305, 4, 318, 303, 1, 305, 4,
+       318, 303, 4, 305, 4, 319, 303, 1,
+       305, 4, 319, 303, 4, 305, 4, 320,
+       303, 1, 305, 4, 320, 303, 4, 305,
+       4, 321, 303, 1, 305, 4, 321, 303,
+       4, 305, 4, 322, 303, 1, 305, 4,
+       322, 303, 4, 305, 4, 323, 303, 1,
+       305, 4, 323, 303, 4, 305, 4, 324,
+       303, 1, 305, 4, 324, 303, 4, 305,
+       4, 325, 303, 1, 305, 4, 325, 303,
+       4, 305, 4, 326, 303, 1, 305, 4,
+       326, 303, 4, 305, 4, 327, 303, 1,
+       305, 4, 327, 303, 4, 305, 4, 328,
+       303, 1, 305, 4, 328, 303, 4, 305,
+       4, 329, 303, 1, 305, 4, 329, 303,
+       4, 305, 4, 330, 303, 1, 305, 4,
+       330, 303, 4, 305, 4, 331, 303, 1,
+       305, 4, 331, 303, 4, 305, 4, 332,
+       303, 1, 305, 4, 332, 303, 4, 305,
+       4, 333, 303, 1, 305, 4, 333, 303,
+       4, 305, 4, 334, 303, 1, 305, 4,
+       334, 303, 4, 305, 4, 335, 303, 1,
+       305, 4, 335, 303, 4, 305, 4, 336,
+       303, 1, 305, 4, 336, 303, 4, 305,
+       4, 337, 303, 1, 305, 4, 337, 303,
+       4, 305, 4, 338, 303, 1, 305, 4,
+       338, 303, 4, 305, 4, 339, 303, 1,
+       305, 4, 339, 303, 4, 305, 4, 340,
+       303, 1, 305, 4, 340, 303, 4, 305,
+       4, 341, 303, 1, 305, 4, 341, 303,
+       4, 305, 4, 342, 303, 1, 305, 4,
+       342, 303, 4, 305, 4, 343, 303, 1,
+       305, 4, 343, 303, 4, 305, 4, 344,
+       303, 1, 305, 4, 344, 303, 4, 305,
+       4, 345, 303, 1, 305, 4, 345, 303,
+       4, 305, 4, 346, 303, 1, 305, 4,
+       346, 303, 4, 305, 4, 347, 303, 1,
+       305, 4, 347, 303, 4, 305, 4, 348,
+       303, 1, 305, 4, 348, 303, 4, 305,
+       4, 349, 303, 1, 305, 4, 349, 303,
+       4, 305, 4, 350, 303, 1, 305, 4,
+       350, 303, 4, 305, 4, 351, 303, 1,
+       305, 4, 351, 303, 4, 305, 4, 352,
+       303, 1, 305, 4, 352, 303, 4, 305,
+       4, 353, 303, 1, 305, 4, 353, 303,
+       4, 305, 4, 354, 303, 1, 305, 4,
+       354, 303, 4, 305, 4, 355, 303, 1,
+       305, 4, 355, 303, 4, 305, 4, 356,
+       303, 1, 305, 4, 356, 303, 4, 305,
+       4, 357, 303, 1, 305, 4, 357, 303,
+       4, 305, 5, 20, 7, 76, 0, 1,
+       5, 27, 293, 29, 291, 1, 5, 27,
+       293, 29, 291, 2, 5, 27, 293, 29,
+       291, 3, 5, 27, 293, 29, 291, 4,
+       5, 29, 291, 1, 287, 0, 5, 29,
+       291, 4, 287, 0, 5, 29, 295, 291,
+       287, 0, 5, 31, 1, 93, 7, 358,
+       5, 31, 1, 310, 303, 305, 5, 31,
+       2, 310, 303, 7, 5, 31, 3, 310,
+       303, 7, 5, 31, 4, 310, 303, 7,
+       5, 31, 4, 310, 303, 305, 5, 33,
+       38, 309, 304, 8, 5, 37, 36, 305,
+       30, 25, 5, 40, 42, 266, 274, 0,
+       5, 40, 42, 267, 274, 0, 5, 40,
+       42, 268, 274, 0, 5, 40, 42, 269,
+       274, 0, 5, 42, 266, 1, 274, 0,
+       5, 42, 266, 4, 274, 0, 5, 42,
+       267, 1, 274, 0, 5, 42, 267, 4,
+       274, 0, 5, 42, 268, 1, 274, 0,
+       5, 42, 268, 4, 274, 0, 5, 42,
+       269, 1, 274, 0, 5, 42, 269, 4,
+       274, 0, 5, 46, 145, 291, 287, 0,
+       5, 46, 291, 1, 287, 0, 5, 46,
+       291, 4, 287, 0, 5, 50, 38, 309,
+       304, 8, 5, 56, 7, 72, 0, 1,
+       5, 80, 7, 85, 0, 1, 5, 90,
+       91, 305, 30, 25, 5, 97, 98, 29,
+       291, 1, 5, 97, 98, 29, 291, 2,
+       5, 97, 98, 29, 291, 3, 5, 97,
+       98, 29, 291, 4, 5, 99, 100, 29,
+       291, 1, 5, 99, 100, 29, 291, 2,
+       5, 99, 100, 29, 291, 3, 5, 99,
+       100, 29, 291, 4, 5, 147, 145, 291,
+       287, 0, 5, 153, 145, 291, 287, 0,
        5, 272, 43, 39, 37, 36, 5, 310,
        303, 1, 7, 358, 5, 310, 303, 4,
        305, 7, 5, 310, 303, 305, 7, 4,
@@ -884,16 +888,17 @@ static const short _zone_scanner_actions[] = {
        97, 98, 29, 291, 287, 0, 6, 99,
        100, 29, 291, 287, 0, 6, 147, 145,
        291, 1, 287, 0, 6, 147, 145, 291,
-       4, 287, 0, 6, 310, 303, 1, 305,
-       7, 358, 6, 310, 303, 305, 7, 358,
-       1, 7, 27, 293, 29, 291, 1, 287,
-       0, 7, 27, 293, 29, 291, 4, 287,
-       0, 7, 31, 1, 310, 303, 305, 7,
-       358, 7, 97, 98, 29, 291, 1, 287,
-       0, 7, 97, 98, 29, 291, 4, 287,
-       0, 7, 99, 100, 29, 291, 1, 287,
-       0, 7, 99, 100, 29, 291, 4, 287,
-       0
+       4, 287, 0, 6, 153, 145, 291, 1,
+       287, 0, 6, 153, 145, 291, 4, 287,
+       0, 6, 310, 303, 1, 305, 7, 358,
+       6, 310, 303, 305, 7, 358, 1, 7,
+       27, 293, 29, 291, 1, 287, 0, 7,
+       27, 293, 29, 291, 4, 287, 0, 7,
+       31, 1, 310, 303, 305, 7, 358, 7,
+       97, 98, 29, 291, 1, 287, 0, 7,
+       97, 98, 29, 291, 4, 287, 0, 7,
+       99, 100, 29, 291, 1, 287, 0, 7,
+       99, 100, 29, 291, 4, 287, 0
 };
 
 static const short _zone_scanner_cond_offsets[] = {
@@ -972,118 +977,121 @@ static const short _zone_scanner_cond_offsets[] = {
        597, 597, 597, 597, 597, 597, 597, 597,
        597, 597, 597, 597, 597, 597, 597, 597,
        597, 597, 597, 597, 597, 597, 597, 597,
-       597, 597, 597, 597, 599, 601, 601, 601,
-       601, 601, 601, 603, 606, 606, 606, 606,
-       606, 606, 606, 606, 606, 606, 608, 608,
-       608, 608, 608, 610, 610, 610, 610, 610,
-       610, 610, 610, 610, 610, 610, 610, 610,
-       610, 612, 612, 612, 612, 612, 612, 612,
-       612, 612, 612, 612, 614, 614, 614, 614,
-       614, 616, 616, 618, 618, 618, 618, 618,
-       618, 618, 618, 618, 618, 618, 618, 618,
-       618, 620, 620, 620, 620, 620, 620, 620,
+       597, 597, 597, 597, 597, 597, 597, 597,
+       597, 597, 597, 597, 597, 597, 597, 597,
+       599, 601, 601, 601, 601, 601, 601, 603,
+       606, 606, 606, 606, 606, 606, 606, 606,
+       606, 608, 610, 610, 612, 612, 612, 612,
+       612, 612, 612, 612, 612, 612, 612, 612,
+       612, 612, 614, 614, 614, 614, 614, 614,
+       614, 614, 614, 614, 614, 614, 614, 614,
+       616, 616, 616, 616, 616, 616, 616, 616,
+       616, 616, 616, 618, 618, 618, 618, 618,
        620, 620, 620, 620, 620, 620, 620, 620,
-       620, 622, 622, 622, 622, 622, 622, 622,
-       622, 624, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 626, 626, 626, 626, 626, 626,
-       626, 626, 628, 630, 632, 634, 636, 638,
-       640, 642, 644, 646, 648, 650, 650, 650,
-       650, 650, 653, 655, 655, 657, 660, 662,
-       662, 664, 667, 669, 669, 671, 674, 677,
-       680, 680, 682, 684, 684, 687, 687, 689,
-       691, 691, 694, 694, 696, 698, 698, 701,
-       701, 703, 705, 708, 708, 708, 708, 710,
-       712, 714, 716, 718, 720, 722, 724, 726,
-       728, 730, 732, 734, 736, 738, 740, 740,
-       742, 744, 746, 748, 750, 752, 754, 756,
-       759, 761, 763, 766, 768, 770, 772, 775,
-       777, 779, 781, 784, 786, 788, 790, 793,
-       795, 798, 800, 802, 805, 808, 811, 813,
-       816, 818, 820, 823, 826, 826, 828, 830,
-       832, 834, 836, 838, 838, 841, 844, 847,
-       847, 849, 851, 853, 855, 857, 859, 861,
-       863, 865, 867, 867, 870, 873, 876, 879,
-       882, 882, 884, 886, 888, 890, 892, 894,
-       896, 899, 902, 905, 907, 907, 907, 907,
-       907, 907, 909, 912, 912, 912, 912, 912,
-       914, 916, 918, 920, 922, 924, 924, 926,
-       929, 932, 935, 938, 938, 940, 942, 944,
-       946, 946, 948, 951, 954, 957, 957, 959,
-       961, 963, 965, 967, 969, 975, 986, 988,
-       991, 997, 1000, 1011, 1014, 1017, 1020, 1022,
-       1024, 1026, 1028, 1034, 1037, 1040, 1042, 1044,
-       1046, 1048, 1054, 1057, 1060, 1062, 1064, 1066,
-       1068, 1074, 1077, 1080, 1083, 1083, 1085, 1087,
-       1089, 1091, 1093, 1095, 1097, 1099, 1101, 1103,
-       1105, 1107, 1109, 1111, 1113, 1115, 1117, 1120,
-       1123, 1126, 1129, 1132, 1135, 1138, 1141, 1141,
-       1141, 1143, 1143, 1143, 1143, 1145, 1145, 1147,
-       1147, 1147, 1149, 1149, 1149, 1149, 1149, 1149,
-       1151, 1153, 1153, 1153, 1155, 1155, 1155, 1155,
-       1157, 1157, 1157, 1157, 1159, 1159, 1159, 1159,
-       1159, 1161, 1161, 1161, 1161, 1163, 1163, 1163,
-       1163, 1165, 1167, 1167, 1167, 1167, 1167, 1169,
-       1169, 1171, 1171, 1171, 1171, 1171, 1173, 1173,
-       1173, 1173, 1175, 1175, 1175, 1175, 1175, 1175,
-       1175, 1175, 1177, 1177, 1177, 1179, 1181, 1181,
-       1181, 1183, 1183, 1185, 1185, 1187, 1189, 1189,
-       1189, 1189, 1189, 1191, 1193, 1193, 1193, 1193,
-       1193, 1195, 1195, 1197, 1199, 1199, 1201, 1203,
-       1203, 1203, 1203, 1203, 1205, 1205, 1205, 1205,
-       1205, 1205, 1205, 1205, 1205, 1205, 1207, 1207,
-       1207, 1209, 1209, 1211, 1211, 1211, 1211, 1213,
-       1215, 1215, 1215, 1215, 1215, 1215, 1217, 1217,
-       1219, 1219, 1221, 1221, 1223, 1223, 1223, 1223,
-       1225, 1225, 1225, 1227, 1227, 1227, 1227, 1229,
-       1229, 1231, 1231, 1231, 1231, 1233, 1233, 1233,
-       1235, 1235, 1235, 1235, 1235, 1235, 1237, 1237,
-       1237, 1237, 1237, 1239, 1241, 1243, 1245, 1247,
-       1249, 1251, 1254, 1257, 1260, 1260, 1262, 1262,
-       1264, 1266, 1268, 1270, 1272, 1274, 1276, 1278,
-       1278, 1278, 1278, 1278, 1278, 1278, 1278, 1278,
-       1278, 1278, 1278, 1278, 1278, 1278, 1281, 1281,
-       1283, 1286, 1289, 1292, 1292, 1294, 1296, 1298,
-       1300, 1302, 1304, 1304, 1304, 1304, 1307, 1310,
-       1313, 1313, 1315, 1317, 1319, 1321, 1323, 1325,
-       1325, 1327, 1330, 1333, 1336, 1339, 1339, 1341,
-       1343, 1343, 1343, 1346, 1346, 1348, 1350, 1352,
-       1354, 1356, 1358, 1358, 1360, 1363, 1366, 1369,
-       1372, 1372, 1374, 1376, 1376, 1379, 1379, 1381,
-       1383, 1383, 1383, 1383, 1383, 1383, 1383, 1383,
-       1383, 1383, 1386, 1386, 1386, 1386, 1386, 1386,
-       1386, 1386, 1386, 1386, 1386, 1386, 1386, 1386,
-       1388, 1390, 1392, 1394, 1394, 1397, 1400, 1400,
-       1402, 1404, 1406, 1408, 1408, 1411, 1414, 1414,
-       1416, 1418, 1418, 1418, 1421, 1423, 1425, 1427,
-       1429, 1431, 1433, 1435, 1437, 1439, 1441, 1441,
-       1441, 1441, 1441, 1441, 1441, 1441, 1441, 1443,
-       1443, 1445, 1448, 1448, 1450, 1453, 1453, 1455,
-       1458, 1460, 1460, 1462, 1465, 1468, 1468, 1468,
-       1470, 1473, 1473, 1473, 1473, 1473, 1473, 1473,
-       1473, 1473, 1473, 1475, 1478, 1478, 1478, 1480,
-       1483, 1485, 1488, 1490, 1493, 1495, 1498, 1498,
-       1498, 1498, 1498, 1500, 1503, 1503, 1505, 1508,
-       1508, 1510, 1513, 1513, 1519, 1522, 1533, 1536,
-       1547, 1550, 1550, 1550, 1550, 1550, 1550, 1550,
-       1550, 1552, 1555, 1555, 1555, 1557, 1560, 1560,
-       1560, 1560, 1560, 1560, 1560
+       620, 620, 620, 620, 620, 620, 620, 622,
+       622, 622, 622, 622, 622, 622, 622, 622,
+       622, 622, 622, 622, 622, 622, 622, 624,
+       624, 624, 624, 624, 626, 626, 626, 626,
+       626, 626, 626, 626, 628, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 630, 630, 630,
+       630, 630, 630, 630, 630, 632, 634, 636,
+       638, 640, 642, 644, 646, 648, 650, 652,
+       654, 654, 654, 654, 654, 657, 659, 659,
+       661, 664, 666, 666, 668, 671, 673, 673,
+       675, 678, 681, 684, 684, 686, 688, 688,
+       691, 691, 693, 695, 695, 698, 698, 700,
+       702, 702, 705, 705, 707, 709, 712, 712,
+       712, 712, 714, 716, 718, 720, 722, 724,
+       726, 728, 730, 732, 734, 736, 738, 740,
+       742, 744, 744, 746, 748, 750, 752, 754,
+       756, 758, 760, 763, 765, 767, 770, 772,
+       774, 776, 779, 781, 783, 785, 788, 790,
+       792, 794, 797, 799, 802, 804, 806, 809,
+       812, 815, 817, 820, 822, 824, 827, 830,
+       830, 832, 834, 836, 838, 840, 842, 842,
+       845, 848, 851, 851, 853, 855, 857, 859,
+       861, 863, 865, 867, 869, 871, 871, 874,
+       877, 880, 883, 886, 886, 888, 890, 892,
+       894, 896, 898, 900, 903, 906, 909, 911,
+       911, 911, 911, 911, 911, 913, 916, 916,
+       916, 916, 916, 918, 920, 922, 924, 926,
+       928, 928, 930, 933, 936, 939, 942, 942,
+       944, 946, 948, 950, 950, 952, 955, 958,
+       961, 961, 963, 965, 967, 969, 971, 973,
+       979, 990, 992, 995, 1001, 1004, 1015, 1018,
+       1021, 1024, 1026, 1028, 1030, 1032, 1038, 1041,
+       1044, 1046, 1048, 1050, 1052, 1058, 1061, 1064,
+       1066, 1068, 1070, 1072, 1078, 1081, 1084, 1087,
+       1087, 1089, 1091, 1093, 1095, 1097, 1099, 1101,
+       1103, 1105, 1107, 1109, 1111, 1113, 1115, 1117,
+       1119, 1121, 1124, 1127, 1130, 1133, 1136, 1139,
+       1142, 1145, 1145, 1145, 1147, 1147, 1147, 1147,
+       1149, 1149, 1151, 1151, 1151, 1153, 1153, 1153,
+       1153, 1153, 1153, 1155, 1157, 1157, 1157, 1159,
+       1159, 1159, 1159, 1161, 1161, 1161, 1161, 1163,
+       1163, 1163, 1163, 1163, 1165, 1165, 1165, 1165,
+       1167, 1167, 1167, 1167, 1169, 1171, 1171, 1171,
+       1171, 1171, 1173, 1173, 1175, 1175, 1175, 1175,
+       1175, 1177, 1177, 1177, 1177, 1179, 1179, 1179,
+       1179, 1179, 1179, 1179, 1179, 1181, 1181, 1181,
+       1183, 1185, 1185, 1185, 1187, 1187, 1189, 1189,
+       1191, 1193, 1193, 1193, 1193, 1193, 1195, 1197,
+       1197, 1197, 1197, 1197, 1199, 1199, 1201, 1203,
+       1203, 1205, 1207, 1207, 1207, 1207, 1207, 1209,
+       1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209,
+       1209, 1211, 1211, 1211, 1213, 1213, 1215, 1215,
+       1215, 1215, 1217, 1219, 1219, 1219, 1219, 1219,
+       1219, 1221, 1221, 1223, 1223, 1225, 1225, 1227,
+       1227, 1227, 1227, 1229, 1229, 1229, 1231, 1231,
+       1231, 1231, 1233, 1233, 1235, 1235, 1235, 1235,
+       1237, 1237, 1237, 1239, 1239, 1239, 1239, 1239,
+       1239, 1241, 1241, 1241, 1241, 1241, 1243, 1245,
+       1247, 1249, 1251, 1253, 1255, 1258, 1261, 1264,
+       1264, 1266, 1266, 1268, 1270, 1272, 1274, 1276,
+       1278, 1280, 1282, 1282, 1282, 1282, 1282, 1282,
+       1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282,
+       1282, 1285, 1285, 1287, 1290, 1293, 1296, 1296,
+       1298, 1300, 1302, 1304, 1306, 1308, 1308, 1308,
+       1308, 1311, 1314, 1317, 1317, 1319, 1321, 1323,
+       1325, 1327, 1329, 1329, 1331, 1334, 1337, 1340,
+       1343, 1343, 1345, 1347, 1347, 1347, 1350, 1350,
+       1352, 1354, 1356, 1358, 1360, 1362, 1362, 1364,
+       1367, 1370, 1373, 1376, 1376, 1378, 1380, 1380,
+       1383, 1383, 1385, 1387, 1387, 1387, 1387, 1387,
+       1387, 1387, 1387, 1387, 1387, 1390, 1390, 1390,
+       1390, 1390, 1390, 1390, 1390, 1390, 1390, 1390,
+       1390, 1390, 1390, 1392, 1394, 1396, 1398, 1398,
+       1401, 1404, 1404, 1406, 1408, 1410, 1412, 1412,
+       1415, 1418, 1418, 1420, 1422, 1422, 1422, 1425,
+       1427, 1429, 1431, 1433, 1435, 1437, 1439, 1441,
+       1443, 1445, 1445, 1445, 1445, 1445, 1445, 1445,
+       1445, 1445, 1447, 1447, 1449, 1452, 1452, 1454,
+       1457, 1457, 1459, 1462, 1464, 1464, 1466, 1469,
+       1472, 1472, 1472, 1474, 1477, 1477, 1477, 1477,
+       1477, 1477, 1477, 1477, 1477, 1477, 1479, 1482,
+       1482, 1482, 1484, 1487, 1489, 1492, 1494, 1497,
+       1499, 1502, 1502, 1502, 1502, 1502, 1504, 1507,
+       1507, 1509, 1512, 1512, 1514, 1517, 1517, 1523,
+       1526, 1537, 1540, 1551, 1554, 1554, 1554, 1554,
+       1554, 1554, 1554, 1554, 1556, 1559, 1559, 1559,
+       1561, 1564, 1564, 1564, 1564, 1564, 1564, 1564
 };
 
 static const char _zone_scanner_cond_lengths[] = {
@@ -1162,22 +1170,22 @@ static const char _zone_scanner_cond_lengths[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 2, 2, 0, 0, 0,
-       0, 0, 2, 3, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 2, 0, 0,
-       0, 0, 2, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       2, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 2, 0, 0, 0, 0,
-       2, 0, 2, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 2,
+       2, 0, 0, 0, 0, 0, 2, 3,
        0, 0, 0, 0, 0, 0, 0, 0,
-       2, 0, 0, 0, 0, 0, 0, 0,
+       2, 2, 0, 2, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       2, 0, 0, 0, 0, 0, 0, 0,
-       2, 2, 0, 0, 0, 0, 0, 0,
+       0, 2, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 2,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 2, 0, 0, 0, 0, 2,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 2, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 2, 0,
+       0, 0, 0, 2, 0, 0, 0, 0,
+       0, 0, 0, 2, 2, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
@@ -1193,87 +1201,90 @@ static const char _zone_scanner_cond_lengths[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 2, 2, 2, 2, 2, 2, 2,
-       2, 2, 2, 2, 2, 0, 0, 0,
-       0, 3, 2, 0, 2, 3, 2, 0,
-       2, 3, 2, 0, 2, 3, 3, 3,
-       0, 2, 2, 0, 3, 0, 2, 2,
-       0, 3, 0, 2, 2, 0, 3, 0,
-       2, 2, 3, 0, 0, 0, 2, 2,
-       2, 2, 2, 2, 2, 2, 2, 2,
-       2, 2, 2, 2, 2, 2, 0, 2,
-       2, 2, 2, 2, 2, 2, 2, 3,
-       2, 2, 3, 2, 2, 2, 3, 2,
-       2, 2, 3, 2, 2, 2, 3, 2,
-       3, 2, 2, 3, 3, 3, 2, 3,
-       2, 2, 3, 3, 0, 2, 2, 2,
-       2, 2, 2, 0, 3, 3, 3, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 2, 2, 2, 2,
        2, 2, 2, 2, 2, 2, 2, 2,
-       2, 2, 0, 3, 3, 3, 3, 3,
+       0, 0, 0, 0, 3, 2, 0, 2,
+       3, 2, 0, 2, 3, 2, 0, 2,
+       3, 3, 3, 0, 2, 2, 0, 3,
+       0, 2, 2, 0, 3, 0, 2, 2,
+       0, 3, 0, 2, 2, 3, 0, 0,
        0, 2, 2, 2, 2, 2, 2, 2,
-       3, 3, 3, 2, 0, 0, 0, 0,
-       0, 2, 3, 0, 0, 0, 0, 2,
-       2, 2, 2, 2, 2, 0, 2, 3,
+       2, 2, 2, 2, 2, 2, 2, 2,
+       2, 0, 2, 2, 2, 2, 2, 2,
+       2, 2, 3, 2, 2, 3, 2, 2,
+       2, 3, 2, 2, 2, 3, 2, 2,
+       2, 3, 2, 3, 2, 2, 3, 3,
+       3, 2, 3, 2, 2, 3, 3, 0,
+       2, 2, 2, 2, 2, 2, 0, 3,
+       3, 3, 0, 2, 2, 2, 2, 2,
+       2, 2, 2, 2, 2, 0, 3, 3,
        3, 3, 3, 0, 2, 2, 2, 2,
-       0, 2, 3, 3, 3, 0, 2, 2,
-       2, 2, 2, 2, 6, 11, 2, 3,
-       6, 3, 11, 3, 3, 3, 2, 2,
-       2, 2, 6, 3, 3, 2, 2, 2,
-       2, 6, 3, 3, 2, 2, 2, 2,
-       6, 3, 3, 3, 0, 2, 2, 2,
+       2, 2, 2, 3, 3, 3, 2, 0,
+       0, 0, 0, 0, 2, 3, 0, 0,
+       0, 0, 2, 2, 2, 2, 2, 2,
+       0, 2, 3, 3, 3, 3, 0, 2,
+       2, 2, 2, 0, 2, 3, 3, 3,
+       0, 2, 2, 2, 2, 2, 2, 6,
+       11, 2, 3, 6, 3, 11, 3, 3,
+       3, 2, 2, 2, 2, 6, 3, 3,
+       2, 2, 2, 2, 6, 3, 3, 2,
+       2, 2, 2, 6, 3, 3, 3, 0,
        2, 2, 2, 2, 2, 2, 2, 2,
-       2, 2, 2, 2, 2, 2, 3, 3,
-       3, 3, 3, 3, 3, 3, 0, 0,
-       2, 0, 0, 0, 2, 0, 2, 0,
-       0, 2, 0, 0, 0, 0, 0, 2,
-       2, 0, 0, 2, 0, 0, 0, 2,
-       0, 0, 0, 2, 0, 0, 0, 0,
+       2, 2, 2, 2, 2, 2, 2, 2,
+       2, 3, 3, 3, 3, 3, 3, 3,
+       3, 0, 0, 2, 0, 0, 0, 2,
+       0, 2, 0, 0, 2, 0, 0, 0,
+       0, 0, 2, 2, 0, 0, 2, 0,
+       0, 0, 2, 0, 0, 0, 2, 0,
+       0, 0, 0, 2, 0, 0, 0, 2,
+       0, 0, 0, 2, 2, 0, 0, 0,
+       0, 2, 0, 2, 0, 0, 0, 0,
        2, 0, 0, 0, 2, 0, 0, 0,
+       0, 0, 0, 0, 2, 0, 0, 2,
+       2, 0, 0, 2, 0, 2, 0, 2,
+       2, 0, 0, 0, 0, 2, 2, 0,
+       0, 0, 0, 2, 0, 2, 2, 0,
        2, 2, 0, 0, 0, 0, 2, 0,
-       2, 0, 0, 0, 0, 2, 0, 0,
-       0, 2, 0, 0, 0, 0, 0, 0,
-       0, 2, 0, 0, 2, 2, 0, 0,
-       2, 0, 2, 0, 2, 2, 0, 0,
-       0, 0, 2, 2, 0, 0, 0, 0,
-       2, 0, 2, 2, 0, 2, 2, 0,
-       0, 0, 0, 2, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 2, 0, 0,
-       2, 0, 2, 0, 0, 0, 2, 2,
-       0, 0, 0, 0, 0, 2, 0, 2,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       2, 0, 0, 2, 0, 2, 0, 0,
+       0, 2, 2, 0, 0, 0, 0, 0,
+       2, 0, 2, 0, 2, 0, 2, 0,
+       0, 0, 2, 0, 0, 2, 0, 0,
        0, 2, 0, 2, 0, 0, 0, 2,
-       0, 0, 2, 0, 0, 0, 2, 0,
-       2, 0, 0, 0, 2, 0, 0, 2,
-       0, 0, 0, 0, 0, 2, 0, 0,
-       0, 0, 2, 2, 2, 2, 2, 2,
-       2, 3, 3, 3, 0, 2, 0, 2,
-       2, 2, 2, 2, 2, 2, 2, 0,
+       0, 0, 2, 0, 0, 0, 0, 0,
+       2, 0, 0, 0, 0, 2, 2, 2,
+       2, 2, 2, 2, 3, 3, 3, 0,
+       2, 0, 2, 2, 2, 2, 2, 2,
+       2, 2, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 3, 0, 2,
+       3, 0, 2, 3, 3, 3, 0, 2,
+       2, 2, 2, 2, 2, 0, 0, 0,
        3, 3, 3, 0, 2, 2, 2, 2,
-       2, 2, 0, 0, 0, 3, 3, 3,
-       0, 2, 2, 2, 2, 2, 2, 0,
-       2, 3, 3, 3, 3, 0, 2, 2,
-       0, 0, 3, 0, 2, 2, 2, 2,
        2, 2, 0, 2, 3, 3, 3, 3,
-       0, 2, 2, 0, 3, 0, 2, 2,
+       0, 2, 2, 0, 0, 3, 0, 2,
+       2, 2, 2, 2, 2, 0, 2, 3,
+       3, 3, 3, 0, 2, 2, 0, 3,
+       0, 2, 2, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 3, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 3, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 2,
-       2, 2, 2, 0, 3, 3, 0, 2,
-       2, 2, 2, 0, 3, 3, 0, 2,
-       2, 0, 0, 3, 2, 2, 2, 2,
-       2, 2, 2, 2, 2, 2, 0, 0,
-       0, 0, 0, 0, 0, 0, 2, 0,
-       2, 3, 0, 2, 3, 0, 2, 3,
-       2, 0, 2, 3, 3, 0, 0, 2,
-       3, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 2, 3, 0, 0, 2, 3,
-       2, 3, 2, 3, 2, 3, 0, 0,
-       0, 0, 2, 3, 0, 2, 3, 0,
-       2, 3, 0, 6, 3, 11, 3, 11,
-       3, 0, 0, 0, 0, 0, 0, 0,
-       2, 3, 0, 0, 2, 3, 0, 0,
-       0, 0, 0, 0, 0
+       0, 0, 2, 2, 2, 2, 0, 3,
+       3, 0, 2, 2, 2, 2, 0, 3,
+       3, 0, 2, 2, 0, 0, 3, 2,
+       2, 2, 2, 2, 2, 2, 2, 2,
+       2, 0, 0, 0, 0, 0, 0, 0,
+       0, 2, 0, 2, 3, 0, 2, 3,
+       0, 2, 3, 2, 0, 2, 3, 3,
+       0, 0, 2, 3, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 2, 3, 0,
+       0, 2, 3, 2, 3, 2, 3, 2,
+       3, 0, 0, 0, 0, 2, 3, 0,
+       2, 3, 0, 2, 3, 0, 6, 3,
+       11, 3, 11, 3, 0, 0, 0, 0,
+       0, 0, 0, 2, 3, 0, 0, 2,
+       3, 0, 0, 0, 0, 0, 0, 0
 };
 
 static const short _zone_scanner_cond_keys[] = {
@@ -1439,6 +1450,7 @@ static const short _zone_scanner_cond_keys[] = {
        10, 10, 59, 59, 10, 10, 59, 59,
        10, 10, 59, 59, 10, 10, 59, 59,
        10, 10, 59, 59, 10, 10, 59, 59,
+       10, 10, 59, 59, 10, 10, 59, 59,
        10, 10, 59, 59, -128, 9, 10, 10,
        11, 127, 10, 10, 59, 59, 10, 10,
        59, 59, -128, 9, 10, 10, 11, 127,
@@ -1749,8 +1761,7 @@ static const char _zone_scanner_cond_spaces[] = {
        7, 7, 7, 0, 0, 0, 7, 7,
        7, 7, 7, 7, 7, 7, 7, 7,
        7, 7, 7, 7, 7, 7, 7, 7,
-       7, 7, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
+       7, 7, 7, 7, 7, 7, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
@@ -1758,21 +1769,20 @@ static const char _zone_scanner_cond_spaces[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 7, 7, 7,
-       7, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 7, 7, 7, 7, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 7, 7, 7, 7,
-       7, 7, 7, 7, 7, 7, 7, 7,
-       7, 7, 7, 7, 0, 0, 0, 7,
-       7, 7, 7, 0, 0, 0, 7, 7,
-       7, 7, 7, 7, 0, 0, 0, 7,
-       7, 7, 7, 7, 7, 0, 0, 0,
-       7, 7, 7, 7, 7, 7, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       7, 7, 7, 7, 7, 7, 7, 7,
+       7, 7, 7, 7, 7, 7, 7, 7,
+       0, 0, 0, 7, 7, 7, 7, 0,
+       0, 0, 7, 7, 7, 7, 7, 7,
+       0, 0, 0, 7, 7, 7, 7, 7,
+       7, 0, 0, 0, 7, 7, 7, 7,
+       7, 7, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
@@ -1782,36 +1792,38 @@ static const char _zone_scanner_cond_spaces[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 1, 1,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 7, 7, 7, 7, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 7, 7, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 1, 1, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 7, 7, 7,
+       7, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 7, 7, 0, 0, 0, 0,
+       7, 7, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 7, 7,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 10, 13, 10, 10, 10, 13, 5,
-       8, 5, 5, 5, 5, 5, 5, 8,
-       5, 5, 1, 1, 8, 8, 8, 6,
-       11, 6, 6, 6, 11, 9, 9, 9,
-       10, 13, 10, 10, 10, 5, 5, 5,
-       13, 5, 5, 12, 12, 12, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 10, 13, 10, 10,
-       10, 13, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 10, 13, 10,
+       10, 10, 13, 5, 8, 5, 5, 5,
+       5, 5, 5, 8, 5, 5, 1, 1,
+       8, 8, 8, 6, 11, 6, 6, 6,
+       11, 9, 9, 9, 10, 13, 10, 10,
+       10, 5, 5, 5, 13, 5, 5, 12,
+       12, 12, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        10, 13, 10, 10, 10, 13, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 10, 13, 10, 10,
        10, 13, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       10, 13, 10, 10, 10, 13, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 1, 1, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 1,
+       1, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
@@ -1827,20 +1839,21 @@ static const char _zone_scanner_cond_spaces[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 1, 1, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 1, 1, 0, 0,
+       0, 0, 0, 0, 0, 1, 1, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       1, 1, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 7, 7, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 7, 7, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 7, 7,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 7, 7, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
@@ -1848,25 +1861,24 @@ static const char _zone_scanner_cond_spaces[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 7,
-       7, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 7, 7, 7, 7, 7,
-       7, 0, 0, 7, 7, 0, 0, 0,
-       7, 7, 0, 0, 0, 7, 7, 0,
-       0, 0, 0, 0, 7, 7, 0, 0,
-       0, 0, 0, 0, 7, 7, 0, 0,
-       0, 7, 7, 0, 0, 0, 7, 7,
        0, 0, 0, 7, 7, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 7,
+       7, 7, 7, 7, 7, 0, 0, 7,
+       7, 0, 0, 0, 7, 7, 0, 0,
+       0, 7, 7, 0, 0, 0, 0, 0,
+       7, 7, 0, 0, 0, 0, 0, 0,
        7, 7, 0, 0, 0, 7, 7, 0,
        0, 0, 7, 7, 0, 0, 0, 7,
        7, 0, 0, 0, 7, 7, 0, 0,
-       0, 6, 11, 6, 6, 6, 11, 9,
-       9, 9, 5, 8, 5, 5, 5, 5,
-       5, 5, 8, 5, 5, 8, 8, 8,
-       10, 13, 10, 10, 10, 5, 5, 5,
-       13, 5, 5, 12, 12, 12, 7, 7,
+       0, 7, 7, 0, 0, 0, 7, 7,
        0, 0, 0, 7, 7, 0, 0, 0,
-       0
+       7, 7, 0, 0, 0, 6, 11, 6,
+       6, 6, 11, 9, 9, 9, 5, 8,
+       5, 5, 5, 5, 5, 5, 8, 5,
+       5, 8, 8, 8, 10, 13, 10, 10,
+       10, 5, 5, 5, 13, 5, 5, 12,
+       12, 12, 7, 7, 0, 0, 0, 7,
+       7, 0, 0, 0, 0
 };
 
 static const short _zone_scanner_key_offsets[] = {
@@ -1940,123 +1952,126 @@ static const short _zone_scanner_key_offsets[] = {
        4146, 4148, 4158, 4160, 4170, 4176, 4184, 4192,
        4204, 4210, 4226, 4229, 4232, 4235, 4241, 4250,
        4260, 4272, 4278, 4294, 4297, 4300, 4308, 4311,
-       4317, 4318, 4319, 4320, 4328, 4329, 4330, 4338,
-       4339, 4340, 4342, 4343, 4344, 4345, 4346, 4354,
-       4355, 4356, 4357, 4358, 4366, 4367, 4368, 4370,
-       4380, 4381, 4382, 4383, 4384, 4385, 4386, 4387,
-       4388, 4389, 4390, 4391, 4392, 4393, 4394, 4402,
-       4403, 4404, 4405, 4413, 4423, 4440, 4441, 4442,
-       4443, 4444, 4451, 4461, 4464, 4465, 4466, 4467,
-       4475, 4482, 4489, 4497, 4505, 4513, 4523, 4524,
-       4531, 4539, 4547, 4564, 4565, 4566, 4567, 4569,
-       4570, 4571, 4572, 4573, 4574, 4578, 4581, 4586,
-       4589, 4603, 4606, 4607, 4608, 4609, 4610, 4611,
-       4619, 4626, 4635, 4642, 4660, 4667, 4668, 4669,
-       4671, 4684, 4690, 4700, 4701, 4702, 4703, 4704,
-       4705, 4706, 4707, 4708, 4709, 4714, 4718, 4720,
-       4724, 4735, 4739, 4740, 4741, 4742, 4743, 4744,
-       4745, 4746, 4747, 4748, 4749, 4750, 4751, 4752,
-       4753, 4763, 4764, 4765, 4766, 4767, 4770, 4772,
-       4775, 4787, 4803, 4804, 4816, 4824, 4828, 4834,
-       4836, 4843, 4845, 4847, 4849, 4851, 4852, 4853,
-       4855, 4857, 4859, 4860, 4866, 4870, 4874, 4875,
-       4877, 4879, 4881, 4883, 4889, 4891, 4893, 4895,
-       4897, 4898, 4899, 4901, 4903, 4905, 4906, 4907,
-       4908, 4914, 4915, 4916, 4918, 4920, 4922, 4923,
-       4924, 4925, 4931, 4933, 4934, 4935, 4936, 4937,
-       4943, 4944, 4945, 4951, 4953, 4955, 4957, 4959,
-       4961, 4963, 4965, 4971, 4973, 4975, 4977, 4979,
-       4981, 4983, 4987, 4989, 4991, 4997, 4999, 5001,
-       5007, 5009, 5011, 5015, 5017, 5018, 5024, 5026,
-       5028, 5031, 5038, 5040, 5042, 5044, 5046, 5047,
-       5048, 5050, 5052, 5054, 5055, 5061, 5062, 5063,
-       5069, 5070, 5071, 5077, 5091, 5099, 5101, 5103,
-       5105, 5107, 5109, 5115, 5121, 5123, 5125, 5127,
-       5129, 5131, 5137, 5141, 5143, 5149, 5151, 5153,
-       5159, 5161, 5163, 5165, 5171, 5173, 5175, 5181,
-       5185, 5187, 5193, 5195, 5197, 5203, 5205, 5207,
-       5209, 5215, 5217, 5219, 5225, 5228, 5237, 5246,
-       5252, 5261, 5267, 5282, 5288, 5296, 5304, 5312,
-       5330, 5338, 5356, 5364, 5382, 5390, 5408, 5416,
-       5428, 5436, 5439, 5447, 5459, 5467, 5470, 5478,
-       5490, 5498, 5501, 5509, 5521, 5529, 5532, 5535,
-       5538, 5544, 5550, 5562, 5568, 5571, 5580, 5586,
-       5601, 5607, 5610, 5612, 5620, 5635, 5641, 5644,
-       5650, 5660, 5676, 5679, 5686, 5699, 5701, 5709,
-       5719, 5727, 5737, 5746, 5754, 5760, 5768, 5776,
-       5786, 5794, 5804, 5813, 5821, 5827, 5836, 5838,
-       5852, 5864, 5878, 5890, 5904, 5916, 5930, 5940,
-       5943, 5956, 5969, 5972, 5985, 5998, 6008, 6011,
-       6024, 6037, 6047, 6050, 6063, 6076, 6086, 6089,
-       6095, 6098, 6106, 6114, 6117, 6120, 6123, 6129,
-       6132, 6140, 6148, 6151, 6154, 6156, 6164, 6172,
-       6180, 6188, 6196, 6211, 6217, 6220, 6223, 6226,
-       6228, 6236, 6244, 6252, 6264, 6270, 6282, 6288,
-       6300, 6306, 6321, 6327, 6330, 6333, 6336, 6339,
-       6342, 6348, 6354, 6362, 6370, 6382, 6388, 6401,
-       6403, 6406, 6409, 6412, 6425, 6427, 6428, 6431,
-       6434, 6436, 6448, 6451, 6452, 6459, 6466, 6468,
-       6476, 6488, 6494, 6502, 6510, 6522, 6528, 6544,
-       6547, 6550, 6553, 6556, 6558, 6566, 6574, 6582,
-       6594, 6600, 6616, 6619, 6622, 6625, 6627, 6635,
-       6645, 6651, 6659, 6667, 6674, 6708, 6721, 6723,
-       6726, 6740, 6743, 6784, 6793, 6796, 6799, 6805,
-       6813, 6821, 6830, 6867, 6870, 6873, 6879, 6887,
-       6895, 6908, 6949, 6952, 6955, 6961, 6969, 6977,
-       6992, 7026, 7029, 7032, 7035, 7069, 7081, 7093,
-       7099, 7107, 7115, 7123, 7131, 7139, 7147, 7155,
-       7163, 7171, 7179, 7194, 7200, 7213, 7215, 7218,
-       7221, 7224, 7227, 7230, 7233, 7236, 7239, 7241,
-       7243, 7249, 7251, 7253, 7255, 7261, 7263, 7269,
-       7279, 7281, 7287, 7291, 7293, 7295, 7297, 7299,
-       7305, 7311, 7313, 7315, 7321, 7323, 7325, 7327,
-       7333, 7335, 7337, 7339, 7345, 7351, 7353, 7355,
-       7357, 7363, 7367, 7369, 7371, 7377, 7379, 7381,
-       7383, 7389, 7395, 7397, 7399, 7401, 7402, 7408,
-       7409, 7415, 7419, 7421, 7423, 7425, 7431, 7433,
-       7435, 7437, 7443, 7445, 7447, 7449, 7451, 7453,
-       7455, 7457, 7463, 7467, 7469, 7475, 7481, 7487,
-       7488, 7494, 7495, 7501, 7503, 7509, 7515, 7519,
-       7521, 7523, 7525, 7531, 7537, 7543, 7545, 7547,
-       7549, 7555, 7557, 7563, 7571, 7573, 7580, 7588,
-       7590, 7592, 7594, 7596, 7602, 7604, 7606, 7608,
-       7610, 7612, 7614, 7616, 7618, 7620, 7626, 7628,
-       7630, 7636, 7642, 7648, 7650, 7652, 7654, 7660,
-       7666, 7678, 7680, 7682, 7684, 7686, 7692, 7694,
-       7700, 7702, 7708, 7710, 7716, 7718, 7720, 7722,
-       7728, 7730, 7732, 7738, 7744, 7746, 7748, 7754,
-       7756, 7762, 7764, 7766, 7768, 7776, 7778, 7780,
-       7786, 7788, 7790, 7792, 7794, 7796, 7802, 7811,
-       7817, 7823, 7825, 7833, 7841, 7849, 7861, 7867,
-       7880, 7882, 7885, 7888, 7891, 7898, 7900, 7902,
-       7910, 7918, 7926, 7934, 7942, 7955, 7961, 7973,
-       7979, 7986, 7992, 7999, 8006, 8012, 8019, 8031,
-       8037, 8038, 8039, 8040, 8041, 8042, 8045, 8051,
-       8063, 8066, 8069, 8072, 8074, 8082, 8090, 8098,
-       8106, 8114, 8127, 8133, 8139, 8151, 8154, 8157,
-       8160, 8162, 8170, 8178, 8186, 8194, 8202, 8214,
-       8220, 8236, 8239, 8242, 8245, 8248, 8250, 8258,
-       8266, 8274, 8280, 8283, 8285, 8293, 8301, 8309,
-       8317, 8325, 8337, 8343, 8359, 8362, 8365, 8368,
-       8371, 8373, 8381, 8390, 8399, 8402, 8404, 8412,
-       8424, 8430, 8436, 8442, 8443, 8449, 8455, 8461,
-       8467, 8474, 8477, 8483, 8489, 8490, 8496, 8502,
-       8509, 8515, 8521, 8522, 8528, 8534, 8541, 8543,
-       8551, 8559, 8567, 8579, 8585, 8588, 8591, 8593,
-       8601, 8613, 8619, 8631, 8637, 8640, 8643, 8645,
-       8653, 8668, 8674, 8680, 8683, 8701, 8734, 8786,
-       8840, 8858, 8912, 8930, 8963, 9032, 9101, 9101,
-       9101, 9101, 9101, 9113, 9113, 9113, 9113, 9129,
-       9129, 9146, 9149, 9149, 9193, 9196, 9196, 9212,
-       9215, 9227, 9227, 9243, 9246, 9249, 9249, 9249,
-       9266, 9269, 9269, 9269, 9269, 9269, 9269, 9269,
-       9269, 9269, 9269, 9285, 9288, 9288, 9288, 9298,
-       9301, 9313, 9316, 9328, 9331, 9343, 9346, 9346,
-       9346, 9346, 9346, 9359, 9362, 9362, 9378, 9381,
-       9381, 9397, 9400, 9400, 9414, 9417, 9430, 9433,
-       9474, 9483, 9483, 9483, 9483, 9483, 9483, 9483,
-       9483, 9499, 9502, 9502, 9502, 9518, 9521, 9521,
-       9521, 9521, 9521, 9521, 9521
+       4319, 4320, 4321, 4322, 4330, 4331, 4332, 4333,
+       4334, 4335, 4336, 4344, 4345, 4346, 4354, 4355,
+       4356, 4358, 4359, 4360, 4361, 4362, 4370, 4371,
+       4372, 4373, 4374, 4382, 4383, 4384, 4386, 4396,
+       4397, 4398, 4399, 4400, 4401, 4402, 4403, 4404,
+       4405, 4406, 4407, 4408, 4409, 4410, 4418, 4419,
+       4420, 4421, 4422, 4430, 4431, 4432, 4433, 4441,
+       4451, 4470, 4471, 4472, 4473, 4474, 4481, 4491,
+       4494, 4495, 4496, 4497, 4498, 4499, 4500, 4501,
+       4508, 4518, 4534, 4535, 4545, 4546, 4547, 4548,
+       4556, 4563, 4570, 4578, 4586, 4594, 4595, 4602,
+       4610, 4618, 4635, 4636, 4637, 4638, 4640, 4641,
+       4642, 4643, 4644, 4645, 4649, 4652, 4657, 4660,
+       4674, 4677, 4678, 4679, 4680, 4681, 4682, 4690,
+       4697, 4706, 4713, 4731, 4738, 4739, 4740, 4742,
+       4755, 4761, 4762, 4763, 4764, 4765, 4766, 4767,
+       4768, 4769, 4770, 4775, 4779, 4781, 4785, 4796,
+       4800, 4801, 4802, 4803, 4804, 4805, 4806, 4807,
+       4808, 4809, 4810, 4811, 4812, 4813, 4814, 4824,
+       4825, 4826, 4827, 4828, 4838, 4839, 4840, 4841,
+       4842, 4845, 4847, 4850, 4862, 4878, 4879, 4891,
+       4899, 4903, 4909, 4911, 4918, 4920, 4922, 4924,
+       4926, 4927, 4928, 4930, 4932, 4934, 4935, 4941,
+       4945, 4949, 4950, 4952, 4954, 4956, 4958, 4964,
+       4966, 4968, 4970, 4972, 4973, 4974, 4976, 4978,
+       4980, 4981, 4982, 4983, 4989, 4990, 4991, 4993,
+       4995, 4997, 4998, 4999, 5000, 5006, 5008, 5009,
+       5010, 5011, 5012, 5018, 5019, 5020, 5026, 5028,
+       5030, 5032, 5034, 5036, 5038, 5040, 5046, 5048,
+       5050, 5052, 5054, 5056, 5058, 5062, 5064, 5066,
+       5072, 5074, 5076, 5082, 5084, 5086, 5090, 5092,
+       5093, 5099, 5101, 5103, 5106, 5113, 5115, 5117,
+       5119, 5121, 5122, 5123, 5125, 5127, 5129, 5130,
+       5136, 5137, 5138, 5144, 5145, 5146, 5152, 5166,
+       5174, 5176, 5178, 5180, 5182, 5184, 5190, 5196,
+       5198, 5200, 5202, 5204, 5206, 5212, 5216, 5218,
+       5224, 5226, 5228, 5234, 5236, 5238, 5240, 5246,
+       5248, 5250, 5256, 5260, 5262, 5268, 5270, 5272,
+       5278, 5280, 5282, 5284, 5290, 5292, 5294, 5300,
+       5303, 5312, 5321, 5327, 5336, 5342, 5357, 5363,
+       5371, 5379, 5387, 5405, 5413, 5431, 5439, 5457,
+       5465, 5483, 5491, 5503, 5511, 5514, 5522, 5534,
+       5542, 5545, 5553, 5565, 5573, 5576, 5584, 5596,
+       5604, 5607, 5610, 5613, 5619, 5625, 5637, 5643,
+       5646, 5655, 5661, 5676, 5682, 5685, 5687, 5695,
+       5710, 5716, 5719, 5725, 5735, 5751, 5754, 5761,
+       5774, 5776, 5784, 5794, 5802, 5812, 5821, 5829,
+       5835, 5843, 5851, 5861, 5869, 5879, 5888, 5896,
+       5902, 5911, 5913, 5927, 5939, 5953, 5965, 5979,
+       5991, 6005, 6015, 6018, 6031, 6044, 6047, 6060,
+       6073, 6083, 6086, 6099, 6112, 6122, 6125, 6138,
+       6151, 6161, 6164, 6170, 6173, 6181, 6189, 6192,
+       6195, 6198, 6204, 6207, 6215, 6223, 6226, 6229,
+       6231, 6239, 6247, 6255, 6263, 6271, 6286, 6292,
+       6295, 6298, 6301, 6303, 6311, 6319, 6327, 6339,
+       6345, 6357, 6363, 6375, 6381, 6396, 6402, 6405,
+       6408, 6411, 6414, 6417, 6423, 6429, 6437, 6445,
+       6457, 6463, 6476, 6478, 6481, 6484, 6487, 6500,
+       6502, 6503, 6506, 6509, 6511, 6523, 6526, 6527,
+       6534, 6541, 6543, 6551, 6563, 6569, 6577, 6585,
+       6597, 6603, 6619, 6622, 6625, 6628, 6631, 6633,
+       6641, 6649, 6657, 6669, 6675, 6691, 6694, 6697,
+       6700, 6702, 6710, 6720, 6726, 6734, 6742, 6749,
+       6783, 6796, 6798, 6801, 6815, 6818, 6859, 6868,
+       6871, 6874, 6880, 6888, 6896, 6905, 6942, 6945,
+       6948, 6954, 6962, 6970, 6983, 7024, 7027, 7030,
+       7036, 7044, 7052, 7067, 7101, 7104, 7107, 7110,
+       7144, 7156, 7168, 7174, 7182, 7190, 7198, 7206,
+       7214, 7222, 7230, 7238, 7246, 7254, 7269, 7275,
+       7288, 7290, 7293, 7296, 7299, 7302, 7305, 7308,
+       7311, 7314, 7316, 7318, 7324, 7326, 7328, 7330,
+       7336, 7338, 7344, 7354, 7356, 7362, 7366, 7368,
+       7370, 7372, 7374, 7380, 7386, 7388, 7390, 7396,
+       7398, 7400, 7402, 7408, 7410, 7412, 7414, 7420,
+       7426, 7428, 7430, 7432, 7438, 7442, 7444, 7446,
+       7452, 7454, 7456, 7458, 7464, 7470, 7472, 7474,
+       7476, 7477, 7483, 7484, 7490, 7494, 7496, 7498,
+       7500, 7506, 7508, 7510, 7512, 7518, 7520, 7522,
+       7524, 7526, 7528, 7530, 7532, 7538, 7542, 7544,
+       7550, 7556, 7562, 7563, 7569, 7570, 7576, 7578,
+       7584, 7590, 7594, 7596, 7598, 7600, 7606, 7612,
+       7618, 7620, 7622, 7624, 7630, 7632, 7638, 7646,
+       7648, 7655, 7663, 7665, 7667, 7669, 7671, 7677,
+       7679, 7681, 7683, 7685, 7687, 7689, 7691, 7693,
+       7695, 7701, 7703, 7705, 7711, 7717, 7723, 7725,
+       7727, 7729, 7735, 7741, 7753, 7755, 7757, 7759,
+       7761, 7767, 7769, 7775, 7777, 7783, 7785, 7791,
+       7793, 7795, 7797, 7803, 7805, 7807, 7813, 7819,
+       7821, 7823, 7829, 7831, 7837, 7839, 7841, 7843,
+       7851, 7853, 7855, 7861, 7863, 7865, 7867, 7869,
+       7871, 7877, 7886, 7892, 7898, 7900, 7908, 7916,
+       7924, 7936, 7942, 7955, 7957, 7960, 7963, 7966,
+       7973, 7975, 7977, 7985, 7993, 8001, 8009, 8017,
+       8030, 8036, 8048, 8054, 8061, 8067, 8074, 8081,
+       8087, 8094, 8106, 8112, 8113, 8114, 8115, 8116,
+       8117, 8120, 8126, 8138, 8141, 8144, 8147, 8149,
+       8157, 8165, 8173, 8181, 8189, 8202, 8208, 8214,
+       8226, 8229, 8232, 8235, 8237, 8245, 8253, 8261,
+       8269, 8277, 8289, 8295, 8311, 8314, 8317, 8320,
+       8323, 8325, 8333, 8341, 8349, 8355, 8358, 8360,
+       8368, 8376, 8384, 8392, 8400, 8412, 8418, 8434,
+       8437, 8440, 8443, 8446, 8448, 8456, 8465, 8474,
+       8477, 8479, 8487, 8499, 8505, 8511, 8517, 8518,
+       8524, 8530, 8536, 8542, 8549, 8552, 8558, 8564,
+       8565, 8571, 8577, 8584, 8590, 8596, 8597, 8603,
+       8609, 8616, 8618, 8626, 8634, 8642, 8654, 8660,
+       8663, 8666, 8668, 8676, 8688, 8694, 8706, 8712,
+       8715, 8718, 8720, 8728, 8743, 8749, 8755, 8758,
+       8776, 8809, 8861, 8915, 8933, 8987, 9005, 9038,
+       9107, 9176, 9176, 9176, 9176, 9176, 9188, 9188,
+       9188, 9188, 9204, 9204, 9221, 9224, 9224, 9268,
+       9271, 9271, 9287, 9290, 9302, 9302, 9318, 9321,
+       9324, 9324, 9324, 9343, 9346, 9346, 9346, 9346,
+       9346, 9346, 9346, 9346, 9346, 9346, 9362, 9365,
+       9365, 9365, 9375, 9378, 9390, 9393, 9405, 9408,
+       9420, 9423, 9423, 9423, 9423, 9423, 9436, 9439,
+       9439, 9455, 9458, 9458, 9474, 9477, 9477, 9491,
+       9494, 9507, 9510, 9551, 9560, 9560, 9560, 9560,
+       9560, 9560, 9560, 9560, 9576, 9579, 9579, 9579,
+       9595, 9598, 9598, 9598, 9598, 9598, 9598, 9598
 };
 
 static const short _zone_scanner_trans_keys[] = {
@@ -2599,7 +2614,9 @@ static const short _zone_scanner_trans_keys[] = {
        48, 57, 65, 70, 97, 102, 2058, 1920,
        2175, 2058, 1920, 2175, 9, 32, 40, 41,
        2058, 2107, 48, 57, 2058, 1920, 2175, 97,
-       101, 105, 107, 110, 112, 108, 112, 110,
+       100, 101, 105, 107, 110, 111, 112, 108,
+       112, 110, 32, 34, 44, 59, 9, 10,
+       40, 41, 111, 104, 112, 97, 116, 104,
        32, 34, 44, 59, 9, 10, 40, 41,
        99, 104, 32, 34, 44, 59, 9, 10,
        40, 41, 112, 118, 52, 54, 104, 105,
@@ -2610,491 +2627,483 @@ static const short _zone_scanner_trans_keys[] = {
        40, 41, 48, 57, 111, 45, 100, 101,
        102, 97, 117, 108, 116, 45, 97, 108,
        112, 110, 32, 34, 44, 59, 9, 10,
-       40, 41, 111, 114, 116, 32, 34, 44,
-       59, 9, 10, 40, 41, 9, 32, 40,
-       41, 3082, 3131, 3338, 3387, 3594, 3643, 9,
-       32, 40, 41, 97, 101, 105, 107, 109,
-       110, 112, 3082, 3131, 3338, 3387, 3594, 3643,
-       108, 112, 110, 61, 32, 34, 59, 9,
-       10, 40, 41, 9, 32, 40, 41, 3082,
-       3131, 3338, 3387, 3594, 3643, 2058, 1920, 2175,
-       99, 104, 61, 34, 43, 47, 57, 65,
+       40, 41, 104, 116, 116, 112, 32, 34,
+       44, 59, 9, 10, 40, 41, 111, 114,
+       116, 32, 34, 44, 59, 9, 10, 40,
+       41, 9, 32, 40, 41, 3082, 3131, 3338,
+       3387, 3594, 3643, 9, 32, 40, 41, 97,
+       100, 101, 105, 107, 109, 110, 111, 112,
+       3082, 3131, 3338, 3387, 3594, 3643, 108, 112,
+       110, 61, 32, 34, 59, 9, 10, 40,
+       41, 9, 32, 40, 41, 3082, 3131, 3338,
+       3387, 3594, 3643, 2058, 1920, 2175, 111, 104,
+       112, 97, 116, 104, 61, 32, 34, 59,
+       9, 10, 40, 41, 9, 32, 40, 41,
+       3082, 3131, 3338, 3387, 3594, 3643, 9, 32,
+       40, 41, 3082, 3131, 3338, 3387, 3594, 3643,
+       -128, 8, 11, 58, 60, 127, 34, 9,
+       32, 40, 41, 3082, 3131, 3338, 3387, 3594,
+       3643, 99, 104, 61, 34, 43, 47, 57,
+       65, 90, 97, 122, 43, 47, 57, 65,
        90, 97, 122, 43, 47, 57, 65, 90,
-       97, 122, 43, 47, 57, 65, 90, 97,
-       122, 43, 61, 47, 57, 65, 90, 97,
-       122, 43, 61, 47, 57, 65, 90, 97,
-       122, 34, 43, 47, 57, 65, 90, 97,
-       122, 9, 32, 40, 41, 3082, 3131, 3338,
-       3387, 3594, 3643, 61, 43, 47, 57, 65,
-       90, 97, 122, 43, 61, 47, 57, 65,
-       90, 97, 122, 43, 61, 47, 57, 65,
-       90, 97, 122, 9, 32, 40, 41, 43,
-       3082, 3131, 3338, 3387, 3594, 3643, 47, 57,
-       65, 90, 97, 122, 61, 112, 118, 52,
-       54, 104, 105, 110, 116, 61, 34, 46,
-       48, 57, 46, 48, 57, 34, 44, 46,
-       48, 57, 46, 48, 57, 9, 32, 40,
-       41, 44, 46, 3082, 3131, 3338, 3387, 3594,
-       3643, 48, 57, 46, 48, 57, 104, 105,
-       110, 116, 61, 34, 46, 48, 58, 65,
-       70, 97, 102, 46, 48, 58, 65, 70,
-       97, 102, 34, 44, 46, 48, 58, 65,
+       97, 122, 43, 61, 47, 57, 65, 90,
+       97, 122, 43, 61, 47, 57, 65, 90,
+       97, 122, 34, 43, 47, 57, 65, 90,
+       97, 122, 61, 43, 47, 57, 65, 90,
+       97, 122, 43, 61, 47, 57, 65, 90,
+       97, 122, 43, 61, 47, 57, 65, 90,
+       97, 122, 9, 32, 40, 41, 43, 3082,
+       3131, 3338, 3387, 3594, 3643, 47, 57, 65,
+       90, 97, 122, 61, 112, 118, 52, 54,
+       104, 105, 110, 116, 61, 34, 46, 48,
+       57, 46, 48, 57, 34, 44, 46, 48,
+       57, 46, 48, 57, 9, 32, 40, 41,
+       44, 46, 3082, 3131, 3338, 3387, 3594, 3643,
+       48, 57, 46, 48, 57, 104, 105, 110,
+       116, 61, 34, 46, 48, 58, 65, 70,
+       97, 102, 46, 48, 58, 65, 70, 97,
+       102, 34, 44, 46, 48, 58, 65, 70,
+       97, 102, 46, 48, 58, 65, 70, 97,
+       102, 9, 32, 40, 41, 44, 46, 3082,
+       3131, 3338, 3387, 3594, 3643, 48, 58, 65,
        70, 97, 102, 46, 48, 58, 65, 70,
-       97, 102, 9, 32, 40, 41, 44, 46,
-       3082, 3131, 3338, 3387, 3594, 3643, 48, 58,
-       65, 70, 97, 102, 46, 48, 58, 65,
-       70, 97, 102, 101, 121, 48, 57, 9,
-       32, 40, 41, 61, 3082, 3131, 3338, 3387,
-       3594, 3643, 48, 57, 32, 59, 9, 10,
-       40, 41, 9, 32, 40, 41, 3082, 3131,
-       3338, 3387, 3594, 3643, 97, 110, 100, 97,
-       116, 111, 114, 121, 61, 34, 65, 90,
-       97, 122, 65, 90, 97, 122, 34, 44,
-       65, 90, 97, 122, 9, 32, 40, 41,
-       44, 3082, 3131, 3338, 3387, 3594, 3643, 65,
-       90, 97, 122, 111, 45, 100, 101, 102,
-       97, 117, 108, 116, 45, 97, 108, 112,
-       110, 9, 32, 40, 41, 3082, 3131, 3338,
-       3387, 3594, 3643, 111, 114, 116, 61, 34,
-       48, 57, 48, 57, 34, 48, 57, 9,
-       32, 40, 41, 3082, 3131, 3338, 3387, 3594,
-       3643, 48, 57, 9, 32, 40, 41, 3082,
-       3131, 3338, 3387, 3594, 3643, -128, 8, 11,
-       58, 60, 127, 34, 68, 69, 73, 80,
-       82, 100, 101, 105, 112, 114, 48, 57,
-       32, 59, 9, 10, 40, 41, 48, 57,
-       72, 83, 104, 115, 32, 59, 9, 10,
-       40, 41, 65, 97, 32, 45, 59, 9,
-       10, 40, 41, 78, 110, 83, 115, 69,
-       101, 67, 99, 51, 45, 83, 115, 72,
-       104, 65, 97, 49, 32, 59, 9, 10,
-       40, 41, 67, 68, 99, 100, 67, 68,
-       99, 100, 45, 71, 103, 79, 111, 83,
-       115, 84, 116, 32, 59, 9, 10, 40,
-       41, 83, 115, 65, 97, 80, 112, 50,
-       51, 53, 54, 83, 115, 72, 104, 65,
-       97, 50, 53, 54, 32, 59, 9, 10,
-       40, 41, 56, 52, 83, 115, 72, 104,
-       65, 97, 51, 56, 52, 32, 59, 9,
-       10, 40, 41, 50, 52, 53, 53, 49,
-       57, 32, 59, 9, 10, 40, 41, 52,
-       56, 32, 59, 9, 10, 40, 41, 78,
-       110, 68, 100, 73, 105, 82, 114, 69,
-       101, 67, 99, 84, 116, 32, 59, 9,
-       10, 40, 41, 82, 114, 73, 105, 86,
-       118, 65, 97, 84, 116, 69, 101, 68,
-       79, 100, 111, 78, 110, 83, 115, 32,
-       59, 9, 10, 40, 41, 73, 105, 68,
-       100, 32, 59, 9, 10, 40, 41, 83,
-       115, 65, 97, 77, 83, 109, 115, 68,
-       100, 53, 32, 59, 9, 10, 40, 41,
-       72, 104, 65, 97, 49, 50, 53, 32,
+       97, 102, 101, 121, 48, 57, 9, 32,
+       40, 41, 61, 3082, 3131, 3338, 3387, 3594,
+       3643, 48, 57, 32, 59, 9, 10, 40,
+       41, 97, 110, 100, 97, 116, 111, 114,
+       121, 61, 34, 65, 90, 97, 122, 65,
+       90, 97, 122, 34, 44, 65, 90, 97,
+       122, 9, 32, 40, 41, 44, 3082, 3131,
+       3338, 3387, 3594, 3643, 65, 90, 97, 122,
+       111, 45, 100, 101, 102, 97, 117, 108,
+       116, 45, 97, 108, 112, 110, 9, 32,
+       40, 41, 3082, 3131, 3338, 3387, 3594, 3643,
+       104, 116, 116, 112, 9, 32, 40, 41,
+       3082, 3131, 3338, 3387, 3594, 3643, 111, 114,
+       116, 61, 34, 48, 57, 48, 57, 34,
+       48, 57, 9, 32, 40, 41, 3082, 3131,
+       3338, 3387, 3594, 3643, 48, 57, 9, 32,
+       40, 41, 3082, 3131, 3338, 3387, 3594, 3643,
+       -128, 8, 11, 58, 60, 127, 34, 68,
+       69, 73, 80, 82, 100, 101, 105, 112,
+       114, 48, 57, 32, 59, 9, 10, 40,
+       41, 48, 57, 72, 83, 104, 115, 32,
+       59, 9, 10, 40, 41, 65, 97, 32,
        45, 59, 9, 10, 40, 41, 78, 110,
        83, 115, 69, 101, 67, 99, 51, 45,
        83, 115, 72, 104, 65, 97, 49, 32,
-       59, 9, 10, 40, 41, 53, 54, 32,
-       59, 9, 10, 40, 41, 49, 50, 32,
-       59, 9, 10, 40, 41, 65, 73, 79,
-       80, 83, 85, 97, 105, 111, 112, 115,
-       117, 48, 57, 32, 59, 9, 10, 40,
-       41, 48, 57, 67, 99, 80, 112, 75,
-       107, 73, 105, 88, 120, 32, 59, 9,
-       10, 40, 41, 65, 80, 83, 97, 112,
-       115, 67, 99, 80, 112, 75, 107, 73,
-       105, 88, 120, 32, 59, 9, 10, 40,
-       41, 71, 75, 103, 107, 80, 112, 32,
-       59, 9, 10, 40, 41, 73, 105, 88,
-       120, 32, 59, 9, 10, 40, 41, 80,
-       112, 75, 107, 73, 105, 32, 59, 9,
-       10, 40, 41, 73, 105, 68, 100, 32,
-       59, 9, 10, 40, 41, 71, 75, 103,
-       107, 80, 112, 32, 59, 9, 10, 40,
-       41, 73, 105, 88, 120, 32, 59, 9,
-       10, 40, 41, 80, 112, 75, 107, 73,
-       105, 32, 59, 9, 10, 40, 41, 82,
-       114, 73, 105, 32, 59, 9, 10, 40,
-       41, 46, 48, 57, 32, 46, 59, 9,
-       10, 40, 41, 48, 57, 42, 92, 95,
-       45, 57, 64, 90, 97, 122, 32, 59,
-       9, 10, 40, 41, 42, 92, 95, 45,
+       59, 9, 10, 40, 41, 67, 68, 99,
+       100, 67, 68, 99, 100, 45, 71, 103,
+       79, 111, 83, 115, 84, 116, 32, 59,
+       9, 10, 40, 41, 83, 115, 65, 97,
+       80, 112, 50, 51, 53, 54, 83, 115,
+       72, 104, 65, 97, 50, 53, 54, 32,
+       59, 9, 10, 40, 41, 56, 52, 83,
+       115, 72, 104, 65, 97, 51, 56, 52,
+       32, 59, 9, 10, 40, 41, 50, 52,
+       53, 53, 49, 57, 32, 59, 9, 10,
+       40, 41, 52, 56, 32, 59, 9, 10,
+       40, 41, 78, 110, 68, 100, 73, 105,
+       82, 114, 69, 101, 67, 99, 84, 116,
+       32, 59, 9, 10, 40, 41, 82, 114,
+       73, 105, 86, 118, 65, 97, 84, 116,
+       69, 101, 68, 79, 100, 111, 78, 110,
+       83, 115, 32, 59, 9, 10, 40, 41,
+       73, 105, 68, 100, 32, 59, 9, 10,
+       40, 41, 83, 115, 65, 97, 77, 83,
+       109, 115, 68, 100, 53, 32, 59, 9,
+       10, 40, 41, 72, 104, 65, 97, 49,
+       50, 53, 32, 45, 59, 9, 10, 40,
+       41, 78, 110, 83, 115, 69, 101, 67,
+       99, 51, 45, 83, 115, 72, 104, 65,
+       97, 49, 32, 59, 9, 10, 40, 41,
+       53, 54, 32, 59, 9, 10, 40, 41,
+       49, 50, 32, 59, 9, 10, 40, 41,
+       65, 73, 79, 80, 83, 85, 97, 105,
+       111, 112, 115, 117, 48, 57, 32, 59,
+       9, 10, 40, 41, 48, 57, 67, 99,
+       80, 112, 75, 107, 73, 105, 88, 120,
+       32, 59, 9, 10, 40, 41, 65, 80,
+       83, 97, 112, 115, 67, 99, 80, 112,
+       75, 107, 73, 105, 88, 120, 32, 59,
+       9, 10, 40, 41, 71, 75, 103, 107,
+       80, 112, 32, 59, 9, 10, 40, 41,
+       73, 105, 88, 120, 32, 59, 9, 10,
+       40, 41, 80, 112, 75, 107, 73, 105,
+       32, 59, 9, 10, 40, 41, 73, 105,
+       68, 100, 32, 59, 9, 10, 40, 41,
+       71, 75, 103, 107, 80, 112, 32, 59,
+       9, 10, 40, 41, 73, 105, 88, 120,
+       32, 59, 9, 10, 40, 41, 80, 112,
+       75, 107, 73, 105, 32, 59, 9, 10,
+       40, 41, 82, 114, 73, 105, 32, 59,
+       9, 10, 40, 41, 46, 48, 57, 32,
+       46, 59, 9, 10, 40, 41, 48, 57,
+       42, 92, 95, 45, 57, 64, 90, 97,
+       122, 32, 59, 9, 10, 40, 41, 42,
+       92, 95, 45, 57, 64, 90, 97, 122,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
+       40, 41, 42, 92, 95, 2058, 2107, 45,
        57, 64, 90, 97, 122, 9, 32, 40,
-       41, 2058, 2107, 9, 32, 40, 41, 42,
-       92, 95, 2058, 2107, 45, 57, 64, 90,
-       97, 122, 9, 32, 40, 41, 2058, 2107,
-       9, 32, 40, 41, 2058, 2107, 48, 57,
-       9, 32, 40, 41, 2058, 2107, 48, 57,
-       9, 32, 40, 41, 2058, 2107, 48, 57,
-       9, 32, 40, 41, 68, 72, 77, 83,
-       87, 100, 104, 109, 115, 119, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 68, 72,
-       77, 83, 87, 100, 104, 109, 115, 119,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       68, 72, 77, 83, 87, 100, 104, 109,
-       115, 119, 2058, 2107, 48, 57, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 32, 59,
-       68, 72, 77, 83, 87, 100, 104, 109,
-       115, 119, 9, 10, 40, 41, 48, 57,
-       32, 59, 9, 10, 40, 41, 48, 57,
-       68, 72, 77, 83, 87, 100, 104, 109,
-       115, 119, 48, 57, 32, 59, 9, 10,
-       40, 41, 48, 57, 2058, 1920, 2175, 9,
-       32, 40, 41, 2058, 2107, 48, 57, 68,
+       41, 2058, 2107, 9, 32, 40, 41, 2058,
+       2107, 48, 57, 9, 32, 40, 41, 2058,
+       2107, 48, 57, 9, 32, 40, 41, 2058,
+       2107, 48, 57, 9, 32, 40, 41, 68,
        72, 77, 83, 87, 100, 104, 109, 115,
-       119, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 2058, 1920, 2175, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 68, 72,
-       77, 83, 87, 100, 104, 109, 115, 119,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 2058, 1920, 2175, 9, 32, 40,
-       41, 2058, 2107, 48, 57, 68, 72, 77,
-       83, 87, 100, 104, 109, 115, 119, 48,
-       57, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 2058, 1920, 2175, 2058, 1920, 2175, 2058,
-       1920, 2175, 32, 59, 9, 10, 40, 41,
-       9, 32, 40, 41, 2058, 2107, 9, 32,
-       40, 41, 2058, 2107, -128, 8, 11, 58,
-       60, 127, 32, 59, 9, 10, 40, 41,
-       2058, 1920, 2175, 42, 92, 95, 45, 57,
-       64, 90, 97, 122, 9, 32, 40, 41,
-       2058, 2107, 9, 32, 40, 41, 42, 92,
-       95, 2058, 2107, 45, 57, 64, 90, 97,
-       122, 32, 59, 9, 10, 40, 41, 2058,
-       1920, 2175, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       42, 92, 95, 2058, 2107, 45, 57, 64,
-       90, 97, 122, 32, 59, 9, 10, 40,
-       41, 2058, 1920, 2175, 32, 59, 9, 10,
-       40, 41, 9, 32, 40, 41, 3082, 3131,
-       3338, 3387, 3594, 3643, 9, 32, 40, 41,
-       3082, 3131, 3338, 3387, 3594, 3643, -128, 8,
-       11, 58, 60, 127, 2058, 1920, 2175, 46,
-       48, 58, 65, 70, 97, 102, 32, 46,
-       59, 9, 10, 40, 41, 48, 58, 65,
-       70, 97, 102, 48, 57, 9, 32, 40,
+       119, 2058, 2107, 48, 57, 9, 32, 40,
        41, 2058, 2107, 48, 57, 9, 32, 40,
-       41, 78, 83, 2058, 2107, 48, 57, 9,
+       41, 68, 72, 77, 83, 87, 100, 104,
+       109, 115, 119, 2058, 2107, 48, 57, 9,
        32, 40, 41, 2058, 2107, 48, 57, 9,
-       32, 40, 41, 78, 83, 2058, 2107, 48,
-       57, 9, 32, 40, 41, 46, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 78, 83,
-       2058, 2107, 9, 32, 40, 41, 2058, 2107,
+       32, 40, 41, 68, 72, 77, 83, 87,
+       100, 104, 109, 115, 119, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 32, 59, 68, 72, 77, 83, 87,
+       100, 104, 109, 115, 119, 9, 10, 40,
+       41, 48, 57, 32, 59, 9, 10, 40,
+       41, 48, 57, 68, 72, 77, 83, 87,
+       100, 104, 109, 115, 119, 48, 57, 32,
+       59, 9, 10, 40, 41, 48, 57, 2058,
+       1920, 2175, 9, 32, 40, 41, 2058, 2107,
+       48, 57, 68, 72, 77, 83, 87, 100,
+       104, 109, 115, 119, 48, 57, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 2058, 1920,
+       2175, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 68, 72, 77, 83, 87, 100, 104,
+       109, 115, 119, 48, 57, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 2058, 1920, 2175,
        9, 32, 40, 41, 2058, 2107, 48, 57,
+       68, 72, 77, 83, 87, 100, 104, 109,
+       115, 119, 48, 57, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 2058, 1920, 2175, 2058,
+       1920, 2175, 2058, 1920, 2175, 32, 59, 9,
+       10, 40, 41, 9, 32, 40, 41, 2058,
+       2107, 9, 32, 40, 41, 2058, 2107, -128,
+       8, 11, 58, 60, 127, 32, 59, 9,
+       10, 40, 41, 2058, 1920, 2175, 42, 92,
+       95, 45, 57, 64, 90, 97, 122, 9,
+       32, 40, 41, 2058, 2107, 9, 32, 40,
+       41, 42, 92, 95, 2058, 2107, 45, 57,
+       64, 90, 97, 122, 32, 59, 9, 10,
+       40, 41, 2058, 1920, 2175, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 42, 92, 95, 2058, 2107,
+       45, 57, 64, 90, 97, 122, 32, 59,
+       9, 10, 40, 41, 2058, 1920, 2175, 32,
+       59, 9, 10, 40, 41, 9, 32, 40,
+       41, 3082, 3131, 3338, 3387, 3594, 3643, 9,
+       32, 40, 41, 3082, 3131, 3338, 3387, 3594,
+       3643, -128, 8, 11, 58, 60, 127, 2058,
+       1920, 2175, 46, 48, 58, 65, 70, 97,
+       102, 32, 46, 59, 9, 10, 40, 41,
+       48, 58, 65, 70, 97, 102, 48, 57,
        9, 32, 40, 41, 2058, 2107, 48, 57,
-       9, 32, 40, 41, 69, 87, 2058, 2107,
+       9, 32, 40, 41, 78, 83, 2058, 2107,
        48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 69, 87,
+       48, 57, 9, 32, 40, 41, 78, 83,
        2058, 2107, 48, 57, 9, 32, 40, 41,
        46, 2058, 2107, 48, 57, 9, 32, 40,
-       41, 69, 87, 2058, 2107, 9, 32, 40,
-       41, 2058, 2107, 9, 32, 40, 41, 45,
-       2058, 2107, 48, 57, 48, 57, 9, 32,
-       40, 41, 46, 109, 3082, 3131, 3338, 3387,
-       3594, 3643, 48, 57, 9, 32, 40, 41,
-       3082, 3131, 3338, 3387, 3594, 3643, 48, 57,
-       9, 32, 40, 41, 46, 109, 3082, 3131,
-       3338, 3387, 3594, 3643, 48, 57, 9, 32,
-       40, 41, 3082, 3131, 3338, 3387, 3594, 3643,
-       48, 57, 9, 32, 40, 41, 46, 109,
-       3082, 3131, 3338, 3387, 3594, 3643, 48, 57,
-       9, 32, 40, 41, 3082, 3131, 3338, 3387,
-       3594, 3643, 48, 57, 9, 32, 40, 41,
-       46, 109, 3082, 3131, 3338, 3387, 3594, 3643,
-       48, 57, 9, 32, 40, 41, 3082, 3131,
-       3338, 3387, 3594, 3643, 2058, 1920, 2175, 9,
-       32, 40, 41, 109, 3082, 3131, 3338, 3387,
-       3594, 3643, 48, 57, 9, 32, 40, 41,
-       109, 3082, 3131, 3338, 3387, 3594, 3643, 48,
-       57, 2058, 1920, 2175, 9, 32, 40, 41,
+       41, 78, 83, 2058, 2107, 9, 32, 40,
+       41, 2058, 2107, 9, 32, 40, 41, 2058,
+       2107, 48, 57, 9, 32, 40, 41, 2058,
+       2107, 48, 57, 9, 32, 40, 41, 69,
+       87, 2058, 2107, 48, 57, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 9, 32, 40,
+       41, 69, 87, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 46, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 69, 87, 2058, 2107,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
+       40, 41, 45, 2058, 2107, 48, 57, 48,
+       57, 9, 32, 40, 41, 46, 109, 3082,
+       3131, 3338, 3387, 3594, 3643, 48, 57, 9,
+       32, 40, 41, 3082, 3131, 3338, 3387, 3594,
+       3643, 48, 57, 9, 32, 40, 41, 46,
        109, 3082, 3131, 3338, 3387, 3594, 3643, 48,
-       57, 9, 32, 40, 41, 109, 3082, 3131,
-       3338, 3387, 3594, 3643, 48, 57, 9, 32,
-       40, 41, 3082, 3131, 3338, 3387, 3594, 3643,
-       2058, 1920, 2175, 9, 32, 40, 41, 109,
-       3082, 3131, 3338, 3387, 3594, 3643, 48, 57,
-       9, 32, 40, 41, 109, 3082, 3131, 3338,
+       57, 9, 32, 40, 41, 3082, 3131, 3338,
+       3387, 3594, 3643, 48, 57, 9, 32, 40,
+       41, 46, 109, 3082, 3131, 3338, 3387, 3594,
+       3643, 48, 57, 9, 32, 40, 41, 3082,
+       3131, 3338, 3387, 3594, 3643, 48, 57, 9,
+       32, 40, 41, 46, 109, 3082, 3131, 3338,
        3387, 3594, 3643, 48, 57, 9, 32, 40,
        41, 3082, 3131, 3338, 3387, 3594, 3643, 2058,
        1920, 2175, 9, 32, 40, 41, 109, 3082,
        3131, 3338, 3387, 3594, 3643, 48, 57, 9,
        32, 40, 41, 109, 3082, 3131, 3338, 3387,
+       3594, 3643, 48, 57, 2058, 1920, 2175, 9,
+       32, 40, 41, 109, 3082, 3131, 3338, 3387,
        3594, 3643, 48, 57, 9, 32, 40, 41,
-       3082, 3131, 3338, 3387, 3594, 3643, 2058, 1920,
-       2175, 9, 32, 40, 41, 2058, 2107, 2058,
-       1920, 2175, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 2058, 1920, 2175, 2058, 1920, 2175,
-       2058, 1920, 2175, 9, 32, 40, 41, 2058,
-       2107, 2058, 1920, 2175, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 2058, 1920, 2175, 2058,
-       1920, 2175, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       42, 92, 95, 2058, 2107, 45, 57, 64,
-       90, 97, 122, 32, 59, 9, 10, 40,
-       41, 2058, 1920, 2175, 2058, 1920, 2175, 2058,
-       1920, 2175, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, -128, 8, 11, 58, 60, 127,
-       9, 32, 40, 41, 2058, 2107, 9, 32,
-       40, 41, 2058, 2107, -128, 8, 11, 58,
-       60, 127, 9, 32, 40, 41, 2058, 2107,
-       9, 32, 40, 41, 2058, 2107, -128, 8,
-       11, 58, 60, 127, 9, 32, 40, 41,
-       2058, 2107, 9, 32, 40, 41, 42, 92,
-       95, 2058, 2107, 45, 57, 64, 90, 97,
-       122, 32, 59, 9, 10, 40, 41, 2058,
-       1920, 2175, 2058, 1920, 2175, 2058, 1920, 2175,
-       2058, 1920, 2175, 2058, 1920, 2175, 48, 57,
-       65, 90, 97, 122, 9, 32, 40, 41,
-       2058, 2107, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 65, 90, 97, 122, 9, 32,
-       40, 41, 2058, 2107, 9, 32, 40, 41,
-       43, 2058, 2107, 47, 57, 65, 90, 97,
-       122, 2570, 2619, 2058, 1920, 2175, 2058, 1920,
-       2175, 2058, 1920, 2175, 9, 32, 33, 40,
-       41, 49, 50, 3082, 3131, 3338, 3387, 3594,
-       3643, 49, 50, 58, 46, 48, 57, 47,
-       46, 57, 48, 57, 9, 32, 40, 41,
+       109, 3082, 3131, 3338, 3387, 3594, 3643, 48,
+       57, 9, 32, 40, 41, 3082, 3131, 3338,
+       3387, 3594, 3643, 2058, 1920, 2175, 9, 32,
+       40, 41, 109, 3082, 3131, 3338, 3387, 3594,
+       3643, 48, 57, 9, 32, 40, 41, 109,
        3082, 3131, 3338, 3387, 3594, 3643, 48, 57,
-       2058, 1920, 2175, 58, 46, 48, 58, 65,
-       70, 97, 102, 47, 46, 58, 65, 70,
-       97, 102, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 65, 90, 97, 122,
-       9, 32, 40, 41, 2058, 2107, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 65, 70,
-       97, 102, 48, 57, 65, 70, 97, 102,
-       9, 32, 40, 41, 3082, 3131, 3338, 3387,
-       3594, 3643, 48, 57, 65, 70, 97, 102,
-       2058, 1920, 2175, 2058, 1920, 2175, 2058, 1920,
-       2175, 2058, 1920, 2175, 48, 57, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 9, 32,
-       40, 41, 2058, 2107, 48, 57, 65, 70,
-       97, 102, 48, 57, 65, 70, 97, 102,
        9, 32, 40, 41, 3082, 3131, 3338, 3387,
-       3594, 3643, 48, 57, 65, 70, 97, 102,
-       2058, 1920, 2175, 2058, 1920, 2175, 2058, 1920,
-       2175, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 48,
-       49, 50, 51, 2058, 2107, 9, 32, 40,
+       3594, 3643, 2058, 1920, 2175, 9, 32, 40,
+       41, 109, 3082, 3131, 3338, 3387, 3594, 3643,
+       48, 57, 9, 32, 40, 41, 109, 3082,
+       3131, 3338, 3387, 3594, 3643, 48, 57, 9,
+       32, 40, 41, 3082, 3131, 3338, 3387, 3594,
+       3643, 2058, 1920, 2175, 9, 32, 40, 41,
+       2058, 2107, 2058, 1920, 2175, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 2058, 1920, 2175,
+       2058, 1920, 2175, 2058, 1920, 2175, 9, 32,
+       40, 41, 2058, 2107, 2058, 1920, 2175, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 2058,
+       1920, 2175, 2058, 1920, 2175, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 42, 92, 95, 2058, 2107,
+       45, 57, 64, 90, 97, 122, 32, 59,
+       9, 10, 40, 41, 2058, 1920, 2175, 2058,
+       1920, 2175, 2058, 1920, 2175, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, -128, 8, 11,
+       58, 60, 127, 9, 32, 40, 41, 2058,
+       2107, 9, 32, 40, 41, 2058, 2107, -128,
+       8, 11, 58, 60, 127, 9, 32, 40,
        41, 2058, 2107, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 46,
-       2058, 2107, 7177, 7200, 7208, 7209, 7433, 7456,
-       7464, 7465, 7689, 7712, 7720, 7721, 10506, 10555,
-       10762, 10811, 11274, 11323, 11530, 11579, 11786, 11835,
-       12298, 12347, 12554, 12603, 12810, 12859, 13322, 13371,
-       13578, 13627, 13834, 13883, 4105, 4128, 4136, 4137,
-       4139, 5130, 5179, 4143, 4153, 4161, 4186, 4193,
-       4218, 2570, 2619, 5130, 4992, 5247, 5641, 5664,
-       5672, 5673, 14602, 14651, 14858, 14907, 15370, 15419,
-       15626, 15675, 15882, 15931, 6666, 6528, 6783, 4139,
-       7177, 7200, 7208, 7209, 7433, 7456, 7464, 7465,
-       7689, 7712, 7720, 7721, 10506, 10555, 10762, 10811,
-       11274, 11323, 11530, 11579, 11786, 11835, 12298, 12347,
-       12554, 12603, 12810, 12859, 13322, 13371, 13578, 13627,
-       13834, 13883, 4143, 4153, 4161, 4186, 4193, 4218,
-       8714, 9226, 9738, 8576, 8831, 9088, 9343, 9600,
-       9855, 2058, 1920, 2175, 2058, 1920, 2175, 9,
+       2107, -128, 8, 11, 58, 60, 127, 9,
+       32, 40, 41, 2058, 2107, 9, 32, 40,
+       41, 42, 92, 95, 2058, 2107, 45, 57,
+       64, 90, 97, 122, 32, 59, 9, 10,
+       40, 41, 2058, 1920, 2175, 2058, 1920, 2175,
+       2058, 1920, 2175, 2058, 1920, 2175, 2058, 1920,
+       2175, 48, 57, 65, 90, 97, 122, 9,
        32, 40, 41, 2058, 2107, 9, 32, 40,
        41, 2058, 2107, 48, 57, 9, 32, 40,
        41, 2058, 2107, 48, 57, 9, 32, 40,
-       41, 46, 2058, 2107, 48, 57, 46, 7177,
-       7200, 7208, 7209, 7433, 7456, 7464, 7465, 7689,
-       7712, 7720, 7721, 10506, 10555, 10762, 10811, 11274,
-       11323, 11530, 11579, 11786, 11835, 12298, 12347, 12554,
-       12603, 12810, 12859, 13322, 13371, 13578, 13627, 13834,
-       13883, 48, 57, 2058, 1920, 2175, 2058, 1920,
-       2175, 9, 32, 40, 41, 2058, 2107, 9,
-       32, 40, 41, 2058, 2107, 48, 57, 9,
+       41, 2058, 2107, 48, 57, 65, 90, 97,
+       122, 9, 32, 40, 41, 2058, 2107, 9,
+       32, 40, 41, 43, 2058, 2107, 47, 57,
+       65, 90, 97, 122, 2570, 2619, 2058, 1920,
+       2175, 2058, 1920, 2175, 2058, 1920, 2175, 9,
+       32, 33, 40, 41, 49, 50, 3082, 3131,
+       3338, 3387, 3594, 3643, 49, 50, 58, 46,
+       48, 57, 47, 46, 57, 48, 57, 9,
+       32, 40, 41, 3082, 3131, 3338, 3387, 3594,
+       3643, 48, 57, 2058, 1920, 2175, 58, 46,
+       48, 58, 65, 70, 97, 102, 47, 46,
+       58, 65, 70, 97, 102, 48, 57, 9,
        32, 40, 41, 2058, 2107, 48, 57, 9,
-       32, 40, 41, 46, 2058, 2107, 48, 58,
-       65, 70, 97, 102, 46, 7177, 7200, 7208,
+       32, 40, 41, 2058, 2107, 48, 57, 65,
+       90, 97, 122, 9, 32, 40, 41, 2058,
+       2107, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 65, 70, 97, 102, 48, 57, 65,
+       70, 97, 102, 9, 32, 40, 41, 3082,
+       3131, 3338, 3387, 3594, 3643, 48, 57, 65,
+       70, 97, 102, 2058, 1920, 2175, 2058, 1920,
+       2175, 2058, 1920, 2175, 2058, 1920, 2175, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 65, 70, 97, 102, 48, 57, 65,
+       70, 97, 102, 9, 32, 40, 41, 3082,
+       3131, 3338, 3387, 3594, 3643, 48, 57, 65,
+       70, 97, 102, 2058, 1920, 2175, 2058, 1920,
+       2175, 2058, 1920, 2175, 48, 57, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 9, 32,
+       40, 41, 48, 49, 50, 51, 2058, 2107,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 9, 32,
+       40, 41, 46, 2058, 2107, 7177, 7200, 7208,
        7209, 7433, 7456, 7464, 7465, 7689, 7712, 7720,
        7721, 10506, 10555, 10762, 10811, 11274, 11323, 11530,
        11579, 11786, 11835, 12298, 12347, 12554, 12603, 12810,
-       12859, 13322, 13371, 13578, 13627, 13834, 13883, 48,
-       58, 65, 70, 97, 102, 2058, 1920, 2175,
-       2058, 1920, 2175, 9, 32, 40, 41, 2058,
-       2107, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 9, 32, 40, 41, 42, 92, 95,
-       2058, 2107, 45, 57, 64, 90, 97, 122,
+       12859, 13322, 13371, 13578, 13627, 13834, 13883, 4105,
+       4128, 4136, 4137, 4139, 5130, 5179, 4143, 4153,
+       4161, 4186, 4193, 4218, 2570, 2619, 5130, 4992,
+       5247, 5641, 5664, 5672, 5673, 14602, 14651, 14858,
+       14907, 15370, 15419, 15626, 15675, 15882, 15931, 6666,
+       6528, 6783, 4139, 7177, 7200, 7208, 7209, 7433,
+       7456, 7464, 7465, 7689, 7712, 7720, 7721, 10506,
+       10555, 10762, 10811, 11274, 11323, 11530, 11579, 11786,
+       11835, 12298, 12347, 12554, 12603, 12810, 12859, 13322,
+       13371, 13578, 13627, 13834, 13883, 4143, 4153, 4161,
+       4186, 4193, 4218, 8714, 9226, 9738, 8576, 8831,
+       9088, 9343, 9600, 9855, 2058, 1920, 2175, 2058,
+       1920, 2175, 9, 32, 40, 41, 2058, 2107,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 46, 2058, 2107, 48,
+       57, 46, 7177, 7200, 7208, 7209, 7433, 7456,
+       7464, 7465, 7689, 7712, 7720, 7721, 10506, 10555,
+       10762, 10811, 11274, 11323, 11530, 11579, 11786, 11835,
+       12298, 12347, 12554, 12603, 12810, 12859, 13322, 13371,
+       13578, 13627, 13834, 13883, 48, 57, 2058, 1920,
+       2175, 2058, 1920, 2175, 9, 32, 40, 41,
+       2058, 2107, 9, 32, 40, 41, 2058, 2107,
+       48, 57, 9, 32, 40, 41, 2058, 2107,
+       48, 57, 9, 32, 40, 41, 46, 2058,
+       2107, 48, 58, 65, 70, 97, 102, 46,
        7177, 7200, 7208, 7209, 7433, 7456, 7464, 7465,
        7689, 7712, 7720, 7721, 10506, 10555, 10762, 10811,
        11274, 11323, 11530, 11579, 11786, 11835, 12298, 12347,
        12554, 12603, 12810, 12859, 13322, 13371, 13578, 13627,
-       13834, 13883, 2058, 1920, 2175, 2058, 1920, 2175,
-       2058, 1920, 2175, 65, 67, 68, 69, 72,
-       73, 75, 76, 77, 78, 79, 80, 82,
-       83, 84, 85, 90, 97, 99, 100, 101,
-       104, 105, 107, 108, 109, 110, 111, 112,
-       114, 115, 116, 117, 122, 9, 32, 40,
-       41, 65, 70, 80, 97, 102, 112, 2058,
-       2107, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 65, 90, 97, 122, 9, 32, 40,
-       41, 2058, 2107, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 9, 32, 40, 41, 42,
-       92, 95, 2058, 2107, 45, 57, 64, 90,
-       97, 122, 9, 32, 40, 41, 2058, 2107,
-       9, 32, 40, 41, 43, 2058, 2107, 47,
-       57, 65, 90, 97, 122, 2570, 2619, 2058,
-       1920, 2175, 2058, 1920, 2175, 2058, 1920, 2175,
-       2058, 1920, 2175, 2058, 1920, 2175, 2058, 1920,
-       2175, 2058, 1920, 2175, 2058, 1920, 2175, 65,
-       97, 65, 97, 9, 32, 40, 41, 2058,
-       2107, 83, 115, 68, 100, 66, 98, 9,
-       32, 40, 41, 2058, 2107, 76, 108, 9,
-       32, 40, 41, 2058, 2107, 65, 68, 69,
-       78, 83, 97, 100, 101, 110, 115, 65,
-       97, 9, 32, 40, 41, 2058, 2107, 78,
-       83, 110, 115, 83, 115, 75, 107, 69,
-       101, 89, 121, 9, 32, 40, 41, 2058,
-       2107, 9, 32, 40, 41, 2058, 2107, 82,
-       114, 84, 116, 9, 32, 40, 41, 2058,
-       2107, 65, 97, 77, 109, 69, 101, 9,
-       32, 40, 41, 2058, 2107, 89, 121, 78,
-       110, 67, 99, 9, 32, 40, 41, 2058,
-       2107, 72, 78, 83, 104, 110, 115, 67,
-       99, 73, 105, 68, 100, 9, 32, 40,
-       41, 2058, 2107, 65, 83, 97, 115, 77,
-       109, 69, 101, 9, 32, 40, 41, 2058,
-       2107, 75, 107, 69, 101, 89, 121, 9,
-       32, 40, 41, 2058, 2107, 9, 32, 40,
-       41, 2058, 2107, 85, 117, 73, 105, 52,
-       54, 56, 9, 32, 40, 41, 2058, 2107,
-       52, 9, 32, 40, 41, 2058, 2107, 73,
-       84, 105, 116, 78, 110, 70, 102, 79,
-       111, 9, 32, 40, 41, 2058, 2107, 84,
-       116, 80, 112, 83, 115, 9, 32, 40,
-       41, 2058, 2107, 80, 112, 83, 115, 69,
-       101, 67, 99, 75, 107, 69, 101, 89,
-       121, 9, 32, 40, 41, 2058, 2107, 69,
-       88, 101, 120, 89, 121, 9, 32, 40,
-       41, 2058, 2107, 9, 32, 40, 41, 2058,
-       2107, 51, 54, 79, 80, 111, 112, 50,
-       9, 32, 40, 41, 2058, 2107, 52, 9,
-       32, 40, 41, 2058, 2107, 67, 99, 9,
-       32, 40, 41, 2058, 2107, 9, 32, 40,
-       41, 2058, 2107, 73, 88, 105, 120, 78,
-       110, 70, 102, 79, 111, 9, 32, 40,
-       41, 2058, 2107, 9, 32, 40, 41, 2058,
-       2107, 65, 73, 83, 97, 105, 115, 80,
-       112, 84, 116, 82, 114, 9, 32, 40,
-       41, 2058, 2107, 68, 100, 9, 32, 40,
-       41, 2058, 2107, 9, 32, 40, 41, 69,
-       101, 2058, 2107, 67, 99, 9, 32, 40,
-       41, 51, 2058, 2107, 9, 32, 40, 41,
-       80, 112, 2058, 2107, 65, 97, 82, 114,
-       65, 97, 77, 109, 9, 32, 40, 41,
-       2058, 2107, 80, 112, 69, 101, 78, 110,
-       80, 112, 71, 103, 80, 112, 75, 107,
-       69, 101, 89, 121, 9, 32, 40, 41,
-       2058, 2107, 84, 116, 82, 114, 9, 32,
-       40, 41, 2058, 2107, 80, 82, 84, 112,
-       114, 116, 9, 32, 40, 41, 2058, 2107,
-       83, 115, 73, 105, 71, 103, 9, 32,
+       13834, 13883, 48, 58, 65, 70, 97, 102,
+       2058, 1920, 2175, 2058, 1920, 2175, 9, 32,
        40, 41, 2058, 2107, 9, 32, 40, 41,
-       2058, 2107, 77, 79, 80, 82, 83, 86,
-       109, 111, 112, 114, 115, 118, 73, 105,
-       77, 109, 69, 101, 65, 97, 9, 32,
-       40, 41, 2058, 2107, 65, 97, 9, 32,
-       40, 41, 2058, 2107, 70, 102, 9, 32,
-       40, 41, 2058, 2107, 86, 118, 9, 32,
-       40, 41, 2058, 2107, 72, 104, 70, 102,
-       80, 112, 9, 32, 40, 41, 2058, 2107,
-       67, 99, 66, 98, 9, 32, 40, 41,
-       2058, 2107, 76, 88, 89, 108, 120, 121,
-       83, 115, 65, 97, 9, 32, 40, 41,
-       2058, 2107, 84, 116, 9, 32, 40, 41,
-       2058, 2107, 80, 112, 69, 101, 48, 57,
-       9, 32, 40, 41, 2058, 2107, 48, 57,
-       82, 114, 73, 105, 9, 32, 40, 41,
-       2058, 2107, 79, 111, 78, 110, 69, 101,
-       77, 109, 68, 100, 9, 32, 40, 41,
-       2058, 2107, 42, 92, 95, 45, 57, 64,
-       90, 97, 122, 32, 59, 9, 10, 40,
-       41, 32, 59, 9, 10, 40, 41, 48,
-       57, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 65, 90, 97, 122, 9, 32, 40,
-       41, 2058, 2107, 9, 32, 40, 41, 43,
-       2058, 2107, 47, 57, 65, 90, 97, 122,
-       2570, 2619, 2058, 1920, 2175, 2058, 1920, 2175,
-       2058, 1920, 2175, 43, 47, 57, 65, 90,
-       97, 122, 2570, 2619, 48, 57, 9, 32,
+       2058, 2107, 48, 57, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 9, 32, 40, 41,
+       42, 92, 95, 2058, 2107, 45, 57, 64,
+       90, 97, 122, 7177, 7200, 7208, 7209, 7433,
+       7456, 7464, 7465, 7689, 7712, 7720, 7721, 10506,
+       10555, 10762, 10811, 11274, 11323, 11530, 11579, 11786,
+       11835, 12298, 12347, 12554, 12603, 12810, 12859, 13322,
+       13371, 13578, 13627, 13834, 13883, 2058, 1920, 2175,
+       2058, 1920, 2175, 2058, 1920, 2175, 65, 67,
+       68, 69, 72, 73, 75, 76, 77, 78,
+       79, 80, 82, 83, 84, 85, 90, 97,
+       99, 100, 101, 104, 105, 107, 108, 109,
+       110, 111, 112, 114, 115, 116, 117, 122,
+       9, 32, 40, 41, 65, 70, 80, 97,
+       102, 112, 2058, 2107, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 65, 90, 97, 122,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
        40, 41, 2058, 2107, 48, 57, 9, 32,
        40, 41, 2058, 2107, 48, 57, 9, 32,
        40, 41, 2058, 2107, 48, 57, 9, 32,
        40, 41, 2058, 2107, 48, 57, 9, 32,
        40, 41, 2058, 2107, 48, 57, 9, 32,
-       40, 41, 45, 2058, 2107, 48, 57, 65,
-       70, 97, 102, 9, 32, 40, 41, 2058,
-       2107, 9, 32, 40, 41, 2058, 2107, 48,
+       40, 41, 2058, 2107, 48, 57, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 9, 32,
+       40, 41, 42, 92, 95, 2058, 2107, 45,
+       57, 64, 90, 97, 122, 9, 32, 40,
+       41, 2058, 2107, 9, 32, 40, 41, 43,
+       2058, 2107, 47, 57, 65, 90, 97, 122,
+       2570, 2619, 2058, 1920, 2175, 2058, 1920, 2175,
+       2058, 1920, 2175, 2058, 1920, 2175, 2058, 1920,
+       2175, 2058, 1920, 2175, 2058, 1920, 2175, 2058,
+       1920, 2175, 65, 97, 65, 97, 9, 32,
+       40, 41, 2058, 2107, 83, 115, 68, 100,
+       66, 98, 9, 32, 40, 41, 2058, 2107,
+       76, 108, 9, 32, 40, 41, 2058, 2107,
+       65, 68, 69, 78, 83, 97, 100, 101,
+       110, 115, 65, 97, 9, 32, 40, 41,
+       2058, 2107, 78, 83, 110, 115, 83, 115,
+       75, 107, 69, 101, 89, 121, 9, 32,
+       40, 41, 2058, 2107, 9, 32, 40, 41,
+       2058, 2107, 82, 114, 84, 116, 9, 32,
+       40, 41, 2058, 2107, 65, 97, 77, 109,
+       69, 101, 9, 32, 40, 41, 2058, 2107,
+       89, 121, 78, 110, 67, 99, 9, 32,
+       40, 41, 2058, 2107, 72, 78, 83, 104,
+       110, 115, 67, 99, 73, 105, 68, 100,
+       9, 32, 40, 41, 2058, 2107, 65, 83,
+       97, 115, 77, 109, 69, 101, 9, 32,
+       40, 41, 2058, 2107, 75, 107, 69, 101,
+       89, 121, 9, 32, 40, 41, 2058, 2107,
+       9, 32, 40, 41, 2058, 2107, 85, 117,
+       73, 105, 52, 54, 56, 9, 32, 40,
+       41, 2058, 2107, 52, 9, 32, 40, 41,
+       2058, 2107, 73, 84, 105, 116, 78, 110,
+       70, 102, 79, 111, 9, 32, 40, 41,
+       2058, 2107, 84, 116, 80, 112, 83, 115,
+       9, 32, 40, 41, 2058, 2107, 80, 112,
+       83, 115, 69, 101, 67, 99, 75, 107,
+       69, 101, 89, 121, 9, 32, 40, 41,
+       2058, 2107, 69, 88, 101, 120, 89, 121,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
+       40, 41, 2058, 2107, 51, 54, 79, 80,
+       111, 112, 50, 9, 32, 40, 41, 2058,
+       2107, 52, 9, 32, 40, 41, 2058, 2107,
+       67, 99, 9, 32, 40, 41, 2058, 2107,
+       9, 32, 40, 41, 2058, 2107, 73, 88,
+       105, 120, 78, 110, 70, 102, 79, 111,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
+       40, 41, 2058, 2107, 65, 73, 83, 97,
+       105, 115, 80, 112, 84, 116, 82, 114,
+       9, 32, 40, 41, 2058, 2107, 68, 100,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
+       40, 41, 69, 101, 2058, 2107, 67, 99,
+       9, 32, 40, 41, 51, 2058, 2107, 9,
+       32, 40, 41, 80, 112, 2058, 2107, 65,
+       97, 82, 114, 65, 97, 77, 109, 9,
+       32, 40, 41, 2058, 2107, 80, 112, 69,
+       101, 78, 110, 80, 112, 71, 103, 80,
+       112, 75, 107, 69, 101, 89, 121, 9,
+       32, 40, 41, 2058, 2107, 84, 116, 82,
+       114, 9, 32, 40, 41, 2058, 2107, 80,
+       82, 84, 112, 114, 116, 9, 32, 40,
+       41, 2058, 2107, 83, 115, 73, 105, 71,
+       103, 9, 32, 40, 41, 2058, 2107, 9,
+       32, 40, 41, 2058, 2107, 77, 79, 80,
+       82, 83, 86, 109, 111, 112, 114, 115,
+       118, 73, 105, 77, 109, 69, 101, 65,
+       97, 9, 32, 40, 41, 2058, 2107, 65,
+       97, 9, 32, 40, 41, 2058, 2107, 70,
+       102, 9, 32, 40, 41, 2058, 2107, 86,
+       118, 9, 32, 40, 41, 2058, 2107, 72,
+       104, 70, 102, 80, 112, 9, 32, 40,
+       41, 2058, 2107, 67, 99, 66, 98, 9,
+       32, 40, 41, 2058, 2107, 76, 88, 89,
+       108, 120, 121, 83, 115, 65, 97, 9,
+       32, 40, 41, 2058, 2107, 84, 116, 9,
+       32, 40, 41, 2058, 2107, 80, 112, 69,
+       101, 48, 57, 9, 32, 40, 41, 2058,
+       2107, 48, 57, 82, 114, 73, 105, 9,
+       32, 40, 41, 2058, 2107, 79, 111, 78,
+       110, 69, 101, 77, 109, 68, 100, 9,
+       32, 40, 41, 2058, 2107, 42, 92, 95,
+       45, 57, 64, 90, 97, 122, 32, 59,
+       9, 10, 40, 41, 32, 59, 9, 10,
+       40, 41, 48, 57, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 65, 90, 97, 122,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
+       40, 41, 43, 2058, 2107, 47, 57, 65,
+       90, 97, 122, 2570, 2619, 2058, 1920, 2175,
+       2058, 1920, 2175, 2058, 1920, 2175, 43, 47,
+       57, 65, 90, 97, 122, 2570, 2619, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 2058, 2107, 48,
+       57, 9, 32, 40, 41, 45, 2058, 2107,
+       48, 57, 65, 70, 97, 102, 9, 32,
+       40, 41, 2058, 2107, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 65, 86, 97, 118,
+       48, 57, 65, 86, 97, 118, 61, 48,
        57, 65, 86, 97, 118, 48, 57, 65,
        86, 97, 118, 61, 48, 57, 65, 86,
-       97, 118, 48, 57, 65, 86, 97, 118,
-       61, 48, 57, 65, 86, 97, 118, 61,
-       48, 57, 65, 86, 97, 118, 48, 57,
-       65, 86, 97, 118, 61, 48, 57, 65,
-       86, 97, 118, 32, 59, 9, 10, 40,
-       41, 48, 57, 65, 86, 97, 118, 32,
-       59, 9, 10, 40, 41, 61, 61, 61,
-       61, 61, 2058, 1920, 2175, 48, 57, 65,
-       70, 97, 102, 9, 32, 40, 41, 2058,
-       2107, 48, 57, 65, 70, 97, 102, 2058,
-       1920, 2175, 2058, 1920, 2175, 2058, 1920, 2175,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 45, 2058,
-       2107, 48, 57, 65, 70, 97, 102, 32,
-       59, 9, 10, 40, 41, 48, 57, 65,
-       70, 97, 102, 32, 59, 9, 10, 40,
-       41, 48, 57, 65, 70, 97, 102, 2058,
-       1920, 2175, 2058, 1920, 2175, 2058, 1920, 2175,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 65, 70, 97, 102, 48, 57,
-       65, 70, 97, 102, 9, 32, 40, 41,
-       3082, 3131, 3338, 3387, 3594, 3643, 48, 57,
-       65, 70, 97, 102, 2058, 1920, 2175, 2058,
-       1920, 2175, 2058, 1920, 2175, 2058, 1920, 2175,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 9, 32, 40, 41, 2058, 2107,
-       48, 57, 32, 59, 9, 10, 40, 41,
-       48, 57, 32, 59, 9, 10, 40, 41,
+       97, 118, 61, 48, 57, 65, 86, 97,
+       118, 48, 57, 65, 86, 97, 118, 61,
+       48, 57, 65, 86, 97, 118, 32, 59,
+       9, 10, 40, 41, 48, 57, 65, 86,
+       97, 118, 32, 59, 9, 10, 40, 41,
+       61, 61, 61, 61, 61, 2058, 1920, 2175,
+       48, 57, 65, 70, 97, 102, 9, 32,
+       40, 41, 2058, 2107, 48, 57, 65, 70,
+       97, 102, 2058, 1920, 2175, 2058, 1920, 2175,
+       2058, 1920, 2175, 48, 57, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 9, 32, 40,
+       41, 2058, 2107, 48, 57, 9, 32, 40,
+       41, 45, 2058, 2107, 48, 57, 65, 70,
+       97, 102, 32, 59, 9, 10, 40, 41,
+       48, 57, 65, 70, 97, 102, 32, 59,
+       9, 10, 40, 41, 48, 57, 65, 70,
+       97, 102, 2058, 1920, 2175, 2058, 1920, 2175,
        2058, 1920, 2175, 48, 57, 9, 32, 40,
        41, 2058, 2107, 48, 57, 9, 32, 40,
        41, 2058, 2107, 48, 57, 9, 32, 40,
@@ -3108,79 +3117,103 @@ static const short _zone_scanner_trans_keys[] = {
        1920, 2175, 2058, 1920, 2175, 2058, 1920, 2175,
        2058, 1920, 2175, 48, 57, 9, 32, 40,
        41, 2058, 2107, 48, 57, 9, 32, 40,
-       41, 46, 2058, 2107, 48, 57, 32, 46,
-       59, 9, 10, 40, 41, 48, 57, 2058,
-       1920, 2175, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 9, 32, 40, 41,
-       2058, 2107, 48, 57, 65, 70, 97, 102,
-       48, 57, 65, 70, 97, 102, 48, 57,
+       41, 2058, 2107, 48, 57, 32, 59, 9,
+       10, 40, 41, 48, 57, 32, 59, 9,
+       10, 40, 41, 2058, 1920, 2175, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
        65, 70, 97, 102, 48, 57, 65, 70,
-       97, 102, 58, 48, 57, 65, 70, 97,
+       97, 102, 9, 32, 40, 41, 3082, 3131,
+       3338, 3387, 3594, 3643, 48, 57, 65, 70,
+       97, 102, 2058, 1920, 2175, 2058, 1920, 2175,
+       2058, 1920, 2175, 2058, 1920, 2175, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 46, 2058, 2107, 48,
+       57, 32, 46, 59, 9, 10, 40, 41,
+       48, 57, 2058, 1920, 2175, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 9,
+       32, 40, 41, 2058, 2107, 48, 57, 65,
+       70, 97, 102, 48, 57, 65, 70, 97,
        102, 48, 57, 65, 70, 97, 102, 48,
-       57, 65, 70, 97, 102, 48, 57, 65,
-       70, 97, 102, 32, 58, 59, 9, 10,
-       40, 41, 2058, 1920, 2175, 48, 57, 65,
+       57, 65, 70, 97, 102, 58, 48, 57,
+       65, 70, 97, 102, 48, 57, 65, 70,
+       97, 102, 48, 57, 65, 70, 97, 102,
+       48, 57, 65, 70, 97, 102, 32, 58,
+       59, 9, 10, 40, 41, 2058, 1920, 2175,
+       48, 57, 65, 70, 97, 102, 48, 57,
+       65, 70, 97, 102, 45, 48, 57, 65,
        70, 97, 102, 48, 57, 65, 70, 97,
-       102, 45, 48, 57, 65, 70, 97, 102,
-       48, 57, 65, 70, 97, 102, 32, 45,
-       59, 9, 10, 40, 41, 48, 57, 65,
+       102, 32, 45, 59, 9, 10, 40, 41,
+       48, 57, 65, 70, 97, 102, 48, 57,
+       65, 70, 97, 102, 45, 48, 57, 65,
        70, 97, 102, 48, 57, 65, 70, 97,
-       102, 45, 48, 57, 65, 70, 97, 102,
-       48, 57, 65, 70, 97, 102, 32, 45,
-       59, 9, 10, 40, 41, 48, 57, 9,
-       32, 40, 41, 2058, 2107, 48, 57, 9,
-       32, 40, 41, 2058, 2107, 48, 57, 9,
-       32, 40, 41, 2058, 2107, 48, 57, 9,
-       32, 40, 41, 2058, 2107, -128, 8, 11,
-       58, 60, 127, 32, 59, 9, 10, 40,
-       41, 2058, 1920, 2175, 2058, 1920, 2175, 48,
-       57, 9, 32, 40, 41, 2058, 2107, 48,
-       57, 9, 32, 40, 41, 2058, 2107, -128,
-       8, 11, 58, 60, 127, 9, 32, 40,
-       41, 2058, 2107, 9, 32, 40, 41, 2058,
-       2107, -128, 8, 11, 58, 60, 127, 32,
-       59, 9, 10, 40, 41, 2058, 1920, 2175,
-       2058, 1920, 2175, 48, 57, 9, 32, 40,
-       41, 2058, 2107, 48, 57, 9, 32, 40,
-       41, 42, 92, 95, 2058, 2107, 45, 57,
-       64, 90, 97, 122, 32, 59, 9, 10,
-       40, 41, 32, 59, 9, 10, 40, 41,
-       2058, 1920, 2175, 9, 32, 36, 40, 41,
+       102, 32, 45, 59, 9, 10, 40, 41,
+       48, 57, 9, 32, 40, 41, 2058, 2107,
+       48, 57, 9, 32, 40, 41, 2058, 2107,
+       48, 57, 9, 32, 40, 41, 2058, 2107,
+       48, 57, 9, 32, 40, 41, 2058, 2107,
+       -128, 8, 11, 58, 60, 127, 32, 59,
+       9, 10, 40, 41, 2058, 1920, 2175, 2058,
+       1920, 2175, 48, 57, 9, 32, 40, 41,
+       2058, 2107, 48, 57, 9, 32, 40, 41,
+       2058, 2107, -128, 8, 11, 58, 60, 127,
+       9, 32, 40, 41, 2058, 2107, 9, 32,
+       40, 41, 2058, 2107, -128, 8, 11, 58,
+       60, 127, 32, 59, 9, 10, 40, 41,
+       2058, 1920, 2175, 2058, 1920, 2175, 48, 57,
+       9, 32, 40, 41, 2058, 2107, 48, 57,
+       9, 32, 40, 41, 42, 92, 95, 2058,
+       2107, 45, 57, 64, 90, 97, 122, 32,
+       59, 9, 10, 40, 41, 32, 59, 9,
+       10, 40, 41, 2058, 1920, 2175, 9, 32,
+       36, 40, 41, 42, 92, 95, 1802, 1851,
+       2058, 2107, 45, 57, 64, 90, 97, 122,
+       9, 32, 36, 40, 41, 42, 58, 92,
+       95, 2826, 2875, 3082, 3131, 3338, 3387, 3594,
+       3643, -128, 8, 11, 44, 45, 57, 60,
+       63, 64, 90, 91, 96, 97, 122, 123,
+       127, 9, 32, 36, 40, 41, 42, 65,
+       67, 68, 69, 72, 73, 75, 76, 77,
+       78, 79, 80, 82, 83, 84, 85, 90,
+       92, 95, 97, 99, 100, 101, 104, 105,
+       107, 108, 109, 110, 111, 112, 114, 115,
+       116, 117, 122, 1802, 1851, 2058, 2107, 45,
+       57, 64, 89, 98, 121, 9, 32, 36,
+       40, 41, 42, 65, 67, 68, 69, 72,
+       73, 75, 76, 77, 78, 79, 80, 82,
+       83, 84, 85, 90, 92, 95, 97, 99,
+       100, 101, 104, 105, 107, 108, 109, 110,
+       111, 112, 114, 115, 116, 117, 122, 1802,
+       1851, 2058, 2107, 45, 47, 48, 57, 64,
+       89, 98, 121, 9, 32, 36, 40, 41,
+       42, 92, 95, 1802, 1851, 2058, 2107, 45,
+       57, 64, 90, 97, 122, 9, 32, 36,
+       40, 41, 42, 65, 67, 68, 69, 72,
+       73, 75, 76, 77, 78, 79, 80, 82,
+       83, 84, 85, 90, 92, 95, 97, 99,
+       100, 101, 104, 105, 107, 108, 109, 110,
+       111, 112, 114, 115, 116, 117, 122, 1802,
+       1851, 2058, 2107, 45, 47, 48, 57, 64,
+       89, 98, 121, 9, 32, 36, 40, 41,
        42, 92, 95, 1802, 1851, 2058, 2107, 45,
        57, 64, 90, 97, 122, 9, 32, 36,
        40, 41, 42, 58, 92, 95, 2826, 2875,
        3082, 3131, 3338, 3387, 3594, 3643, -128, 8,
        11, 44, 45, 57, 60, 63, 64, 90,
        91, 96, 97, 122, 123, 127, 9, 32,
-       36, 40, 41, 42, 65, 67, 68, 69,
-       72, 73, 75, 76, 77, 78, 79, 80,
-       82, 83, 84, 85, 90, 92, 95, 97,
-       99, 100, 101, 104, 105, 107, 108, 109,
-       110, 111, 112, 114, 115, 116, 117, 122,
-       1802, 1851, 2058, 2107, 45, 57, 64, 89,
-       98, 121, 9, 32, 36, 40, 41, 42,
-       65, 67, 68, 69, 72, 73, 75, 76,
-       77, 78, 79, 80, 82, 83, 84, 85,
-       90, 92, 95, 97, 99, 100, 101, 104,
-       105, 107, 108, 109, 110, 111, 112, 114,
-       115, 116, 117, 122, 1802, 1851, 2058, 2107,
-       45, 47, 48, 57, 64, 89, 98, 121,
-       9, 32, 36, 40, 41, 42, 92, 95,
-       1802, 1851, 2058, 2107, 45, 57, 64, 90,
-       97, 122, 9, 32, 36, 40, 41, 42,
-       65, 67, 68, 69, 72, 73, 75, 76,
-       77, 78, 79, 80, 82, 83, 84, 85,
-       90, 92, 95, 97, 99, 100, 101, 104,
-       105, 107, 108, 109, 110, 111, 112, 114,
-       115, 116, 117, 122, 1802, 1851, 2058, 2107,
-       45, 47, 48, 57, 64, 89, 98, 121,
-       9, 32, 36, 40, 41, 42, 92, 95,
-       1802, 1851, 2058, 2107, 45, 57, 64, 90,
-       97, 122, 9, 32, 36, 40, 41, 42,
-       58, 92, 95, 2826, 2875, 3082, 3131, 3338,
-       3387, 3594, 3643, -128, 8, 11, 44, 45,
-       57, 60, 63, 64, 90, 91, 96, 97,
-       122, 123, 127, 9, 32, 36, 40, 41,
+       36, 40, 41, 42, 58, 65, 67, 68,
+       69, 72, 73, 75, 76, 77, 78, 79,
+       80, 82, 83, 84, 85, 90, 92, 95,
+       97, 99, 100, 101, 104, 105, 107, 108,
+       109, 110, 111, 112, 114, 115, 116, 117,
+       122, 2826, 2875, 3082, 3131, 3338, 3387, 3594,
+       3643, -128, 8, 11, 44, 45, 47, 48,
+       57, 60, 63, 64, 89, 91, 96, 98,
+       121, 123, 127, 9, 32, 36, 40, 41,
        42, 58, 65, 67, 68, 69, 72, 73,
        75, 76, 77, 78, 79, 80, 82, 83,
        84, 85, 90, 92, 95, 97, 99, 100,
@@ -3189,68 +3222,59 @@ static const short _zone_scanner_trans_keys[] = {
        3082, 3131, 3338, 3387, 3594, 3643, -128, 8,
        11, 44, 45, 47, 48, 57, 60, 63,
        64, 89, 91, 96, 98, 121, 123, 127,
-       9, 32, 36, 40, 41, 42, 58, 65,
-       67, 68, 69, 72, 73, 75, 76, 77,
-       78, 79, 80, 82, 83, 84, 85, 90,
-       92, 95, 97, 99, 100, 101, 104, 105,
-       107, 108, 109, 110, 111, 112, 114, 115,
-       116, 117, 122, 2826, 2875, 3082, 3131, 3338,
-       3387, 3594, 3643, -128, 8, 11, 44, 45,
-       47, 48, 57, 60, 63, 64, 89, 91,
-       96, 98, 121, 123, 127, 32, 33, 59,
-       92, 9, 10, 35, 39, 40, 41, 42,
-       126, 9, 32, 40, 41, 42, 46, 92,
-       95, 2058, 2107, 45, 57, 65, 90, 97,
-       122, 9, 32, 40, 41, 43, 3082, 3131,
-       3338, 3387, 3594, 3643, 47, 57, 65, 90,
-       97, 122, 2058, 1920, 2175, 9, 32, 40,
-       41, 65, 67, 68, 69, 72, 73, 75,
-       76, 77, 78, 79, 80, 82, 83, 84,
-       85, 90, 97, 99, 100, 101, 104, 105,
-       107, 108, 109, 110, 111, 112, 114, 115,
-       116, 117, 122, 3082, 3131, 3338, 3387, 3594,
-       3643, 2058, 1920, 2175, 9, 32, 40, 41,
-       3082, 3131, 3338, 3387, 3594, 3643, 48, 57,
-       65, 70, 97, 102, 2058, 1920, 2175, 9,
-       32, 40, 41, 2058, 2107, 48, 57, 65,
-       70, 97, 102, 9, 32, 40, 41, 3082,
-       3131, 3338, 3387, 3594, 3643, 48, 57, 65,
-       70, 97, 102, 2058, 1920, 2175, 2058, 1920,
-       2175, 9, 32, 40, 41, 97, 101, 105,
-       107, 109, 110, 112, 3082, 3131, 3338, 3387,
-       3594, 3643, 2058, 1920, 2175, 9, 32, 40,
-       41, 3082, 3131, 3338, 3387, 3594, 3643, -128,
-       8, 11, 58, 60, 127, 2058, 1920, 2175,
+       32, 33, 59, 92, 9, 10, 35, 39,
+       40, 41, 42, 126, 9, 32, 40, 41,
+       42, 46, 92, 95, 2058, 2107, 45, 57,
+       65, 90, 97, 122, 9, 32, 40, 41,
+       43, 3082, 3131, 3338, 3387, 3594, 3643, 47,
+       57, 65, 90, 97, 122, 2058, 1920, 2175,
+       9, 32, 40, 41, 65, 67, 68, 69,
+       72, 73, 75, 76, 77, 78, 79, 80,
+       82, 83, 84, 85, 90, 97, 99, 100,
+       101, 104, 105, 107, 108, 109, 110, 111,
+       112, 114, 115, 116, 117, 122, 3082, 3131,
+       3338, 3387, 3594, 3643, 2058, 1920, 2175, 9,
+       32, 40, 41, 3082, 3131, 3338, 3387, 3594,
+       3643, 48, 57, 65, 70, 97, 102, 2058,
+       1920, 2175, 9, 32, 40, 41, 2058, 2107,
+       48, 57, 65, 70, 97, 102, 9, 32,
+       40, 41, 3082, 3131, 3338, 3387, 3594, 3643,
+       48, 57, 65, 70, 97, 102, 2058, 1920,
+       2175, 2058, 1920, 2175, 9, 32, 40, 41,
+       97, 100, 101, 105, 107, 109, 110, 111,
+       112, 3082, 3131, 3338, 3387, 3594, 3643, 2058,
+       1920, 2175, 9, 32, 40, 41, 3082, 3131,
+       3338, 3387, 3594, 3643, -128, 8, 11, 58,
+       60, 127, 2058, 1920, 2175, 9, 32, 40,
+       41, 3082, 3131, 3338, 3387, 3594, 3643, 2058,
+       1920, 2175, 9, 32, 40, 41, 3082, 3131,
+       3338, 3387, 3594, 3643, 48, 57, 2058, 1920,
+       2175, 9, 32, 40, 41, 3082, 3131, 3338,
+       3387, 3594, 3643, 48, 57, 2058, 1920, 2175,
        9, 32, 40, 41, 3082, 3131, 3338, 3387,
-       3594, 3643, 2058, 1920, 2175, 9, 32, 40,
-       41, 3082, 3131, 3338, 3387, 3594, 3643, 48,
-       57, 2058, 1920, 2175, 9, 32, 40, 41,
-       3082, 3131, 3338, 3387, 3594, 3643, 48, 57,
-       2058, 1920, 2175, 9, 32, 40, 41, 3082,
-       3131, 3338, 3387, 3594, 3643, 48, 57, 2058,
-       1920, 2175, 9, 32, 33, 40, 41, 49,
-       50, 3082, 3131, 3338, 3387, 3594, 3643, 2058,
+       3594, 3643, 48, 57, 2058, 1920, 2175, 9,
+       32, 33, 40, 41, 49, 50, 3082, 3131,
+       3338, 3387, 3594, 3643, 2058, 1920, 2175, 9,
+       32, 40, 41, 3082, 3131, 3338, 3387, 3594,
+       3643, 48, 57, 65, 70, 97, 102, 2058,
        1920, 2175, 9, 32, 40, 41, 3082, 3131,
        3338, 3387, 3594, 3643, 48, 57, 65, 70,
-       97, 102, 2058, 1920, 2175, 9, 32, 40,
-       41, 3082, 3131, 3338, 3387, 3594, 3643, 48,
-       57, 65, 70, 97, 102, 2058, 1920, 2175,
-       5641, 5664, 5672, 5673, 14602, 14651, 14858, 14907,
-       15370, 15419, 15626, 15675, 15882, 15931, 6666, 6528,
-       6783, 4105, 4128, 4136, 4137, 4139, 5130, 5179,
-       4143, 4153, 4161, 4186, 4193, 4218, 5130, 4992,
-       5247, 4139, 7177, 7200, 7208, 7209, 7433, 7456,
-       7464, 7465, 7689, 7712, 7720, 7721, 10506, 10555,
-       10762, 10811, 11274, 11323, 11530, 11579, 11786, 11835,
-       12298, 12347, 12554, 12603, 12810, 12859, 13322, 13371,
-       13578, 13627, 13834, 13883, 4143, 4153, 4161, 4186,
-       4193, 4218, 8714, 9226, 9738, 8576, 8831, 9088,
-       9343, 9600, 9855, 9, 32, 40, 41, 3082,
+       97, 102, 2058, 1920, 2175, 5641, 5664, 5672,
+       5673, 14602, 14651, 14858, 14907, 15370, 15419, 15626,
+       15675, 15882, 15931, 6666, 6528, 6783, 4105, 4128,
+       4136, 4137, 4139, 5130, 5179, 4143, 4153, 4161,
+       4186, 4193, 4218, 5130, 4992, 5247, 4139, 7177,
+       7200, 7208, 7209, 7433, 7456, 7464, 7465, 7689,
+       7712, 7720, 7721, 10506, 10555, 10762, 10811, 11274,
+       11323, 11530, 11579, 11786, 11835, 12298, 12347, 12554,
+       12603, 12810, 12859, 13322, 13371, 13578, 13627, 13834,
+       13883, 4143, 4153, 4161, 4186, 4193, 4218, 8714,
+       9226, 9738, 8576, 8831, 9088, 9343, 9600, 9855,
+       9, 32, 40, 41, 3082, 3131, 3338, 3387,
+       3594, 3643, 48, 57, 65, 70, 97, 102,
+       2058, 1920, 2175, 9, 32, 40, 41, 3082,
        3131, 3338, 3387, 3594, 3643, 48, 57, 65,
-       70, 97, 102, 2058, 1920, 2175, 9, 32,
-       40, 41, 3082, 3131, 3338, 3387, 3594, 3643,
-       48, 57, 65, 70, 97, 102, 2058, 1920,
-       2175, 0
+       70, 97, 102, 2058, 1920, 2175, 0
 };
 
 static const char _zone_scanner_single_lengths[] = {
@@ -3323,124 +3347,127 @@ static const char _zone_scanner_single_lengths[] = {
        2, 2, 2, 2, 2, 10, 2, 2,
        2, 10, 2, 10, 6, 6, 6, 6,
        0, 10, 1, 1, 1, 6, 7, 8,
-       6, 0, 10, 1, 1, 6, 1, 6,
-       1, 1, 1, 4, 1, 1, 4, 1,
-       1, 2, 1, 1, 1, 1, 4, 1,
-       1, 1, 1, 4, 1, 1, 0, 4,
+       6, 0, 10, 1, 1, 6, 1, 8,
+       1, 1, 1, 4, 1, 1, 1, 1,
+       1, 1, 4, 1, 1, 4, 1, 1,
+       2, 1, 1, 1, 1, 4, 1, 1,
+       1, 1, 4, 1, 1, 0, 4, 1,
        1, 1, 1, 1, 1, 1, 1, 1,
-       1, 1, 1, 1, 1, 1, 4, 1,
-       1, 1, 4, 10, 17, 1, 1, 1,
-       1, 3, 10, 1, 1, 1, 1, 2,
-       1, 1, 2, 2, 2, 10, 1, 1,
-       2, 2, 11, 1, 1, 1, 2, 1,
-       1, 1, 1, 1, 2, 1, 3, 1,
-       12, 1, 1, 1, 1, 1, 1, 2,
-       1, 3, 1, 12, 1, 1, 1, 0,
-       11, 2, 10, 1, 1, 1, 1, 1,
-       1, 1, 1, 1, 1, 0, 2, 0,
-       11, 0, 1, 1, 1, 1, 1, 1,
+       1, 1, 1, 1, 1, 4, 1, 1,
+       1, 1, 4, 1, 1, 1, 4, 10,
+       19, 1, 1, 1, 1, 3, 10, 1,
+       1, 1, 1, 1, 1, 1, 1, 3,
+       10, 10, 1, 10, 1, 1, 1, 2,
+       1, 1, 2, 2, 2, 1, 1, 2,
+       2, 11, 1, 1, 1, 2, 1, 1,
+       1, 1, 1, 2, 1, 3, 1, 12,
+       1, 1, 1, 1, 1, 1, 2, 1,
+       3, 1, 12, 1, 1, 1, 0, 11,
+       2, 1, 1, 1, 1, 1, 1, 1,
+       1, 1, 1, 0, 2, 0, 11, 0,
        1, 1, 1, 1, 1, 1, 1, 1,
-       10, 1, 1, 1, 1, 1, 0, 1,
-       10, 10, 1, 10, 2, 4, 2, 2,
-       3, 2, 2, 2, 2, 1, 1, 2,
-       2, 2, 1, 2, 4, 4, 1, 2,
+       1, 1, 1, 1, 1, 1, 10, 1,
+       1, 1, 1, 10, 1, 1, 1, 1,
+       1, 0, 1, 10, 10, 1, 10, 2,
+       4, 2, 2, 3, 2, 2, 2, 2,
+       1, 1, 2, 2, 2, 1, 2, 4,
+       4, 1, 2, 2, 2, 2, 2, 2,
+       2, 2, 2, 1, 1, 2, 2, 2,
+       1, 1, 1, 2, 1, 1, 2, 2,
+       2, 1, 1, 1, 2, 2, 1, 1,
+       1, 1, 2, 1, 1, 2, 2, 2,
        2, 2, 2, 2, 2, 2, 2, 2,
-       1, 1, 2, 2, 2, 1, 1, 1,
-       2, 1, 1, 2, 2, 2, 1, 1,
-       1, 2, 2, 1, 1, 1, 1, 2,
-       1, 1, 2, 2, 2, 2, 2, 2,
+       2, 2, 2, 2, 4, 2, 2, 2,
+       2, 2, 2, 2, 2, 4, 2, 1,
+       2, 2, 2, 3, 3, 2, 2, 2,
+       2, 1, 1, 2, 2, 2, 1, 2,
+       1, 1, 2, 1, 1, 2, 12, 2,
+       2, 2, 2, 2, 2, 2, 6, 2,
+       2, 2, 2, 2, 2, 4, 2, 2,
        2, 2, 2, 2, 2, 2, 2, 2,
-       2, 4, 2, 2, 2, 2, 2, 2,
-       2, 2, 4, 2, 1, 2, 2, 2,
-       3, 3, 2, 2, 2, 2, 1, 1,
-       2, 2, 2, 1, 2, 1, 1, 2,
-       1, 1, 2, 12, 2, 2, 2, 2,
-       2, 2, 2, 6, 2, 2, 2, 2,
        2, 2, 4, 2, 2, 2, 2, 2,
-       2, 2, 2, 2, 2, 2, 2, 4,
-       2, 2, 2, 2, 2, 2, 2, 2,
-       2, 2, 2, 2, 1, 3, 3, 2,
-       3, 6, 9, 6, 6, 6, 6, 16,
-       6, 16, 6, 16, 6, 12, 2, 10,
-       2, 1, 6, 10, 6, 1, 6, 10,
-       6, 1, 6, 10, 6, 1, 1, 1,
-       2, 6, 6, 2, 1, 3, 6, 9,
-       2, 1, 0, 6, 9, 2, 1, 2,
-       10, 10, 1, 1, 3, 0, 6, 8,
-       6, 8, 7, 8, 6, 6, 6, 8,
-       6, 8, 7, 8, 6, 7, 0, 12,
-       10, 12, 10, 12, 10, 12, 10, 1,
-       11, 11, 1, 11, 11, 10, 1, 11,
-       11, 10, 1, 11, 11, 10, 1, 6,
-       1, 6, 6, 1, 1, 1, 6, 1,
-       6, 6, 1, 1, 0, 6, 6, 6,
-       6, 6, 9, 2, 1, 1, 1, 0,
-       6, 6, 6, 6, 6, 6, 6, 6,
-       6, 9, 2, 1, 1, 1, 1, 1,
-       0, 6, 6, 6, 6, 6, 7, 2,
-       1, 1, 1, 13, 2, 1, 1, 1,
-       0, 10, 1, 1, 1, 1, 0, 6,
-       6, 6, 6, 6, 6, 0, 10, 1,
+       2, 2, 2, 2, 2, 2, 2, 1,
+       3, 3, 2, 3, 6, 9, 6, 6,
+       6, 6, 16, 6, 16, 6, 16, 6,
+       12, 2, 10, 2, 1, 6, 10, 6,
+       1, 6, 10, 6, 1, 6, 10, 6,
+       1, 1, 1, 2, 6, 6, 2, 1,
+       3, 6, 9, 2, 1, 0, 6, 9,
+       2, 1, 2, 10, 10, 1, 1, 3,
+       0, 6, 8, 6, 8, 7, 8, 6,
+       6, 6, 8, 6, 8, 7, 8, 6,
+       7, 0, 12, 10, 12, 10, 12, 10,
+       12, 10, 1, 11, 11, 1, 11, 11,
+       10, 1, 11, 11, 10, 1, 11, 11,
+       10, 1, 6, 1, 6, 6, 1, 1,
+       1, 6, 1, 6, 6, 1, 1, 0,
+       6, 6, 6, 6, 6, 9, 2, 1,
+       1, 1, 0, 6, 6, 6, 6, 6,
+       6, 6, 6, 6, 9, 2, 1, 1,
        1, 1, 1, 0, 6, 6, 6, 6,
-       0, 10, 1, 1, 1, 0, 6, 10,
-       6, 6, 6, 7, 34, 7, 2, 1,
-       14, 1, 35, 3, 1, 1, 6, 6,
-       6, 7, 35, 1, 1, 6, 6, 6,
-       7, 35, 1, 1, 6, 6, 6, 9,
-       34, 1, 1, 1, 34, 12, 6, 6,
-       6, 6, 6, 6, 6, 6, 6, 6,
-       6, 6, 9, 6, 7, 2, 1, 1,
-       1, 1, 1, 1, 1, 1, 2, 2,
-       6, 2, 2, 2, 6, 2, 6, 10,
-       2, 6, 4, 2, 2, 2, 2, 6,
-       6, 2, 2, 6, 2, 2, 2, 6,
-       2, 2, 2, 6, 6, 2, 2, 2,
-       6, 4, 2, 2, 6, 2, 2, 2,
-       6, 6, 2, 2, 2, 1, 6, 1,
-       6, 4, 2, 2, 2, 6, 2, 2,
-       2, 6, 2, 2, 2, 2, 2, 2,
-       2, 6, 4, 2, 6, 6, 6, 1,
-       6, 1, 6, 2, 6, 6, 4, 2,
-       2, 2, 6, 6, 6, 2, 2, 2,
-       6, 2, 6, 8, 2, 7, 8, 2,
-       2, 2, 2, 6, 2, 2, 2, 2,
-       2, 2, 2, 2, 2, 6, 2, 2,
-       6, 6, 6, 2, 2, 2, 6, 6,
-       12, 2, 2, 2, 2, 6, 2, 6,
-       2, 6, 2, 6, 2, 2, 2, 6,
+       6, 7, 2, 1, 1, 1, 13, 2,
+       1, 1, 1, 0, 10, 1, 1, 1,
+       1, 0, 6, 6, 6, 6, 6, 6,
+       0, 10, 1, 1, 1, 1, 0, 6,
+       6, 6, 6, 0, 10, 1, 1, 1,
+       0, 6, 10, 6, 6, 6, 7, 34,
+       7, 2, 1, 14, 1, 35, 3, 1,
+       1, 6, 6, 6, 7, 35, 1, 1,
+       6, 6, 6, 7, 35, 1, 1, 6,
+       6, 6, 9, 34, 1, 1, 1, 34,
+       12, 6, 6, 6, 6, 6, 6, 6,
+       6, 6, 6, 6, 6, 9, 6, 7,
+       2, 1, 1, 1, 1, 1, 1, 1,
+       1, 2, 2, 6, 2, 2, 2, 6,
+       2, 6, 10, 2, 6, 4, 2, 2,
        2, 2, 6, 6, 2, 2, 6, 2,
-       6, 2, 2, 0, 6, 2, 2, 6,
-       2, 2, 2, 2, 2, 6, 3, 2,
+       2, 2, 6, 2, 2, 2, 6, 6,
+       2, 2, 2, 6, 4, 2, 2, 6,
+       2, 2, 2, 6, 6, 2, 2, 2,
+       1, 6, 1, 6, 4, 2, 2, 2,
+       6, 2, 2, 2, 6, 2, 2, 2,
+       2, 2, 2, 2, 6, 4, 2, 6,
+       6, 6, 1, 6, 1, 6, 2, 6,
+       6, 4, 2, 2, 2, 6, 6, 6,
+       2, 2, 2, 6, 2, 6, 8, 2,
+       7, 8, 2, 2, 2, 2, 6, 2,
+       2, 2, 2, 2, 2, 2, 2, 2,
+       6, 2, 2, 6, 6, 6, 2, 2,
+       2, 6, 6, 12, 2, 2, 2, 2,
+       6, 2, 6, 2, 6, 2, 6, 2,
+       2, 2, 6, 2, 2, 6, 6, 2,
+       2, 6, 2, 6, 2, 2, 0, 6,
+       2, 2, 6, 2, 2, 2, 2, 2,
+       6, 3, 2, 2, 0, 6, 6, 6,
+       6, 6, 7, 2, 1, 1, 1, 1,
        2, 0, 6, 6, 6, 6, 6, 7,
-       2, 1, 1, 1, 1, 2, 0, 6,
-       6, 6, 6, 6, 7, 6, 6, 0,
-       1, 0, 1, 1, 0, 1, 2, 2,
-       1, 1, 1, 1, 1, 1, 0, 6,
+       6, 6, 0, 1, 0, 1, 1, 0,
+       1, 2, 2, 1, 1, 1, 1, 1,
+       1, 0, 6, 1, 1, 1, 0, 6,
+       6, 6, 6, 6, 7, 2, 0, 2,
        1, 1, 1, 0, 6, 6, 6, 6,
-       6, 7, 2, 0, 2, 1, 1, 1,
-       0, 6, 6, 6, 6, 6, 6, 0,
-       10, 1, 1, 1, 1, 0, 6, 6,
-       2, 2, 1, 0, 6, 6, 6, 6,
        6, 6, 0, 10, 1, 1, 1, 1,
-       0, 6, 7, 3, 1, 0, 6, 6,
-       0, 0, 0, 1, 0, 0, 0, 0,
-       3, 1, 0, 0, 1, 0, 0, 3,
-       0, 0, 1, 0, 0, 3, 0, 6,
-       6, 6, 6, 2, 1, 1, 0, 6,
-       6, 6, 6, 2, 1, 1, 0, 6,
-       9, 2, 2, 1, 12, 17, 46, 46,
-       12, 46, 12, 17, 51, 51, 0, 0,
-       0, 0, 4, 0, 0, 0, 10, 0,
-       11, 1, 0, 44, 1, 0, 10, 1,
-       6, 0, 10, 1, 1, 0, 0, 17,
-       1, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 10, 1, 0, 0, 10, 1,
-       10, 1, 10, 1, 10, 1, 0, 0,
-       0, 0, 13, 1, 0, 10, 1, 0,
-       10, 1, 0, 14, 1, 7, 1, 35,
-       3, 0, 0, 0, 0, 0, 0, 0,
-       10, 1, 0, 0, 10, 1, 0, 0,
-       0, 0, 0, 0, 0
+       0, 6, 6, 2, 2, 1, 0, 6,
+       6, 6, 6, 6, 6, 0, 10, 1,
+       1, 1, 1, 0, 6, 7, 3, 1,
+       0, 6, 6, 0, 0, 0, 1, 0,
+       0, 0, 0, 3, 1, 0, 0, 1,
+       0, 0, 3, 0, 0, 1, 0, 0,
+       3, 0, 6, 6, 6, 6, 2, 1,
+       1, 0, 6, 6, 6, 6, 2, 1,
+       1, 0, 6, 9, 2, 2, 1, 12,
+       17, 46, 46, 12, 46, 12, 17, 51,
+       51, 0, 0, 0, 0, 4, 0, 0,
+       0, 10, 0, 11, 1, 0, 44, 1,
+       0, 10, 1, 6, 0, 10, 1, 1,
+       0, 0, 19, 1, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 10, 1, 0,
+       0, 10, 1, 10, 1, 10, 1, 10,
+       1, 0, 0, 0, 0, 13, 1, 0,
+       10, 1, 0, 10, 1, 0, 14, 1,
+       7, 1, 35, 3, 0, 0, 0, 0,
+       0, 0, 0, 10, 1, 0, 0, 10,
+       1, 0, 0, 0, 0, 0, 0, 0
 };
 
 static const char _zone_scanner_range_lengths[] = {
@@ -3514,73 +3541,77 @@ static const char _zone_scanner_range_lengths[] = {
        0, 0, 0, 0, 0, 1, 1, 3,
        3, 3, 1, 1, 1, 0, 1, 1,
        3, 3, 3, 1, 1, 1, 1, 0,
-       0, 0, 0, 2, 0, 0, 2, 0,
-       0, 0, 0, 0, 0, 0, 2, 0,
-       0, 0, 0, 2, 0, 0, 1, 3,
+       0, 0, 0, 2, 0, 0, 0, 0,
+       0, 0, 2, 0, 0, 2, 0, 0,
+       0, 0, 0, 0, 0, 2, 0, 0,
+       0, 0, 2, 0, 0, 1, 3, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 2, 0, 0,
+       0, 0, 2, 0, 0, 0, 2, 0,
+       0, 0, 0, 0, 0, 2, 0, 1,
+       0, 0, 0, 0, 0, 0, 0, 2,
+       0, 3, 0, 0, 0, 0, 0, 3,
+       3, 3, 3, 3, 3, 0, 3, 3,
+       3, 3, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 1, 1, 1, 1, 1,
+       1, 0, 0, 0, 0, 0, 3, 3,
+       3, 3, 3, 3, 0, 0, 1, 1,
+       2, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 2, 2, 0, 2, 0, 2,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       1, 1, 1, 1, 3, 0, 1, 3,
+       0, 2, 0, 2, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 2, 0,
        0, 0, 0, 0, 0, 0, 2, 0,
-       0, 0, 2, 0, 0, 0, 0, 0,
-       0, 2, 0, 1, 0, 0, 0, 3,
-       3, 3, 3, 3, 3, 0, 0, 3,
-       3, 3, 3, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 1, 1, 1, 1,
-       1, 1, 0, 0, 0, 0, 0, 3,
-       3, 3, 3, 3, 3, 0, 0, 1,
-       1, 2, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 2, 2, 0, 2,
-       0, 2, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 1, 1, 1,
-       1, 3, 0, 1, 3, 0, 2, 0,
-       2, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 2, 0, 0, 0, 0,
-       0, 0, 0, 2, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       2, 0, 0, 0, 0, 0, 0, 0,
-       0, 2, 0, 0, 0, 0, 0, 2,
-       0, 0, 2, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 2, 0, 0, 0,
+       0, 0, 2, 0, 0, 2, 0, 0,
+       0, 0, 0, 0, 0, 2, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 2,
        0, 0, 2, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 2, 0, 0, 2,
+       2, 0, 0, 0, 2, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 2,
+       0, 0, 2, 0, 0, 2, 1, 3,
        0, 0, 0, 0, 0, 2, 0, 0,
-       0, 2, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 2, 0, 0, 2,
-       0, 0, 2, 1, 3, 0, 0, 0,
-       0, 0, 2, 0, 0, 0, 0, 0,
+       0, 0, 2, 0, 0, 0, 2, 0,
        0, 2, 0, 0, 2, 0, 0, 2,
-       0, 0, 0, 2, 0, 0, 2, 0,
-       0, 2, 0, 0, 2, 0, 0, 0,
-       2, 0, 0, 2, 1, 3, 3, 2,
-       3, 0, 3, 0, 1, 1, 1, 1,
-       1, 1, 1, 1, 1, 3, 3, 1,
-       3, 1, 1, 1, 1, 1, 1, 1,
-       1, 1, 1, 1, 1, 1, 1, 1,
-       2, 0, 3, 2, 1, 3, 0, 3,
-       2, 1, 1, 1, 3, 2, 1, 2,
-       0, 3, 1, 3, 5, 1, 1, 1,
-       1, 1, 1, 0, 0, 1, 1, 1,
-       1, 1, 1, 0, 0, 1, 1, 1,
-       1, 1, 1, 1, 1, 1, 0, 1,
-       1, 1, 1, 1, 1, 0, 1, 1,
-       1, 0, 1, 1, 1, 0, 1, 0,
-       1, 1, 1, 1, 1, 1, 0, 1,
+       0, 0, 0, 2, 0, 0, 2, 1,
+       3, 3, 2, 3, 0, 3, 0, 1,
        1, 1, 1, 1, 1, 1, 1, 1,
-       1, 1, 3, 2, 1, 1, 1, 1,
-       1, 1, 1, 3, 0, 3, 0, 3,
-       0, 3, 2, 1, 1, 1, 1, 1,
-       3, 0, 1, 1, 3, 0, 3, 0,
-       1, 1, 1, 0, 0, 0, 1, 1,
-       1, 1, 1, 0, 3, 3, 1, 1,
-       3, 0, 1, 1, 3, 3, 3, 1,
-       1, 1, 1, 1, 1, 1, 1, 3,
-       3, 3, 1, 1, 1, 1, 1, 0,
-       0, 1, 1, 0, 0, 3, 0, 1,
-       0, 1, 3, 3, 1, 1, 0, 1,
-       1, 1, 1, 1, 1, 0, 1, 1,
-       3, 3, 1, 1, 0, 1, 1, 3,
-       0, 1, 1, 1, 0, 0, 3, 0,
+       3, 3, 1, 3, 1, 1, 1, 1,
        1, 1, 1, 1, 1, 1, 1, 1,
-       1, 1, 3, 0, 3, 0, 1, 1,
+       1, 1, 1, 2, 0, 3, 2, 1,
+       3, 0, 3, 2, 1, 1, 1, 3,
+       2, 1, 2, 0, 3, 1, 3, 5,
        1, 1, 1, 1, 1, 1, 0, 0,
+       1, 1, 1, 1, 1, 1, 0, 0,
+       1, 1, 1, 1, 1, 1, 1, 1,
+       1, 0, 1, 1, 1, 1, 1, 1,
+       0, 1, 1, 1, 0, 1, 1, 1,
+       0, 1, 0, 1, 1, 1, 1, 1,
+       1, 0, 1, 1, 1, 1, 1, 1,
+       1, 1, 1, 1, 1, 3, 2, 1,
+       1, 1, 1, 1, 1, 1, 3, 0,
+       3, 0, 3, 0, 3, 2, 1, 1,
+       1, 1, 1, 3, 0, 1, 1, 3,
+       0, 3, 0, 1, 1, 1, 0, 0,
+       0, 1, 1, 1, 1, 1, 0, 3,
+       3, 1, 1, 3, 0, 1, 1, 3,
+       3, 3, 1, 1, 1, 1, 1, 1,
+       1, 1, 3, 3, 3, 1, 1, 1,
+       1, 1, 0, 0, 1, 1, 0, 0,
+       3, 0, 1, 0, 1, 3, 3, 1,
+       1, 0, 1, 1, 1, 1, 1, 1,
+       0, 1, 1, 3, 3, 1, 1, 0,
+       1, 1, 3, 0, 1, 1, 1, 0,
+       0, 3, 0, 1, 1, 1, 1, 1,
+       1, 1, 1, 1, 1, 3, 0, 3,
+       0, 1, 1, 1, 1, 1, 1, 1,
+       1, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
@@ -3598,39 +3629,38 @@ static const char _zone_scanner_range_lengths[] = {
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 1, 1,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 1, 1, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 3, 2,
-       2, 1, 1, 1, 1, 3, 0, 3,
-       0, 1, 1, 1, 3, 0, 1, 1,
-       1, 1, 1, 1, 3, 0, 3, 3,
-       3, 3, 3, 3, 3, 3, 5, 2,
-       0, 0, 0, 0, 0, 1, 3, 3,
+       0, 3, 2, 2, 1, 1, 1, 1,
+       3, 0, 3, 0, 1, 1, 1, 3,
+       0, 1, 1, 1, 1, 1, 1, 3,
+       0, 3, 3, 3, 3, 3, 3, 3,
+       3, 5, 2, 0, 0, 0, 0, 0,
+       1, 3, 3, 1, 1, 1, 1, 1,
+       1, 1, 1, 1, 3, 2, 3, 5,
        1, 1, 1, 1, 1, 1, 1, 1,
-       1, 3, 2, 3, 5, 1, 1, 1,
-       1, 1, 1, 1, 1, 1, 3, 3,
-       3, 1, 1, 1, 1, 1, 1, 1,
-       3, 2, 1, 1, 1, 1, 1, 1,
        1, 3, 3, 3, 1, 1, 1, 1,
-       1, 1, 1, 3, 1, 1, 1, 3,
-       3, 3, 3, 0, 3, 3, 3, 3,
-       2, 1, 3, 3, 0, 3, 3, 2,
-       3, 3, 0, 3, 3, 2, 1, 1,
-       1, 1, 3, 2, 1, 1, 1, 1,
-       3, 0, 3, 2, 1, 1, 1, 1,
-       3, 2, 2, 1, 3, 8, 3, 4,
-       3, 4, 3, 8, 9, 9, 0, 0,
-       0, 0, 4, 0, 0, 0, 3, 0,
-       3, 1, 0, 0, 1, 0, 3, 1,
-       3, 0, 3, 1, 1, 0, 0, 0,
-       1, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 3, 1, 0, 0, 0, 1,
-       1, 1, 1, 1, 1, 1, 0, 0,
-       0, 0, 0, 1, 0, 3, 1, 0,
-       3, 1, 0, 0, 1, 3, 1, 3,
-       3, 0, 0, 0, 0, 0, 0, 0,
-       3, 1, 0, 0, 3, 1, 0, 0,
-       0, 0, 0, 0, 0
+       1, 1, 1, 3, 2, 1, 1, 1,
+       1, 1, 1, 1, 3, 3, 3, 1,
+       1, 1, 1, 1, 1, 1, 3, 1,
+       1, 1, 3, 3, 3, 3, 0, 3,
+       3, 3, 3, 2, 1, 3, 3, 0,
+       3, 3, 2, 3, 3, 0, 3, 3,
+       2, 1, 1, 1, 1, 3, 2, 1,
+       1, 1, 1, 3, 0, 3, 2, 1,
+       1, 1, 1, 3, 2, 2, 1, 3,
+       8, 3, 4, 3, 4, 3, 8, 9,
+       9, 0, 0, 0, 0, 4, 0, 0,
+       0, 3, 0, 3, 1, 0, 0, 1,
+       0, 3, 1, 3, 0, 3, 1, 1,
+       0, 0, 0, 1, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 3, 1, 0,
+       0, 0, 1, 1, 1, 1, 1, 1,
+       1, 0, 0, 0, 0, 0, 1, 0,
+       3, 1, 0, 3, 1, 0, 0, 1,
+       3, 1, 3, 3, 0, 0, 0, 0,
+       0, 0, 0, 3, 1, 0, 0, 3,
+       1, 0, 0, 0, 0, 0, 0, 0
 };
 
 static const short _zone_scanner_index_offsets[] = {
@@ -3704,123 +3734,126 @@ static const short _zone_scanner_index_offsets[] = {
        4447, 4450, 4461, 4464, 4475, 4482, 4490, 4498,
        4508, 4512, 4526, 4529, 4532, 4535, 4542, 4551,
        4561, 4571, 4575, 4589, 4592, 4595, 4603, 4606,
-       4613, 4615, 4617, 4619, 4626, 4628, 4630, 4637,
-       4639, 4641, 4644, 4646, 4648, 4650, 4652, 4659,
-       4661, 4663, 4665, 4667, 4674, 4676, 4678, 4680,
-       4688, 4690, 4692, 4694, 4696, 4698, 4700, 4702,
-       4704, 4706, 4708, 4710, 4712, 4714, 4716, 4723,
-       4725, 4727, 4729, 4736, 4747, 4765, 4767, 4769,
-       4771, 4773, 4779, 4790, 4793, 4795, 4797, 4799,
-       4805, 4810, 4815, 4821, 4827, 4833, 4844, 4846,
-       4851, 4857, 4863, 4878, 4880, 4882, 4884, 4887,
-       4889, 4891, 4893, 4895, 4897, 4901, 4904, 4909,
-       4912, 4926, 4929, 4931, 4933, 4935, 4937, 4939,
-       4945, 4950, 4957, 4962, 4978, 4983, 4985, 4987,
-       4989, 5002, 5007, 5018, 5020, 5022, 5024, 5026,
-       5028, 5030, 5032, 5034, 5036, 5040, 5043, 5046,
-       5049, 5061, 5064, 5066, 5068, 5070, 5072, 5074,
-       5076, 5078, 5080, 5082, 5084, 5086, 5088, 5090,
-       5092, 5103, 5105, 5107, 5109, 5111, 5114, 5116,
-       5119, 5131, 5145, 5147, 5159, 5165, 5170, 5175,
-       5178, 5184, 5187, 5190, 5193, 5196, 5198, 5200,
-       5203, 5206, 5209, 5211, 5216, 5221, 5226, 5228,
-       5231, 5234, 5237, 5240, 5245, 5248, 5251, 5254,
-       5257, 5259, 5261, 5264, 5267, 5270, 5272, 5274,
-       5276, 5281, 5283, 5285, 5288, 5291, 5294, 5296,
-       5298, 5300, 5305, 5308, 5310, 5312, 5314, 5316,
-       5321, 5323, 5325, 5330, 5333, 5336, 5339, 5342,
-       5345, 5348, 5351, 5356, 5359, 5362, 5365, 5368,
-       5371, 5374, 5379, 5382, 5385, 5390, 5393, 5396,
-       5401, 5404, 5407, 5412, 5415, 5417, 5422, 5425,
-       5428, 5432, 5438, 5441, 5444, 5447, 5450, 5452,
-       5454, 5457, 5460, 5463, 5465, 5470, 5472, 5474,
-       5479, 5481, 5483, 5488, 5502, 5508, 5511, 5514,
-       5517, 5520, 5523, 5528, 5535, 5538, 5541, 5544,
-       5547, 5550, 5555, 5560, 5563, 5568, 5571, 5574,
-       5579, 5582, 5585, 5588, 5593, 5596, 5599, 5604,
-       5609, 5612, 5617, 5620, 5623, 5628, 5631, 5634,
-       5637, 5642, 5645, 5648, 5653, 5656, 5663, 5670,
-       5675, 5682, 5689, 5702, 5709, 5717, 5725, 5733,
-       5751, 5759, 5777, 5785, 5803, 5811, 5827, 5833,
-       5845, 5851, 5854, 5862, 5874, 5882, 5885, 5893,
-       5905, 5913, 5916, 5924, 5936, 5944, 5947, 5950,
-       5953, 5958, 5965, 5975, 5980, 5983, 5990, 5997,
-       6010, 6015, 6018, 6020, 6028, 6041, 6046, 6049,
-       6054, 6065, 6079, 6082, 6087, 6096, 6098, 6106,
-       6116, 6124, 6134, 6143, 6152, 6159, 6167, 6175,
-       6185, 6193, 6203, 6212, 6221, 6228, 6237, 6239,
-       6253, 6265, 6279, 6291, 6305, 6317, 6331, 6342,
-       6345, 6358, 6371, 6374, 6387, 6400, 6411, 6414,
-       6427, 6440, 6451, 6454, 6467, 6480, 6491, 6494,
-       6501, 6504, 6512, 6520, 6523, 6526, 6529, 6536,
-       6539, 6547, 6555, 6558, 6561, 6563, 6571, 6579,
-       6587, 6595, 6603, 6616, 6621, 6624, 6627, 6630,
-       6632, 6640, 6648, 6656, 6666, 6673, 6683, 6690,
-       6700, 6707, 6720, 6725, 6728, 6731, 6734, 6737,
-       6740, 6744, 6751, 6759, 6767, 6777, 6784, 6795,
-       6798, 6801, 6804, 6807, 6821, 6824, 6826, 6829,
-       6832, 6834, 6846, 6849, 6851, 6856, 6861, 6863,
-       6871, 6881, 6888, 6896, 6904, 6914, 6918, 6932,
-       6935, 6938, 6941, 6944, 6946, 6954, 6962, 6970,
-       6980, 6984, 6998, 7001, 7004, 7007, 7009, 7017,
-       7028, 7035, 7043, 7051, 7059, 7094, 7105, 7108,
-       7111, 7126, 7129, 7168, 7175, 7178, 7181, 7188,
-       7196, 7204, 7213, 7250, 7253, 7256, 7263, 7271,
-       7279, 7290, 7329, 7332, 7335, 7342, 7350, 7358,
-       7371, 7406, 7409, 7412, 7415, 7450, 7463, 7473,
-       7480, 7488, 7496, 7504, 7512, 7520, 7528, 7536,
-       7544, 7552, 7560, 7573, 7580, 7591, 7594, 7597,
-       7600, 7603, 7606, 7609, 7612, 7615, 7618, 7621,
-       7624, 7631, 7634, 7637, 7640, 7647, 7650, 7657,
-       7668, 7671, 7678, 7683, 7686, 7689, 7692, 7695,
-       7702, 7709, 7712, 7715, 7722, 7725, 7728, 7731,
-       7738, 7741, 7744, 7747, 7754, 7761, 7764, 7767,
-       7770, 7777, 7782, 7785, 7788, 7795, 7798, 7801,
-       7804, 7811, 7818, 7821, 7824, 7827, 7829, 7836,
-       7838, 7845, 7850, 7853, 7856, 7859, 7866, 7869,
-       7872, 7875, 7882, 7885, 7888, 7891, 7894, 7897,
-       7900, 7903, 7910, 7915, 7918, 7925, 7932, 7939,
-       7941, 7948, 7950, 7957, 7960, 7967, 7974, 7979,
-       7982, 7985, 7988, 7995, 8002, 8009, 8012, 8015,
-       8018, 8025, 8028, 8035, 8044, 8047, 8055, 8064,
-       8067, 8070, 8073, 8076, 8083, 8086, 8089, 8092,
-       8095, 8098, 8101, 8104, 8107, 8110, 8117, 8120,
-       8123, 8130, 8137, 8144, 8147, 8150, 8153, 8160,
-       8167, 8180, 8183, 8186, 8189, 8192, 8199, 8202,
-       8209, 8212, 8219, 8222, 8229, 8232, 8235, 8238,
-       8245, 8248, 8251, 8258, 8265, 8268, 8271, 8278,
-       8281, 8288, 8291, 8294, 8296, 8304, 8307, 8310,
-       8317, 8320, 8323, 8326, 8329, 8332, 8339, 8346,
-       8351, 8356, 8358, 8366, 8374, 8382, 8392, 8399,
-       8410, 8413, 8416, 8419, 8422, 8427, 8430, 8432,
-       8440, 8448, 8456, 8464, 8472, 8483, 8490, 8500,
-       8504, 8509, 8513, 8518, 8523, 8527, 8532, 8540,
-       8545, 8547, 8549, 8551, 8553, 8555, 8558, 8562,
-       8572, 8575, 8578, 8581, 8583, 8591, 8599, 8607,
-       8615, 8623, 8634, 8639, 8643, 8651, 8654, 8657,
-       8660, 8662, 8670, 8678, 8686, 8694, 8702, 8712,
-       8716, 8730, 8733, 8736, 8739, 8742, 8744, 8752,
-       8760, 8766, 8771, 8774, 8776, 8784, 8792, 8800,
-       8808, 8816, 8826, 8830, 8844, 8847, 8850, 8853,
-       8856, 8858, 8866, 8875, 8882, 8885, 8887, 8895,
-       8905, 8909, 8913, 8917, 8919, 8923, 8927, 8931,
-       8935, 8941, 8944, 8948, 8952, 8954, 8958, 8962,
-       8968, 8972, 8976, 8978, 8982, 8986, 8992, 8994,
-       9002, 9010, 9018, 9028, 9033, 9036, 9039, 9041,
-       9049, 9059, 9066, 9076, 9081, 9084, 9087, 9089,
-       9097, 9110, 9115, 9120, 9123, 9139, 9165, 9215,
-       9266, 9282, 9333, 9349, 9375, 9436, 9497, 9498,
-       9499, 9500, 9501, 9510, 9511, 9512, 9513, 9527,
-       9528, 9543, 9546, 9547, 9592, 9595, 9596, 9610,
-       9613, 9623, 9624, 9638, 9641, 9644, 9645, 9646,
-       9664, 9667, 9668, 9669, 9670, 9671, 9672, 9673,
-       9674, 9675, 9676, 9690, 9693, 9694, 9695, 9706,
-       9709, 9721, 9724, 9736, 9739, 9751, 9754, 9755,
-       9756, 9757, 9758, 9772, 9775, 9776, 9790, 9793,
-       9794, 9808, 9811, 9812, 9827, 9830, 9841, 9844,
-       9883, 9890, 9891, 9892, 9893, 9894, 9895, 9896,
-       9897, 9911, 9914, 9915, 9916, 9930, 9933, 9934,
-       9935, 9936, 9937, 9938, 9939
+       4615, 4617, 4619, 4621, 4628, 4630, 4632, 4634,
+       4636, 4638, 4640, 4647, 4649, 4651, 4658, 4660,
+       4662, 4665, 4667, 4669, 4671, 4673, 4680, 4682,
+       4684, 4686, 4688, 4695, 4697, 4699, 4701, 4709,
+       4711, 4713, 4715, 4717, 4719, 4721, 4723, 4725,
+       4727, 4729, 4731, 4733, 4735, 4737, 4744, 4746,
+       4748, 4750, 4752, 4759, 4761, 4763, 4765, 4772,
+       4783, 4803, 4805, 4807, 4809, 4811, 4817, 4828,
+       4831, 4833, 4835, 4837, 4839, 4841, 4843, 4845,
+       4851, 4862, 4876, 4878, 4889, 4891, 4893, 4895,
+       4901, 4906, 4911, 4917, 4923, 4929, 4931, 4936,
+       4942, 4948, 4963, 4965, 4967, 4969, 4972, 4974,
+       4976, 4978, 4980, 4982, 4986, 4989, 4994, 4997,
+       5011, 5014, 5016, 5018, 5020, 5022, 5024, 5030,
+       5035, 5042, 5047, 5063, 5068, 5070, 5072, 5074,
+       5087, 5092, 5094, 5096, 5098, 5100, 5102, 5104,
+       5106, 5108, 5110, 5114, 5117, 5120, 5123, 5135,
+       5138, 5140, 5142, 5144, 5146, 5148, 5150, 5152,
+       5154, 5156, 5158, 5160, 5162, 5164, 5166, 5177,
+       5179, 5181, 5183, 5185, 5196, 5198, 5200, 5202,
+       5204, 5207, 5209, 5212, 5224, 5238, 5240, 5252,
+       5258, 5263, 5268, 5271, 5277, 5280, 5283, 5286,
+       5289, 5291, 5293, 5296, 5299, 5302, 5304, 5309,
+       5314, 5319, 5321, 5324, 5327, 5330, 5333, 5338,
+       5341, 5344, 5347, 5350, 5352, 5354, 5357, 5360,
+       5363, 5365, 5367, 5369, 5374, 5376, 5378, 5381,
+       5384, 5387, 5389, 5391, 5393, 5398, 5401, 5403,
+       5405, 5407, 5409, 5414, 5416, 5418, 5423, 5426,
+       5429, 5432, 5435, 5438, 5441, 5444, 5449, 5452,
+       5455, 5458, 5461, 5464, 5467, 5472, 5475, 5478,
+       5483, 5486, 5489, 5494, 5497, 5500, 5505, 5508,
+       5510, 5515, 5518, 5521, 5525, 5531, 5534, 5537,
+       5540, 5543, 5545, 5547, 5550, 5553, 5556, 5558,
+       5563, 5565, 5567, 5572, 5574, 5576, 5581, 5595,
+       5601, 5604, 5607, 5610, 5613, 5616, 5621, 5628,
+       5631, 5634, 5637, 5640, 5643, 5648, 5653, 5656,
+       5661, 5664, 5667, 5672, 5675, 5678, 5681, 5686,
+       5689, 5692, 5697, 5702, 5705, 5710, 5713, 5716,
+       5721, 5724, 5727, 5730, 5735, 5738, 5741, 5746,
+       5749, 5756, 5763, 5768, 5775, 5782, 5795, 5802,
+       5810, 5818, 5826, 5844, 5852, 5870, 5878, 5896,
+       5904, 5920, 5926, 5938, 5944, 5947, 5955, 5967,
+       5975, 5978, 5986, 5998, 6006, 6009, 6017, 6029,
+       6037, 6040, 6043, 6046, 6051, 6058, 6068, 6073,
+       6076, 6083, 6090, 6103, 6108, 6111, 6113, 6121,
+       6134, 6139, 6142, 6147, 6158, 6172, 6175, 6180,
+       6189, 6191, 6199, 6209, 6217, 6227, 6236, 6245,
+       6252, 6260, 6268, 6278, 6286, 6296, 6305, 6314,
+       6321, 6330, 6332, 6346, 6358, 6372, 6384, 6398,
+       6410, 6424, 6435, 6438, 6451, 6464, 6467, 6480,
+       6493, 6504, 6507, 6520, 6533, 6544, 6547, 6560,
+       6573, 6584, 6587, 6594, 6597, 6605, 6613, 6616,
+       6619, 6622, 6629, 6632, 6640, 6648, 6651, 6654,
+       6656, 6664, 6672, 6680, 6688, 6696, 6709, 6714,
+       6717, 6720, 6723, 6725, 6733, 6741, 6749, 6759,
+       6766, 6776, 6783, 6793, 6800, 6813, 6818, 6821,
+       6824, 6827, 6830, 6833, 6837, 6844, 6852, 6860,
+       6870, 6877, 6888, 6891, 6894, 6897, 6900, 6914,
+       6917, 6919, 6922, 6925, 6927, 6939, 6942, 6944,
+       6949, 6954, 6956, 6964, 6974, 6981, 6989, 6997,
+       7007, 7011, 7025, 7028, 7031, 7034, 7037, 7039,
+       7047, 7055, 7063, 7073, 7077, 7091, 7094, 7097,
+       7100, 7102, 7110, 7121, 7128, 7136, 7144, 7152,
+       7187, 7198, 7201, 7204, 7219, 7222, 7261, 7268,
+       7271, 7274, 7281, 7289, 7297, 7306, 7343, 7346,
+       7349, 7356, 7364, 7372, 7383, 7422, 7425, 7428,
+       7435, 7443, 7451, 7464, 7499, 7502, 7505, 7508,
+       7543, 7556, 7566, 7573, 7581, 7589, 7597, 7605,
+       7613, 7621, 7629, 7637, 7645, 7653, 7666, 7673,
+       7684, 7687, 7690, 7693, 7696, 7699, 7702, 7705,
+       7708, 7711, 7714, 7717, 7724, 7727, 7730, 7733,
+       7740, 7743, 7750, 7761, 7764, 7771, 7776, 7779,
+       7782, 7785, 7788, 7795, 7802, 7805, 7808, 7815,
+       7818, 7821, 7824, 7831, 7834, 7837, 7840, 7847,
+       7854, 7857, 7860, 7863, 7870, 7875, 7878, 7881,
+       7888, 7891, 7894, 7897, 7904, 7911, 7914, 7917,
+       7920, 7922, 7929, 7931, 7938, 7943, 7946, 7949,
+       7952, 7959, 7962, 7965, 7968, 7975, 7978, 7981,
+       7984, 7987, 7990, 7993, 7996, 8003, 8008, 8011,
+       8018, 8025, 8032, 8034, 8041, 8043, 8050, 8053,
+       8060, 8067, 8072, 8075, 8078, 8081, 8088, 8095,
+       8102, 8105, 8108, 8111, 8118, 8121, 8128, 8137,
+       8140, 8148, 8157, 8160, 8163, 8166, 8169, 8176,
+       8179, 8182, 8185, 8188, 8191, 8194, 8197, 8200,
+       8203, 8210, 8213, 8216, 8223, 8230, 8237, 8240,
+       8243, 8246, 8253, 8260, 8273, 8276, 8279, 8282,
+       8285, 8292, 8295, 8302, 8305, 8312, 8315, 8322,
+       8325, 8328, 8331, 8338, 8341, 8344, 8351, 8358,
+       8361, 8364, 8371, 8374, 8381, 8384, 8387, 8389,
+       8397, 8400, 8403, 8410, 8413, 8416, 8419, 8422,
+       8425, 8432, 8439, 8444, 8449, 8451, 8459, 8467,
+       8475, 8485, 8492, 8503, 8506, 8509, 8512, 8515,
+       8520, 8523, 8525, 8533, 8541, 8549, 8557, 8565,
+       8576, 8583, 8593, 8597, 8602, 8606, 8611, 8616,
+       8620, 8625, 8633, 8638, 8640, 8642, 8644, 8646,
+       8648, 8651, 8655, 8665, 8668, 8671, 8674, 8676,
+       8684, 8692, 8700, 8708, 8716, 8727, 8732, 8736,
+       8744, 8747, 8750, 8753, 8755, 8763, 8771, 8779,
+       8787, 8795, 8805, 8809, 8823, 8826, 8829, 8832,
+       8835, 8837, 8845, 8853, 8859, 8864, 8867, 8869,
+       8877, 8885, 8893, 8901, 8909, 8919, 8923, 8937,
+       8940, 8943, 8946, 8949, 8951, 8959, 8968, 8975,
+       8978, 8980, 8988, 8998, 9002, 9006, 9010, 9012,
+       9016, 9020, 9024, 9028, 9034, 9037, 9041, 9045,
+       9047, 9051, 9055, 9061, 9065, 9069, 9071, 9075,
+       9079, 9085, 9087, 9095, 9103, 9111, 9121, 9126,
+       9129, 9132, 9134, 9142, 9152, 9159, 9169, 9174,
+       9177, 9180, 9182, 9190, 9203, 9208, 9213, 9216,
+       9232, 9258, 9308, 9359, 9375, 9426, 9442, 9468,
+       9529, 9590, 9591, 9592, 9593, 9594, 9603, 9604,
+       9605, 9606, 9620, 9621, 9636, 9639, 9640, 9685,
+       9688, 9689, 9703, 9706, 9716, 9717, 9731, 9734,
+       9737, 9738, 9739, 9759, 9762, 9763, 9764, 9765,
+       9766, 9767, 9768, 9769, 9770, 9771, 9785, 9788,
+       9789, 9790, 9801, 9804, 9816, 9819, 9831, 9834,
+       9846, 9849, 9850, 9851, 9852, 9853, 9867, 9870,
+       9871, 9885, 9888, 9889, 9903, 9906, 9907, 9922,
+       9925, 9936, 9939, 9978, 9985, 9986, 9987, 9988,
+       9989, 9990, 9991, 9992, 10006, 10009, 10010, 10011,
+       10025, 10028, 10029, 10030, 10031, 10032, 10033, 10034
 };
 
 static const short _zone_scanner_indicies[] = {
@@ -4400,696 +4433,708 @@ static const short _zone_scanner_indicies[] = {
        1856, 1845, 1845, 1845, 1806, 1858, 1857, 1806,
        1860, 1859, 1792, 1861, 1861, 1862, 1863, 1864,
        1865, 1838, 1798, 1867, 1866, 1792, 1869, 1870,
-       1871, 1872, 1873, 1874, 1868, 1875, 1868, 1876,
-       1868, 1877, 1868, 1878, 1878, 1878, 1878, 1878,
-       1878, 1868, 1879, 1868, 1880, 1868, 1881, 1881,
-       1881, 1881, 1881, 1881, 1868, 1882, 1868, 1883,
-       1868, 1884, 1885, 1868, 1886, 1868, 1887, 1868,
-       1888, 1868, 1889, 1868, 1890, 1890, 1890, 1890,
-       1890, 1890, 1868, 1891, 1868, 1892, 1868, 1893,
-       1868, 1894, 1868, 1895, 1895, 1895, 1895, 1895,
-       1895, 1868, 1896, 1868, 1897, 1868, 1899, 1898,
-       1900, 1900, 1900, 1900, 1900, 1900, 1901, 1898,
-       1902, 1868, 1903, 1868, 1904, 1868, 1905, 1868,
-       1906, 1868, 1907, 1868, 1908, 1868, 1909, 1868,
-       1910, 1868, 1911, 1868, 1912, 1868, 1913, 1868,
-       1914, 1868, 1915, 1868, 1916, 1916, 1916, 1916,
-       1916, 1916, 1868, 1917, 1868, 1918, 1868, 1919,
-       1868, 1920, 1920, 1920, 1920, 1920, 1920, 1868,
-       1922, 1922, 1923, 1924, 1925, 1926, 1927, 1927,
-       1928, 1929, 1921, 1930, 1930, 1931, 1932, 1933,
-       1934, 1935, 1936, 1937, 1938, 1939, 1940, 1941,
-       1942, 1942, 1943, 1944, 1921, 1945, 1921, 1946,
-       1921, 1947, 1921, 1948, 1921, 1921, 1950, 1921,
-       1921, 1921, 1949, 1951, 1951, 1952, 1953, 1954,
-       1955, 1956, 1956, 1957, 1958, 1921, 1960, 1959,
-       1921, 1961, 1921, 1962, 1921, 1963, 1921, 1964,
-       1965, 1965, 1965, 1965, 1921, 1966, 1966, 1966,
-       1966, 1921, 1967, 1967, 1967, 1967, 1921, 1968,
-       1969, 1968, 1968, 1968, 1921, 1970, 1971, 1970,
-       1970, 1970, 1921, 1972, 1973, 1973, 1973, 1973,
-       1921, 1974, 1974, 1975, 1976, 1977, 1978, 1979,
-       1979, 1980, 1981, 1921, 1971, 1921, 1982, 1982,
-       1982, 1982, 1921, 1983, 1984, 1983, 1983, 1983,
-       1921, 1985, 1986, 1985, 1985, 1985, 1921, 1987,
-       1987, 1988, 1989, 1990, 1991, 1992, 1993, 1993,
-       1994, 1995, 1990, 1990, 1990, 1921, 1986, 1921,
-       1996, 1921, 1997, 1921, 1998, 1999, 1921, 2000,
-       1921, 2001, 1921, 2002, 1921, 2003, 1921, 2004,
-       1921, 2006, 2007, 2007, 2005, 2008, 2008, 2005,
-       2009, 2010, 2011, 2011, 2005, 2012, 2012, 2005,
-       2013, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-       2020, 2020, 2021, 2022, 2017, 2005, 2023, 2023,
-       2005, 2024, 1921, 2025, 1921, 2026, 1921, 2027,
-       1921, 2028, 1921, 2029, 2030, 2030, 2030, 2030,
-       2005, 2031, 2031, 2031, 2031, 2005, 2032, 2033,
-       2034, 2034, 2034, 2034, 2005, 2035, 2035, 2035,
-       2035, 2005, 2036, 2036, 2037, 2038, 2039, 2040,
-       2041, 2042, 2043, 2043, 2044, 2045, 2040, 2040,
-       2040, 2005, 2046, 2046, 2046, 2046, 2005, 2047,
-       1921, 2048, 1921, 2050, 2049, 2051, 2051, 2052,
-       2053, 2055, 2056, 2057, 2058, 2058, 2059, 2060,
-       2054, 2049, 1921, 1921, 1921, 1921, 2061, 1987,
-       1987, 1988, 1989, 1991, 1992, 1993, 1993, 1994,
-       1995, 1921, 2062, 1921, 2063, 1921, 2064, 1921,
-       2065, 1921, 2066, 1921, 2067, 1921, 2068, 1921,
-       2069, 1921, 2070, 1921, 2071, 2072, 2072, 1921,
-       2073, 2073, 1921, 2074, 2075, 1921, 2076, 2076,
-       1921, 2077, 2077, 2078, 2079, 2080, 2081, 2082,
-       2083, 2083, 2084, 2085, 1921, 2086, 2086, 1921,
-       2087, 1921, 2088, 1921, 2089, 1921, 2090, 1921,
-       2091, 1921, 2092, 1921, 2093, 1921, 2094, 1921,
-       2095, 1921, 2096, 1921, 2097, 1921, 2098, 1921,
-       2099, 1921, 2100, 1921, 2101, 2101, 2102, 2103,
-       2104, 2105, 2106, 2106, 2107, 2108, 1921, 2109,
-       1921, 2110, 1921, 2111, 1921, 2112, 1921, 2113,
-       2114, 2049, 2115, 2049, 2116, 2117, 2049, 2118,
-       2118, 2119, 2120, 2122, 2123, 2124, 2124, 2125,
-       2126, 2121, 2049, 1951, 1951, 1952, 1953, 1954,
-       1955, 1956, 1956, 1957, 1958, 2127, 2127, 2127,
-       1921, 2128, 1921, 2131, 2132, 2133, 2134, 2135,
-       2131, 2132, 2133, 2134, 2135, 2130, 2129, 2136,
-       2136, 2136, 2136, 2137, 2129, 2138, 2139, 2138,
-       2139, 2129, 2140, 2140, 2140, 2140, 2129, 2141,
-       2141, 2129, 2142, 2143, 2142, 2142, 2142, 2129,
-       2144, 2144, 2129, 2145, 2145, 2129, 2146, 2146,
-       2129, 2147, 2147, 2129, 2148, 2129, 2149, 2129,
-       2150, 2150, 2129, 2151, 2151, 2129, 2152, 2152,
-       2129, 2153, 2129, 2154, 2154, 2154, 2154, 2129,
-       2155, 2156, 2155, 2156, 2129, 2157, 2158, 2157,
-       2158, 2129, 2159, 2129, 2160, 2160, 2129, 2161,
-       2161, 2129, 2162, 2162, 2129, 2163, 2163, 2129,
-       2164, 2164, 2164, 2164, 2129, 2165, 2165, 2129,
-       2166, 2166, 2129, 2167, 2167, 2129, 2168, 2169,
-       2129, 2170, 2129, 2171, 2129, 2172, 2172, 2129,
-       2173, 2173, 2129, 2174, 2174, 2129, 2175, 2129,
-       2176, 2129, 2177, 2129, 2178, 2178, 2178, 2178,
-       2129, 2179, 2129, 2180, 2129, 2181, 2181, 2129,
-       2182, 2182, 2129, 2183, 2183, 2129, 2184, 2129,
-       2185, 2129, 2186, 2129, 2187, 2187, 2187, 2187,
-       2129, 2188, 2189, 2129, 2190, 2129, 2191, 2129,
-       2192, 2129, 2193, 2129, 2194, 2194, 2194, 2194,
-       2129, 2195, 2129, 2196, 2129, 2197, 2197, 2197,
-       2197, 2129, 2198, 2198, 2129, 2199, 2199, 2129,
-       2200, 2200, 2129, 2201, 2201, 2129, 2202, 2202,
-       2129, 2203, 2203, 2129, 2204, 2204, 2129, 2205,
-       2205, 2205, 2205, 2129, 2206, 2206, 2129, 2207,
-       2207, 2129, 2208, 2208, 2129, 2209, 2209, 2129,
-       2210, 2210, 2129, 2211, 2211, 2129, 2212, 2213,
-       2212, 2213, 2129, 2214, 2214, 2129, 2215, 2215,
-       2129, 2216, 2216, 2216, 2216, 2129, 2217, 2217,
-       2129, 2218, 2218, 2129, 2219, 2219, 2219, 2219,
-       2129, 2220, 2220, 2129, 2221, 2221, 2129, 2222,
-       2223, 2222, 2223, 2129, 2224, 2224, 2129, 2225,
-       2129, 2226, 2226, 2226, 2226, 2129, 2227, 2227,
-       2129, 2228, 2228, 2129, 2229, 2230, 2231, 2129,
-       2232, 2233, 2232, 2232, 2232, 2129, 2234, 2234,
-       2129, 2235, 2235, 2129, 2236, 2236, 2129, 2237,
-       2237, 2129, 2238, 2129, 2239, 2129, 2240, 2240,
-       2129, 2241, 2241, 2129, 2242, 2242, 2129, 2243,
-       2129, 2244, 2244, 2244, 2244, 2129, 2245, 2129,
-       2246, 2129, 2247, 2247, 2247, 2247, 2129, 2248,
-       2129, 2249, 2129, 2250, 2250, 2250, 2250, 2129,
-       2253, 2254, 2255, 2256, 2257, 2258, 2253, 2254,
-       2255, 2256, 2257, 2258, 2252, 2251, 2259, 2259,
-       2259, 2259, 2260, 2251, 2261, 2261, 2251, 2262,
-       2262, 2251, 2263, 2263, 2251, 2264, 2264, 2251,
-       2265, 2265, 2251, 2266, 2266, 2266, 2266, 2251,
-       2267, 2268, 2269, 2267, 2268, 2269, 2251, 2270,
-       2270, 2251, 2271, 2271, 2251, 2272, 2272, 2251,
-       2273, 2273, 2251, 2274, 2274, 2251, 2275, 2275,
-       2275, 2275, 2251, 2276, 2277, 2276, 2277, 2251,
-       2278, 2278, 2251, 2279, 2279, 2279, 2279, 2251,
-       2280, 2280, 2251, 2281, 2281, 2251, 2282, 2282,
-       2282, 2282, 2251, 2283, 2283, 2251, 2284, 2284,
-       2251, 2285, 2285, 2251, 2286, 2286, 2286, 2286,
-       2251, 2287, 2287, 2251, 2288, 2288, 2251, 2289,
-       2289, 2289, 2289, 2251, 2290, 2291, 2290, 2291,
-       2251, 2292, 2292, 2251, 2293, 2293, 2293, 2293,
-       2251, 2294, 2294, 2251, 2295, 2295, 2251, 2296,
-       2296, 2296, 2296, 2251, 2297, 2297, 2251, 2298,
-       2298, 2251, 2299, 2299, 2251, 2300, 2300, 2300,
-       2300, 2251, 2301, 2301, 2251, 2302, 2302, 2251,
-       2303, 2303, 2303, 2303, 2251, 2305, 2305, 2304,
-       2306, 2307, 2306, 2306, 2306, 2307, 2304, 2308,
-       2308, 2308, 2308, 2308, 2308, 75, 2309, 2309,
-       2309, 2309, 75, 2310, 2310, 2310, 2310, 2310,
-       2310, 75, 2311, 2311, 2312, 2313, 2314, 2315,
-       75, 2316, 2316, 2317, 2318, 2319, 2319, 2319,
-       2320, 2321, 2319, 2319, 2319, 75, 2322, 2322,
-       2323, 2324, 2325, 2326, 75, 2328, 2328, 2329,
-       2330, 2332, 2333, 2331, 2327, 2334, 2334, 2335,
-       2336, 2338, 2339, 2337, 2327, 2340, 2340, 2341,
-       2342, 2344, 2345, 2343, 2327, 2347, 2347, 2348,
-       2349, 2351, 2352, 2353, 2354, 2355, 2351, 2352,
-       2353, 2354, 2355, 2356, 2357, 2350, 2346, 2358,
-       2358, 2359, 2360, 2362, 2363, 2361, 2327, 2364,
-       2364, 2365, 2366, 2368, 2369, 2370, 2371, 2372,
-       2368, 2369, 2370, 2371, 2372, 2373, 2374, 2367,
-       2346, 2375, 2375, 2376, 2377, 2379, 2380, 2378,
-       2327, 2381, 2381, 2382, 2383, 2385, 2386, 2387,
-       2388, 2389, 2385, 2386, 2387, 2388, 2389, 2390,
-       2391, 2384, 2346, 2392, 2392, 2393, 2394, 2396,
-       2397, 2395, 2327, 2398, 2398, 2400, 2401, 2402,
-       2403, 2404, 2400, 2401, 2402, 2403, 2404, 2398,
-       2398, 2399, 2346, 2398, 2398, 2398, 2398, 2405,
-       2346, 2407, 2408, 2409, 2410, 2411, 2407, 2408,
-       2409, 2410, 2411, 2406, 2346, 2412, 2412, 2412,
-       2412, 2413, 2346, 2415, 2414, 75, 2381, 2381,
-       2382, 2383, 2390, 2391, 2416, 2346, 2418, 2419,
-       2420, 2421, 2422, 2418, 2419, 2420, 2421, 2422,
-       2417, 2346, 2423, 2423, 2424, 2425, 2427, 2428,
-       2426, 2346, 2430, 2429, 75, 2364, 2364, 2365,
-       2366, 2373, 2374, 2431, 2346, 2433, 2434, 2435,
-       2436, 2437, 2433, 2434, 2435, 2436, 2437, 2432,
-       2346, 2438, 2438, 2439, 2440, 2442, 2443, 2441,
-       2346, 2445, 2444, 75, 2347, 2347, 2348, 2349,
-       2356, 2357, 2446, 2346, 2448, 2449, 2450, 2451,
-       2452, 2448, 2449, 2450, 2451, 2452, 2447, 2346,
-       2453, 2453, 2454, 2455, 2457, 2458, 2456, 2346,
-       2460, 2459, 75, 2462, 2461, 75, 2464, 2463,
-       75, 75, 75, 75, 75, 2465, 2466, 2466,
-       2467, 2468, 2469, 2470, 75, 2472, 2472, 2473,
-       2474, 2475, 2476, 2471, 2471, 2471, 75, 2477,
-       2477, 2477, 2477, 75, 2479, 2478, 75, 2480,
-       2480, 2480, 2480, 2480, 2480, 75, 2481, 2481,
-       2482, 2483, 2484, 2485, 75, 2486, 2486, 2487,
-       2488, 2489, 2489, 2489, 2490, 2491, 2489, 2489,
-       2489, 75, 2492, 2492, 2492, 2492, 75, 2494,
-       2493, 75, 2495, 2327, 2496, 2496, 2497, 2498,
-       2500, 2501, 2499, 2327, 2502, 2502, 2503, 2504,
-       2505, 2505, 2505, 2506, 2507, 2505, 2505, 2505,
-       75, 2508, 2508, 2508, 2508, 75, 2510, 2509,
-       75, 2512, 2512, 2512, 2512, 2511, 2513, 2513,
-       2514, 2515, 2516, 2517, 2518, 2518, 2519, 2520,
-       2512, 2522, 2522, 2523, 2524, 2525, 2526, 2527,
-       2527, 2528, 2529, 2521, 2521, 2521, 2512, 2531,
-       2530, 2512, 2532, 2532, 2532, 2532, 2304, 2533,
-       2534, 2533, 2533, 2533, 2534, 2534, 2534, 2304,
-       2536, 2535, 2537, 2537, 2538, 2539, 2541, 2542,
-       2540, 2535, 2543, 2543, 2544, 2545, 2547, 2548,
-       2549, 2550, 2546, 2535, 2551, 2551, 2552, 2553,
-       2555, 2556, 2554, 2535, 2557, 2557, 2558, 2559,
-       2547, 2548, 2561, 2562, 2560, 2535, 2563, 2563,
-       2564, 2565, 2566, 2568, 2569, 2567, 2535, 2570,
-       2570, 2571, 2572, 2547, 2548, 2573, 2574, 2535,
-       2575, 2575, 2576, 2577, 2578, 2579, 2535, 2575,
-       2575, 2576, 2577, 2578, 2579, 2580, 2535, 2581,
-       2581, 2582, 2583, 2585, 2586, 2584, 2535, 2587,
-       2587, 2588, 2589, 2591, 2592, 2593, 2594, 2590,
-       2535, 2595, 2595, 2596, 2597, 2599, 2600, 2598,
-       2535, 2601, 2601, 2602, 2603, 2591, 2592, 2605,
-       2606, 2604, 2535, 2607, 2607, 2608, 2609, 2610,
-       2612, 2613, 2611, 2535, 2614, 2614, 2615, 2616,
-       2591, 2592, 2617, 2618, 2535, 2619, 2619, 2620,
-       2621, 2622, 2623, 2535, 2619, 2619, 2620, 2621,
-       2624, 2622, 2623, 2625, 2535, 2626, 2535, 2627,
-       2627, 2628, 2629, 2630, 2632, 2633, 2634, 2635,
-       2635, 2636, 2637, 2631, 2535, 2638, 2638, 2639,
-       2640, 2642, 2643, 2644, 2644, 2645, 2646, 2641,
-       2535, 2647, 2647, 2648, 2649, 2650, 2652, 2653,
-       2654, 2655, 2655, 2656, 2657, 2651, 2535, 2658,
-       2658, 2659, 2660, 2662, 2663, 2644, 2644, 2664,
-       2665, 2661, 2535, 2666, 2666, 2667, 2668, 2669,
-       2671, 2672, 2673, 2674, 2674, 2675, 2676, 2670,
-       2535, 2677, 2677, 2678, 2679, 2681, 2682, 2644,
-       2644, 2683, 2684, 2680, 2535, 2685, 2685, 2686,
-       2687, 2688, 2685, 2690, 2691, 2692, 2692, 2693,
-       2694, 2689, 2535, 2695, 2695, 2696, 2697, 2698,
-       2699, 2644, 2644, 2700, 2701, 2535, 2703, 2702,
-       2535, 2704, 2704, 2705, 2706, 2704, 2708, 2709,
-       2710, 2710, 2711, 2712, 2707, 2535, 2685, 2685,
-       2686, 2687, 2685, 2690, 2691, 2692, 2692, 2693,
-       2694, 2713, 2535, 2715, 2714, 2535, 2716, 2716,
-       2717, 2718, 2720, 2721, 2722, 2723, 2723, 2724,
-       2725, 2719, 2535, 2666, 2666, 2667, 2668, 2671,
-       2672, 2673, 2674, 2674, 2675, 2676, 2726, 2535,
-       2677, 2677, 2678, 2679, 2681, 2682, 2644, 2644,
-       2683, 2684, 2535, 2728, 2727, 2535, 2729, 2729,
-       2730, 2731, 2733, 2734, 2735, 2736, 2736, 2737,
-       2738, 2732, 2535, 2647, 2647, 2648, 2649, 2652,
-       2653, 2654, 2655, 2655, 2656, 2657, 2739, 2535,
-       2658, 2658, 2659, 2660, 2662, 2663, 2644, 2644,
-       2664, 2665, 2535, 2741, 2740, 2535, 2742, 2742,
-       2743, 2744, 2746, 2747, 2748, 2749, 2749, 2750,
-       2751, 2745, 2535, 2627, 2627, 2628, 2629, 2632,
-       2633, 2634, 2635, 2635, 2636, 2637, 2752, 2535,
-       2638, 2638, 2639, 2640, 2642, 2643, 2644, 2644,
-       2645, 2646, 2535, 2754, 2753, 2535, 2755, 2755,
-       2756, 2757, 2758, 2759, 2535, 2761, 2760, 2535,
-       2762, 2762, 2763, 2764, 2766, 2767, 2765, 2535,
-       2607, 2607, 2608, 2609, 2612, 2613, 2768, 2535,
-       2770, 2769, 2535, 2772, 2771, 2535, 2774, 2773,
-       2535, 2775, 2775, 2776, 2777, 2778, 2779, 2535,
-       2781, 2780, 2535, 2782, 2782, 2783, 2784, 2786,
-       2787, 2785, 2535, 2563, 2563, 2564, 2565, 2568,
-       2569, 2788, 2535, 2790, 2789, 2535, 2792, 2791,
-       2535, 2793, 2327, 2794, 2794, 2795, 2796, 2798,
-       2799, 2797, 2327, 2800, 2800, 2801, 2802, 2804,
-       2805, 2803, 2327, 2806, 2806, 2807, 2808, 2810,
-       2811, 2809, 2327, 2812, 2812, 2813, 2814, 2816,
-       2817, 2815, 2327, 2818, 2818, 2819, 2820, 2822,
-       2823, 2821, 2327, 2824, 2824, 2825, 2826, 2827,
-       2827, 2827, 2828, 2829, 2827, 2827, 2827, 75,
-       2830, 2830, 2830, 2830, 75, 2832, 2831, 75,
-       2834, 2833, 75, 2836, 2835, 75, 2837, 2327,
-       2838, 2838, 2839, 2840, 2842, 2843, 2841, 2327,
-       2844, 2844, 2845, 2846, 2848, 2849, 2847, 2327,
-       2850, 2850, 2851, 2852, 2854, 2855, 2853, 2327,
-       2857, 2857, 2858, 2859, 2860, 2861, 2856, 2856,
-       2856, 75, 2862, 2862, 2863, 2864, 2865, 2866,
-       75, 2868, 2868, 2869, 2870, 2871, 2872, 2867,
-       2867, 2867, 75, 2873, 2873, 2874, 2875, 2876,
-       2877, 75, 2879, 2879, 2880, 2881, 2882, 2883,
-       2878, 2878, 2878, 75, 2884, 2884, 2885, 2886,
-       2887, 2888, 75, 2889, 2889, 2890, 2891, 2892,
-       2892, 2892, 2893, 2894, 2892, 2892, 2892, 75,
-       2895, 2895, 2895, 2895, 75, 2897, 2896, 75,
-       2899, 2898, 75, 2901, 2900, 75, 2903, 2902,
-       75, 2905, 2904, 75, 2906, 2906, 2906, 75,
-       2907, 2907, 2908, 2909, 2910, 2911, 75, 2907,
-       2907, 2908, 2909, 2910, 2911, 2912, 2327, 2913,
-       2913, 2914, 2915, 2917, 2918, 2916, 2327, 2919,
-       2919, 2920, 2921, 2923, 2924, 2922, 2922, 2922,
-       75, 2925, 2925, 2926, 2927, 2928, 2929, 75,
-       2925, 2925, 2926, 2927, 2930, 2928, 2929, 2930,
-       2930, 2930, 75, 2931, 2931, 75, 2933, 2932,
-       75, 2935, 2934, 75, 2937, 2936, 75, 2939,
-       2939, 2940, 2941, 2942, 2943, 2944, 2945, 2946,
-       2947, 2947, 2948, 2949, 2938, 2950, 2951, 2938,
-       2952, 2938, 2954, 2954, 2953, 2956, 2955, 2953,
-       2957, 2938, 2958, 2958, 2959, 2960, 2962, 2963,
-       2964, 2964, 2965, 2966, 2961, 2938, 2968, 2967,
-       75, 2969, 2938, 2970, 2970, 2970, 2970, 2953,
-       2972, 2971, 2971, 2971, 2953, 2973, 2327, 2974,
-       2974, 2975, 2976, 2978, 2979, 2977, 2327, 2980,
-       2980, 2981, 2982, 2984, 2985, 2983, 2983, 2983,
-       75, 2986, 2986, 2987, 2988, 2989, 2990, 75,
-       2986, 2986, 2987, 2988, 2989, 2990, 2991, 2327,
-       2992, 2992, 2993, 2994, 2996, 2997, 2995, 2327,
-       2999, 2999, 3000, 3001, 3003, 3004, 3002, 3002,
-       3002, 2998, 3005, 3005, 3005, 2998, 3006, 3006,
-       3007, 3008, 3009, 3010, 3011, 3011, 3012, 3013,
-       3002, 3002, 3002, 2998, 3015, 3014, 2998, 3017,
-       3016, 75, 3019, 3018, 75, 3021, 3020, 75,
-       3022, 2327, 3023, 3023, 3024, 3025, 3027, 3028,
-       3026, 2327, 3029, 3029, 3030, 3031, 3033, 3034,
-       3032, 2327, 3035, 3035, 3036, 3037, 3039, 3040,
-       3038, 2327, 3041, 3041, 3042, 3043, 3045, 3046,
-       3044, 3044, 3044, 2998, 3047, 3047, 3047, 2998,
-       3048, 3048, 3049, 3050, 3051, 3052, 3053, 3053,
-       3054, 3055, 3044, 3044, 3044, 2998, 3057, 3056,
-       2998, 3059, 3058, 75, 3061, 3060, 75, 3062,
-       2327, 3063, 3063, 3064, 3065, 3067, 3068, 3066,
-       2327, 3070, 3070, 3071, 3072, 3073, 3074, 3075,
-       3076, 3077, 3078, 3069, 3079, 3079, 3080, 3081,
-       3082, 3083, 3069, 3079, 3079, 3080, 3081, 3082,
-       3083, 3085, 3084, 3086, 3086, 3087, 3088, 3090,
-       3091, 3089, 3084, 3092, 3092, 3093, 3094, 3095,
-       3096, 3097, 3069, 3099, 3099, 3100, 3101, 3102,
-       3102, 3103, 3104, 3105, 3105, 3106, 3107, 3108,
-       3108, 3108, 3108, 3109, 3110, 3108, 3108, 3111,
-       3112, 3113, 3114, 3108, 3108, 3115, 3116, 3117,
-       3118, 3108, 3108, 3119, 3120, 3098, 3099, 3099,
-       3100, 3101, 3122, 3109, 3110, 3122, 3122, 3122,
-       3121, 3108, 3108, 3121, 3124, 3123, 3121, 3102,
-       3102, 3103, 3104, 3108, 3108, 3108, 3108, 3113,
-       3114, 3108, 3108, 3115, 3116, 3121, 3126, 3125,
-       3121, 3122, 3099, 3099, 3100, 3101, 3102, 3102,
-       3103, 3104, 3105, 3105, 3106, 3107, 3108, 3108,
-       3108, 3108, 3109, 3110, 3108, 3108, 3111, 3112,
-       3113, 3114, 3108, 3108, 3115, 3116, 3117, 3118,
-       3108, 3108, 3119, 3120, 3122, 3122, 3122, 3121,
-       3124, 3126, 3128, 3123, 3125, 3127, 3121, 3130,
-       3129, 3069, 3132, 3131, 3069, 3133, 3133, 3134,
-       3135, 3136, 3137, 3069, 3133, 3133, 3134, 3135,
-       3136, 3137, 3138, 3084, 3139, 3139, 3140, 3141,
-       3143, 3144, 3142, 3084, 3146, 3146, 3147, 3148,
-       3149, 3150, 3151, 3149, 3145, 3153, 3154, 3154,
-       3155, 3156, 3157, 3157, 3158, 3159, 3160, 3160,
-       3161, 3162, 3163, 3163, 3163, 3163, 3164, 3165,
-       3163, 3163, 3166, 3167, 3168, 3169, 3163, 3163,
-       3170, 3171, 3172, 3173, 3163, 3163, 3174, 3175,
-       3153, 3152, 3177, 3176, 3069, 3179, 3178, 3069,
-       3180, 3180, 3181, 3182, 3183, 3184, 3069, 3180,
-       3180, 3181, 3182, 3183, 3184, 3185, 3084, 3186,
-       3186, 3187, 3188, 3190, 3191, 3189, 3084, 3192,
-       3192, 3193, 3194, 3195, 3196, 3197, 3195, 3195,
-       3195, 3145, 3198, 3199, 3199, 3200, 3201, 3202,
-       3202, 3203, 3204, 3205, 3205, 3206, 3207, 3208,
-       3208, 3208, 3208, 3209, 3210, 3208, 3208, 3211,
-       3212, 3213, 3214, 3208, 3208, 3215, 3216, 3217,
-       3218, 3208, 3208, 3219, 3220, 3198, 3198, 3198,
-       3152, 3222, 3221, 3069, 3224, 3223, 3069, 3225,
-       3225, 3226, 3227, 3228, 3229, 3069, 3225, 3225,
-       3226, 3227, 3228, 3229, 3230, 3084, 3231, 3231,
-       3232, 3233, 3235, 3236, 3234, 3084, 3237, 3237,
-       3238, 3239, 3240, 3240, 3240, 3241, 3242, 3240,
-       3240, 3240, 3069, 3243, 3243, 3244, 3245, 3246,
-       3246, 3247, 3248, 3249, 3249, 3250, 3251, 3252,
-       3252, 3252, 3252, 3253, 3254, 3252, 3252, 3255,
-       3256, 3257, 3258, 3252, 3252, 3259, 3260, 3261,
-       3262, 3252, 3252, 3263, 3264, 3098, 3266, 3265,
-       3069, 3268, 3267, 3069, 3270, 3269, 75, 3272,
-       3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280,
-       3281, 3282, 3283, 3284, 3285, 3286, 3287, 3288,
-       3272, 3273, 3274, 3275, 3276, 3277, 3278, 3279,
-       3280, 3281, 3282, 3283, 3284, 3285, 3286, 3287,
-       3288, 3271, 3289, 3289, 3290, 3291, 3292, 3293,
-       3294, 3292, 3293, 3294, 3295, 3296, 3271, 3297,
-       3297, 3298, 3299, 3301, 3302, 3300, 3300, 3300,
-       75, 3303, 3303, 3304, 3305, 3306, 3307, 75,
-       3303, 3303, 3304, 3305, 3306, 3307, 3308, 2327,
-       3309, 3309, 3310, 3311, 3313, 3314, 3312, 2327,
-       3315, 3315, 3316, 3317, 3319, 3320, 3318, 2327,
-       3321, 3321, 3322, 3323, 3325, 3326, 3324, 2327,
-       3328, 3328, 3329, 3330, 3332, 3333, 3331, 3327,
-       3334, 3334, 3335, 3336, 3338, 3339, 3337, 3327,
-       3340, 3340, 3341, 3342, 3344, 3345, 3343, 3327,
-       3346, 3346, 3347, 3348, 3350, 3351, 3349, 3327,
-       3352, 3352, 3353, 3354, 3356, 3357, 3355, 2327,
-       3358, 3358, 3359, 3360, 3362, 3363, 3361, 2327,
-       3364, 3364, 3365, 3366, 3367, 3367, 3367, 3368,
-       3369, 3367, 3367, 3367, 75, 3370, 3370, 3371,
-       3372, 3373, 3374, 75, 3375, 3375, 3376, 3377,
-       3378, 3379, 3380, 3378, 3378, 3378, 75, 3381,
-       3381, 75, 3383, 3382, 75, 3385, 3384, 75,
-       3387, 3386, 75, 3389, 3388, 75, 3391, 3390,
-       75, 3393, 3392, 75, 3395, 3394, 75, 3397,
-       3396, 75, 3398, 3398, 3271, 3399, 3399, 3271,
-       3400, 3400, 3401, 3402, 3403, 3404, 3271, 3405,
-       3405, 3271, 3406, 3406, 3271, 3407, 3407, 3271,
-       3408, 3408, 3409, 3410, 3411, 3412, 3271, 3413,
-       3413, 3271, 3414, 3414, 3415, 3416, 3417, 3418,
-       3271, 3419, 3420, 3421, 3422, 3423, 3419, 3420,
-       3421, 3422, 3423, 3271, 3424, 3424, 3271, 3425,
-       3425, 3426, 3427, 3428, 3429, 3271, 3430, 3431,
-       3430, 3431, 3271, 3432, 3432, 3271, 3433, 3433,
-       3271, 3434, 3434, 3271, 3435, 3435, 3271, 3436,
-       3436, 3437, 3438, 3439, 3440, 3271, 3441, 3441,
-       3442, 3443, 3444, 3445, 3271, 3446, 3446, 3271,
-       3447, 3447, 3271, 3448, 3448, 3449, 3450, 3451,
-       3452, 3271, 3453, 3453, 3271, 3454, 3454, 3271,
-       3455, 3455, 3271, 3456, 3456, 3457, 3458, 3459,
-       3460, 3271, 3461, 3461, 3271, 3462, 3462, 3271,
-       3463, 3463, 3271, 3464, 3464, 3465, 3466, 3467,
-       3468, 3271, 3469, 3470, 3471, 3469, 3470, 3471,
-       3271, 3472, 3472, 3271, 3473, 3473, 3271, 3474,
-       3474, 3271, 3475, 3475, 3476, 3477, 3478, 3479,
-       3271, 3480, 3481, 3480, 3481, 3271, 3482, 3482,
-       3271, 3483, 3483, 3271, 3484, 3484, 3485, 3486,
-       3487, 3488, 3271, 3489, 3489, 3271, 3490, 3490,
-       3271, 3491, 3491, 3271, 3492, 3492, 3493, 3494,
-       3495, 3496, 3271, 3497, 3497, 3498, 3499, 3500,
-       3501, 3271, 3502, 3502, 3271, 3503, 3503, 3271,
-       3504, 3505, 3271, 3506, 3271, 3507, 3507, 3508,
-       3509, 3510, 3511, 3271, 3512, 3271, 3513, 3513,
-       3514, 3515, 3516, 3517, 3271, 3518, 3519, 3518,
-       3519, 3271, 3520, 3520, 3271, 3521, 3521, 3271,
-       3522, 3522, 3271, 3523, 3523, 3524, 3525, 3526,
-       3527, 3271, 3528, 3528, 3271, 3529, 3529, 3271,
-       3530, 3530, 3271, 3531, 3531, 3532, 3533, 3534,
-       3535, 3271, 3536, 3536, 3271, 3537, 3537, 3271,
-       3538, 3538, 3271, 3539, 3539, 3271, 3540, 3540,
-       3271, 3541, 3541, 3271, 3542, 3542, 3271, 3543,
-       3543, 3544, 3545, 3546, 3547, 3271, 3548, 3549,
-       3548, 3549, 3271, 3550, 3550, 3271, 3551, 3551,
-       3552, 3553, 3554, 3555, 3271, 3556, 3556, 3557,
-       3558, 3559, 3560, 3271, 3561, 3562, 3563, 3564,
-       3563, 3564, 3271, 3565, 3271, 3566, 3566, 3567,
-       3568, 3569, 3570, 3271, 3571, 3271, 3572, 3572,
-       3573, 3574, 3575, 3576, 3271, 3577, 3577, 3271,
-       3578, 3578, 3579, 3580, 3581, 3582, 3271, 3583,
-       3583, 3584, 3585, 3586, 3587, 3271, 3588, 3589,
-       3588, 3589, 3271, 3590, 3590, 3271, 3591, 3591,
-       3271, 3592, 3592, 3271, 3593, 3593, 3594, 3595,
-       3596, 3597, 3271, 3598, 3598, 3599, 3600, 3601,
-       3602, 3271, 3603, 3604, 3605, 3603, 3604, 3605,
-       3271, 3606, 3606, 3271, 3607, 3607, 3271, 3608,
-       3608, 3271, 3609, 3609, 3610, 3611, 3612, 3613,
-       3271, 3614, 3614, 3271, 3615, 3615, 3616, 3617,
-       3618, 3619, 3271, 3620, 3620, 3621, 3622, 3623,
-       3623, 3624, 3625, 3271, 3626, 3626, 3271, 3627,
-       3627, 3628, 3629, 3630, 3631, 3632, 3271, 3633,
-       3633, 3634, 3635, 3636, 3636, 3637, 3638, 3271,
-       3639, 3639, 3271, 3640, 3640, 3271, 3641, 3641,
-       3271, 3642, 3642, 3271, 3643, 3643, 3644, 3645,
-       3646, 3647, 3271, 3648, 3648, 3271, 3649, 3649,
-       3271, 3650, 3650, 3271, 3651, 3651, 3271, 3652,
-       3652, 3271, 3653, 3653, 3271, 3654, 3654, 3271,
-       3655, 3655, 3271, 3656, 3656, 3271, 3657, 3657,
-       3658, 3659, 3660, 3661, 3271, 3662, 3662, 3271,
-       3663, 3663, 3271, 3664, 3664, 3665, 3666, 3667,
-       3668, 3271, 3669, 3670, 3671, 3669, 3670, 3671,
-       3271, 3672, 3672, 3673, 3674, 3675, 3676, 3271,
-       3677, 3677, 3271, 3678, 3678, 3271, 3679, 3679,
-       3271, 3680, 3680, 3681, 3682, 3683, 3684, 3271,
-       3685, 3685, 3686, 3687, 3688, 3689, 3271, 3690,
-       3691, 3692, 3693, 3694, 3695, 3690, 3691, 3692,
-       3693, 3694, 3695, 3271, 3696, 3696, 3271, 3697,
-       3697, 3271, 3698, 3698, 3271, 3699, 3699, 3271,
-       3700, 3700, 3701, 3702, 3703, 3704, 3271, 3705,
-       3705, 3271, 3706, 3706, 3707, 3708, 3709, 3710,
-       3271, 3711, 3711, 3271, 3712, 3712, 3713, 3714,
-       3715, 3716, 3271, 3717, 3717, 3271, 3718, 3718,
-       3719, 3720, 3721, 3722, 3271, 3723, 3723, 3271,
-       3724, 3724, 3271, 3725, 3725, 3271, 3726, 3726,
-       3727, 3728, 3729, 3730, 3271, 3731, 3731, 3271,
-       3732, 3732, 3271, 3733, 3733, 3734, 3735, 3736,
-       3737, 3271, 3738, 3739, 3740, 3738, 3739, 3740,
-       3271, 3741, 3741, 3271, 3742, 3742, 3271, 3743,
-       3743, 3744, 3745, 3746, 3747, 3271, 3748, 3748,
-       3271, 3749, 3749, 3750, 3751, 3752, 3753, 3271,
-       3754, 3754, 3271, 3755, 3755, 3271, 3757, 3756,
-       3758, 3758, 3759, 3760, 3762, 3763, 3761, 3756,
-       3764, 3764, 3271, 3765, 3765, 3271, 3766, 3766,
-       3767, 3768, 3769, 3770, 3271, 3771, 3771, 3271,
-       3772, 3772, 3271, 3773, 3773, 3271, 3774, 3774,
-       3271, 3775, 3775, 3271, 3776, 3776, 3777, 3778,
-       3779, 3780, 3271, 3781, 3781, 3781, 3781, 3781,
-       3781, 75, 3782, 3782, 3782, 3782, 75, 3783,
-       3783, 3783, 3783, 75, 3784, 2327, 3785, 3785,
-       3786, 3787, 3789, 3790, 3788, 2327, 3791, 3791,
-       3792, 3793, 3795, 3796, 3794, 2327, 3797, 3797,
-       3798, 3799, 3801, 3802, 3800, 2327, 3803, 3803,
-       3804, 3805, 3807, 3808, 3806, 3806, 3806, 75,
-       3809, 3809, 3810, 3811, 3812, 3813, 75, 3809,
-       3809, 3810, 3811, 3814, 3812, 3813, 3814, 3814,
-       3814, 75, 3815, 3815, 75, 3817, 3816, 75,
-       3819, 3818, 75, 3821, 3820, 75, 3822, 3822,
-       3822, 3822, 75, 3823, 3823, 75, 3824, 2327,
-       3825, 3825, 3826, 3827, 3829, 3830, 3828, 2327,
-       3831, 3831, 3832, 3833, 3835, 3836, 3834, 2327,
-       3837, 3837, 3838, 3839, 3841, 3842, 3840, 2327,
-       3843, 3843, 3844, 3845, 3847, 3848, 3846, 2327,
-       3849, 3849, 3850, 3851, 3853, 3854, 3852, 2327,
-       3855, 3855, 3856, 3857, 3858, 3860, 3861, 3859,
-       3859, 3859, 2998, 3862, 3862, 3863, 3864, 3865,
-       3866, 2998, 3868, 3868, 3869, 3870, 3872, 3873,
-       3871, 3871, 3871, 3867, 3874, 3874, 3874, 3867,
-       3876, 3875, 3875, 3875, 3867, 3877, 3877, 3877,
-       3867, 3879, 3878, 3878, 3878, 3867, 3881, 3880,
-       3880, 3880, 3867, 3882, 3882, 3882, 3867, 3884,
-       3883, 3883, 3883, 3867, 3885, 3885, 3885, 3885,
-       3886, 3886, 3886, 3867, 3887, 3887, 3887, 3887,
-       75, 3888, 3867, 3884, 3867, 3881, 3867, 3889,
-       3867, 3879, 3867, 3891, 3890, 75, 3892, 3892,
-       3892, 2998, 3862, 3862, 3863, 3864, 3865, 3866,
-       3893, 3893, 3893, 2998, 3895, 3894, 75, 3897,
-       3896, 75, 3899, 3898, 75, 3900, 2327, 3901,
-       3901, 3902, 3903, 3905, 3906, 3904, 2327, 3907,
-       3907, 3908, 3909, 3911, 3912, 3910, 2327, 3913,
-       3913, 3914, 3915, 3917, 3918, 3916, 2327, 3919,
-       3919, 3920, 3921, 3923, 3924, 3922, 2327, 3925,
-       3925, 3926, 3927, 3929, 3930, 3928, 2327, 3931,
-       3931, 3932, 3933, 3934, 3936, 3937, 3935, 3935,
-       3935, 2998, 3938, 3938, 3938, 3938, 2998, 3939,
-       3939, 3939, 2998, 3938, 3938, 3938, 3938, 3940,
-       3940, 3940, 2998, 3942, 3941, 75, 3944, 3943,
-       75, 3946, 3945, 75, 3947, 2327, 3948, 3948,
-       3949, 3950, 3952, 3953, 3951, 2327, 3954, 3954,
-       3955, 3956, 3958, 3959, 3957, 2327, 3960, 3960,
-       3961, 3962, 3964, 3965, 3963, 2327, 3966, 3966,
-       3967, 3968, 3970, 3971, 3969, 2327, 3972, 3972,
-       3973, 3974, 3976, 3977, 3975, 2327, 3978, 3978,
-       3979, 3980, 3982, 3983, 3981, 3981, 3981, 2998,
-       3984, 3984, 3984, 2998, 3985, 3985, 3986, 3987,
-       3988, 3989, 3990, 3990, 3991, 3992, 3981, 3981,
-       3981, 2998, 3994, 3993, 2998, 3996, 3995, 75,
-       3998, 3997, 75, 4000, 3999, 75, 4001, 2327,
-       4002, 4002, 4003, 4004, 4006, 4007, 4005, 2327,
-       4008, 4008, 4009, 4010, 4012, 4013, 4011, 2327,
-       4014, 4014, 4014, 4014, 4015, 2327, 4016, 4016,
-       4016, 4016, 75, 4018, 4017, 75, 4019, 2327,
-       4020, 4020, 4021, 4022, 4024, 4025, 4023, 2327,
-       4026, 4026, 4027, 4028, 4030, 4031, 4029, 2327,
-       4032, 4032, 4033, 4034, 4036, 4037, 4035, 2327,
-       4038, 4038, 4039, 4040, 4042, 4043, 4041, 2327,
-       4044, 4044, 4045, 4046, 4048, 4049, 4047, 2327,
-       4050, 4050, 4051, 4052, 4054, 4055, 4053, 4053,
-       4053, 2998, 4056, 4056, 4056, 2998, 4057, 4057,
-       4058, 4059, 4060, 4061, 4062, 4062, 4063, 4064,
-       4053, 4053, 4053, 2998, 4066, 4065, 2998, 4068,
-       4067, 75, 4070, 4069, 75, 4072, 4071, 75,
-       4073, 2327, 4074, 4074, 4075, 4076, 4078, 4079,
-       4077, 2327, 4080, 4080, 4081, 4082, 4083, 4084,
-       4085, 4083, 2304, 4086, 4087, 4086, 4086, 4086,
-       4087, 2304, 4089, 4088, 75, 4090, 2327, 4091,
-       4091, 4092, 4093, 4095, 4096, 4094, 2327, 4097,
-       4097, 4098, 4099, 4101, 4102, 4100, 4100, 4100,
-       2998, 4103, 4103, 4103, 2998, 4104, 4104, 4104,
-       2998, 4105, 4105, 4105, 2998, 4107, 4106, 4108,
-       4108, 4108, 2998, 4109, 4109, 4109, 2998, 4110,
-       4110, 4110, 2998, 4111, 4111, 4111, 2998, 4113,
-       4107, 4113, 4113, 4113, 4112, 4115, 4114, 75,
-       4116, 4116, 4116, 2998, 4117, 4117, 4117, 2998,
-       4119, 4118, 4120, 4120, 4120, 2998, 4121, 4121,
-       4121, 2998, 4122, 4119, 4122, 4122, 4122, 4118,
-       4123, 4123, 4123, 2998, 4124, 4124, 4124, 2998,
-       4125, 4118, 4126, 4126, 4126, 2998, 4127, 4127,
-       4127, 2998, 4128, 4125, 4128, 4128, 4128, 4118,
-       4129, 2327, 4130, 4130, 4131, 4132, 4134, 4135,
-       4133, 2327, 4136, 4136, 4137, 4138, 4140, 4141,
-       4139, 2327, 4142, 4142, 4143, 4144, 4146, 4147,
-       4145, 2327, 4149, 4149, 4150, 4151, 4152, 4153,
-       4148, 4148, 4148, 75, 4154, 4154, 4154, 4154,
-       75, 4156, 4155, 75, 4158, 4157, 75, 4159,
-       2327, 4160, 4160, 4161, 4162, 4164, 4165, 4163,
-       2327, 4167, 4167, 4168, 4169, 4170, 4171, 4166,
-       4166, 4166, 75, 4172, 4172, 4173, 4174, 4175,
-       4176, 75, 4178, 4178, 4179, 4180, 4181, 4182,
-       4177, 4177, 4177, 75, 4183, 4183, 4183, 4183,
-       75, 4185, 4184, 75, 4187, 4186, 75, 4188,
-       2327, 4189, 4189, 4190, 4191, 4193, 4194, 4192,
-       2327, 4195, 4195, 4196, 4197, 4198, 4198, 4198,
-       4199, 4200, 4198, 4198, 4198, 75, 4201, 4201,
-       4201, 4201, 75, 4202, 4202, 4202, 4202, 75,
-       4204, 4203, 75, 4206, 4206, 4207, 4208, 4209,
-       4210, 4210, 4210, 4211, 4212, 4213, 4214, 4210,
-       4210, 4210, 4205, 4215, 4215, 4216, 4217, 4218,
-       4219, 73, 4220, 4219, 4211, 4212, 4221, 4222,
-       4223, 4224, 4225, 4226, 73, 73, 4219, 73,
-       4219, 73, 4219, 73, 871, 4228, 4228, 4207,
-       4229, 4230, 4210, 4231, 4232, 4233, 4234, 4235,
-       4236, 4237, 4238, 4239, 4240, 4241, 4242, 4243,
-       4244, 4245, 4246, 4247, 4210, 4210, 4231, 4232,
-       4233, 4234, 4235, 4236, 4237, 4238, 4239, 4240,
-       4241, 4242, 4243, 4244, 4245, 4246, 4247, 4211,
-       4212, 4248, 4249, 4210, 4210, 4210, 4227, 4228,
-       4228, 4207, 4229, 4230, 4210, 4252, 4253, 4254,
-       4255, 4256, 4257, 4258, 4259, 4260, 4261, 4262,
-       4263, 4264, 4265, 4266, 4267, 4268, 4210, 4210,
-       4252, 4253, 4254, 4255, 4256, 4257, 4258, 4259,
-       4260, 4261, 4262, 4263, 4264, 4265, 4266, 4267,
-       4268, 4211, 4212, 4248, 4249, 4210, 4251, 4210,
-       4210, 4250, 4270, 4270, 4271, 4272, 4273, 4274,
-       4274, 4274, 4275, 4276, 4277, 4278, 4274, 4274,
-       4274, 4269, 4206, 4206, 4207, 4279, 4280, 4210,
-       4252, 4253, 4254, 4255, 4256, 4257, 4258, 4259,
-       4260, 4261, 4262, 4263, 4264, 4265, 4266, 4267,
-       4268, 4210, 4210, 4252, 4253, 4254, 4255, 4256,
-       4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264,
-       4265, 4266, 4267, 4268, 4211, 4212, 4281, 4282,
-       4210, 4251, 4210, 4210, 4250, 4283, 4283, 4207,
-       4284, 4285, 4210, 4210, 4210, 87, 88, 4286,
-       4287, 4210, 4210, 4210, 871, 4288, 4288, 4216,
-       4289, 4290, 4219, 73, 4220, 4219, 87, 88,
-       4286, 4291, 105, 106, 4286, 4292, 73, 73,
-       4219, 73, 4219, 73, 4219, 73, 871, 4215,
-       4215, 4216, 4217, 4218, 4219, 73, 4295, 4296,
+       1871, 1872, 1873, 1874, 1875, 1876, 1868, 1877,
+       1868, 1878, 1868, 1879, 1868, 1880, 1880, 1880,
+       1880, 1880, 1880, 1868, 1881, 1868, 1882, 1868,
+       1883, 1868, 1884, 1868, 1885, 1868, 1886, 1868,
+       1887, 1887, 1887, 1887, 1887, 1887, 1868, 1888,
+       1868, 1889, 1868, 1890, 1890, 1890, 1890, 1890,
+       1890, 1868, 1891, 1868, 1892, 1868, 1893, 1894,
+       1868, 1895, 1868, 1896, 1868, 1897, 1868, 1898,
+       1868, 1899, 1899, 1899, 1899, 1899, 1899, 1868,
+       1900, 1868, 1901, 1868, 1902, 1868, 1903, 1868,
+       1904, 1904, 1904, 1904, 1904, 1904, 1868, 1905,
+       1868, 1906, 1868, 1908, 1907, 1909, 1909, 1909,
+       1909, 1909, 1909, 1910, 1907, 1911, 1868, 1912,
+       1868, 1913, 1868, 1914, 1868, 1915, 1868, 1916,
+       1868, 1917, 1868, 1918, 1868, 1919, 1868, 1920,
+       1868, 1921, 1868, 1922, 1868, 1923, 1868, 1924,
+       1868, 1925, 1925, 1925, 1925, 1925, 1925, 1868,
+       1926, 1868, 1927, 1868, 1928, 1868, 1929, 1868,
+       1930, 1930, 1930, 1930, 1930, 1930, 1868, 1931,
+       1868, 1932, 1868, 1933, 1868, 1934, 1934, 1934,
+       1934, 1934, 1934, 1868, 1936, 1936, 1937, 1938,
+       1939, 1940, 1941, 1941, 1942, 1943, 1935, 1944,
+       1944, 1945, 1946, 1947, 1948, 1949, 1950, 1951,
+       1952, 1953, 1954, 1955, 1956, 1957, 1958, 1958,
+       1959, 1960, 1935, 1961, 1935, 1962, 1935, 1963,
+       1935, 1964, 1935, 1935, 1966, 1935, 1935, 1935,
+       1965, 1967, 1967, 1968, 1969, 1970, 1971, 1972,
+       1972, 1973, 1974, 1935, 1976, 1975, 1935, 1977,
+       1935, 1978, 1935, 1979, 1935, 1980, 1935, 1981,
+       1935, 1982, 1935, 1983, 1935, 1935, 1985, 1935,
+       1935, 1935, 1984, 1986, 1986, 1987, 1988, 1989,
+       1990, 1991, 1991, 1992, 1993, 1935, 1986, 1986,
+       1987, 1988, 1989, 1990, 1991, 1991, 1992, 1993,
+       1994, 1994, 1994, 1935, 1995, 1935, 1996, 1996,
+       1997, 1998, 1999, 2000, 2001, 2001, 2002, 2003,
+       1935, 2004, 1935, 2005, 1935, 2006, 1935, 2007,
+       2008, 2008, 2008, 2008, 1935, 2009, 2009, 2009,
+       2009, 1935, 2010, 2010, 2010, 2010, 1935, 2011,
+       2012, 2011, 2011, 2011, 1935, 2013, 2014, 2013,
+       2013, 2013, 1935, 1995, 2015, 2015, 2015, 2015,
+       1935, 2014, 1935, 2016, 2016, 2016, 2016, 1935,
+       2017, 2018, 2017, 2017, 2017, 1935, 2019, 2020,
+       2019, 2019, 2019, 1935, 1986, 1986, 1987, 1988,
+       2021, 1989, 1990, 1991, 1991, 1992, 1993, 2021,
+       2021, 2021, 1935, 2020, 1935, 2022, 1935, 2023,
+       1935, 2024, 2025, 1935, 2026, 1935, 2027, 1935,
+       2028, 1935, 2029, 1935, 2030, 1935, 2032, 2033,
+       2033, 2031, 2034, 2034, 2031, 2035, 2036, 2037,
+       2037, 2031, 2038, 2038, 2031, 2039, 2039, 2040,
+       2041, 2042, 2043, 2044, 2045, 2046, 2046, 2047,
+       2048, 2043, 2031, 2049, 2049, 2031, 2050, 1935,
+       2051, 1935, 2052, 1935, 2053, 1935, 2054, 1935,
+       2055, 2056, 2056, 2056, 2056, 2031, 2057, 2057,
+       2057, 2057, 2031, 2058, 2059, 2060, 2060, 2060,
+       2060, 2031, 2061, 2061, 2061, 2061, 2031, 2062,
+       2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069,
+       2069, 2070, 2071, 2066, 2066, 2066, 2031, 2072,
+       2072, 2072, 2072, 2031, 2073, 1935, 2074, 1935,
+       2076, 2075, 2077, 2077, 2078, 2079, 2081, 2082,
+       2083, 2084, 2084, 2085, 2086, 2080, 2075, 1935,
+       1935, 1935, 1935, 1984, 2087, 1935, 2088, 1935,
+       2089, 1935, 2090, 1935, 2091, 1935, 2092, 1935,
+       2093, 1935, 2094, 1935, 2095, 1935, 2096, 2097,
+       2097, 1935, 2098, 2098, 1935, 2099, 2100, 1935,
+       2101, 2101, 1935, 2102, 2102, 2103, 2104, 2105,
+       2106, 2107, 2108, 2108, 2109, 2110, 1935, 2111,
+       2111, 1935, 2112, 1935, 2113, 1935, 2114, 1935,
+       2115, 1935, 2116, 1935, 2117, 1935, 2118, 1935,
+       2119, 1935, 2120, 1935, 2121, 1935, 2122, 1935,
+       2123, 1935, 2124, 1935, 2125, 1935, 2126, 2126,
+       2127, 2128, 2129, 2130, 2131, 2131, 2132, 2133,
+       1935, 2134, 1935, 2135, 1935, 2136, 1935, 2137,
+       1935, 2138, 2138, 2139, 2140, 2141, 2142, 2143,
+       2143, 2144, 2145, 1935, 2146, 1935, 2147, 1935,
+       2148, 1935, 2149, 1935, 2150, 2151, 2075, 2152,
+       2075, 2153, 2154, 2075, 2155, 2155, 2156, 2157,
+       2159, 2160, 2161, 2161, 2162, 2163, 2158, 2075,
+       1967, 1967, 1968, 1969, 1970, 1971, 1972, 1972,
+       1973, 1974, 2164, 2164, 2164, 1935, 2165, 1935,
+       2168, 2169, 2170, 2171, 2172, 2168, 2169, 2170,
+       2171, 2172, 2167, 2166, 2173, 2173, 2173, 2173,
+       2174, 2166, 2175, 2176, 2175, 2176, 2166, 2177,
+       2177, 2177, 2177, 2166, 2178, 2178, 2166, 2179,
+       2180, 2179, 2179, 2179, 2166, 2181, 2181, 2166,
+       2182, 2182, 2166, 2183, 2183, 2166, 2184, 2184,
+       2166, 2185, 2166, 2186, 2166, 2187, 2187, 2166,
+       2188, 2188, 2166, 2189, 2189, 2166, 2190, 2166,
+       2191, 2191, 2191, 2191, 2166, 2192, 2193, 2192,
+       2193, 2166, 2194, 2195, 2194, 2195, 2166, 2196,
+       2166, 2197, 2197, 2166, 2198, 2198, 2166, 2199,
+       2199, 2166, 2200, 2200, 2166, 2201, 2201, 2201,
+       2201, 2166, 2202, 2202, 2166, 2203, 2203, 2166,
+       2204, 2204, 2166, 2205, 2206, 2166, 2207, 2166,
+       2208, 2166, 2209, 2209, 2166, 2210, 2210, 2166,
+       2211, 2211, 2166, 2212, 2166, 2213, 2166, 2214,
+       2166, 2215, 2215, 2215, 2215, 2166, 2216, 2166,
+       2217, 2166, 2218, 2218, 2166, 2219, 2219, 2166,
+       2220, 2220, 2166, 2221, 2166, 2222, 2166, 2223,
+       2166, 2224, 2224, 2224, 2224, 2166, 2225, 2226,
+       2166, 2227, 2166, 2228, 2166, 2229, 2166, 2230,
+       2166, 2231, 2231, 2231, 2231, 2166, 2232, 2166,
+       2233, 2166, 2234, 2234, 2234, 2234, 2166, 2235,
+       2235, 2166, 2236, 2236, 2166, 2237, 2237, 2166,
+       2238, 2238, 2166, 2239, 2239, 2166, 2240, 2240,
+       2166, 2241, 2241, 2166, 2242, 2242, 2242, 2242,
+       2166, 2243, 2243, 2166, 2244, 2244, 2166, 2245,
+       2245, 2166, 2246, 2246, 2166, 2247, 2247, 2166,
+       2248, 2248, 2166, 2249, 2250, 2249, 2250, 2166,
+       2251, 2251, 2166, 2252, 2252, 2166, 2253, 2253,
+       2253, 2253, 2166, 2254, 2254, 2166, 2255, 2255,
+       2166, 2256, 2256, 2256, 2256, 2166, 2257, 2257,
+       2166, 2258, 2258, 2166, 2259, 2260, 2259, 2260,
+       2166, 2261, 2261, 2166, 2262, 2166, 2263, 2263,
+       2263, 2263, 2166, 2264, 2264, 2166, 2265, 2265,
+       2166, 2266, 2267, 2268, 2166, 2269, 2270, 2269,
+       2269, 2269, 2166, 2271, 2271, 2166, 2272, 2272,
+       2166, 2273, 2273, 2166, 2274, 2274, 2166, 2275,
+       2166, 2276, 2166, 2277, 2277, 2166, 2278, 2278,
+       2166, 2279, 2279, 2166, 2280, 2166, 2281, 2281,
+       2281, 2281, 2166, 2282, 2166, 2283, 2166, 2284,
+       2284, 2284, 2284, 2166, 2285, 2166, 2286, 2166,
+       2287, 2287, 2287, 2287, 2166, 2290, 2291, 2292,
+       2293, 2294, 2295, 2290, 2291, 2292, 2293, 2294,
+       2295, 2289, 2288, 2296, 2296, 2296, 2296, 2297,
+       2288, 2298, 2298, 2288, 2299, 2299, 2288, 2300,
+       2300, 2288, 2301, 2301, 2288, 2302, 2302, 2288,
+       2303, 2303, 2303, 2303, 2288, 2304, 2305, 2306,
+       2304, 2305, 2306, 2288, 2307, 2307, 2288, 2308,
+       2308, 2288, 2309, 2309, 2288, 2310, 2310, 2288,
+       2311, 2311, 2288, 2312, 2312, 2312, 2312, 2288,
+       2313, 2314, 2313, 2314, 2288, 2315, 2315, 2288,
+       2316, 2316, 2316, 2316, 2288, 2317, 2317, 2288,
+       2318, 2318, 2288, 2319, 2319, 2319, 2319, 2288,
+       2320, 2320, 2288, 2321, 2321, 2288, 2322, 2322,
+       2288, 2323, 2323, 2323, 2323, 2288, 2324, 2324,
+       2288, 2325, 2325, 2288, 2326, 2326, 2326, 2326,
+       2288, 2327, 2328, 2327, 2328, 2288, 2329, 2329,
+       2288, 2330, 2330, 2330, 2330, 2288, 2331, 2331,
+       2288, 2332, 2332, 2288, 2333, 2333, 2333, 2333,
+       2288, 2334, 2334, 2288, 2335, 2335, 2288, 2336,
+       2336, 2288, 2337, 2337, 2337, 2337, 2288, 2338,
+       2338, 2288, 2339, 2339, 2288, 2340, 2340, 2340,
+       2340, 2288, 2342, 2342, 2341, 2343, 2344, 2343,
+       2343, 2343, 2344, 2341, 2345, 2345, 2345, 2345,
+       2345, 2345, 75, 2346, 2346, 2346, 2346, 75,
+       2347, 2347, 2347, 2347, 2347, 2347, 75, 2348,
+       2348, 2349, 2350, 2351, 2352, 75, 2353, 2353,
+       2354, 2355, 2356, 2356, 2356, 2357, 2358, 2356,
+       2356, 2356, 75, 2359, 2359, 2360, 2361, 2362,
+       2363, 75, 2365, 2365, 2366, 2367, 2369, 2370,
+       2368, 2364, 2371, 2371, 2372, 2373, 2375, 2376,
+       2374, 2364, 2377, 2377, 2378, 2379, 2381, 2382,
+       2380, 2364, 2384, 2384, 2385, 2386, 2388, 2389,
+       2390, 2391, 2392, 2388, 2389, 2390, 2391, 2392,
+       2393, 2394, 2387, 2383, 2395, 2395, 2396, 2397,
+       2399, 2400, 2398, 2364, 2401, 2401, 2402, 2403,
+       2405, 2406, 2407, 2408, 2409, 2405, 2406, 2407,
+       2408, 2409, 2410, 2411, 2404, 2383, 2412, 2412,
+       2413, 2414, 2416, 2417, 2415, 2364, 2418, 2418,
+       2419, 2420, 2422, 2423, 2424, 2425, 2426, 2422,
+       2423, 2424, 2425, 2426, 2427, 2428, 2421, 2383,
+       2429, 2429, 2430, 2431, 2433, 2434, 2432, 2364,
+       2435, 2435, 2437, 2438, 2439, 2440, 2441, 2437,
+       2438, 2439, 2440, 2441, 2435, 2435, 2436, 2383,
+       2435, 2435, 2435, 2435, 2442, 2383, 2444, 2445,
+       2446, 2447, 2448, 2444, 2445, 2446, 2447, 2448,
+       2443, 2383, 2449, 2449, 2449, 2449, 2450, 2383,
+       2452, 2451, 75, 2418, 2418, 2419, 2420, 2427,
+       2428, 2453, 2383, 2455, 2456, 2457, 2458, 2459,
+       2455, 2456, 2457, 2458, 2459, 2454, 2383, 2460,
+       2460, 2461, 2462, 2464, 2465, 2463, 2383, 2467,
+       2466, 75, 2401, 2401, 2402, 2403, 2410, 2411,
+       2468, 2383, 2470, 2471, 2472, 2473, 2474, 2470,
+       2471, 2472, 2473, 2474, 2469, 2383, 2475, 2475,
+       2476, 2477, 2479, 2480, 2478, 2383, 2482, 2481,
+       75, 2384, 2384, 2385, 2386, 2393, 2394, 2483,
+       2383, 2485, 2486, 2487, 2488, 2489, 2485, 2486,
+       2487, 2488, 2489, 2484, 2383, 2490, 2490, 2491,
+       2492, 2494, 2495, 2493, 2383, 2497, 2496, 75,
+       2499, 2498, 75, 2501, 2500, 75, 75, 75,
+       75, 75, 2502, 2503, 2503, 2504, 2505, 2506,
+       2507, 75, 2509, 2509, 2510, 2511, 2512, 2513,
+       2508, 2508, 2508, 75, 2514, 2514, 2514, 2514,
+       75, 2516, 2515, 75, 2517, 2517, 2517, 2517,
+       2517, 2517, 75, 2518, 2518, 2519, 2520, 2521,
+       2522, 75, 2523, 2523, 2524, 2525, 2526, 2526,
+       2526, 2527, 2528, 2526, 2526, 2526, 75, 2529,
+       2529, 2529, 2529, 75, 2531, 2530, 75, 2532,
+       2364, 2533, 2533, 2534, 2535, 2537, 2538, 2536,
+       2364, 2539, 2539, 2540, 2541, 2542, 2542, 2542,
+       2543, 2544, 2542, 2542, 2542, 75, 2545, 2545,
+       2545, 2545, 75, 2547, 2546, 75, 2549, 2549,
+       2549, 2549, 2548, 2550, 2550, 2551, 2552, 2553,
+       2554, 2555, 2555, 2556, 2557, 2549, 2559, 2559,
+       2560, 2561, 2562, 2563, 2564, 2564, 2565, 2566,
+       2558, 2558, 2558, 2549, 2568, 2567, 2549, 2569,
+       2569, 2569, 2569, 2341, 2570, 2571, 2570, 2570,
+       2570, 2571, 2571, 2571, 2341, 2573, 2572, 2574,
+       2574, 2575, 2576, 2578, 2579, 2577, 2572, 2580,
+       2580, 2581, 2582, 2584, 2585, 2586, 2587, 2583,
+       2572, 2588, 2588, 2589, 2590, 2592, 2593, 2591,
+       2572, 2594, 2594, 2595, 2596, 2584, 2585, 2598,
+       2599, 2597, 2572, 2600, 2600, 2601, 2602, 2603,
+       2605, 2606, 2604, 2572, 2607, 2607, 2608, 2609,
+       2584, 2585, 2610, 2611, 2572, 2612, 2612, 2613,
+       2614, 2615, 2616, 2572, 2612, 2612, 2613, 2614,
+       2615, 2616, 2617, 2572, 2618, 2618, 2619, 2620,
+       2622, 2623, 2621, 2572, 2624, 2624, 2625, 2626,
+       2628, 2629, 2630, 2631, 2627, 2572, 2632, 2632,
+       2633, 2634, 2636, 2637, 2635, 2572, 2638, 2638,
+       2639, 2640, 2628, 2629, 2642, 2643, 2641, 2572,
+       2644, 2644, 2645, 2646, 2647, 2649, 2650, 2648,
+       2572, 2651, 2651, 2652, 2653, 2628, 2629, 2654,
+       2655, 2572, 2656, 2656, 2657, 2658, 2659, 2660,
+       2572, 2656, 2656, 2657, 2658, 2661, 2659, 2660,
+       2662, 2572, 2663, 2572, 2664, 2664, 2665, 2666,
+       2667, 2669, 2670, 2671, 2672, 2672, 2673, 2674,
+       2668, 2572, 2675, 2675, 2676, 2677, 2679, 2680,
+       2681, 2681, 2682, 2683, 2678, 2572, 2684, 2684,
+       2685, 2686, 2687, 2689, 2690, 2691, 2692, 2692,
+       2693, 2694, 2688, 2572, 2695, 2695, 2696, 2697,
+       2699, 2700, 2681, 2681, 2701, 2702, 2698, 2572,
+       2703, 2703, 2704, 2705, 2706, 2708, 2709, 2710,
+       2711, 2711, 2712, 2713, 2707, 2572, 2714, 2714,
+       2715, 2716, 2718, 2719, 2681, 2681, 2720, 2721,
+       2717, 2572, 2722, 2722, 2723, 2724, 2725, 2722,
+       2727, 2728, 2729, 2729, 2730, 2731, 2726, 2572,
+       2732, 2732, 2733, 2734, 2735, 2736, 2681, 2681,
+       2737, 2738, 2572, 2740, 2739, 2572, 2741, 2741,
+       2742, 2743, 2741, 2745, 2746, 2747, 2747, 2748,
+       2749, 2744, 2572, 2722, 2722, 2723, 2724, 2722,
+       2727, 2728, 2729, 2729, 2730, 2731, 2750, 2572,
+       2752, 2751, 2572, 2753, 2753, 2754, 2755, 2757,
+       2758, 2759, 2760, 2760, 2761, 2762, 2756, 2572,
+       2703, 2703, 2704, 2705, 2708, 2709, 2710, 2711,
+       2711, 2712, 2713, 2763, 2572, 2714, 2714, 2715,
+       2716, 2718, 2719, 2681, 2681, 2720, 2721, 2572,
+       2765, 2764, 2572, 2766, 2766, 2767, 2768, 2770,
+       2771, 2772, 2773, 2773, 2774, 2775, 2769, 2572,
+       2684, 2684, 2685, 2686, 2689, 2690, 2691, 2692,
+       2692, 2693, 2694, 2776, 2572, 2695, 2695, 2696,
+       2697, 2699, 2700, 2681, 2681, 2701, 2702, 2572,
+       2778, 2777, 2572, 2779, 2779, 2780, 2781, 2783,
+       2784, 2785, 2786, 2786, 2787, 2788, 2782, 2572,
+       2664, 2664, 2665, 2666, 2669, 2670, 2671, 2672,
+       2672, 2673, 2674, 2789, 2572, 2675, 2675, 2676,
+       2677, 2679, 2680, 2681, 2681, 2682, 2683, 2572,
+       2791, 2790, 2572, 2792, 2792, 2793, 2794, 2795,
+       2796, 2572, 2798, 2797, 2572, 2799, 2799, 2800,
+       2801, 2803, 2804, 2802, 2572, 2644, 2644, 2645,
+       2646, 2649, 2650, 2805, 2572, 2807, 2806, 2572,
+       2809, 2808, 2572, 2811, 2810, 2572, 2812, 2812,
+       2813, 2814, 2815, 2816, 2572, 2818, 2817, 2572,
+       2819, 2819, 2820, 2821, 2823, 2824, 2822, 2572,
+       2600, 2600, 2601, 2602, 2605, 2606, 2825, 2572,
+       2827, 2826, 2572, 2829, 2828, 2572, 2830, 2364,
+       2831, 2831, 2832, 2833, 2835, 2836, 2834, 2364,
+       2837, 2837, 2838, 2839, 2841, 2842, 2840, 2364,
+       2843, 2843, 2844, 2845, 2847, 2848, 2846, 2364,
+       2849, 2849, 2850, 2851, 2853, 2854, 2852, 2364,
+       2855, 2855, 2856, 2857, 2859, 2860, 2858, 2364,
+       2861, 2861, 2862, 2863, 2864, 2864, 2864, 2865,
+       2866, 2864, 2864, 2864, 75, 2867, 2867, 2867,
+       2867, 75, 2869, 2868, 75, 2871, 2870, 75,
+       2873, 2872, 75, 2874, 2364, 2875, 2875, 2876,
+       2877, 2879, 2880, 2878, 2364, 2881, 2881, 2882,
+       2883, 2885, 2886, 2884, 2364, 2887, 2887, 2888,
+       2889, 2891, 2892, 2890, 2364, 2894, 2894, 2895,
+       2896, 2897, 2898, 2893, 2893, 2893, 75, 2899,
+       2899, 2900, 2901, 2902, 2903, 75, 2905, 2905,
+       2906, 2907, 2908, 2909, 2904, 2904, 2904, 75,
+       2910, 2910, 2911, 2912, 2913, 2914, 75, 2916,
+       2916, 2917, 2918, 2919, 2920, 2915, 2915, 2915,
+       75, 2921, 2921, 2922, 2923, 2924, 2925, 75,
+       2926, 2926, 2927, 2928, 2929, 2929, 2929, 2930,
+       2931, 2929, 2929, 2929, 75, 2932, 2932, 2932,
+       2932, 75, 2934, 2933, 75, 2936, 2935, 75,
+       2938, 2937, 75, 2940, 2939, 75, 2942, 2941,
+       75, 2943, 2943, 2943, 75, 2944, 2944, 2945,
+       2946, 2947, 2948, 75, 2944, 2944, 2945, 2946,
+       2947, 2948, 2949, 2364, 2950, 2950, 2951, 2952,
+       2954, 2955, 2953, 2364, 2956, 2956, 2957, 2958,
+       2960, 2961, 2959, 2959, 2959, 75, 2962, 2962,
+       2963, 2964, 2965, 2966, 75, 2962, 2962, 2963,
+       2964, 2967, 2965, 2966, 2967, 2967, 2967, 75,
+       2968, 2968, 75, 2970, 2969, 75, 2972, 2971,
+       75, 2974, 2973, 75, 2976, 2976, 2977, 2978,
+       2979, 2980, 2981, 2982, 2983, 2984, 2984, 2985,
+       2986, 2975, 2987, 2988, 2975, 2989, 2975, 2991,
+       2991, 2990, 2993, 2992, 2990, 2994, 2975, 2995,
+       2995, 2996, 2997, 2999, 3000, 3001, 3001, 3002,
+       3003, 2998, 2975, 3005, 3004, 75, 3006, 2975,
+       3007, 3007, 3007, 3007, 2990, 3009, 3008, 3008,
+       3008, 2990, 3010, 2364, 3011, 3011, 3012, 3013,
+       3015, 3016, 3014, 2364, 3017, 3017, 3018, 3019,
+       3021, 3022, 3020, 3020, 3020, 75, 3023, 3023,
+       3024, 3025, 3026, 3027, 75, 3023, 3023, 3024,
+       3025, 3026, 3027, 3028, 2364, 3029, 3029, 3030,
+       3031, 3033, 3034, 3032, 2364, 3036, 3036, 3037,
+       3038, 3040, 3041, 3039, 3039, 3039, 3035, 3042,
+       3042, 3042, 3035, 3043, 3043, 3044, 3045, 3046,
+       3047, 3048, 3048, 3049, 3050, 3039, 3039, 3039,
+       3035, 3052, 3051, 3035, 3054, 3053, 75, 3056,
+       3055, 75, 3058, 3057, 75, 3059, 2364, 3060,
+       3060, 3061, 3062, 3064, 3065, 3063, 2364, 3066,
+       3066, 3067, 3068, 3070, 3071, 3069, 2364, 3072,
+       3072, 3073, 3074, 3076, 3077, 3075, 2364, 3078,
+       3078, 3079, 3080, 3082, 3083, 3081, 3081, 3081,
+       3035, 3084, 3084, 3084, 3035, 3085, 3085, 3086,
+       3087, 3088, 3089, 3090, 3090, 3091, 3092, 3081,
+       3081, 3081, 3035, 3094, 3093, 3035, 3096, 3095,
+       75, 3098, 3097, 75, 3099, 2364, 3100, 3100,
+       3101, 3102, 3104, 3105, 3103, 2364, 3107, 3107,
+       3108, 3109, 3110, 3111, 3112, 3113, 3114, 3115,
+       3106, 3116, 3116, 3117, 3118, 3119, 3120, 3106,
+       3116, 3116, 3117, 3118, 3119, 3120, 3122, 3121,
+       3123, 3123, 3124, 3125, 3127, 3128, 3126, 3121,
+       3129, 3129, 3130, 3131, 3132, 3133, 3134, 3106,
+       3136, 3136, 3137, 3138, 3139, 3139, 3140, 3141,
+       3142, 3142, 3143, 3144, 3145, 3145, 3145, 3145,
+       3146, 3147, 3145, 3145, 3148, 3149, 3150, 3151,
+       3145, 3145, 3152, 3153, 3154, 3155, 3145, 3145,
+       3156, 3157, 3135, 3136, 3136, 3137, 3138, 3159,
+       3146, 3147, 3159, 3159, 3159, 3158, 3145, 3145,
+       3158, 3161, 3160, 3158, 3139, 3139, 3140, 3141,
+       3145, 3145, 3145, 3145, 3150, 3151, 3145, 3145,
+       3152, 3153, 3158, 3163, 3162, 3158, 3159, 3136,
+       3136, 3137, 3138, 3139, 3139, 3140, 3141, 3142,
+       3142, 3143, 3144, 3145, 3145, 3145, 3145, 3146,
+       3147, 3145, 3145, 3148, 3149, 3150, 3151, 3145,
+       3145, 3152, 3153, 3154, 3155, 3145, 3145, 3156,
+       3157, 3159, 3159, 3159, 3158, 3161, 3163, 3165,
+       3160, 3162, 3164, 3158, 3167, 3166, 3106, 3169,
+       3168, 3106, 3170, 3170, 3171, 3172, 3173, 3174,
+       3106, 3170, 3170, 3171, 3172, 3173, 3174, 3175,
+       3121, 3176, 3176, 3177, 3178, 3180, 3181, 3179,
+       3121, 3183, 3183, 3184, 3185, 3186, 3187, 3188,
+       3186, 3182, 3190, 3191, 3191, 3192, 3193, 3194,
+       3194, 3195, 3196, 3197, 3197, 3198, 3199, 3200,
+       3200, 3200, 3200, 3201, 3202, 3200, 3200, 3203,
+       3204, 3205, 3206, 3200, 3200, 3207, 3208, 3209,
+       3210, 3200, 3200, 3211, 3212, 3190, 3189, 3214,
+       3213, 3106, 3216, 3215, 3106, 3217, 3217, 3218,
+       3219, 3220, 3221, 3106, 3217, 3217, 3218, 3219,
+       3220, 3221, 3222, 3121, 3223, 3223, 3224, 3225,
+       3227, 3228, 3226, 3121, 3229, 3229, 3230, 3231,
+       3232, 3233, 3234, 3232, 3232, 3232, 3182, 3235,
+       3236, 3236, 3237, 3238, 3239, 3239, 3240, 3241,
+       3242, 3242, 3243, 3244, 3245, 3245, 3245, 3245,
+       3246, 3247, 3245, 3245, 3248, 3249, 3250, 3251,
+       3245, 3245, 3252, 3253, 3254, 3255, 3245, 3245,
+       3256, 3257, 3235, 3235, 3235, 3189, 3259, 3258,
+       3106, 3261, 3260, 3106, 3262, 3262, 3263, 3264,
+       3265, 3266, 3106, 3262, 3262, 3263, 3264, 3265,
+       3266, 3267, 3121, 3268, 3268, 3269, 3270, 3272,
+       3273, 3271, 3121, 3274, 3274, 3275, 3276, 3277,
+       3277, 3277, 3278, 3279, 3277, 3277, 3277, 3106,
+       3280, 3280, 3281, 3282, 3283, 3283, 3284, 3285,
+       3286, 3286, 3287, 3288, 3289, 3289, 3289, 3289,
+       3290, 3291, 3289, 3289, 3292, 3293, 3294, 3295,
+       3289, 3289, 3296, 3297, 3298, 3299, 3289, 3289,
+       3300, 3301, 3135, 3303, 3302, 3106, 3305, 3304,
+       3106, 3307, 3306, 75, 3309, 3310, 3311, 3312,
+       3313, 3314, 3315, 3316, 3317, 3318, 3319, 3320,
+       3321, 3322, 3323, 3324, 3325, 3309, 3310, 3311,
+       3312, 3313, 3314, 3315, 3316, 3317, 3318, 3319,
+       3320, 3321, 3322, 3323, 3324, 3325, 3308, 3326,
+       3326, 3327, 3328, 3329, 3330, 3331, 3329, 3330,
+       3331, 3332, 3333, 3308, 3334, 3334, 3335, 3336,
+       3338, 3339, 3337, 3337, 3337, 75, 3340, 3340,
+       3341, 3342, 3343, 3344, 75, 3340, 3340, 3341,
+       3342, 3343, 3344, 3345, 2364, 3346, 3346, 3347,
+       3348, 3350, 3351, 3349, 2364, 3352, 3352, 3353,
+       3354, 3356, 3357, 3355, 2364, 3358, 3358, 3359,
+       3360, 3362, 3363, 3361, 2364, 3365, 3365, 3366,
+       3367, 3369, 3370, 3368, 3364, 3371, 3371, 3372,
+       3373, 3375, 3376, 3374, 3364, 3377, 3377, 3378,
+       3379, 3381, 3382, 3380, 3364, 3383, 3383, 3384,
+       3385, 3387, 3388, 3386, 3364, 3389, 3389, 3390,
+       3391, 3393, 3394, 3392, 2364, 3395, 3395, 3396,
+       3397, 3399, 3400, 3398, 2364, 3401, 3401, 3402,
+       3403, 3404, 3404, 3404, 3405, 3406, 3404, 3404,
+       3404, 75, 3407, 3407, 3408, 3409, 3410, 3411,
+       75, 3412, 3412, 3413, 3414, 3415, 3416, 3417,
+       3415, 3415, 3415, 75, 3418, 3418, 75, 3420,
+       3419, 75, 3422, 3421, 75, 3424, 3423, 75,
+       3426, 3425, 75, 3428, 3427, 75, 3430, 3429,
+       75, 3432, 3431, 75, 3434, 3433, 75, 3435,
+       3435, 3308, 3436, 3436, 3308, 3437, 3437, 3438,
+       3439, 3440, 3441, 3308, 3442, 3442, 3308, 3443,
+       3443, 3308, 3444, 3444, 3308, 3445, 3445, 3446,
+       3447, 3448, 3449, 3308, 3450, 3450, 3308, 3451,
+       3451, 3452, 3453, 3454, 3455, 3308, 3456, 3457,
+       3458, 3459, 3460, 3456, 3457, 3458, 3459, 3460,
+       3308, 3461, 3461, 3308, 3462, 3462, 3463, 3464,
+       3465, 3466, 3308, 3467, 3468, 3467, 3468, 3308,
+       3469, 3469, 3308, 3470, 3470, 3308, 3471, 3471,
+       3308, 3472, 3472, 3308, 3473, 3473, 3474, 3475,
+       3476, 3477, 3308, 3478, 3478, 3479, 3480, 3481,
+       3482, 3308, 3483, 3483, 3308, 3484, 3484, 3308,
+       3485, 3485, 3486, 3487, 3488, 3489, 3308, 3490,
+       3490, 3308, 3491, 3491, 3308, 3492, 3492, 3308,
+       3493, 3493, 3494, 3495, 3496, 3497, 3308, 3498,
+       3498, 3308, 3499, 3499, 3308, 3500, 3500, 3308,
+       3501, 3501, 3502, 3503, 3504, 3505, 3308, 3506,
+       3507, 3508, 3506, 3507, 3508, 3308, 3509, 3509,
+       3308, 3510, 3510, 3308, 3511, 3511, 3308, 3512,
+       3512, 3513, 3514, 3515, 3516, 3308, 3517, 3518,
+       3517, 3518, 3308, 3519, 3519, 3308, 3520, 3520,
+       3308, 3521, 3521, 3522, 3523, 3524, 3525, 3308,
+       3526, 3526, 3308, 3527, 3527, 3308, 3528, 3528,
+       3308, 3529, 3529, 3530, 3531, 3532, 3533, 3308,
+       3534, 3534, 3535, 3536, 3537, 3538, 3308, 3539,
+       3539, 3308, 3540, 3540, 3308, 3541, 3542, 3308,
+       3543, 3308, 3544, 3544, 3545, 3546, 3547, 3548,
+       3308, 3549, 3308, 3550, 3550, 3551, 3552, 3553,
+       3554, 3308, 3555, 3556, 3555, 3556, 3308, 3557,
+       3557, 3308, 3558, 3558, 3308, 3559, 3559, 3308,
+       3560, 3560, 3561, 3562, 3563, 3564, 3308, 3565,
+       3565, 3308, 3566, 3566, 3308, 3567, 3567, 3308,
+       3568, 3568, 3569, 3570, 3571, 3572, 3308, 3573,
+       3573, 3308, 3574, 3574, 3308, 3575, 3575, 3308,
+       3576, 3576, 3308, 3577, 3577, 3308, 3578, 3578,
+       3308, 3579, 3579, 3308, 3580, 3580, 3581, 3582,
+       3583, 3584, 3308, 3585, 3586, 3585, 3586, 3308,
+       3587, 3587, 3308, 3588, 3588, 3589, 3590, 3591,
+       3592, 3308, 3593, 3593, 3594, 3595, 3596, 3597,
+       3308, 3598, 3599, 3600, 3601, 3600, 3601, 3308,
+       3602, 3308, 3603, 3603, 3604, 3605, 3606, 3607,
+       3308, 3608, 3308, 3609, 3609, 3610, 3611, 3612,
+       3613, 3308, 3614, 3614, 3308, 3615, 3615, 3616,
+       3617, 3618, 3619, 3308, 3620, 3620, 3621, 3622,
+       3623, 3624, 3308, 3625, 3626, 3625, 3626, 3308,
+       3627, 3627, 3308, 3628, 3628, 3308, 3629, 3629,
+       3308, 3630, 3630, 3631, 3632, 3633, 3634, 3308,
+       3635, 3635, 3636, 3637, 3638, 3639, 3308, 3640,
+       3641, 3642, 3640, 3641, 3642, 3308, 3643, 3643,
+       3308, 3644, 3644, 3308, 3645, 3645, 3308, 3646,
+       3646, 3647, 3648, 3649, 3650, 3308, 3651, 3651,
+       3308, 3652, 3652, 3653, 3654, 3655, 3656, 3308,
+       3657, 3657, 3658, 3659, 3660, 3660, 3661, 3662,
+       3308, 3663, 3663, 3308, 3664, 3664, 3665, 3666,
+       3667, 3668, 3669, 3308, 3670, 3670, 3671, 3672,
+       3673, 3673, 3674, 3675, 3308, 3676, 3676, 3308,
+       3677, 3677, 3308, 3678, 3678, 3308, 3679, 3679,
+       3308, 3680, 3680, 3681, 3682, 3683, 3684, 3308,
+       3685, 3685, 3308, 3686, 3686, 3308, 3687, 3687,
+       3308, 3688, 3688, 3308, 3689, 3689, 3308, 3690,
+       3690, 3308, 3691, 3691, 3308, 3692, 3692, 3308,
+       3693, 3693, 3308, 3694, 3694, 3695, 3696, 3697,
+       3698, 3308, 3699, 3699, 3308, 3700, 3700, 3308,
+       3701, 3701, 3702, 3703, 3704, 3705, 3308, 3706,
+       3707, 3708, 3706, 3707, 3708, 3308, 3709, 3709,
+       3710, 3711, 3712, 3713, 3308, 3714, 3714, 3308,
+       3715, 3715, 3308, 3716, 3716, 3308, 3717, 3717,
+       3718, 3719, 3720, 3721, 3308, 3722, 3722, 3723,
+       3724, 3725, 3726, 3308, 3727, 3728, 3729, 3730,
+       3731, 3732, 3727, 3728, 3729, 3730, 3731, 3732,
+       3308, 3733, 3733, 3308, 3734, 3734, 3308, 3735,
+       3735, 3308, 3736, 3736, 3308, 3737, 3737, 3738,
+       3739, 3740, 3741, 3308, 3742, 3742, 3308, 3743,
+       3743, 3744, 3745, 3746, 3747, 3308, 3748, 3748,
+       3308, 3749, 3749, 3750, 3751, 3752, 3753, 3308,
+       3754, 3754, 3308, 3755, 3755, 3756, 3757, 3758,
+       3759, 3308, 3760, 3760, 3308, 3761, 3761, 3308,
+       3762, 3762, 3308, 3763, 3763, 3764, 3765, 3766,
+       3767, 3308, 3768, 3768, 3308, 3769, 3769, 3308,
+       3770, 3770, 3771, 3772, 3773, 3774, 3308, 3775,
+       3776, 3777, 3775, 3776, 3777, 3308, 3778, 3778,
+       3308, 3779, 3779, 3308, 3780, 3780, 3781, 3782,
+       3783, 3784, 3308, 3785, 3785, 3308, 3786, 3786,
+       3787, 3788, 3789, 3790, 3308, 3791, 3791, 3308,
+       3792, 3792, 3308, 3794, 3793, 3795, 3795, 3796,
+       3797, 3799, 3800, 3798, 3793, 3801, 3801, 3308,
+       3802, 3802, 3308, 3803, 3803, 3804, 3805, 3806,
+       3807, 3308, 3808, 3808, 3308, 3809, 3809, 3308,
+       3810, 3810, 3308, 3811, 3811, 3308, 3812, 3812,
+       3308, 3813, 3813, 3814, 3815, 3816, 3817, 3308,
+       3818, 3818, 3818, 3818, 3818, 3818, 75, 3819,
+       3819, 3819, 3819, 75, 3820, 3820, 3820, 3820,
+       75, 3821, 2364, 3822, 3822, 3823, 3824, 3826,
+       3827, 3825, 2364, 3828, 3828, 3829, 3830, 3832,
+       3833, 3831, 2364, 3834, 3834, 3835, 3836, 3838,
+       3839, 3837, 2364, 3840, 3840, 3841, 3842, 3844,
+       3845, 3843, 3843, 3843, 75, 3846, 3846, 3847,
+       3848, 3849, 3850, 75, 3846, 3846, 3847, 3848,
+       3851, 3849, 3850, 3851, 3851, 3851, 75, 3852,
+       3852, 75, 3854, 3853, 75, 3856, 3855, 75,
+       3858, 3857, 75, 3859, 3859, 3859, 3859, 75,
+       3860, 3860, 75, 3861, 2364, 3862, 3862, 3863,
+       3864, 3866, 3867, 3865, 2364, 3868, 3868, 3869,
+       3870, 3872, 3873, 3871, 2364, 3874, 3874, 3875,
+       3876, 3878, 3879, 3877, 2364, 3880, 3880, 3881,
+       3882, 3884, 3885, 3883, 2364, 3886, 3886, 3887,
+       3888, 3890, 3891, 3889, 2364, 3892, 3892, 3893,
+       3894, 3895, 3897, 3898, 3896, 3896, 3896, 3035,
+       3899, 3899, 3900, 3901, 3902, 3903, 3035, 3905,
+       3905, 3906, 3907, 3909, 3910, 3908, 3908, 3908,
+       3904, 3911, 3911, 3911, 3904, 3913, 3912, 3912,
+       3912, 3904, 3914, 3914, 3914, 3904, 3916, 3915,
+       3915, 3915, 3904, 3918, 3917, 3917, 3917, 3904,
+       3919, 3919, 3919, 3904, 3921, 3920, 3920, 3920,
+       3904, 3922, 3922, 3922, 3922, 3923, 3923, 3923,
+       3904, 3924, 3924, 3924, 3924, 75, 3925, 3904,
+       3921, 3904, 3918, 3904, 3926, 3904, 3916, 3904,
+       3928, 3927, 75, 3929, 3929, 3929, 3035, 3899,
+       3899, 3900, 3901, 3902, 3903, 3930, 3930, 3930,
+       3035, 3932, 3931, 75, 3934, 3933, 75, 3936,
+       3935, 75, 3937, 2364, 3938, 3938, 3939, 3940,
+       3942, 3943, 3941, 2364, 3944, 3944, 3945, 3946,
+       3948, 3949, 3947, 2364, 3950, 3950, 3951, 3952,
+       3954, 3955, 3953, 2364, 3956, 3956, 3957, 3958,
+       3960, 3961, 3959, 2364, 3962, 3962, 3963, 3964,
+       3966, 3967, 3965, 2364, 3968, 3968, 3969, 3970,
+       3971, 3973, 3974, 3972, 3972, 3972, 3035, 3975,
+       3975, 3975, 3975, 3035, 3976, 3976, 3976, 3035,
+       3975, 3975, 3975, 3975, 3977, 3977, 3977, 3035,
+       3979, 3978, 75, 3981, 3980, 75, 3983, 3982,
+       75, 3984, 2364, 3985, 3985, 3986, 3987, 3989,
+       3990, 3988, 2364, 3991, 3991, 3992, 3993, 3995,
+       3996, 3994, 2364, 3997, 3997, 3998, 3999, 4001,
+       4002, 4000, 2364, 4003, 4003, 4004, 4005, 4007,
+       4008, 4006, 2364, 4009, 4009, 4010, 4011, 4013,
+       4014, 4012, 2364, 4015, 4015, 4016, 4017, 4019,
+       4020, 4018, 4018, 4018, 3035, 4021, 4021, 4021,
+       3035, 4022, 4022, 4023, 4024, 4025, 4026, 4027,
+       4027, 4028, 4029, 4018, 4018, 4018, 3035, 4031,
+       4030, 3035, 4033, 4032, 75, 4035, 4034, 75,
+       4037, 4036, 75, 4038, 2364, 4039, 4039, 4040,
+       4041, 4043, 4044, 4042, 2364, 4045, 4045, 4046,
+       4047, 4049, 4050, 4048, 2364, 4051, 4051, 4051,
+       4051, 4052, 2364, 4053, 4053, 4053, 4053, 75,
+       4055, 4054, 75, 4056, 2364, 4057, 4057, 4058,
+       4059, 4061, 4062, 4060, 2364, 4063, 4063, 4064,
+       4065, 4067, 4068, 4066, 2364, 4069, 4069, 4070,
+       4071, 4073, 4074, 4072, 2364, 4075, 4075, 4076,
+       4077, 4079, 4080, 4078, 2364, 4081, 4081, 4082,
+       4083, 4085, 4086, 4084, 2364, 4087, 4087, 4088,
+       4089, 4091, 4092, 4090, 4090, 4090, 3035, 4093,
+       4093, 4093, 3035, 4094, 4094, 4095, 4096, 4097,
+       4098, 4099, 4099, 4100, 4101, 4090, 4090, 4090,
+       3035, 4103, 4102, 3035, 4105, 4104, 75, 4107,
+       4106, 75, 4109, 4108, 75, 4110, 2364, 4111,
+       4111, 4112, 4113, 4115, 4116, 4114, 2364, 4117,
+       4117, 4118, 4119, 4120, 4121, 4122, 4120, 2341,
+       4123, 4124, 4123, 4123, 4123, 4124, 2341, 4126,
+       4125, 75, 4127, 2364, 4128, 4128, 4129, 4130,
+       4132, 4133, 4131, 2364, 4134, 4134, 4135, 4136,
+       4138, 4139, 4137, 4137, 4137, 3035, 4140, 4140,
+       4140, 3035, 4141, 4141, 4141, 3035, 4142, 4142,
+       4142, 3035, 4144, 4143, 4145, 4145, 4145, 3035,
+       4146, 4146, 4146, 3035, 4147, 4147, 4147, 3035,
+       4148, 4148, 4148, 3035, 4150, 4144, 4150, 4150,
+       4150, 4149, 4152, 4151, 75, 4153, 4153, 4153,
+       3035, 4154, 4154, 4154, 3035, 4156, 4155, 4157,
+       4157, 4157, 3035, 4158, 4158, 4158, 3035, 4159,
+       4156, 4159, 4159, 4159, 4155, 4160, 4160, 4160,
+       3035, 4161, 4161, 4161, 3035, 4162, 4155, 4163,
+       4163, 4163, 3035, 4164, 4164, 4164, 3035, 4165,
+       4162, 4165, 4165, 4165, 4155, 4166, 2364, 4167,
+       4167, 4168, 4169, 4171, 4172, 4170, 2364, 4173,
+       4173, 4174, 4175, 4177, 4178, 4176, 2364, 4179,
+       4179, 4180, 4181, 4183, 4184, 4182, 2364, 4186,
+       4186, 4187, 4188, 4189, 4190, 4185, 4185, 4185,
+       75, 4191, 4191, 4191, 4191, 75, 4193, 4192,
+       75, 4195, 4194, 75, 4196, 2364, 4197, 4197,
+       4198, 4199, 4201, 4202, 4200, 2364, 4204, 4204,
+       4205, 4206, 4207, 4208, 4203, 4203, 4203, 75,
+       4209, 4209, 4210, 4211, 4212, 4213, 75, 4215,
+       4215, 4216, 4217, 4218, 4219, 4214, 4214, 4214,
+       75, 4220, 4220, 4220, 4220, 75, 4222, 4221,
+       75, 4224, 4223, 75, 4225, 2364, 4226, 4226,
+       4227, 4228, 4230, 4231, 4229, 2364, 4232, 4232,
+       4233, 4234, 4235, 4235, 4235, 4236, 4237, 4235,
+       4235, 4235, 75, 4238, 4238, 4238, 4238, 75,
+       4239, 4239, 4239, 4239, 75, 4241, 4240, 75,
+       4243, 4243, 4244, 4245, 4246, 4247, 4247, 4247,
+       4248, 4249, 4250, 4251, 4247, 4247, 4247, 4242,
+       4252, 4252, 4253, 4254, 4255, 4256, 73, 4257,
+       4256, 4248, 4249, 4258, 4259, 4260, 4261, 4262,
+       4263, 73, 73, 4256, 73, 4256, 73, 4256,
+       73, 871, 4265, 4265, 4244, 4266, 4267, 4247,
+       4268, 4269, 4270, 4271, 4272, 4273, 4274, 4275,
+       4276, 4277, 4278, 4279, 4280, 4281, 4282, 4283,
+       4284, 4247, 4247, 4268, 4269, 4270, 4271, 4272,
+       4273, 4274, 4275, 4276, 4277, 4278, 4279, 4280,
+       4281, 4282, 4283, 4284, 4248, 4249, 4285, 4286,
+       4247, 4247, 4247, 4264, 4265, 4265, 4244, 4266,
+       4267, 4247, 4289, 4290, 4291, 4292, 4293, 4294,
+       4295, 4296, 4297, 4298, 4299, 4300, 4301, 4302,
+       4303, 4304, 4305, 4247, 4247, 4289, 4290, 4291,
+       4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299,
+       4300, 4301, 4302, 4303, 4304, 4305, 4248, 4249,
+       4285, 4286, 4247, 4288, 4247, 4247, 4287, 4307,
+       4307, 4308, 4309, 4310, 4311, 4311, 4311, 4312,
+       4313, 4314, 4315, 4311, 4311, 4311, 4306, 4243,
+       4243, 4244, 4316, 4317, 4247, 4289, 4290, 4291,
+       4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299,
+       4300, 4301, 4302, 4303, 4304, 4305, 4247, 4247,
+       4289, 4290, 4291, 4292, 4293, 4294, 4295, 4296,
        4297, 4298, 4299, 4300, 4301, 4302, 4303, 4304,
-       4305, 4306, 4307, 4308, 4309, 4310, 4311, 4220,
-       4219, 4295, 4296, 4297, 4298, 4299, 4300, 4301,
-       4302, 4303, 4304, 4305, 4306, 4307, 4308, 4309,
-       4310, 4311, 4211, 4212, 4221, 4222, 4223, 4224,
-       4225, 4226, 73, 73, 4219, 4294, 73, 4219,
-       73, 4219, 73, 4293, 4288, 4288, 4216, 4289,
-       4290, 4219, 73, 4295, 4296, 4297, 4298, 4299,
-       4300, 4301, 4302, 4303, 4304, 4305, 4306, 4307,
-       4308, 4309, 4310, 4311, 4220, 4219, 4295, 4296,
-       4297, 4298, 4299, 4300, 4301, 4302, 4303, 4304,
-       4305, 4306, 4307, 4308, 4309, 4310, 4311, 87,
-       88, 4312, 4291, 105, 106, 4312, 4292, 73,
-       73, 4219, 4294, 73, 4219, 73, 4219, 73,
-       4293, 778, 778, 778, 778, 1036, 1037, 1036,
-       1039, 1036, 1037, 1038, 1037, 1032, 778, 778,
-       778, 1194, 1194, 1195, 1196, 1163, 1164, 1165,
-       1163, 1197, 1198, 1163, 1163, 1163, 1169, 778,
-       1209, 1209, 1210, 1211, 1204, 1212, 1213, 1214,
-       1214, 1215, 1216, 1204, 1204, 1204, 1203, 1218,
-       1217, 1203, 778, 1228, 1228, 1229, 1230, 1231,
-       1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239,
-       1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247,
-       1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238,
-       1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246,
-       1247, 1248, 1249, 1250, 1250, 1251, 1252, 1219,
-       1275, 1274, 1219, 778, 1814, 1814, 1815, 1816,
-       1817, 1818, 1819, 1819, 1820, 1821, 1810, 1810,
-       1810, 1806, 1823, 1822, 1806, 1842, 1842, 1843,
-       1844, 1846, 1847, 1845, 1845, 1845, 1806, 1792,
-       1849, 1849, 1850, 1851, 1852, 1853, 1854, 1854,
-       1855, 1856, 1845, 1845, 1845, 1806, 1858, 1857,
-       1806, 1860, 1859, 1792, 778, 778, 1930, 1930,
-       1931, 1932, 1933, 1934, 1935, 1936, 1937, 1938,
-       1939, 1940, 1941, 1942, 1942, 1943, 1944, 1921,
-       1960, 1959, 1921, 778, 778, 778, 778, 778,
-       778, 778, 778, 778, 2522, 2522, 2523, 2524,
-       2525, 2526, 2527, 2527, 2528, 2529, 2521, 2521,
-       2521, 2512, 2531, 2530, 2512, 778, 778, 2695,
-       2695, 2696, 2697, 2698, 2699, 2644, 2644, 2700,
-       2701, 2535, 2703, 2702, 2535, 2677, 2677, 2678,
-       2679, 2681, 2682, 2644, 2644, 2683, 2684, 2680,
-       2535, 2715, 2714, 2535, 2658, 2658, 2659, 2660,
-       2662, 2663, 2644, 2644, 2664, 2665, 2661, 2535,
-       2728, 2727, 2535, 2638, 2638, 2639, 2640, 2642,
-       2643, 2644, 2644, 2645, 2646, 2641, 2535, 2741,
-       2740, 2535, 778, 778, 778, 778, 2939, 2939,
-       2940, 2941, 2942, 2943, 2944, 2945, 2946, 2947,
-       2947, 2948, 2949, 2938, 2968, 2967, 75, 778,
-       3006, 3006, 3007, 3008, 3009, 3010, 3011, 3011,
-       3012, 3013, 3002, 3002, 3002, 2998, 3015, 3014,
-       2998, 778, 3048, 3048, 3049, 3050, 3051, 3052,
-       3053, 3053, 3054, 3055, 3044, 3044, 3044, 2998,
-       3057, 3056, 2998, 778, 3102, 3102, 3103, 3104,
-       3108, 3108, 3108, 3108, 3113, 3114, 3108, 3108,
-       3115, 3116, 3121, 3126, 3125, 3121, 3099, 3099,
-       3100, 3101, 3122, 3109, 3110, 3122, 3122, 3122,
-       3121, 3124, 3123, 3121, 3122, 3099, 3099, 3100,
-       3101, 3102, 3102, 3103, 3104, 3105, 3105, 3106,
-       3107, 3108, 3108, 3108, 3108, 3109, 3110, 3108,
-       3108, 3111, 3112, 3113, 3114, 3108, 3108, 3115,
-       3116, 3117, 3118, 3108, 3108, 3119, 3120, 3122,
-       3122, 3122, 3121, 3124, 3126, 3128, 3123, 3125,
-       3127, 3121, 778, 778, 778, 778, 778, 778,
-       778, 3985, 3985, 3986, 3987, 3988, 3989, 3990,
-       3990, 3991, 3992, 3981, 3981, 3981, 2998, 3994,
-       3993, 2998, 778, 778, 4057, 4057, 4058, 4059,
-       4060, 4061, 4062, 4062, 4063, 4064, 4053, 4053,
-       4053, 2998, 4066, 4065, 2998, 778, 778, 778,
-       778, 778, 778, 778, 0
+       4305, 4248, 4249, 4318, 4319, 4247, 4288, 4247,
+       4247, 4287, 4320, 4320, 4244, 4321, 4322, 4247,
+       4247, 4247, 87, 88, 4323, 4324, 4247, 4247,
+       4247, 871, 4325, 4325, 4253, 4326, 4327, 4256,
+       73, 4257, 4256, 87, 88, 4323, 4328, 105,
+       106, 4323, 4329, 73, 73, 4256, 73, 4256,
+       73, 4256, 73, 871, 4252, 4252, 4253, 4254,
+       4255, 4256, 73, 4332, 4333, 4334, 4335, 4336,
+       4337, 4338, 4339, 4340, 4341, 4342, 4343, 4344,
+       4345, 4346, 4347, 4348, 4257, 4256, 4332, 4333,
+       4334, 4335, 4336, 4337, 4338, 4339, 4340, 4341,
+       4342, 4343, 4344, 4345, 4346, 4347, 4348, 4248,
+       4249, 4258, 4259, 4260, 4261, 4262, 4263, 73,
+       73, 4256, 4331, 73, 4256, 73, 4256, 73,
+       4330, 4325, 4325, 4253, 4326, 4327, 4256, 73,
+       4332, 4333, 4334, 4335, 4336, 4337, 4338, 4339,
+       4340, 4341, 4342, 4343, 4344, 4345, 4346, 4347,
+       4348, 4257, 4256, 4332, 4333, 4334, 4335, 4336,
+       4337, 4338, 4339, 4340, 4341, 4342, 4343, 4344,
+       4345, 4346, 4347, 4348, 87, 88, 4349, 4328,
+       105, 106, 4349, 4329, 73, 73, 4256, 4331,
+       73, 4256, 73, 4256, 73, 4330, 778, 778,
+       778, 778, 1036, 1037, 1036, 1039, 1036, 1037,
+       1038, 1037, 1032, 778, 778, 778, 1194, 1194,
+       1195, 1196, 1163, 1164, 1165, 1163, 1197, 1198,
+       1163, 1163, 1163, 1169, 778, 1209, 1209, 1210,
+       1211, 1204, 1212, 1213, 1214, 1214, 1215, 1216,
+       1204, 1204, 1204, 1203, 1218, 1217, 1203, 778,
+       1228, 1228, 1229, 1230, 1231, 1232, 1233, 1234,
+       1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242,
+       1243, 1244, 1245, 1246, 1247, 1231, 1232, 1233,
+       1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241,
+       1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249,
+       1250, 1250, 1251, 1252, 1219, 1275, 1274, 1219,
+       778, 1814, 1814, 1815, 1816, 1817, 1818, 1819,
+       1819, 1820, 1821, 1810, 1810, 1810, 1806, 1823,
+       1822, 1806, 1842, 1842, 1843, 1844, 1846, 1847,
+       1845, 1845, 1845, 1806, 1792, 1849, 1849, 1850,
+       1851, 1852, 1853, 1854, 1854, 1855, 1856, 1845,
+       1845, 1845, 1806, 1858, 1857, 1806, 1860, 1859,
+       1792, 778, 778, 1944, 1944, 1945, 1946, 1947,
+       1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955,
+       1956, 1957, 1958, 1958, 1959, 1960, 1935, 1976,
+       1975, 1935, 778, 778, 778, 778, 778, 778,
+       778, 778, 778, 2559, 2559, 2560, 2561, 2562,
+       2563, 2564, 2564, 2565, 2566, 2558, 2558, 2558,
+       2549, 2568, 2567, 2549, 778, 778, 2732, 2732,
+       2733, 2734, 2735, 2736, 2681, 2681, 2737, 2738,
+       2572, 2740, 2739, 2572, 2714, 2714, 2715, 2716,
+       2718, 2719, 2681, 2681, 2720, 2721, 2717, 2572,
+       2752, 2751, 2572, 2695, 2695, 2696, 2697, 2699,
+       2700, 2681, 2681, 2701, 2702, 2698, 2572, 2765,
+       2764, 2572, 2675, 2675, 2676, 2677, 2679, 2680,
+       2681, 2681, 2682, 2683, 2678, 2572, 2778, 2777,
+       2572, 778, 778, 778, 778, 2976, 2976, 2977,
+       2978, 2979, 2980, 2981, 2982, 2983, 2984, 2984,
+       2985, 2986, 2975, 3005, 3004, 75, 778, 3043,
+       3043, 3044, 3045, 3046, 3047, 3048, 3048, 3049,
+       3050, 3039, 3039, 3039, 3035, 3052, 3051, 3035,
+       778, 3085, 3085, 3086, 3087, 3088, 3089, 3090,
+       3090, 3091, 3092, 3081, 3081, 3081, 3035, 3094,
+       3093, 3035, 778, 3139, 3139, 3140, 3141, 3145,
+       3145, 3145, 3145, 3150, 3151, 3145, 3145, 3152,
+       3153, 3158, 3163, 3162, 3158, 3136, 3136, 3137,
+       3138, 3159, 3146, 3147, 3159, 3159, 3159, 3158,
+       3161, 3160, 3158, 3159, 3136, 3136, 3137, 3138,
+       3139, 3139, 3140, 3141, 3142, 3142, 3143, 3144,
+       3145, 3145, 3145, 3145, 3146, 3147, 3145, 3145,
+       3148, 3149, 3150, 3151, 3145, 3145, 3152, 3153,
+       3154, 3155, 3145, 3145, 3156, 3157, 3159, 3159,
+       3159, 3158, 3161, 3163, 3165, 3160, 3162, 3164,
+       3158, 778, 778, 778, 778, 778, 778, 778,
+       4022, 4022, 4023, 4024, 4025, 4026, 4027, 4027,
+       4028, 4029, 4018, 4018, 4018, 3035, 4031, 4030,
+       3035, 778, 778, 4094, 4094, 4095, 4096, 4097,
+       4098, 4099, 4099, 4100, 4101, 4090, 4090, 4090,
+       3035, 4103, 4102, 3035, 778, 778, 778, 778,
+       778, 778, 778, 0
 };
 
 static const short _zone_scanner_trans_targs[] = {
        0, 1, 1, 1, 2, 4, 17, 40,
        54, 61, 175, 81, 85, 93, 99, 115,
-       125, 128, 135, 154, 164, 167, 1396, 183,
-       1401, 302, 0, 3, 3, 3, 2, 198,
+       125, 128, 135, 154, 164, 167, 1423, 183,
+       1428, 302, 0, 3, 3, 3, 2, 198,
        198, 198, 198, 198, 3, 201, 0, 3,
        3, 3, 4, 17, 40, 54, 61, 70,
        81, 85, 93, 99, 115, 125, 128, 135,
        154, 164, 167, 3, 201, 0, 5, 5,
        5, 266, 269, 273, 5, 10, 6, 11,
        20, 6, 5, 0, 5, 5, 9, 5,
-       10, 11, 20, 0, 7, 7, 7, 1396,
-       8, 0, 7, 7, 7, 1396, 8, 8,
-       1396, 6, 6, 10, 5, 12, 12, 12,
-       13, 1402, 208, 280, 12, 12, 12, 13,
-       1402, 208, 280, 13, 1397, 14, 0, 14,
+       10, 11, 20, 0, 7, 7, 7, 1423,
+       8, 0, 7, 7, 7, 1423, 8, 8,
+       1423, 6, 6, 10, 5, 12, 12, 12,
+       13, 1429, 208, 280, 12, 12, 12, 13,
+       1429, 208, 280, 13, 1424, 14, 0, 14,
        14, 15, 204, 211, 212, 213, 214, 215,
        216, 217, 218, 219, 220, 221, 222, 223,
-       224, 225, 226, 1404, 275, 1402, 276, 1405,
-       278, 0, 16, 16, 16, 1398, 305, 0,
-       16, 16, 16, 1398, 305, 18, 22, 29,
+       224, 225, 226, 1431, 275, 1429, 276, 1432,
+       278, 0, 16, 16, 16, 1425, 305, 0,
+       16, 16, 16, 1425, 305, 18, 22, 29,
        32, 36, 19, 5, 5, 5, 5, 10,
        6, 11, 20, 21, 21, 21, 13, 21,
        21, 21, 13, 23, 28, 24, 25, 26,
@@ -5157,15 +5202,15 @@ static const short _zone_scanner_trans_targs[] = {
        5, 5, 10, 6, 11, 20, 168, 169,
        170, 171, 172, 5, 5, 5, 5, 10,
        6, 11, 20, 173, 72, 174, 174, 174,
-       1399, 303, 176, 177, 177, 177, 177, 182,
+       1426, 303, 176, 177, 177, 177, 177, 182,
        177, 177, 177, 178, 4, 17, 40, 54,
        61, 73, 81, 85, 93, 99, 115, 125,
        128, 135, 154, 164, 167, 177, 182, 72,
        72, 72, 178, 179, 179, 179, 179, 179,
        72, 173, 180, 180, 181, 181, 181, 181,
        181, 72, 72, 72, 180, 72, 173, 182,
-       177, 183, 1396, 0, 185, 229, 235, 186,
-       187, 188, 189, 190, 191, 1400, 0, 193,
+       177, 183, 1423, 0, 185, 229, 235, 186,
+       187, 188, 189, 190, 191, 1427, 0, 193,
        193, 193, 193, 194, 193, 193, 193, 193,
        194, 194, 0, 193, 0, 196, 196, 196,
        196, 197, 196, 196, 196, 196, 197, 197,
@@ -5173,1176 +5218,1187 @@ static const short _zone_scanner_trans_targs[] = {
        3, 3, 3, 199, 3, 201, 201, 3,
        0, 203, 203, 203, 203, 282, 283, 284,
        203, 203, 203, 203, 282, 283, 284, 0,
-       205, 205, 205, 1397, 13, 1402, 208, 1403,
-       280, 205, 205, 205, 1397, 1403, 206, 206,
-       206, 1401, 207, 207, 1401, 209, 209, 209,
-       1396, 8, 209, 209, 209, 8, 210, 210,
-       210, 227, 264, 227, 1404, 0, 230, 231,
-       232, 233, 234, 1400, 236, 237, 1400, 0,
-       206, 206, 206, 1401, 207, 0, 240, 240,
-       240, 1399, 241, 240, 240, 240, 1399, 241,
-       241, 1399, 0, 243, 243, 243, 1404, 227,
-       1405, 264, 243, 243, 243, 1404, 1405, 261,
+       205, 205, 205, 1424, 13, 1429, 208, 1430,
+       280, 205, 205, 205, 1424, 1430, 206, 206,
+       206, 1428, 207, 207, 1428, 209, 209, 209,
+       1423, 8, 209, 209, 209, 8, 210, 210,
+       210, 227, 264, 227, 1431, 0, 230, 231,
+       232, 233, 234, 1427, 236, 237, 1427, 0,
+       206, 206, 206, 1428, 207, 0, 240, 240,
+       240, 1426, 241, 240, 240, 240, 1426, 241,
+       241, 1426, 0, 243, 243, 243, 1431, 227,
+       1432, 264, 243, 243, 243, 1431, 1432, 261,
        0, 261, 261, 261, 262, 206, 206, 206,
-       1401, 207, 263, 1401, 263, 263, 207, 263,
+       1428, 207, 263, 1428, 263, 263, 207, 263,
        263, 263, 207, 265, 265, 265, 227, 265,
        265, 265, 227, 267, 268, 5, 5, 5,
        5, 10, 6, 11, 20, 270, 271, 272,
        5, 5, 5, 5, 10, 6, 11, 20,
        274, 5, 5, 5, 5, 10, 6, 11,
-       20, 275, 1404, 277, 277, 277, 1396, 277,
-       277, 277, 1396, 279, 279, 279, 279, 279,
+       20, 275, 1431, 277, 277, 277, 1423, 277,
+       277, 277, 1423, 279, 279, 279, 279, 279,
        279, 281, 281, 281, 281, 281, 281, 282,
        203, 210, 210, 210, 227, 264, 285, 285,
-       285, 285, 285, 285, 0, 302, 1401, 303,
-       1399, 305, 1398, 306, 1406, 306, 306, 308,
-       1407, 308, 1407, 0, 310, 316, 317, 312,
-       1408, 310, 311, 312, 1408, 310, 312, 313,
-       0, 314, 315, 1408, 310, 311, 312, 1408,
-       0, 319, 324, 320, 1409, 319, 1410, 320,
-       0, 321, 322, 323, 1409, 319, 1410, 320,
+       285, 285, 285, 285, 0, 302, 1428, 303,
+       1426, 305, 1425, 306, 1433, 306, 306, 308,
+       1434, 308, 1434, 0, 310, 316, 317, 312,
+       1435, 310, 311, 312, 1435, 310, 312, 313,
+       0, 314, 315, 1435, 310, 311, 312, 1435,
+       0, 319, 324, 320, 1436, 319, 1437, 320,
+       0, 321, 322, 323, 1436, 319, 1437, 320,
        324, 325, 326, 327, 324, 325, 326, 327,
-       0, 1409, 328, 329, 330, 324, 325, 326,
+       0, 1436, 328, 329, 330, 324, 325, 326,
        327, 0, 332, 332, 332, 332, 339, 0,
        333, 0, 334, 334, 334, 333, 336, 336,
-       336, 336, 336, 1411, 335, 0, 334, 334,
-       334, 1411, 335, 335, 1411, 337, 0, 337,
+       336, 336, 336, 1438, 335, 0, 334, 334,
+       334, 1438, 335, 335, 1438, 337, 0, 337,
        338, 338, 338, 338, 338, 334, 334, 334,
-       337, 1411, 335, 339, 332, 0, 341, 341,
+       337, 1438, 335, 339, 332, 0, 341, 341,
        341, 341, 351, 342, 350, 346, 342, 343,
-       346, 0, 344, 344, 344, 342, 346, 1412,
-       345, 344, 344, 344, 1412, 345, 345, 1412,
+       346, 0, 344, 344, 344, 342, 346, 1439,
+       345, 344, 344, 344, 1439, 345, 345, 1439,
        347, 0, 348, 349, 342, 343, 346, 351,
        341, 353, 353, 353, 353, 368, 354, 0,
-       0, 355, 355, 355, 1413, 359, 365, 0,
-       355, 355, 355, 356, 364, 360, 1413, 359,
+       0, 355, 355, 355, 1440, 359, 365, 0,
+       355, 355, 355, 356, 364, 360, 1440, 359,
        365, 0, 356, 357, 360, 358, 358, 358,
-       356, 360, 1413, 359, 358, 358, 358, 359,
-       1413, 361, 0, 362, 363, 356, 357, 360,
-       365, 1414, 366, 366, 366, 366, 367, 367,
+       356, 360, 1440, 359, 358, 358, 358, 359,
+       1440, 361, 0, 362, 363, 356, 357, 360,
+       365, 1441, 366, 366, 366, 366, 367, 367,
        366, 368, 353, 0, 370, 371, 372, 375,
-       373, 373, 373, 373, 373, 374, 1415, 1416,
-       1417, 374, 373, 0, 377, 377, 377, 377,
-       382, 1418, 1419, 1420, 377, 377, 377, 378,
+       373, 373, 373, 373, 373, 374, 1442, 1443,
+       1444, 374, 373, 0, 377, 377, 377, 377,
+       382, 1445, 1446, 1447, 377, 377, 377, 378,
        383, 404, 418, 425, 434, 442, 446, 454,
        460, 476, 486, 489, 496, 515, 525, 528,
-       377, 382, 1418, 1419, 1420, 377, 377, 377,
-       379, 534, 538, 377, 382, 1418, 1419, 1420,
-       380, 381, 377, 377, 377, 377, 382, 1418,
-       1419, 1420, 382, 377, 384, 386, 393, 396,
-       400, 385, 377, 377, 377, 377, 382, 1418,
-       1419, 1420, 387, 392, 388, 389, 390, 391,
-       377, 377, 377, 377, 382, 1418, 1419, 1420,
-       377, 377, 377, 377, 382, 1418, 1419, 1420,
-       394, 395, 377, 377, 377, 377, 382, 1418,
-       1419, 1420, 397, 398, 399, 377, 377, 377,
-       377, 382, 1418, 1419, 1420, 401, 402, 403,
-       377, 377, 377, 377, 382, 1418, 1419, 1420,
+       377, 382, 1445, 1446, 1447, 377, 377, 377,
+       379, 534, 538, 377, 382, 1445, 1446, 1447,
+       380, 381, 377, 377, 377, 377, 382, 1445,
+       1446, 1447, 382, 377, 384, 386, 393, 396,
+       400, 385, 377, 377, 377, 377, 382, 1445,
+       1446, 1447, 387, 392, 388, 389, 390, 391,
+       377, 377, 377, 377, 382, 1445, 1446, 1447,
+       377, 377, 377, 377, 382, 1445, 1446, 1447,
+       394, 395, 377, 377, 377, 377, 382, 1445,
+       1446, 1447, 397, 398, 399, 377, 377, 377,
+       377, 382, 1445, 1446, 1447, 401, 402, 403,
+       377, 377, 377, 377, 382, 1445, 1446, 1447,
        405, 409, 417, 406, 407, 408, 377, 377,
-       377, 377, 382, 1418, 1419, 1420, 410, 413,
-       411, 412, 377, 377, 377, 377, 382, 1418,
-       1419, 1420, 414, 415, 416, 377, 377, 377,
-       377, 382, 1418, 1419, 1420, 377, 377, 377,
-       377, 382, 1418, 1419, 1420, 419, 420, 421,
-       423, 422, 377, 377, 377, 377, 382, 1418,
-       1419, 1420, 424, 377, 377, 377, 377, 382,
-       1418, 1419, 1420, 426, 430, 427, 428, 429,
-       377, 377, 377, 377, 382, 1418, 1419, 1420,
+       377, 377, 382, 1445, 1446, 1447, 410, 413,
+       411, 412, 377, 377, 377, 377, 382, 1445,
+       1446, 1447, 414, 415, 416, 377, 377, 377,
+       377, 382, 1445, 1446, 1447, 377, 377, 377,
+       377, 382, 1445, 1446, 1447, 419, 420, 421,
+       423, 422, 377, 377, 377, 377, 382, 1445,
+       1446, 1447, 424, 377, 377, 377, 377, 382,
+       1445, 1446, 1447, 426, 430, 427, 428, 429,
+       377, 377, 377, 377, 382, 1445, 1446, 1447,
        431, 432, 433, 377, 377, 377, 377, 382,
-       1418, 1419, 1420, 435, 436, 437, 438, 439,
-       440, 441, 377, 377, 377, 377, 382, 1418,
-       1419, 1420, 443, 445, 444, 377, 377, 377,
-       377, 382, 1418, 1419, 1420, 377, 377, 377,
-       377, 382, 1418, 1419, 1420, 447, 449, 451,
-       453, 448, 377, 377, 377, 377, 382, 1418,
-       1419, 1420, 450, 377, 377, 377, 377, 382,
-       1418, 1419, 1420, 452, 377, 377, 377, 377,
-       382, 1418, 1419, 1420, 377, 377, 377, 377,
-       382, 1418, 1419, 1420, 455, 459, 456, 457,
-       458, 377, 377, 377, 377, 382, 1418, 1419,
-       1420, 377, 377, 377, 377, 382, 1418, 1419,
-       1420, 461, 465, 467, 462, 463, 464, 377,
-       377, 377, 377, 382, 1418, 1419, 1420, 466,
-       377, 377, 377, 377, 382, 1418, 1419, 1420,
-       377, 377, 377, 468, 377, 382, 1418, 1419,
-       1420, 469, 377, 377, 377, 470, 377, 382,
-       1418, 1419, 1420, 377, 377, 377, 471, 377,
-       382, 1418, 1419, 1420, 472, 473, 474, 475,
-       377, 377, 377, 377, 382, 1418, 1419, 1420,
+       1445, 1446, 1447, 435, 436, 437, 438, 439,
+       440, 441, 377, 377, 377, 377, 382, 1445,
+       1446, 1447, 443, 445, 444, 377, 377, 377,
+       377, 382, 1445, 1446, 1447, 377, 377, 377,
+       377, 382, 1445, 1446, 1447, 447, 449, 451,
+       453, 448, 377, 377, 377, 377, 382, 1445,
+       1446, 1447, 450, 377, 377, 377, 377, 382,
+       1445, 1446, 1447, 452, 377, 377, 377, 377,
+       382, 1445, 1446, 1447, 377, 377, 377, 377,
+       382, 1445, 1446, 1447, 455, 459, 456, 457,
+       458, 377, 377, 377, 377, 382, 1445, 1446,
+       1447, 377, 377, 377, 377, 382, 1445, 1446,
+       1447, 461, 465, 467, 462, 463, 464, 377,
+       377, 377, 377, 382, 1445, 1446, 1447, 466,
+       377, 377, 377, 377, 382, 1445, 1446, 1447,
+       377, 377, 377, 468, 377, 382, 1445, 1446,
+       1447, 469, 377, 377, 377, 470, 377, 382,
+       1445, 1446, 1447, 377, 377, 377, 471, 377,
+       382, 1445, 1446, 1447, 472, 473, 474, 475,
+       377, 377, 377, 377, 382, 1445, 1446, 1447,
        477, 478, 479, 480, 481, 482, 483, 484,
-       485, 377, 377, 377, 377, 382, 1418, 1419,
-       1420, 487, 488, 377, 377, 377, 377, 382,
-       1418, 1419, 1420, 490, 491, 495, 377, 377,
-       377, 377, 382, 1418, 1419, 1420, 492, 493,
-       494, 377, 377, 377, 377, 382, 1418, 1419,
-       1420, 377, 377, 377, 377, 382, 1418, 1419,
-       1420, 497, 502, 504, 506, 508, 512, 498,
+       485, 377, 377, 377, 377, 382, 1445, 1446,
+       1447, 487, 488, 377, 377, 377, 377, 382,
+       1445, 1446, 1447, 490, 491, 495, 377, 377,
+       377, 377, 382, 1445, 1446, 1447, 492, 493,
+       494, 377, 377, 377, 377, 382, 1445, 1446,
+       1447, 377, 377, 377, 377, 382, 1445, 1446,
+       1447, 497, 502, 504, 506, 508, 512, 498,
        499, 500, 501, 377, 377, 377, 377, 382,
-       1418, 1419, 1420, 503, 377, 377, 377, 377,
-       382, 1418, 1419, 1420, 505, 377, 377, 377,
-       377, 382, 1418, 1419, 1420, 507, 377, 377,
-       377, 377, 382, 1418, 1419, 1420, 509, 510,
-       511, 377, 377, 377, 377, 382, 1418, 1419,
-       1420, 513, 514, 377, 377, 377, 377, 382,
-       1418, 1419, 1420, 516, 519, 521, 517, 518,
-       377, 377, 377, 377, 382, 1418, 1419, 1420,
-       520, 377, 377, 377, 377, 382, 1418, 1419,
-       1420, 522, 523, 524, 377, 377, 377, 524,
-       377, 382, 1418, 1419, 1420, 526, 527, 377,
-       377, 377, 377, 382, 1418, 1419, 1420, 529,
+       1445, 1446, 1447, 503, 377, 377, 377, 377,
+       382, 1445, 1446, 1447, 505, 377, 377, 377,
+       377, 382, 1445, 1446, 1447, 507, 377, 377,
+       377, 377, 382, 1445, 1446, 1447, 509, 510,
+       511, 377, 377, 377, 377, 382, 1445, 1446,
+       1447, 513, 514, 377, 377, 377, 377, 382,
+       1445, 1446, 1447, 516, 519, 521, 517, 518,
+       377, 377, 377, 377, 382, 1445, 1446, 1447,
+       520, 377, 377, 377, 377, 382, 1445, 1446,
+       1447, 522, 523, 524, 377, 377, 377, 524,
+       377, 382, 1445, 1446, 1447, 526, 527, 377,
+       377, 377, 377, 382, 1445, 1446, 1447, 529,
        530, 531, 532, 533, 377, 377, 377, 377,
-       382, 1418, 1419, 1420, 535, 536, 537, 377,
-       377, 377, 377, 382, 1418, 1419, 1420, 539,
-       377, 377, 377, 377, 382, 1418, 1419, 1420,
+       382, 1445, 1446, 1447, 535, 536, 537, 377,
+       377, 377, 377, 382, 1445, 1446, 1447, 539,
+       377, 377, 377, 377, 382, 1445, 1446, 1447,
        0, 541, 541, 541, 541, 548, 0, 542,
        543, 543, 543, 542, 543, 547, 0, 543,
        543, 543, 544, 543, 547, 545, 545, 545,
-       545, 545, 546, 1421, 1422, 1423, 546, 545,
+       545, 545, 546, 1448, 1449, 1450, 546, 545,
        547, 543, 548, 541, 550, 550, 550, 550,
-       558, 551, 557, 1424, 1424, 1424, 557, 1425,
-       1424, 1428, 552, 552, 552, 553, 552, 556,
-       554, 554, 554, 554, 554, 555, 1425, 1426,
-       1427, 555, 554, 556, 552, 552, 552, 552,
-       552, 556, 558, 550, 0, 560, 564, 567,
-       580, 584, 599, 561, 562, 563, 1429, 565,
-       566, 1429, 568, 569, 570, 575, 571, 572,
-       573, 574, 1429, 576, 577, 578, 579, 1429,
-       581, 582, 0, 583, 1429, 583, 585, 586,
-       587, 588, 589, 590, 591, 592, 593, 594,
-       595, 596, 597, 598, 1429, 600, 601, 602,
-       1429, 0, 604, 604, 604, 604, 611, 1430,
-       1431, 1432, 604, 604, 604, 605, 612, 628,
-       653, 659, 674, 689, 604, 611, 1430, 1431,
-       1432, 606, 607, 608, 609, 610, 697, 604,
-       604, 604, 604, 611, 1430, 1431, 1432, 611,
-       604, 613, 614, 615, 616, 623, 617, 618,
-       619, 622, 620, 620, 621, 617, 604, 604,
-       604, 604, 611, 1430, 1431, 1432, 624, 625,
-       627, 626, 626, 604, 604, 604, 623, 604,
-       611, 1430, 1431, 1432, 629, 630, 631, 642,
-       632, 633, 634, 635, 636, 0, 637, 640,
-       638, 621, 639, 638, 638, 604, 604, 604,
-       641, 640, 604, 611, 1430, 1431, 1432, 640,
-       643, 644, 645, 646, 647, 648, 651, 649,
-       621, 650, 649, 649, 604, 604, 604, 652,
-       651, 604, 611, 1430, 1431, 1432, 651, 654,
-       655, 0, 656, 604, 604, 604, 656, 657,
-       604, 611, 1430, 1431, 1432, 658, 660, 661,
-       662, 663, 664, 665, 666, 667, 668, 669,
-       672, 670, 621, 671, 670, 604, 604, 604,
-       673, 604, 611, 1430, 1431, 1432, 672, 675,
-       676, 677, 678, 679, 680, 681, 682, 683,
-       684, 685, 686, 687, 688, 604, 604, 604,
-       604, 611, 1430, 1431, 1432, 690, 691, 692,
-       693, 694, 696, 695, 621, 695, 604, 604,
-       604, 696, 604, 611, 1430, 1431, 1432, 698,
-       621, 0, 700, 701, 716, 755, 763, 776,
-       1433, 700, 702, 703, 1433, 704, 1433, 705,
-       706, 707, 708, 709, 710, 711, 712, 713,
-       714, 715, 1433, 717, 746, 718, 724, 719,
-       720, 721, 722, 723, 1433, 725, 726, 727,
-       728, 737, 729, 730, 731, 732, 733, 734,
-       735, 736, 1433, 738, 739, 740, 741, 742,
-       743, 744, 745, 1433, 747, 752, 748, 749,
-       750, 751, 1433, 753, 754, 1433, 756, 757,
-       758, 759, 760, 761, 762, 1433, 764, 765,
-       766, 767, 768, 769, 770, 773, 771, 772,
-       1433, 774, 775, 1433, 777, 778, 779, 782,
-       780, 781, 1433, 783, 784, 785, 797, 800,
-       1433, 786, 787, 788, 789, 790, 791, 792,
-       793, 794, 795, 796, 1433, 798, 799, 1433,
-       801, 802, 1433, 0, 804, 805, 811, 828,
-       831, 837, 841, 1434, 804, 806, 807, 808,
-       809, 810, 1434, 812, 818, 824, 813, 814,
-       815, 816, 817, 1434, 819, 821, 820, 1434,
-       822, 823, 1434, 825, 826, 827, 1434, 829,
-       830, 1434, 832, 834, 833, 1434, 835, 836,
-       1434, 838, 839, 840, 1434, 842, 843, 1434,
-       0, 845, 1435, 845, 847, 1436, 849, 850,
-       850, 850, 850, 879, 850, 850, 850, 851,
-       850, 879, 852, 852, 852, 852, 878, 0,
-       852, 852, 852, 853, 852, 878, 854, 854,
-       854, 853, 854, 877, 854, 854, 854, 855,
-       854, 877, 0, 856, 856, 856, 855, 874,
-       874, 874, 874, 874, 856, 873, 856, 856,
-       856, 857, 856, 873, 858, 858, 858, 857,
-       870, 870, 870, 870, 870, 858, 869, 858,
-       858, 858, 859, 858, 869, 860, 860, 860,
-       859, 866, 866, 866, 866, 866, 860, 865,
-       860, 860, 860, 861, 860, 865, 1437, 861,
-       862, 862, 862, 862, 862, 863, 863, 864,
-       864, 864, 864, 864, 1437, 863, 865, 860,
-       867, 867, 868, 868, 868, 868, 868, 860,
-       860, 860, 867, 860, 865, 869, 858, 871,
-       871, 872, 872, 872, 872, 872, 858, 858,
-       858, 871, 858, 869, 873, 856, 875, 875,
-       876, 876, 876, 876, 876, 856, 856, 856,
-       875, 856, 873, 877, 854, 878, 852, 879,
-       850, 881, 882, 882, 882, 882, 884, 883,
-       882, 882, 882, 882, 884, 1438, 884, 882,
-       886, 887, 887, 887, 887, 889, 887, 887,
-       887, 888, 887, 889, 1439, 889, 887, 891,
-       892, 892, 892, 891, 892, 894, 892, 892,
-       892, 893, 892, 894, 1440, 894, 892, 896,
-       0, 897, 897, 897, 897, 898, 1441, 1442,
-       1443, 896, 897, 897, 897, 897, 898, 1441,
-       1442, 1443, 898, 897, 900, 1444, 900, 0,
-       902, 903, 903, 903, 902, 903, 955, 903,
-       903, 903, 904, 908, 950, 903, 955, 905,
-       905, 905, 904, 905, 954, 905, 905, 905,
-       906, 905, 954, 907, 907, 907, 952, 906,
-       907, 951, 907, 907, 907, 907, 951, 909,
-       909, 909, 909, 949, 910, 911, 911, 911,
-       910, 911, 948, 911, 911, 911, 912, 916,
-       943, 911, 948, 913, 913, 913, 912, 913,
-       947, 913, 913, 913, 914, 913, 947, 915,
-       915, 915, 945, 914, 915, 944, 915, 915,
-       915, 915, 944, 917, 917, 917, 917, 942,
-       918, 919, 919, 920, 920, 920, 939, 919,
-       941, 920, 938, 1445, 1452, 1453, 920, 920,
-       920, 921, 920, 938, 1445, 1452, 1453, 922,
-       922, 922, 935, 921, 937, 922, 934, 1445,
-       1450, 1451, 922, 922, 922, 923, 922, 934,
-       1450, 1451, 924, 924, 924, 931, 923, 933,
-       924, 930, 1445, 1448, 1449, 924, 924, 924,
-       925, 924, 930, 1448, 1449, 926, 926, 926,
-       928, 925, 926, 927, 1445, 1446, 1447, 926,
-       926, 926, 926, 927, 1446, 1447, 927, 926,
-       926, 926, 926, 929, 926, 927, 1445, 1446,
-       1447, 929, 930, 924, 924, 924, 924, 932,
-       933, 924, 930, 1445, 1448, 1449, 932, 934,
-       922, 922, 922, 922, 936, 937, 922, 934,
-       1445, 1450, 1451, 936, 938, 920, 920, 920,
-       920, 940, 941, 920, 938, 1445, 1452, 1453,
-       940, 942, 917, 917, 917, 917, 917, 942,
-       944, 915, 915, 915, 915, 946, 915, 944,
-       946, 947, 913, 948, 911, 949, 909, 909,
-       909, 909, 909, 949, 951, 907, 907, 907,
-       907, 953, 907, 951, 953, 954, 905, 955,
-       903, 957, 958, 958, 958, 957, 958, 966,
-       958, 958, 958, 959, 958, 966, 960, 960,
-       960, 959, 960, 965, 960, 960, 960, 961,
-       960, 965, 962, 962, 962, 961, 962, 964,
-       962, 962, 962, 963, 962, 964, 1454, 964,
-       962, 965, 960, 966, 958, 968, 969, 969,
-       969, 968, 969, 983, 969, 969, 969, 970,
-       969, 983, 971, 971, 971, 970, 971, 982,
-       972, 971, 971, 971, 971, 982, 973, 973,
-       973, 973, 981, 974, 973, 973, 973, 973,
-       981, 975, 975, 975, 975, 980, 976, 975,
-       975, 975, 975, 980, 977, 977, 977, 977,
-       979, 977, 977, 977, 978, 977, 979, 1455,
-       979, 977, 980, 975, 981, 973, 982, 971,
-       983, 969, 985, 986, 986, 986, 986, 994,
-       987, 988, 988, 988, 987, 988, 993, 988,
-       988, 988, 989, 988, 993, 990, 990, 990,
-       990, 992, 991, 1456, 992, 990, 993, 988,
-       994, 986, 0, 995, 996, 995, 995, 997,
-       1003, 995, 1002, 1457, 1458, 1459, 997, 1003,
-       998, 0, 999, 999, 1000, 1001, 995, 995,
-       995, 1001, 995, 1002, 1457, 1458, 1459, 1002,
-       995, 1004, 1005, 1005, 1000, 1007, 1008, 1008,
-       1008, 1007, 1008, 1018, 1008, 1008, 1008, 1009,
-       1008, 1018, 1010, 1010, 1010, 1010, 1017, 1011,
-       1012, 1012, 1012, 1011, 1012, 1016, 0, 1012,
-       1012, 1012, 1013, 1012, 1016, 1014, 1014, 1014,
-       1014, 1014, 1015, 1460, 1461, 1462, 1015, 1014,
-       1016, 1012, 1017, 1010, 1018, 1008, 1020, 1021,
-       1021, 1021, 1020, 1021, 1028, 1021, 1021, 1021,
-       1022, 1021, 1028, 1023, 1023, 1023, 1022, 1023,
-       1027, 1023, 1023, 1023, 1024, 1023, 1027, 1025,
-       1025, 1025, 1025, 1025, 1026, 1463, 1464, 1465,
-       1026, 1025, 1027, 1023, 1028, 1021, 1030, 1031,
-       1031, 1031, 1030, 1031, 1067, 0, 1031, 1031,
-       1031, 1032, 1046, 1053, 1060, 1031, 1067, 1033,
-       1033, 1033, 1033, 1045, 0, 1034, 1035, 1035,
-       1035, 1034, 1035, 1044, 1035, 1035, 1035, 1036,
-       1035, 1044, 0, 1037, 1037, 1037, 1040, 1040,
-       1040, 1042, 1042, 1042, 1466, 1037, 1039, 1469,
-       1470, 1040, 1041, 1467, 1468, 1042, 1043, 1471,
-       1472, 0, 1038, 1039, 1037, 1041, 1040, 1043,
-       1042, 1044, 1035, 1045, 1033, 1047, 1047, 1047,
-       1047, 1052, 1048, 1049, 1049, 1049, 1048, 1049,
-       1051, 0, 1049, 1049, 1049, 1050, 1049, 1051,
-       0, 1050, 1037, 1037, 1037, 1040, 1040, 1040,
-       1042, 1042, 1042, 1466, 1037, 1039, 1469, 1470,
-       1040, 1041, 1467, 1468, 1042, 1043, 1471, 1472,
-       1051, 1049, 1052, 1047, 1054, 1054, 1054, 1054,
-       1059, 1055, 1056, 1056, 1056, 1055, 1056, 1058,
-       1056, 1056, 1056, 1057, 1056, 1058, 1057, 1037,
-       1037, 1037, 1040, 1040, 1040, 1042, 1042, 1042,
-       1466, 1037, 1039, 1469, 1470, 1040, 1041, 1467,
-       1468, 1042, 1043, 1471, 1472, 1058, 1056, 1059,
-       1054, 1061, 1061, 1061, 1061, 1066, 1062, 1063,
-       1063, 1063, 1062, 1063, 1065, 1063, 1063, 1063,
-       1064, 1063, 1065, 1037, 1037, 1037, 1040, 1040,
-       1040, 1042, 1042, 1042, 1466, 1037, 1039, 1469,
-       1470, 1040, 1041, 1467, 1468, 1042, 1043, 1471,
-       1472, 1065, 1063, 1066, 1061, 1067, 1031, 0,
-       1069, 1103, 1124, 1138, 1145, 1154, 1162, 1166,
-       1174, 1180, 1196, 1206, 1209, 1216, 1235, 1245,
-       1248, 1070, 1070, 1070, 1094, 1097, 1101, 1070,
-       1093, 1070, 1070, 1070, 1071, 1070, 1093, 1072,
-       1072, 1072, 1072, 1092, 1073, 1074, 1074, 1074,
-       1073, 1074, 1091, 1074, 1074, 1074, 1075, 1074,
-       1091, 1076, 1076, 1076, 1075, 1076, 1090, 0,
-       1076, 1076, 1076, 1077, 1076, 1090, 1078, 1078,
-       1078, 1077, 1078, 1089, 1078, 1078, 1078, 1079,
-       1078, 1089, 1080, 1080, 1080, 1079, 1080, 1088,
-       1080, 1080, 1080, 1081, 1080, 1088, 1082, 1082,
-       1082, 1081, 1082, 1087, 1082, 1082, 1082, 1083,
-       1082, 1087, 1084, 1084, 1084, 1084, 1086, 1084,
-       1084, 1084, 1085, 1084, 1086, 1473, 1086, 1084,
-       1087, 1082, 1088, 1080, 1089, 1078, 1090, 1076,
-       1091, 1074, 1092, 1072, 1093, 1070, 1095, 1096,
-       1070, 1070, 1070, 1070, 1093, 1098, 1099, 1100,
-       1070, 1070, 1070, 1070, 1093, 1102, 1070, 1070,
-       1070, 1070, 1093, 1104, 1106, 1113, 1116, 1120,
-       1105, 1070, 1070, 1070, 1070, 1093, 1107, 1112,
-       1108, 1109, 1110, 1111, 1070, 1070, 1070, 1070,
-       1093, 1070, 1070, 1070, 1070, 1093, 1114, 1115,
-       1070, 1070, 1070, 1070, 1093, 1117, 1118, 1119,
-       1070, 1070, 1070, 1070, 1093, 1121, 1122, 1123,
-       1070, 1070, 1070, 1070, 1093, 1125, 1129, 1137,
-       1126, 1127, 1128, 1070, 1070, 1070, 1070, 1093,
-       1130, 1133, 1131, 1132, 1070, 1070, 1070, 1070,
-       1093, 1134, 1135, 1136, 1070, 1070, 1070, 1070,
-       1093, 1070, 1070, 1070, 1070, 1093, 1139, 1140,
-       1141, 1143, 1142, 1070, 1070, 1070, 1070, 1093,
-       1144, 1070, 1070, 1070, 1070, 1093, 1146, 1150,
-       1147, 1148, 1149, 1070, 1070, 1070, 1070, 1093,
-       1151, 1152, 1153, 1070, 1070, 1070, 1070, 1093,
-       1155, 1156, 1157, 1158, 1159, 1160, 1161, 1070,
-       1070, 1070, 1070, 1093, 1163, 1165, 1164, 1070,
-       1070, 1070, 1070, 1093, 1070, 1070, 1070, 1070,
-       1093, 1167, 1169, 1171, 1173, 1168, 1070, 1070,
-       1070, 1070, 1093, 1170, 1070, 1070, 1070, 1070,
-       1093, 1172, 1070, 1070, 1070, 1070, 1093, 1070,
-       1070, 1070, 1070, 1093, 1175, 1179, 1176, 1177,
-       1178, 1070, 1070, 1070, 1070, 1093, 1070, 1070,
-       1070, 1070, 1093, 1181, 1185, 1187, 1182, 1183,
-       1184, 1070, 1070, 1070, 1070, 1093, 1186, 1070,
-       1070, 1070, 1070, 1093, 1070, 1070, 1070, 1188,
-       1070, 1093, 1189, 1070, 1070, 1070, 1190, 1070,
-       1093, 1070, 1070, 1070, 1191, 1070, 1093, 1192,
-       1193, 1194, 1195, 1070, 1070, 1070, 1070, 1093,
-       1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204,
-       1205, 1070, 1070, 1070, 1070, 1093, 1207, 1208,
-       1070, 1070, 1070, 1070, 1093, 1210, 1211, 1215,
-       1070, 1070, 1070, 1070, 1093, 1212, 1213, 1214,
-       1070, 1070, 1070, 1070, 1093, 1070, 1070, 1070,
-       1070, 1093, 1217, 1222, 1224, 1226, 1228, 1232,
-       1218, 1219, 1220, 1221, 1070, 1070, 1070, 1070,
-       1093, 1223, 1070, 1070, 1070, 1070, 1093, 1225,
-       1070, 1070, 1070, 1070, 1093, 1227, 1070, 1070,
-       1070, 1070, 1093, 1229, 1230, 1231, 1070, 1070,
-       1070, 1070, 1093, 1233, 1234, 1070, 1070, 1070,
-       1070, 1093, 1236, 1239, 1241, 1237, 1238, 1070,
-       1070, 1070, 1070, 1093, 1240, 1070, 1070, 1070,
-       1070, 1093, 1242, 1243, 0, 1244, 1070, 1070,
-       1070, 1244, 1070, 1093, 1246, 1247, 1070, 1070,
-       1070, 1070, 1093, 1249, 1250, 1251, 1252, 1253,
-       1070, 1070, 1070, 1070, 1093, 1255, 1256, 1474,
-       1258, 1259, 1259, 1259, 1258, 1259, 1267, 1259,
-       1259, 1259, 1260, 1259, 1267, 1261, 1261, 1261,
-       1260, 1261, 1266, 1261, 1261, 1261, 1262, 1261,
-       1266, 1263, 1263, 1263, 1263, 1265, 1264, 1475,
-       1265, 1263, 1266, 1261, 1267, 1259, 1269, 1476,
-       1271, 1272, 1272, 1272, 1271, 1272, 1298, 1272,
-       1272, 1272, 1273, 1272, 1298, 1274, 1274, 1274,
-       1273, 1274, 1297, 1274, 1274, 1274, 1275, 1274,
-       1297, 1276, 1276, 1276, 1275, 1276, 1296, 1276,
-       1276, 1276, 1277, 1294, 1276, 1296, 1278, 1278,
-       1278, 1278, 1293, 0, 1278, 1278, 1278, 1279,
-       1278, 1293, 1280, 1281, 1291, 1282, 1283, 1290,
-       1284, 1288, 1285, 1286, 1286, 1287, 1279, 1477,
-       1289, 1292, 1293, 1278, 1295, 1294, 1296, 1276,
-       1297, 1274, 1298, 1272, 1300, 1301, 1301, 1301,
-       1300, 1301, 1311, 1301, 1301, 1301, 1302, 1301,
-       1311, 1303, 1303, 1303, 1302, 1303, 1310, 1303,
-       1303, 1303, 1304, 1303, 1310, 1305, 1305, 1305,
-       1304, 1305, 1309, 1305, 1305, 1305, 1306, 1307,
-       1305, 1309, 1478, 1308, 1307, 1309, 1305, 1310,
-       1303, 1311, 1301, 1313, 1314, 1314, 1314, 1313,
-       1314, 1324, 1314, 1314, 1314, 1315, 1314, 1324,
-       1316, 1316, 1316, 1315, 1316, 1323, 1316, 1316,
-       1316, 1317, 1316, 1323, 1318, 1318, 1318, 1317,
-       1318, 1322, 1318, 1318, 1318, 1319, 1318, 1322,
-       1320, 1320, 1320, 1320, 1320, 1321, 1479, 1480,
-       1481, 1321, 1320, 1322, 1318, 1323, 1316, 1324,
-       1314, 1326, 1327, 1327, 1327, 1326, 1327, 1330,
-       1327, 1327, 1327, 1328, 1327, 1330, 1329, 1328,
-       1482, 1330, 1327, 1332, 1333, 1333, 1333, 1332,
-       1333, 1343, 1333, 1333, 1333, 1334, 1333, 1343,
-       1335, 1335, 1335, 1334, 1335, 1342, 1335, 1335,
-       1335, 1336, 1335, 1342, 1337, 1337, 1337, 1336,
-       1337, 1341, 1337, 1337, 1337, 1338, 1337, 1341,
-       1339, 1339, 1339, 1339, 1339, 1340, 1483, 1484,
-       1485, 1340, 1339, 1341, 1337, 1342, 1335, 1343,
-       1333, 1345, 1346, 1346, 1346, 1345, 1346, 1348,
-       1346, 1346, 1346, 1347, 1346, 1348, 1486, 1347,
-       1348, 1346, 1350, 1351, 1351, 1351, 1350, 1351,
-       1361, 1351, 1351, 1351, 1352, 1351, 1361, 1353,
-       1354, 1355, 0, 1356, 1357, 1358, 1359, 1360,
-       0, 1487, 1361, 1351, 1363, 1364, 0, 1365,
-       1366, 1367, 1488, 1369, 1370, 1371, 1372, 1373,
-       1489, 1375, 1376, 1376, 1376, 1375, 1376, 1381,
-       1376, 1376, 1376, 1377, 1376, 1381, 1378, 1378,
-       1378, 1377, 1378, 1380, 1379, 1378, 1378, 1378,
-       1378, 1380, 1490, 1380, 1378, 1381, 1376, 1383,
-       1384, 1384, 1384, 1383, 1384, 1389, 1385, 1384,
-       1384, 1384, 1384, 1389, 1386, 1386, 1386, 1386,
-       1388, 1387, 1386, 1386, 1386, 1386, 1388, 1491,
-       1388, 1386, 1389, 1384, 1391, 1392, 1392, 1392,
-       1391, 1392, 1395, 1392, 1392, 1392, 1393, 1392,
-       1395, 1394, 1492, 1395, 1392, 0, 1, 184,
-       1, 1, 192, 1396, 183, 1401, 302, 14,
-       228, 14, 14, 238, 260, 1404, 275, 1402,
-       276, 1405, 278, 0, 174, 174, 174, 202,
-       286, 287, 288, 289, 304, 291, 292, 293,
-       294, 295, 296, 297, 298, 299, 300, 301,
-       1399, 303, 0, 195, 202, 286, 287, 288,
-       289, 290, 291, 292, 293, 294, 295, 296,
-       297, 298, 299, 300, 301, 0, 1, 184,
-       1, 1, 192, 1396, 183, 1401, 302, 1,
-       1, 1401, 302, 206, 206, 206, 1401, 207,
-       210, 210, 210, 227, 264, 0, 239, 242,
-       244, 245, 246, 247, 248, 249, 250, 251,
-       252, 253, 254, 255, 256, 257, 258, 259,
-       1401
+       558, 551, 557, 1451, 1451, 1451, 557, 1452,
+       1451, 1455, 552, 552, 552, 553, 552, 556,
+       554, 554, 554, 554, 554, 555, 1452, 1453,
+       1454, 555, 554, 556, 552, 552, 552, 552,
+       552, 556, 558, 550, 0, 560, 564, 571,
+       574, 587, 591, 606, 611, 561, 562, 563,
+       1456, 565, 566, 567, 568, 569, 570, 1456,
+       572, 573, 1456, 575, 576, 577, 582, 578,
+       579, 580, 581, 1456, 583, 584, 585, 586,
+       1456, 588, 589, 0, 590, 1456, 590, 592,
+       593, 594, 595, 596, 597, 598, 599, 600,
+       601, 602, 603, 604, 605, 1456, 607, 608,
+       609, 610, 1456, 612, 613, 614, 1456, 0,
+       616, 616, 616, 616, 623, 1457, 1458, 1459,
+       616, 616, 616, 617, 624, 636, 651, 676,
+       681, 696, 711, 716, 616, 623, 1457, 1458,
+       1459, 618, 619, 620, 621, 622, 724, 616,
+       616, 616, 616, 623, 1457, 1458, 1459, 623,
+       616, 625, 626, 627, 628, 629, 630, 631,
+       632, 633, 616, 616, 616, 616, 623, 1457,
+       1458, 1459, 634, 635, 616, 616, 616, 616,
+       623, 1457, 1458, 1459, 637, 638, 639, 640,
+       646, 641, 642, 643, 645, 644, 644, 641,
+       647, 648, 650, 649, 649, 646, 652, 653,
+       654, 665, 655, 656, 657, 658, 659, 0,
+       660, 663, 661, 635, 662, 661, 661, 616,
+       616, 616, 664, 663, 616, 623, 1457, 1458,
+       1459, 663, 666, 667, 668, 669, 670, 671,
+       674, 672, 635, 673, 672, 672, 616, 616,
+       616, 675, 674, 616, 623, 1457, 1458, 1459,
+       674, 677, 678, 0, 679, 616, 616, 616,
+       679, 680, 616, 623, 1457, 1458, 1459, 682,
+       683, 684, 685, 686, 687, 688, 689, 690,
+       691, 694, 692, 635, 693, 692, 616, 616,
+       616, 695, 616, 623, 1457, 1458, 1459, 694,
+       697, 698, 699, 700, 701, 702, 703, 704,
+       705, 706, 707, 708, 709, 710, 616, 616,
+       616, 616, 623, 1457, 1458, 1459, 712, 713,
+       714, 715, 616, 616, 616, 616, 623, 1457,
+       1458, 1459, 717, 718, 719, 720, 721, 723,
+       722, 635, 722, 616, 616, 616, 723, 616,
+       623, 1457, 1458, 1459, 725, 635, 0, 727,
+       728, 743, 782, 790, 803, 1460, 727, 729,
+       730, 1460, 731, 1460, 732, 733, 734, 735,
+       736, 737, 738, 739, 740, 741, 742, 1460,
+       744, 773, 745, 751, 746, 747, 748, 749,
+       750, 1460, 752, 753, 754, 755, 764, 756,
+       757, 758, 759, 760, 761, 762, 763, 1460,
+       765, 766, 767, 768, 769, 770, 771, 772,
+       1460, 774, 779, 775, 776, 777, 778, 1460,
+       780, 781, 1460, 783, 784, 785, 786, 787,
+       788, 789, 1460, 791, 792, 793, 794, 795,
+       796, 797, 800, 798, 799, 1460, 801, 802,
+       1460, 804, 805, 806, 809, 807, 808, 1460,
+       810, 811, 812, 824, 827, 1460, 813, 814,
+       815, 816, 817, 818, 819, 820, 821, 822,
+       823, 1460, 825, 826, 1460, 828, 829, 1460,
+       0, 831, 832, 838, 855, 858, 864, 868,
+       1461, 831, 833, 834, 835, 836, 837, 1461,
+       839, 845, 851, 840, 841, 842, 843, 844,
+       1461, 846, 848, 847, 1461, 849, 850, 1461,
+       852, 853, 854, 1461, 856, 857, 1461, 859,
+       861, 860, 1461, 862, 863, 1461, 865, 866,
+       867, 1461, 869, 870, 1461, 0, 872, 1462,
+       872, 874, 1463, 876, 877, 877, 877, 877,
+       906, 877, 877, 877, 878, 877, 906, 879,
+       879, 879, 879, 905, 0, 879, 879, 879,
+       880, 879, 905, 881, 881, 881, 880, 881,
+       904, 881, 881, 881, 882, 881, 904, 0,
+       883, 883, 883, 882, 901, 901, 901, 901,
+       901, 883, 900, 883, 883, 883, 884, 883,
+       900, 885, 885, 885, 884, 897, 897, 897,
+       897, 897, 885, 896, 885, 885, 885, 886,
+       885, 896, 887, 887, 887, 886, 893, 893,
+       893, 893, 893, 887, 892, 887, 887, 887,
+       888, 887, 892, 1464, 888, 889, 889, 889,
+       889, 889, 890, 890, 891, 891, 891, 891,
+       891, 1464, 890, 892, 887, 894, 894, 895,
+       895, 895, 895, 895, 887, 887, 887, 894,
+       887, 892, 896, 885, 898, 898, 899, 899,
+       899, 899, 899, 885, 885, 885, 898, 885,
+       896, 900, 883, 902, 902, 903, 903, 903,
+       903, 903, 883, 883, 883, 902, 883, 900,
+       904, 881, 905, 879, 906, 877, 908, 909,
+       909, 909, 909, 911, 910, 909, 909, 909,
+       909, 911, 1465, 911, 909, 913, 914, 914,
+       914, 914, 916, 914, 914, 914, 915, 914,
+       916, 1466, 916, 914, 918, 919, 919, 919,
+       918, 919, 921, 919, 919, 919, 920, 919,
+       921, 1467, 921, 919, 923, 0, 924, 924,
+       924, 924, 925, 1468, 1469, 1470, 923, 924,
+       924, 924, 924, 925, 1468, 1469, 1470, 925,
+       924, 927, 1471, 927, 0, 929, 930, 930,
+       930, 929, 930, 982, 930, 930, 930, 931,
+       935, 977, 930, 982, 932, 932, 932, 931,
+       932, 981, 932, 932, 932, 933, 932, 981,
+       934, 934, 934, 979, 933, 934, 978, 934,
+       934, 934, 934, 978, 936, 936, 936, 936,
+       976, 937, 938, 938, 938, 937, 938, 975,
+       938, 938, 938, 939, 943, 970, 938, 975,
+       940, 940, 940, 939, 940, 974, 940, 940,
+       940, 941, 940, 974, 942, 942, 942, 972,
+       941, 942, 971, 942, 942, 942, 942, 971,
+       944, 944, 944, 944, 969, 945, 946, 946,
+       947, 947, 947, 966, 946, 968, 947, 965,
+       1472, 1479, 1480, 947, 947, 947, 948, 947,
+       965, 1472, 1479, 1480, 949, 949, 949, 962,
+       948, 964, 949, 961, 1472, 1477, 1478, 949,
+       949, 949, 950, 949, 961, 1477, 1478, 951,
+       951, 951, 958, 950, 960, 951, 957, 1472,
+       1475, 1476, 951, 951, 951, 952, 951, 957,
+       1475, 1476, 953, 953, 953, 955, 952, 953,
+       954, 1472, 1473, 1474, 953, 953, 953, 953,
+       954, 1473, 1474, 954, 953, 953, 953, 953,
+       956, 953, 954, 1472, 1473, 1474, 956, 957,
+       951, 951, 951, 951, 959, 960, 951, 957,
+       1472, 1475, 1476, 959, 961, 949, 949, 949,
+       949, 963, 964, 949, 961, 1472, 1477, 1478,
+       963, 965, 947, 947, 947, 947, 967, 968,
+       947, 965, 1472, 1479, 1480, 967, 969, 944,
+       944, 944, 944, 944, 969, 971, 942, 942,
+       942, 942, 973, 942, 971, 973, 974, 940,
+       975, 938, 976, 936, 936, 936, 936, 936,
+       976, 978, 934, 934, 934, 934, 980, 934,
+       978, 980, 981, 932, 982, 930, 984, 985,
+       985, 985, 984, 985, 993, 985, 985, 985,
+       986, 985, 993, 987, 987, 987, 986, 987,
+       992, 987, 987, 987, 988, 987, 992, 989,
+       989, 989, 988, 989, 991, 989, 989, 989,
+       990, 989, 991, 1481, 991, 989, 992, 987,
+       993, 985, 995, 996, 996, 996, 995, 996,
+       1010, 996, 996, 996, 997, 996, 1010, 998,
+       998, 998, 997, 998, 1009, 999, 998, 998,
+       998, 998, 1009, 1000, 1000, 1000, 1000, 1008,
+       1001, 1000, 1000, 1000, 1000, 1008, 1002, 1002,
+       1002, 1002, 1007, 1003, 1002, 1002, 1002, 1002,
+       1007, 1004, 1004, 1004, 1004, 1006, 1004, 1004,
+       1004, 1005, 1004, 1006, 1482, 1006, 1004, 1007,
+       1002, 1008, 1000, 1009, 998, 1010, 996, 1012,
+       1013, 1013, 1013, 1013, 1021, 1014, 1015, 1015,
+       1015, 1014, 1015, 1020, 1015, 1015, 1015, 1016,
+       1015, 1020, 1017, 1017, 1017, 1017, 1019, 1018,
+       1483, 1019, 1017, 1020, 1015, 1021, 1013, 0,
+       1022, 1023, 1022, 1022, 1024, 1030, 1022, 1029,
+       1484, 1485, 1486, 1024, 1030, 1025, 0, 1026,
+       1026, 1027, 1028, 1022, 1022, 1022, 1028, 1022,
+       1029, 1484, 1485, 1486, 1029, 1022, 1031, 1032,
+       1032, 1027, 1034, 1035, 1035, 1035, 1034, 1035,
+       1045, 1035, 1035, 1035, 1036, 1035, 1045, 1037,
+       1037, 1037, 1037, 1044, 1038, 1039, 1039, 1039,
+       1038, 1039, 1043, 0, 1039, 1039, 1039, 1040,
+       1039, 1043, 1041, 1041, 1041, 1041, 1041, 1042,
+       1487, 1488, 1489, 1042, 1041, 1043, 1039, 1044,
+       1037, 1045, 1035, 1047, 1048, 1048, 1048, 1047,
+       1048, 1055, 1048, 1048, 1048, 1049, 1048, 1055,
+       1050, 1050, 1050, 1049, 1050, 1054, 1050, 1050,
+       1050, 1051, 1050, 1054, 1052, 1052, 1052, 1052,
+       1052, 1053, 1490, 1491, 1492, 1053, 1052, 1054,
+       1050, 1055, 1048, 1057, 1058, 1058, 1058, 1057,
+       1058, 1094, 0, 1058, 1058, 1058, 1059, 1073,
+       1080, 1087, 1058, 1094, 1060, 1060, 1060, 1060,
+       1072, 0, 1061, 1062, 1062, 1062, 1061, 1062,
+       1071, 1062, 1062, 1062, 1063, 1062, 1071, 0,
+       1064, 1064, 1064, 1067, 1067, 1067, 1069, 1069,
+       1069, 1493, 1064, 1066, 1496, 1497, 1067, 1068,
+       1494, 1495, 1069, 1070, 1498, 1499, 0, 1065,
+       1066, 1064, 1068, 1067, 1070, 1069, 1071, 1062,
+       1072, 1060, 1074, 1074, 1074, 1074, 1079, 1075,
+       1076, 1076, 1076, 1075, 1076, 1078, 0, 1076,
+       1076, 1076, 1077, 1076, 1078, 0, 1077, 1064,
+       1064, 1064, 1067, 1067, 1067, 1069, 1069, 1069,
+       1493, 1064, 1066, 1496, 1497, 1067, 1068, 1494,
+       1495, 1069, 1070, 1498, 1499, 1078, 1076, 1079,
+       1074, 1081, 1081, 1081, 1081, 1086, 1082, 1083,
+       1083, 1083, 1082, 1083, 1085, 1083, 1083, 1083,
+       1084, 1083, 1085, 1084, 1064, 1064, 1064, 1067,
+       1067, 1067, 1069, 1069, 1069, 1493, 1064, 1066,
+       1496, 1497, 1067, 1068, 1494, 1495, 1069, 1070,
+       1498, 1499, 1085, 1083, 1086, 1081, 1088, 1088,
+       1088, 1088, 1093, 1089, 1090, 1090, 1090, 1089,
+       1090, 1092, 1090, 1090, 1090, 1091, 1090, 1092,
+       1064, 1064, 1064, 1067, 1067, 1067, 1069, 1069,
+       1069, 1493, 1064, 1066, 1496, 1497, 1067, 1068,
+       1494, 1495, 1069, 1070, 1498, 1499, 1092, 1090,
+       1093, 1088, 1094, 1058, 0, 1096, 1130, 1151,
+       1165, 1172, 1181, 1189, 1193, 1201, 1207, 1223,
+       1233, 1236, 1243, 1262, 1272, 1275, 1097, 1097,
+       1097, 1121, 1124, 1128, 1097, 1120, 1097, 1097,
+       1097, 1098, 1097, 1120, 1099, 1099, 1099, 1099,
+       1119, 1100, 1101, 1101, 1101, 1100, 1101, 1118,
+       1101, 1101, 1101, 1102, 1101, 1118, 1103, 1103,
+       1103, 1102, 1103, 1117, 0, 1103, 1103, 1103,
+       1104, 1103, 1117, 1105, 1105, 1105, 1104, 1105,
+       1116, 1105, 1105, 1105, 1106, 1105, 1116, 1107,
+       1107, 1107, 1106, 1107, 1115, 1107, 1107, 1107,
+       1108, 1107, 1115, 1109, 1109, 1109, 1108, 1109,
+       1114, 1109, 1109, 1109, 1110, 1109, 1114, 1111,
+       1111, 1111, 1111, 1113, 1111, 1111, 1111, 1112,
+       1111, 1113, 1500, 1113, 1111, 1114, 1109, 1115,
+       1107, 1116, 1105, 1117, 1103, 1118, 1101, 1119,
+       1099, 1120, 1097, 1122, 1123, 1097, 1097, 1097,
+       1097, 1120, 1125, 1126, 1127, 1097, 1097, 1097,
+       1097, 1120, 1129, 1097, 1097, 1097, 1097, 1120,
+       1131, 1133, 1140, 1143, 1147, 1132, 1097, 1097,
+       1097, 1097, 1120, 1134, 1139, 1135, 1136, 1137,
+       1138, 1097, 1097, 1097, 1097, 1120, 1097, 1097,
+       1097, 1097, 1120, 1141, 1142, 1097, 1097, 1097,
+       1097, 1120, 1144, 1145, 1146, 1097, 1097, 1097,
+       1097, 1120, 1148, 1149, 1150, 1097, 1097, 1097,
+       1097, 1120, 1152, 1156, 1164, 1153, 1154, 1155,
+       1097, 1097, 1097, 1097, 1120, 1157, 1160, 1158,
+       1159, 1097, 1097, 1097, 1097, 1120, 1161, 1162,
+       1163, 1097, 1097, 1097, 1097, 1120, 1097, 1097,
+       1097, 1097, 1120, 1166, 1167, 1168, 1170, 1169,
+       1097, 1097, 1097, 1097, 1120, 1171, 1097, 1097,
+       1097, 1097, 1120, 1173, 1177, 1174, 1175, 1176,
+       1097, 1097, 1097, 1097, 1120, 1178, 1179, 1180,
+       1097, 1097, 1097, 1097, 1120, 1182, 1183, 1184,
+       1185, 1186, 1187, 1188, 1097, 1097, 1097, 1097,
+       1120, 1190, 1192, 1191, 1097, 1097, 1097, 1097,
+       1120, 1097, 1097, 1097, 1097, 1120, 1194, 1196,
+       1198, 1200, 1195, 1097, 1097, 1097, 1097, 1120,
+       1197, 1097, 1097, 1097, 1097, 1120, 1199, 1097,
+       1097, 1097, 1097, 1120, 1097, 1097, 1097, 1097,
+       1120, 1202, 1206, 1203, 1204, 1205, 1097, 1097,
+       1097, 1097, 1120, 1097, 1097, 1097, 1097, 1120,
+       1208, 1212, 1214, 1209, 1210, 1211, 1097, 1097,
+       1097, 1097, 1120, 1213, 1097, 1097, 1097, 1097,
+       1120, 1097, 1097, 1097, 1215, 1097, 1120, 1216,
+       1097, 1097, 1097, 1217, 1097, 1120, 1097, 1097,
+       1097, 1218, 1097, 1120, 1219, 1220, 1221, 1222,
+       1097, 1097, 1097, 1097, 1120, 1224, 1225, 1226,
+       1227, 1228, 1229, 1230, 1231, 1232, 1097, 1097,
+       1097, 1097, 1120, 1234, 1235, 1097, 1097, 1097,
+       1097, 1120, 1237, 1238, 1242, 1097, 1097, 1097,
+       1097, 1120, 1239, 1240, 1241, 1097, 1097, 1097,
+       1097, 1120, 1097, 1097, 1097, 1097, 1120, 1244,
+       1249, 1251, 1253, 1255, 1259, 1245, 1246, 1247,
+       1248, 1097, 1097, 1097, 1097, 1120, 1250, 1097,
+       1097, 1097, 1097, 1120, 1252, 1097, 1097, 1097,
+       1097, 1120, 1254, 1097, 1097, 1097, 1097, 1120,
+       1256, 1257, 1258, 1097, 1097, 1097, 1097, 1120,
+       1260, 1261, 1097, 1097, 1097, 1097, 1120, 1263,
+       1266, 1268, 1264, 1265, 1097, 1097, 1097, 1097,
+       1120, 1267, 1097, 1097, 1097, 1097, 1120, 1269,
+       1270, 0, 1271, 1097, 1097, 1097, 1271, 1097,
+       1120, 1273, 1274, 1097, 1097, 1097, 1097, 1120,
+       1276, 1277, 1278, 1279, 1280, 1097, 1097, 1097,
+       1097, 1120, 1282, 1283, 1501, 1285, 1286, 1286,
+       1286, 1285, 1286, 1294, 1286, 1286, 1286, 1287,
+       1286, 1294, 1288, 1288, 1288, 1287, 1288, 1293,
+       1288, 1288, 1288, 1289, 1288, 1293, 1290, 1290,
+       1290, 1290, 1292, 1291, 1502, 1292, 1290, 1293,
+       1288, 1294, 1286, 1296, 1503, 1298, 1299, 1299,
+       1299, 1298, 1299, 1325, 1299, 1299, 1299, 1300,
+       1299, 1325, 1301, 1301, 1301, 1300, 1301, 1324,
+       1301, 1301, 1301, 1302, 1301, 1324, 1303, 1303,
+       1303, 1302, 1303, 1323, 1303, 1303, 1303, 1304,
+       1321, 1303, 1323, 1305, 1305, 1305, 1305, 1320,
+       0, 1305, 1305, 1305, 1306, 1305, 1320, 1307,
+       1308, 1318, 1309, 1310, 1317, 1311, 1315, 1312,
+       1313, 1313, 1314, 1306, 1504, 1316, 1319, 1320,
+       1305, 1322, 1321, 1323, 1303, 1324, 1301, 1325,
+       1299, 1327, 1328, 1328, 1328, 1327, 1328, 1338,
+       1328, 1328, 1328, 1329, 1328, 1338, 1330, 1330,
+       1330, 1329, 1330, 1337, 1330, 1330, 1330, 1331,
+       1330, 1337, 1332, 1332, 1332, 1331, 1332, 1336,
+       1332, 1332, 1332, 1333, 1334, 1332, 1336, 1505,
+       1335, 1334, 1336, 1332, 1337, 1330, 1338, 1328,
+       1340, 1341, 1341, 1341, 1340, 1341, 1351, 1341,
+       1341, 1341, 1342, 1341, 1351, 1343, 1343, 1343,
+       1342, 1343, 1350, 1343, 1343, 1343, 1344, 1343,
+       1350, 1345, 1345, 1345, 1344, 1345, 1349, 1345,
+       1345, 1345, 1346, 1345, 1349, 1347, 1347, 1347,
+       1347, 1347, 1348, 1506, 1507, 1508, 1348, 1347,
+       1349, 1345, 1350, 1343, 1351, 1341, 1353, 1354,
+       1354, 1354, 1353, 1354, 1357, 1354, 1354, 1354,
+       1355, 1354, 1357, 1356, 1355, 1509, 1357, 1354,
+       1359, 1360, 1360, 1360, 1359, 1360, 1370, 1360,
+       1360, 1360, 1361, 1360, 1370, 1362, 1362, 1362,
+       1361, 1362, 1369, 1362, 1362, 1362, 1363, 1362,
+       1369, 1364, 1364, 1364, 1363, 1364, 1368, 1364,
+       1364, 1364, 1365, 1364, 1368, 1366, 1366, 1366,
+       1366, 1366, 1367, 1510, 1511, 1512, 1367, 1366,
+       1368, 1364, 1369, 1362, 1370, 1360, 1372, 1373,
+       1373, 1373, 1372, 1373, 1375, 1373, 1373, 1373,
+       1374, 1373, 1375, 1513, 1374, 1375, 1373, 1377,
+       1378, 1378, 1378, 1377, 1378, 1388, 1378, 1378,
+       1378, 1379, 1378, 1388, 1380, 1381, 1382, 0,
+       1383, 1384, 1385, 1386, 1387, 0, 1514, 1388,
+       1378, 1390, 1391, 0, 1392, 1393, 1394, 1515,
+       1396, 1397, 1398, 1399, 1400, 1516, 1402, 1403,
+       1403, 1403, 1402, 1403, 1408, 1403, 1403, 1403,
+       1404, 1403, 1408, 1405, 1405, 1405, 1404, 1405,
+       1407, 1406, 1405, 1405, 1405, 1405, 1407, 1517,
+       1407, 1405, 1408, 1403, 1410, 1411, 1411, 1411,
+       1410, 1411, 1416, 1412, 1411, 1411, 1411, 1411,
+       1416, 1413, 1413, 1413, 1413, 1415, 1414, 1413,
+       1413, 1413, 1413, 1415, 1518, 1415, 1413, 1416,
+       1411, 1418, 1419, 1419, 1419, 1418, 1419, 1422,
+       1419, 1419, 1419, 1420, 1419, 1422, 1421, 1519,
+       1422, 1419, 0, 1, 184, 1, 1, 192,
+       1423, 183, 1428, 302, 14, 228, 14, 14,
+       238, 260, 1431, 275, 1429, 276, 1432, 278,
+       0, 174, 174, 174, 202, 286, 287, 288,
+       289, 304, 291, 292, 293, 294, 295, 296,
+       297, 298, 299, 300, 301, 1426, 303, 0,
+       195, 202, 286, 287, 288, 289, 290, 291,
+       292, 293, 294, 295, 296, 297, 298, 299,
+       300, 301, 0, 1, 184, 1, 1, 192,
+       1423, 183, 1428, 302, 1, 1, 1428, 302,
+       206, 206, 206, 1428, 207, 210, 210, 210,
+       227, 264, 0, 239, 242, 244, 245, 246,
+       247, 248, 249, 250, 251, 252, 253, 254,
+       255, 256, 257, 258, 259, 1428
 };
 
 static const short _zone_scanner_trans_actions[] = {
-       2709, 0, 5, 7, 631, 802, 802, 802,
-       802, 802, 802, 802, 802, 802, 802, 802,
-       802, 802, 802, 802, 802, 802, 3, 9,
-       3, 9, 2885, 103, 820, 823, 45, 59,
-       57, 55, 0, 61, 817, 826, 413, 0,
+       2711, 0, 5, 7, 633, 804, 804, 804,
+       804, 804, 804, 804, 804, 804, 804, 804,
+       804, 804, 804, 804, 804, 804, 3, 9,
+       3, 9, 2887, 103, 822, 825, 45, 59,
+       57, 55, 0, 61, 819, 828, 415, 0,
        5, 7, 97, 97, 97, 97, 97, 97,
        97, 97, 97, 97, 97, 97, 97, 97,
-       97, 97, 97, 3, 9, 2263, 2266, 3393,
-       3397, 0, 0, 0, 3389, 3401, 3409, 5417,
-       5437, 407, 0, 405, 5, 7, 411, 3,
-       9, 421, 448, 2248, 13, 469, 472, 2553,
-       475, 15, 0, 5, 7, 2410, 9, 11,
-       2525, 2257, 409, 11, 463, 13, 430, 436,
-       445, 5412, 3369, 2505, 0, 5, 7, 9,
-       3377, 2254, 448, 11, 2521, 0, 4567, 5,
-       7, 2697, 3017, 3017, 3017, 3017, 3017, 3017,
-       3017, 3017, 3017, 3017, 3017, 3017, 3017, 3017,
-       3017, 3017, 3017, 3, 9, 2251, 2254, 421,
-       448, 6098, 829, 3021, 3025, 4812, 3029, 2260,
-       0, 5, 7, 424, 9, 0, 0, 0,
-       0, 0, 0, 2401, 4297, 4301, 4293, 4305,
-       4309, 5882, 5887, 460, 2509, 2513, 2517, 11,
-       451, 454, 457, 0, 0, 0, 0, 0,
-       0, 2365, 4057, 4061, 4053, 4065, 4069, 5762,
-       5767, 2362, 4037, 4041, 4033, 4045, 4049, 5752,
-       5757, 0, 0, 2320, 3757, 3761, 3753, 3765,
-       3769, 5612, 5617, 0, 0, 0, 2272, 3437,
-       3441, 3433, 3445, 3449, 5452, 5457, 0, 0,
-       0, 2371, 4097, 4101, 4093, 4105, 4109, 5782,
-       5787, 0, 0, 0, 0, 0, 0, 2347,
-       3937, 3941, 3933, 3945, 3949, 5702, 5707, 0,
-       0, 0, 0, 2323, 3777, 3781, 3773, 3785,
-       3789, 5622, 5627, 0, 0, 0, 2344, 3917,
-       3921, 3913, 3925, 3929, 5692, 5697, 2329, 3817,
-       3821, 3813, 3825, 3829, 5642, 5647, 0, 0,
-       0, 0, 0, 2392, 4237, 4241, 4233, 4245,
-       4249, 5852, 5857, 0, 2395, 4257, 4261, 4253,
-       4265, 4269, 5862, 5867, 0, 0, 0, 0,
-       0, 2281, 3497, 3501, 3493, 3505, 3509, 5482,
-       5487, 0, 0, 0, 2407, 4337, 4341, 4333,
-       4345, 4349, 5902, 5907, 0, 0, 101, 808,
-       811, 805, 814, 0, 5, 7, 0, 0,
+       97, 97, 97, 3, 9, 2265, 2268, 3399,
+       3403, 0, 0, 0, 3395, 3407, 3415, 5443,
+       5463, 409, 0, 407, 5, 7, 413, 3,
+       9, 423, 450, 2250, 13, 471, 474, 2555,
+       477, 15, 0, 5, 7, 2412, 9, 11,
+       2527, 2259, 411, 11, 465, 13, 432, 438,
+       447, 5438, 3375, 2507, 0, 5, 7, 9,
+       3383, 2256, 450, 11, 2523, 0, 4573, 5,
+       7, 2699, 3019, 3019, 3019, 3019, 3019, 3019,
+       3019, 3019, 3019, 3019, 3019, 3019, 3019, 3019,
+       3019, 3019, 3019, 3, 9, 2253, 2256, 423,
+       450, 6124, 831, 3023, 3027, 4818, 3031, 2262,
+       0, 5, 7, 426, 9, 0, 0, 0,
+       0, 0, 0, 2403, 4303, 4307, 4299, 4311,
+       4315, 5908, 5913, 462, 2511, 2515, 2519, 11,
+       453, 456, 459, 0, 0, 0, 0, 0,
+       0, 2367, 4063, 4067, 4059, 4071, 4075, 5788,
+       5793, 2364, 4043, 4047, 4039, 4051, 4055, 5778,
+       5783, 0, 0, 2322, 3763, 3767, 3759, 3771,
+       3775, 5638, 5643, 0, 0, 0, 2274, 3443,
+       3447, 3439, 3451, 3455, 5478, 5483, 0, 0,
+       0, 2373, 4103, 4107, 4099, 4111, 4115, 5808,
+       5813, 0, 0, 0, 0, 0, 0, 2349,
+       3943, 3947, 3939, 3951, 3955, 5728, 5733, 0,
+       0, 0, 0, 2325, 3783, 3787, 3779, 3791,
+       3795, 5648, 5653, 0, 0, 0, 2346, 3923,
+       3927, 3919, 3931, 3935, 5718, 5723, 2331, 3823,
+       3827, 3819, 3831, 3835, 5668, 5673, 0, 0,
+       0, 0, 0, 2394, 4243, 4247, 4239, 4251,
+       4255, 5878, 5883, 0, 2397, 4263, 4267, 4259,
+       4271, 4275, 5888, 5893, 0, 0, 0, 0,
+       0, 2283, 3503, 3507, 3499, 3511, 3515, 5508,
+       5513, 0, 0, 0, 2409, 4343, 4347, 4339,
+       4351, 4355, 5928, 5933, 0, 0, 101, 810,
+       813, 807, 816, 0, 5, 7, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 3,
-       9, 0, 0, 0, 0, 0, 0, 2335,
-       3857, 3861, 3853, 3865, 3869, 5662, 5667, 0,
-       0, 0, 2302, 3637, 3641, 3633, 3645, 3649,
-       5552, 5557, 2317, 3737, 3741, 3733, 3745, 3749,
-       5602, 5607, 0, 0, 0, 0, 0, 2383,
-       4177, 4181, 4173, 4185, 4189, 5822, 5827, 0,
-       2386, 4197, 4201, 4193, 4205, 4209, 5832, 5837,
-       0, 2308, 3677, 3681, 3673, 3685, 3689, 5572,
-       5577, 2389, 4217, 4221, 4213, 4225, 4229, 5842,
-       5847, 0, 0, 0, 0, 0, 2284, 3517,
-       3521, 3513, 3525, 3529, 5492, 5497, 2287, 3537,
-       3541, 3533, 3545, 3549, 5502, 5507, 0, 0,
-       0, 0, 0, 0, 2314, 3717, 3721, 3713,
-       3725, 3729, 5592, 5597, 0, 2380, 4157, 4161,
-       4153, 4165, 4169, 5812, 5817, 2269, 3417, 3421,
-       0, 3413, 3425, 3429, 5442, 5447, 0, 2341,
-       3897, 3901, 0, 3893, 3905, 3909, 5682, 5687,
-       2350, 3957, 3961, 0, 3953, 3965, 3969, 5712,
-       5717, 0, 0, 0, 0, 2353, 3977, 3981,
-       3973, 3985, 3989, 5722, 5727, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 2368, 4077,
-       4081, 4073, 4085, 4089, 5772, 5777, 0, 0,
-       2278, 3477, 3481, 3473, 3485, 3489, 5472, 5477,
-       0, 0, 0, 2293, 3577, 3581, 3573, 3585,
-       3589, 5522, 5527, 0, 0, 0, 2338, 3877,
-       3881, 3873, 3885, 3889, 5672, 5677, 2299, 3617,
-       3621, 3613, 3625, 3629, 5542, 5547, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       2359, 4017, 4021, 4013, 4025, 4029, 5742, 5747,
-       0, 2275, 3457, 3461, 3453, 3465, 3469, 5462,
-       5467, 0, 2377, 4137, 4141, 4133, 4145, 4149,
-       5802, 5807, 0, 2311, 3697, 3701, 3693, 3705,
-       3709, 5582, 5587, 0, 0, 0, 2332, 3837,
-       3841, 3833, 3845, 3849, 5652, 5657, 0, 0,
-       2404, 4317, 4321, 4313, 4325, 4329, 5892, 5897,
-       0, 0, 0, 0, 0, 2356, 3997, 4001,
-       3993, 4005, 4009, 5732, 5737, 0, 2290, 3557,
-       3561, 3553, 3565, 3569, 5512, 5517, 0, 0,
-       649, 631, 2713, 721, 2861, 2865, 45, 2857,
-       2869, 2873, 4752, 4757, 0, 0, 2398, 4277,
-       4281, 4273, 4285, 4289, 5872, 5877, 0, 0,
-       0, 0, 0, 2374, 4117, 4121, 4113, 4125,
-       4129, 5792, 5797, 11, 463, 0, 5, 7,
-       3, 9, 0, 101, 808, 811, 805, 814,
-       0, 5, 7, 631, 99, 99, 99, 99,
+       9, 0, 0, 0, 0, 0, 0, 2337,
+       3863, 3867, 3859, 3871, 3875, 5688, 5693, 0,
+       0, 0, 2304, 3643, 3647, 3639, 3651, 3655,
+       5578, 5583, 2319, 3743, 3747, 3739, 3751, 3755,
+       5628, 5633, 0, 0, 0, 0, 0, 2385,
+       4183, 4187, 4179, 4191, 4195, 5848, 5853, 0,
+       2388, 4203, 4207, 4199, 4211, 4215, 5858, 5863,
+       0, 2310, 3683, 3687, 3679, 3691, 3695, 5598,
+       5603, 2391, 4223, 4227, 4219, 4231, 4235, 5868,
+       5873, 0, 0, 0, 0, 0, 2286, 3523,
+       3527, 3519, 3531, 3535, 5518, 5523, 2289, 3543,
+       3547, 3539, 3551, 3555, 5528, 5533, 0, 0,
+       0, 0, 0, 0, 2316, 3723, 3727, 3719,
+       3731, 3735, 5618, 5623, 0, 2382, 4163, 4167,
+       4159, 4171, 4175, 5838, 5843, 2271, 3423, 3427,
+       0, 3419, 3431, 3435, 5468, 5473, 0, 2343,
+       3903, 3907, 0, 3899, 3911, 3915, 5708, 5713,
+       2352, 3963, 3967, 0, 3959, 3971, 3975, 5738,
+       5743, 0, 0, 0, 0, 2355, 3983, 3987,
+       3979, 3991, 3995, 5748, 5753, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 2370, 4083,
+       4087, 4079, 4091, 4095, 5798, 5803, 0, 0,
+       2280, 3483, 3487, 3479, 3491, 3495, 5498, 5503,
+       0, 0, 0, 2295, 3583, 3587, 3579, 3591,
+       3595, 5548, 5553, 0, 0, 0, 2340, 3883,
+       3887, 3879, 3891, 3895, 5698, 5703, 2301, 3623,
+       3627, 3619, 3631, 3635, 5568, 5573, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       2361, 4023, 4027, 4019, 4031, 4035, 5768, 5773,
+       0, 2277, 3463, 3467, 3459, 3471, 3475, 5488,
+       5493, 0, 2379, 4143, 4147, 4139, 4151, 4155,
+       5828, 5833, 0, 2313, 3703, 3707, 3699, 3711,
+       3715, 5608, 5613, 0, 0, 0, 2334, 3843,
+       3847, 3839, 3851, 3855, 5678, 5683, 0, 0,
+       2406, 4323, 4327, 4319, 4331, 4335, 5918, 5923,
+       0, 0, 0, 0, 0, 2358, 4003, 4007,
+       3999, 4011, 4015, 5758, 5763, 0, 2292, 3563,
+       3567, 3559, 3571, 3575, 5538, 5543, 0, 0,
+       651, 633, 2715, 723, 2863, 2867, 45, 2859,
+       2871, 2875, 4758, 4763, 0, 0, 2400, 4283,
+       4287, 4279, 4291, 4295, 5898, 5903, 0, 0,
+       0, 0, 0, 2376, 4123, 4127, 4119, 4131,
+       4135, 5818, 5823, 11, 465, 0, 5, 7,
+       3, 9, 0, 101, 810, 813, 807, 816,
+       0, 5, 7, 633, 99, 99, 99, 99,
        99, 99, 99, 99, 99, 99, 99, 99,
        99, 99, 99, 99, 99, 3, 9, 103,
-       820, 823, 45, 59, 57, 55, 0, 61,
-       817, 826, 2889, 45, 59, 57, 55, 0,
-       61, 742, 2929, 2933, 4767, 2925, 2937, 11,
-       463, 11, 463, 95, 91, 91, 91, 0,
+       822, 825, 45, 59, 57, 55, 0, 61,
+       819, 828, 2891, 45, 59, 57, 55, 0,
+       61, 744, 2931, 2935, 4773, 2927, 2939, 11,
+       465, 11, 465, 95, 91, 91, 91, 0,
        0, 0, 0, 0, 0, 89, 41, 39,
-       577, 580, 574, 583, 0, 5, 7, 3,
-       9, 11, 0, 463, 4552, 589, 2625, 2633,
-       2617, 2641, 0, 5, 7, 3, 9, 11,
-       463, 2889, 45, 59, 57, 55, 0, 61,
-       742, 2929, 2933, 4767, 2925, 2937, 11, 463,
-       2685, 2653, 4507, 4522, 4492, 4537, 5966, 5990,
-       0, 5, 7, 3, 9, 421, 448, 3385,
-       3405, 5422, 5427, 6182, 5432, 6354, 6194, 6347,
-       6188, 0, 5, 7, 424, 2457, 0, 5,
-       7, 424, 9, 11, 2521, 478, 2529, 2537,
-       4402, 2545, 11, 427, 433, 442, 0, 5,
-       7, 9, 448, 11, 2521, 3361, 0, 0,
-       0, 0, 0, 83, 0, 0, 79, 2677,
-       586, 2621, 2629, 4482, 2637, 6242, 2645, 4497,
-       4512, 5960, 4527, 0, 5, 7, 424, 9,
-       11, 2521, 4557, 4542, 5972, 5978, 6228, 5984,
-       6377, 6235, 0, 5, 7, 424, 2457, 2649,
-       598, 4502, 4517, 4487, 4532, 13, 430, 436,
-       2429, 445, 460, 4377, 2509, 2513, 2517, 11,
-       451, 454, 457, 460, 2509, 2513, 2517, 11,
-       451, 454, 457, 0, 0, 2305, 3657, 3661,
-       3653, 3665, 3669, 5562, 5567, 0, 0, 0,
-       2296, 3597, 3601, 3593, 3605, 3609, 5532, 5537,
-       0, 2326, 3797, 3801, 3793, 3805, 3809, 5632,
-       5637, 11, 463, 478, 2529, 2537, 4412, 11,
-       427, 433, 4353, 460, 2509, 2513, 11, 451,
-       454, 460, 2509, 2513, 11, 451, 454, 11,
-       463, 13, 430, 436, 445, 2505, 460, 2509,
-       2513, 11, 451, 454, 601, 11, 463, 11,
-       463, 11, 2521, 0, 496, 3, 7, 490,
-       2557, 17, 493, 31, 2581, 29, 0, 529,
-       2561, 21, 23, 0, 520, 499, 19, 502,
-       511, 25, 25, 4422, 505, 508, 27, 526,
-       763, 67, 0, 0, 772, 775, 2953, 73,
-       2949, 766, 71, 71, 2941, 2945, 4772, 769,
-       67, 67, 0, 0, 775, 775, 73, 73,
-       69, 1, 766, 71, 71, 2945, 2945, 769,
-       769, 77, 0, 5, 7, 3, 9, 634,
-       631, 4762, 13, 469, 472, 45, 59, 57,
-       55, 0, 61, 4407, 475, 484, 0, 5,
-       7, 2961, 9, 11, 4387, 2889, 2877, 45,
-       59, 57, 55, 0, 61, 736, 2893, 2897,
-       4767, 6104, 2901, 11, 463, 81, 0, 5,
-       7, 3, 9, 4777, 784, 2965, 21, 23,
-       0, 487, 523, 2565, 2569, 499, 19, 5912,
-       2573, 0, 5, 7, 2969, 9, 11, 4392,
-       502, 514, 25, 25, 505, 508, 27, 11,
-       463, 0, 5, 7, 3, 9, 787, 85,
-       793, 790, 2973, 2977, 6110, 2985, 2981, 799,
-       0, 5, 7, 4782, 796, 2989, 2993, 9,
-       9, 87, 21, 23, 0, 2577, 4427, 4432,
-       499, 19, 6200, 4437, 0, 5, 7, 11,
-       4397, 502, 517, 25, 25, 505, 508, 27,
-       11, 4382, 0, 5, 7, 3, 9, 11,
-       463, 11, 463, 127, 119, 121, 123, 0,
-       125, 0, 5, 7, 3, 9, 1, 418,
-       439, 11, 463, 363, 361, 2125, 2128, 2122,
-       2131, 3321, 5377, 5382, 0, 5, 7, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       3, 9, 2134, 2445, 2493, 265, 1549, 1552,
-       0, 0, 0, 1546, 1555, 3129, 4897, 4902,
-       0, 0, 291, 1705, 1708, 1702, 1711, 3181,
-       5027, 5032, 11, 463, 0, 0, 0, 0,
-       0, 0, 355, 2089, 2092, 2086, 2095, 3309,
-       5347, 5352, 0, 0, 0, 0, 0, 0,
-       331, 1945, 1948, 1942, 1951, 3261, 5227, 5232,
-       329, 1933, 1936, 1930, 1939, 3257, 5217, 5222,
-       0, 0, 301, 1765, 1768, 1762, 1771, 3201,
-       5077, 5082, 0, 0, 0, 269, 1573, 1576,
-       1570, 1579, 3137, 4917, 4922, 0, 0, 0,
-       335, 1969, 1972, 1966, 1975, 3269, 5247, 5252,
-       0, 0, 0, 0, 0, 0, 319, 1873,
-       1876, 1870, 1879, 3237, 5167, 5172, 0, 0,
-       0, 0, 303, 1777, 1780, 1774, 1783, 3205,
-       5087, 5092, 0, 0, 0, 317, 1861, 1864,
-       1858, 1867, 3233, 5157, 5162, 307, 1801, 1804,
-       1798, 1807, 3213, 5107, 5112, 0, 0, 0,
-       0, 0, 349, 2053, 2056, 2050, 2059, 3297,
-       5317, 5322, 0, 351, 2065, 2068, 2062, 2071,
-       3301, 5327, 5332, 0, 0, 0, 0, 0,
-       275, 1609, 1612, 1606, 1615, 3149, 4947, 4952,
-       0, 0, 0, 359, 2113, 2116, 2110, 2119,
-       3317, 5367, 5372, 0, 0, 0, 0, 0,
-       0, 0, 311, 1825, 1828, 1822, 1831, 3221,
-       5127, 5132, 0, 0, 0, 289, 1693, 1696,
-       1690, 1699, 3177, 5017, 5022, 299, 1753, 1756,
-       1750, 1759, 3197, 5067, 5072, 0, 0, 0,
-       0, 0, 343, 2017, 2020, 2014, 2023, 3285,
-       5287, 5292, 0, 345, 2029, 2032, 2026, 2035,
-       3289, 5297, 5302, 0, 293, 1717, 1720, 1714,
-       1723, 3185, 5037, 5042, 347, 2041, 2044, 2038,
-       2047, 3293, 5307, 5312, 0, 0, 0, 0,
-       0, 277, 1621, 1624, 1618, 1627, 3153, 4957,
-       4962, 279, 1633, 1636, 1630, 1639, 3157, 4967,
-       4972, 0, 0, 0, 0, 0, 0, 297,
-       1741, 1744, 1738, 1747, 3193, 5057, 5062, 0,
-       341, 2005, 2008, 2002, 2011, 3281, 5277, 5282,
-       267, 1561, 1564, 0, 1558, 1567, 3133, 4907,
-       4912, 0, 315, 1849, 1852, 0, 1846, 1855,
-       3229, 5147, 5152, 321, 1885, 1888, 0, 1882,
-       1891, 3241, 5177, 5182, 0, 0, 0, 0,
-       323, 1897, 1900, 1894, 1903, 3245, 5187, 5192,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 333, 1957, 1960, 1954, 1963, 3265, 5237,
-       5242, 0, 0, 273, 1597, 1600, 1594, 1603,
-       3145, 4937, 4942, 0, 0, 0, 283, 1657,
-       1660, 1654, 1663, 3165, 4987, 4992, 0, 0,
-       0, 313, 1837, 1840, 1834, 1843, 3225, 5137,
-       5142, 287, 1681, 1684, 1678, 1687, 3173, 5007,
-       5012, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 327, 1921, 1924, 1918, 1927,
-       3253, 5207, 5212, 0, 271, 1585, 1588, 1582,
-       1591, 3141, 4927, 4932, 0, 339, 1993, 1996,
-       1990, 1999, 3277, 5267, 5272, 0, 295, 1729,
-       1732, 1726, 1735, 3189, 5047, 5052, 0, 0,
-       0, 309, 1813, 1816, 1810, 1819, 3217, 5117,
-       5122, 0, 0, 357, 2101, 2104, 2098, 2107,
-       3313, 5357, 5362, 0, 0, 0, 0, 0,
-       325, 1909, 1912, 1906, 1915, 3249, 5197, 5202,
-       0, 281, 1645, 1648, 1642, 1651, 3161, 4977,
-       4982, 0, 0, 631, 263, 1537, 1540, 45,
-       1534, 1543, 3125, 4887, 4892, 0, 0, 353,
-       2077, 2080, 2074, 2083, 3305, 5337, 5342, 0,
-       0, 0, 0, 0, 337, 1981, 1984, 1978,
-       1987, 3273, 5257, 5262, 0, 0, 0, 285,
-       1669, 1672, 1666, 1675, 3169, 4997, 5002, 0,
-       305, 1789, 1792, 1786, 1795, 3209, 5097, 5102,
-       377, 0, 5, 7, 3, 9, 637, 631,
-       53, 727, 730, 45, 724, 733, 3109, 0,
+       579, 582, 576, 585, 0, 5, 7, 3,
+       9, 11, 0, 465, 4558, 591, 2627, 2635,
+       2619, 2643, 0, 5, 7, 3, 9, 11,
+       465, 2891, 45, 59, 57, 55, 0, 61,
+       744, 2931, 2935, 4773, 2927, 2939, 11, 465,
+       2687, 2655, 4513, 4528, 4498, 4543, 5992, 6016,
+       0, 5, 7, 3, 9, 423, 450, 3391,
+       3411, 5448, 5453, 6214, 5458, 6400, 6226, 6393,
+       6220, 0, 5, 7, 426, 2459, 0, 5,
+       7, 426, 9, 11, 2523, 480, 2531, 2539,
+       4408, 2547, 11, 429, 435, 444, 0, 5,
+       7, 9, 450, 11, 2523, 3367, 0, 0,
+       0, 0, 0, 83, 0, 0, 79, 2679,
+       588, 2623, 2631, 4488, 2639, 6274, 2647, 4503,
+       4518, 5986, 4533, 0, 5, 7, 426, 9,
+       11, 2523, 4563, 4548, 5998, 6004, 6260, 6010,
+       6423, 6267, 0, 5, 7, 426, 2459, 2651,
+       600, 4508, 4523, 4493, 4538, 13, 432, 438,
+       2431, 447, 462, 4383, 2511, 2515, 2519, 11,
+       453, 456, 459, 462, 2511, 2515, 2519, 11,
+       453, 456, 459, 0, 0, 2307, 3663, 3667,
+       3659, 3671, 3675, 5588, 5593, 0, 0, 0,
+       2298, 3603, 3607, 3599, 3611, 3615, 5558, 5563,
+       0, 2328, 3803, 3807, 3799, 3811, 3815, 5658,
+       5663, 11, 465, 480, 2531, 2539, 4418, 11,
+       429, 435, 4359, 462, 2511, 2515, 11, 453,
+       456, 462, 2511, 2515, 11, 453, 456, 11,
+       465, 13, 432, 438, 447, 2507, 462, 2511,
+       2515, 11, 453, 456, 603, 11, 465, 11,
+       465, 11, 2523, 0, 498, 3, 7, 492,
+       2559, 17, 495, 31, 2583, 29, 0, 531,
+       2563, 21, 23, 0, 522, 501, 19, 504,
+       513, 25, 25, 4428, 507, 510, 27, 528,
+       765, 67, 0, 0, 774, 777, 2955, 73,
+       2951, 768, 71, 71, 2943, 2947, 4778, 771,
+       67, 67, 0, 0, 777, 777, 73, 73,
+       69, 1, 768, 71, 71, 2947, 2947, 771,
+       771, 77, 0, 5, 7, 3, 9, 636,
+       633, 4768, 13, 471, 474, 45, 59, 57,
+       55, 0, 61, 4413, 477, 486, 0, 5,
+       7, 2963, 9, 11, 4393, 2891, 2879, 45,
+       59, 57, 55, 0, 61, 738, 2895, 2899,
+       4773, 6130, 2903, 11, 465, 81, 0, 5,
+       7, 3, 9, 4783, 786, 2967, 21, 23,
+       0, 489, 525, 2567, 2571, 501, 19, 5938,
+       2575, 0, 5, 7, 2971, 9, 11, 4398,
+       504, 516, 25, 25, 507, 510, 27, 11,
+       465, 0, 5, 7, 3, 9, 789, 85,
+       795, 792, 2975, 2979, 6136, 2987, 2983, 801,
+       0, 5, 7, 4788, 798, 2991, 2995, 9,
+       9, 87, 21, 23, 0, 2579, 4433, 4438,
+       501, 19, 6232, 4443, 0, 5, 7, 11,
+       4403, 504, 519, 25, 25, 507, 510, 27,
+       11, 4388, 0, 5, 7, 3, 9, 11,
+       465, 11, 465, 127, 119, 121, 123, 0,
+       125, 0, 5, 7, 3, 9, 1, 420,
+       441, 11, 465, 365, 363, 2127, 2130, 2124,
+       2133, 3327, 5403, 5408, 0, 5, 7, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       3, 9, 2136, 2447, 2495, 267, 1551, 1554,
+       0, 0, 0, 1548, 1557, 3135, 4923, 4928,
+       0, 0, 293, 1707, 1710, 1704, 1713, 3187,
+       5053, 5058, 11, 465, 0, 0, 0, 0,
+       0, 0, 357, 2091, 2094, 2088, 2097, 3315,
+       5373, 5378, 0, 0, 0, 0, 0, 0,
+       333, 1947, 1950, 1944, 1953, 3267, 5253, 5258,
+       331, 1935, 1938, 1932, 1941, 3263, 5243, 5248,
+       0, 0, 303, 1767, 1770, 1764, 1773, 3207,
+       5103, 5108, 0, 0, 0, 271, 1575, 1578,
+       1572, 1581, 3143, 4943, 4948, 0, 0, 0,
+       337, 1971, 1974, 1968, 1977, 3275, 5273, 5278,
+       0, 0, 0, 0, 0, 0, 321, 1875,
+       1878, 1872, 1881, 3243, 5193, 5198, 0, 0,
+       0, 0, 305, 1779, 1782, 1776, 1785, 3211,
+       5113, 5118, 0, 0, 0, 319, 1863, 1866,
+       1860, 1869, 3239, 5183, 5188, 309, 1803, 1806,
+       1800, 1809, 3219, 5133, 5138, 0, 0, 0,
+       0, 0, 351, 2055, 2058, 2052, 2061, 3303,
+       5343, 5348, 0, 353, 2067, 2070, 2064, 2073,
+       3307, 5353, 5358, 0, 0, 0, 0, 0,
+       277, 1611, 1614, 1608, 1617, 3155, 4973, 4978,
+       0, 0, 0, 361, 2115, 2118, 2112, 2121,
+       3323, 5393, 5398, 0, 0, 0, 0, 0,
+       0, 0, 313, 1827, 1830, 1824, 1833, 3227,
+       5153, 5158, 0, 0, 0, 291, 1695, 1698,
+       1692, 1701, 3183, 5043, 5048, 301, 1755, 1758,
+       1752, 1761, 3203, 5093, 5098, 0, 0, 0,
+       0, 0, 345, 2019, 2022, 2016, 2025, 3291,
+       5313, 5318, 0, 347, 2031, 2034, 2028, 2037,
+       3295, 5323, 5328, 0, 295, 1719, 1722, 1716,
+       1725, 3191, 5063, 5068, 349, 2043, 2046, 2040,
+       2049, 3299, 5333, 5338, 0, 0, 0, 0,
+       0, 279, 1623, 1626, 1620, 1629, 3159, 4983,
+       4988, 281, 1635, 1638, 1632, 1641, 3163, 4993,
+       4998, 0, 0, 0, 0, 0, 0, 299,
+       1743, 1746, 1740, 1749, 3199, 5083, 5088, 0,
+       343, 2007, 2010, 2004, 2013, 3287, 5303, 5308,
+       269, 1563, 1566, 0, 1560, 1569, 3139, 4933,
+       4938, 0, 317, 1851, 1854, 0, 1848, 1857,
+       3235, 5173, 5178, 323, 1887, 1890, 0, 1884,
+       1893, 3247, 5203, 5208, 0, 0, 0, 0,
+       325, 1899, 1902, 1896, 1905, 3251, 5213, 5218,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 335, 1959, 1962, 1956, 1965, 3271, 5263,
+       5268, 0, 0, 275, 1599, 1602, 1596, 1605,
+       3151, 4963, 4968, 0, 0, 0, 285, 1659,
+       1662, 1656, 1665, 3171, 5013, 5018, 0, 0,
+       0, 315, 1839, 1842, 1836, 1845, 3231, 5163,
+       5168, 289, 1683, 1686, 1680, 1689, 3179, 5033,
+       5038, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 329, 1923, 1926, 1920, 1929,
+       3259, 5233, 5238, 0, 273, 1587, 1590, 1584,
+       1593, 3147, 4953, 4958, 0, 341, 1995, 1998,
+       1992, 2001, 3283, 5293, 5298, 0, 297, 1731,
+       1734, 1728, 1737, 3195, 5073, 5078, 0, 0,
+       0, 311, 1815, 1818, 1812, 1821, 3223, 5143,
+       5148, 0, 0, 359, 2103, 2106, 2100, 2109,
+       3319, 5383, 5388, 0, 0, 0, 0, 0,
+       327, 1911, 1914, 1908, 1917, 3255, 5223, 5228,
+       0, 283, 1647, 1650, 1644, 1653, 3167, 5003,
+       5008, 0, 0, 633, 265, 1539, 1542, 45,
+       1536, 1545, 3131, 4913, 4918, 0, 0, 355,
+       2079, 2082, 2076, 2085, 3311, 5363, 5368, 0,
+       0, 0, 0, 0, 339, 1983, 1986, 1980,
+       1989, 3279, 5283, 5288, 0, 0, 0, 287,
+       1671, 1674, 1668, 1677, 3175, 5023, 5028, 0,
+       307, 1791, 1794, 1788, 1797, 3215, 5123, 5128,
+       379, 0, 5, 7, 3, 9, 639, 633,
+       53, 729, 732, 45, 726, 735, 3111, 0,
+       5, 7, 115, 3, 9, 117, 0, 5,
+       7, 3, 9, 867, 2443, 2491, 11, 465,
+       11, 465, 11, 465, 0, 5, 7, 3,
+       9, 633, 633, 417, 2419, 2423, 45, 1,
+       2415, 2427, 0, 5, 7, 115, 3, 9,
+       117, 0, 5, 7, 3, 9, 867, 2443,
+       2491, 11, 465, 11, 465, 53, 729, 732,
+       726, 735, 11, 465, 389, 395, 395, 395,
+       395, 395, 395, 395, 395, 0, 0, 0,
+       921, 0, 0, 0, 0, 0, 0, 939,
+       0, 0, 933, 0, 0, 0, 0, 0,
+       0, 0, 0, 930, 0, 0, 0, 0,
+       936, 0, 0, 645, 633, 687, 45, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 924, 0, 0,
+       0, 0, 942, 0, 0, 0, 927, 387,
+       385, 2226, 2229, 2223, 2232, 3355, 5413, 5418,
+       0, 5, 7, 391, 391, 391, 391, 391,
+       391, 391, 391, 391, 3, 9, 2235, 2455,
+       2503, 0, 0, 0, 157, 5433, 5433, 4458,
+       5950, 5956, 5944, 5962, 6239, 6407, 6415, 11,
+       465, 0, 0, 0, 0, 0, 0, 167,
+       561, 561, 567, 2603, 2607, 2599, 2611, 4463,
+       5968, 5974, 561, 37, 393, 2241, 2244, 2238,
+       2247, 3359, 5423, 5428, 0, 0, 163, 0,
+       564, 564, 121, 123, 0, 125, 0, 119,
+       121, 123, 0, 125, 0, 119, 0, 0,
+       0, 0, 0, 0, 0, 0, 161, 837,
+       0, 2595, 2595, 3063, 843, 105, 834, 4838,
+       6154, 6160, 843, 105, 6148, 6166, 6351, 6431,
+       6439, 834, 0, 0, 0, 0, 165, 0,
+       2595, 2595, 3087, 846, 105, 834, 4853, 6178,
+       6184, 846, 105, 6172, 6190, 6358, 6447, 6455,
+       834, 0, 0, 642, 633, 2839, 4738, 4743,
+       45, 49, 4733, 4748, 6106, 6337, 6344, 0,
+       0, 0, 0, 0, 0, 0, 0, 155,
+       0, 3363, 3363, 570, 0, 397, 2615, 4473,
+       4478, 0, 4468, 4483, 5980, 6246, 6253, 397,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 3119, 4873,
+       4878, 4868, 4883, 6196, 6365, 6372, 0, 0,
+       0, 0, 3123, 4898, 4903, 4893, 4908, 6202,
+       6379, 6386, 0, 0, 0, 159, 0, 4888,
+       4888, 49, 45, 705, 2847, 2851, 45, 2843,
+       2855, 4753, 6112, 6118, 5433, 2591, 399, 633,
+       0, 0, 0, 0, 0, 672, 45, 0,
+       0, 876, 0, 879, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 885,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 897, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 900,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       903, 0, 0, 0, 0, 0, 0, 906,
+       0, 0, 909, 0, 0, 0, 0, 0,
+       0, 0, 912, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 915, 0, 0,
+       918, 0, 0, 0, 0, 0, 0, 873,
+       0, 0, 0, 0, 0, 882, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 888, 0, 0, 891, 0, 0, 894,
+       401, 633, 0, 0, 0, 0, 0, 0,
+       687, 45, 0, 0, 0, 0, 0, 939,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       942, 0, 0, 0, 936, 0, 0, 930,
+       0, 0, 0, 933, 0, 0, 948, 0,
+       0, 0, 927, 0, 0, 921, 0, 0,
+       0, 924, 0, 0, 945, 840, 834, 3043,
+       105, 606, 609, 606, 43, 615, 618, 612,
+       621, 0, 5, 7, 606, 3, 9, 43,
+       615, 618, 612, 621, 648, 0, 5, 7,
+       633, 3, 9, 51, 714, 717, 45, 711,
+       720, 0, 5, 7, 633, 3, 9, 2883,
+       51, 714, 717, 45, 59, 57, 55, 0,
+       61, 711, 720, 0, 5, 7, 633, 3,
+       9, 51, 714, 717, 45, 59, 57, 55,
+       0, 61, 711, 720, 0, 5, 7, 633,
+       3, 9, 51, 714, 717, 45, 59, 57,
+       55, 0, 61, 711, 720, 0, 5, 7,
+       633, 3, 9, 708, 45, 59, 57, 55,
+       0, 61, 2891, 45, 59, 57, 55, 0,
+       61, 2907, 4773, 11, 465, 2891, 45, 59,
+       57, 55, 0, 61, 741, 2915, 2919, 4773,
+       2911, 2923, 11, 465, 2891, 45, 59, 57,
+       55, 0, 61, 741, 2915, 2919, 4773, 2911,
+       2923, 11, 465, 2891, 45, 59, 57, 55,
+       0, 61, 741, 2915, 2919, 4773, 2911, 2923,
+       11, 465, 11, 465, 11, 465, 534, 35,
+       549, 552, 546, 555, 534, 0, 5, 7,
+       3, 9, 543, 11, 465, 606, 43, 615,
+       618, 612, 621, 0, 5, 7, 606, 3,
+       9, 609, 11, 465, 633, 49, 693, 696,
+       45, 690, 699, 0, 5, 7, 606, 3,
+       9, 609, 11, 465, 2959, 783, 35, 549,
+       552, 546, 555, 2587, 4448, 4453, 534, 0,
+       5, 7, 3, 9, 780, 2439, 2487, 11,
+       465, 834, 3067, 105, 2214, 3331, 367, 2142,
+       2145, 45, 2139, 2148, 0, 5, 7, 633,
+       0, 0, 3, 9, 371, 2166, 2169, 45,
+       2163, 2172, 0, 5, 7, 4728, 3, 9,
+       654, 2747, 2751, 0, 45, 2743, 2755, 0,
+       5, 7, 3, 9, 0, 5, 7, 3,
+       9, 633, 369, 2154, 2157, 45, 2151, 2160,
+       0, 5, 7, 633, 0, 0, 3, 9,
+       373, 2178, 2181, 45, 2175, 2184, 0, 5,
+       7, 4728, 3, 9, 657, 2763, 2767, 0,
+       45, 2759, 2771, 0, 5, 7, 3, 9,
+       0, 5, 7, 3, 9, 0, 4723, 6208,
+       660, 2779, 2783, 0, 45, 660, 2775, 2787,
+       4703, 6058, 6064, 0, 5, 7, 4723, 3,
+       9, 2211, 2451, 2499, 663, 2795, 2799, 0,
+       45, 663, 2791, 2803, 4708, 6070, 6076, 0,
+       5, 7, 4723, 3, 9, 2451, 2499, 666,
+       2811, 2815, 0, 45, 666, 2807, 2819, 4713,
+       6082, 6088, 0, 5, 7, 4723, 3, 9,
+       2451, 2499, 669, 2827, 2831, 0, 45, 2823,
+       2835, 4718, 6094, 6100, 0, 5, 7, 3,
+       9, 2451, 2499, 11, 465, 2739, 4688, 4693,
+       4578, 4683, 4698, 6052, 6323, 6330, 630, 11,
+       465, 2735, 4668, 4673, 4578, 2735, 4663, 4678,
+       6046, 6309, 6316, 630, 11, 465, 2731, 4648,
+       4653, 4578, 2731, 4643, 4658, 6040, 6295, 6302,
+       630, 11, 465, 2727, 4628, 4633, 4578, 2727,
+       4623, 4638, 6034, 6281, 6288, 630, 11, 465,
+       377, 2202, 2205, 2199, 2208, 11, 465, 2723,
+       4608, 4613, 4578, 4603, 4618, 630, 11, 465,
+       11, 465, 11, 465, 375, 2190, 2193, 2187,
+       2196, 11, 465, 2719, 4588, 4593, 4578, 4583,
+       4598, 630, 11, 465, 11, 465, 633, 49,
+       693, 696, 45, 690, 699, 0, 5, 7,
+       633, 3, 9, 49, 693, 696, 45, 690,
+       699, 0, 5, 7, 633, 3, 9, 49,
+       693, 696, 45, 690, 699, 0, 5, 7,
+       606, 3, 9, 609, 11, 465, 11, 465,
+       11, 465, 633, 49, 693, 696, 45, 690,
+       699, 0, 5, 7, 633, 3, 9, 49,
+       693, 696, 45, 690, 699, 534, 0, 5,
+       7, 3, 9, 35, 549, 552, 546, 555,
+       534, 0, 5, 7, 3, 9, 35, 549,
+       552, 546, 555, 534, 0, 5, 7, 3,
+       9, 35, 549, 552, 546, 555, 0, 5,
+       7, 606, 3, 9, 609, 11, 465, 11,
+       465, 11, 465, 11, 465, 11, 465, 405,
+       0, 5, 7, 3, 9, 633, 49, 693,
+       696, 45, 690, 699, 0, 5, 7, 403,
+       3, 9, 0, 5, 7, 3, 9, 129,
+       1, 11, 465, 11, 465, 11, 465, 861,
+       0, 849, 5, 7, 852, 855, 3, 9,
+       1, 420, 441, 111, 113, 0, 3035, 834,
+       105, 107, 633, 858, 3099, 3103, 45, 3095,
+       3107, 3091, 4858, 4863, 11, 465, 0, 834,
+       105, 109, 633, 49, 693, 696, 45, 690,
+       699, 0, 5, 7, 403, 3, 9, 0,
+       5, 7, 3, 9, 633, 47, 678, 681,
+       45, 675, 684, 864, 0, 5, 7, 115,
+       3, 9, 117, 0, 5, 7, 3, 9,
+       1, 420, 441, 11, 465, 11, 465, 11,
+       465, 11, 465, 633, 47, 678, 681, 45,
+       675, 684, 0, 5, 7, 633, 3, 9,
+       47, 678, 681, 45, 675, 684, 0, 5,
+       7, 115, 3, 9, 117, 0, 5, 7,
+       3, 9, 1, 420, 441, 11, 465, 11,
+       465, 11, 465, 633, 47, 678, 681, 45,
+       675, 684, 951, 0, 5, 7, 147, 149,
+       151, 153, 3, 9, 0, 5, 7, 3,
+       9, 2703, 633, 47, 678, 681, 45, 675,
+       684, 0, 5, 7, 0, 3, 9, 3127,
+       0, 5, 7, 0, 5, 7, 0, 5,
+       7, 1, 3, 9, 420, 441, 3, 9,
+       420, 441, 3, 9, 420, 441, 954, 129,
+       11, 465, 11, 465, 11, 465, 11, 465,
+       11, 465, 0, 5, 7, 3, 9, 633,
+       47, 678, 681, 45, 675, 684, 3039, 0,
+       5, 7, 834, 3, 9, 4823, 105, 843,
+       3051, 3055, 843, 3051, 3055, 843, 3051, 3055,
+       3043, 3047, 3059, 4828, 4833, 3047, 3059, 4828,
+       4833, 3047, 3059, 4828, 4833, 11, 465, 11,
+       465, 0, 5, 7, 3, 9, 633, 47,
+       678, 681, 45, 675, 684, 0, 5, 7,
+       834, 3, 9, 105, 846, 3075, 3079, 846,
+       3075, 3079, 846, 3075, 3079, 3067, 3071, 3083,
+       4843, 4848, 3071, 3083, 4843, 4848, 3071, 3083,
+       4843, 4848, 11, 465, 11, 465, 0, 5,
+       7, 3, 9, 633, 47, 678, 681, 45,
+       675, 684, 0, 5, 7, 606, 3, 9,
+       43, 615, 618, 43, 615, 618, 43, 615,
+       618, 609, 612, 621, 2691, 2695, 612, 621,
+       2691, 2695, 612, 621, 2691, 2695, 11, 465,
+       11, 465, 11, 465, 957, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 169, 963,
+       966, 0, 0, 0, 960, 969, 0, 5,
+       7, 403, 3, 9, 0, 5, 7, 3,
+       9, 633, 47, 678, 681, 45, 675, 684,
+       0, 5, 7, 633, 3, 9, 51, 714,
+       717, 45, 711, 720, 762, 0, 5, 7,
+       747, 3, 9, 65, 753, 756, 63, 750,
+       759, 0, 5, 7, 747, 3, 9, 65,
+       753, 756, 63, 750, 759, 0, 5, 7,
+       633, 3, 9, 49, 693, 696, 45, 690,
+       699, 0, 5, 7, 606, 3, 9, 43,
+       615, 618, 612, 621, 0, 5, 7, 129,
+       3, 9, 1, 11, 465, 11, 465, 11,
+       465, 11, 465, 11, 465, 11, 465, 11,
+       465, 11, 465, 0, 0, 195, 1119, 1122,
+       1116, 1125, 0, 0, 0, 189, 1083, 1086,
+       1080, 1089, 0, 209, 1203, 1206, 1200, 1209,
+       0, 0, 0, 0, 0, 0, 259, 1503,
+       1506, 1500, 1509, 0, 0, 0, 0, 0,
+       0, 235, 1359, 1362, 1356, 1365, 233, 1347,
+       1350, 1344, 1353, 0, 0, 205, 1179, 1182,
+       1176, 1185, 0, 0, 0, 173, 987, 990,
+       984, 993, 0, 0, 0, 239, 1383, 1386,
+       1380, 1389, 0, 0, 0, 0, 0, 0,
+       223, 1287, 1290, 1284, 1293, 0, 0, 0,
+       0, 207, 1191, 1194, 1188, 1197, 0, 0,
+       0, 221, 1275, 1278, 1272, 1281, 211, 1215,
+       1218, 1212, 1221, 0, 0, 0, 0, 0,
+       253, 1467, 1470, 1464, 1473, 0, 255, 1479,
+       1482, 1476, 1485, 0, 0, 0, 0, 0,
+       179, 1023, 1026, 1020, 1029, 0, 0, 0,
+       263, 1527, 1530, 1524, 1533, 0, 0, 0,
+       0, 0, 0, 0, 215, 1239, 1242, 1236,
+       1245, 0, 0, 0, 193, 1107, 1110, 1104,
+       1113, 203, 1167, 1170, 1164, 1173, 0, 0,
+       0, 0, 0, 247, 1431, 1434, 1428, 1437,
+       0, 249, 1443, 1446, 1440, 1449, 0, 197,
+       1131, 1134, 1128, 1137, 251, 1455, 1458, 1452,
+       1461, 0, 0, 0, 0, 0, 181, 1035,
+       1038, 1032, 1041, 183, 1047, 1050, 1044, 1053,
+       0, 0, 0, 0, 0, 0, 201, 1155,
+       1158, 1152, 1161, 0, 245, 1419, 1422, 1416,
+       1425, 171, 975, 978, 0, 972, 981, 0,
+       219, 1263, 1266, 0, 1260, 1269, 225, 1299,
+       1302, 0, 1296, 1305, 0, 0, 0, 0,
+       227, 1311, 1314, 1308, 1317, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 237, 1371,
+       1374, 1368, 1377, 0, 0, 177, 1011, 1014,
+       1008, 1017, 0, 0, 0, 187, 1071, 1074,
+       1068, 1077, 0, 0, 0, 217, 1251, 1254,
+       1248, 1257, 191, 1095, 1098, 1092, 1101, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 231, 1335, 1338, 1332, 1341, 0, 175,
+       999, 1002, 996, 1005, 0, 243, 1407, 1410,
+       1404, 1413, 0, 199, 1143, 1146, 1140, 1149,
+       0, 0, 0, 213, 1227, 1230, 1224, 1233,
+       0, 0, 261, 1515, 1518, 1512, 1521, 0,
+       0, 0, 0, 0, 229, 1323, 1326, 1320,
+       1329, 0, 185, 1059, 1062, 1056, 1065, 0,
+       0, 2707, 633, 49, 693, 696, 45, 690,
+       699, 0, 0, 257, 1491, 1494, 1488, 1497,
+       0, 0, 0, 0, 0, 241, 1395, 1398,
+       1392, 1401, 606, 624, 1, 633, 49, 693,
+       696, 45, 690, 699, 0, 5, 7, 633,
+       3, 9, 47, 678, 681, 45, 675, 684,
+       0, 5, 7, 403, 3, 9, 0, 5,
+       7, 3, 9, 129, 1, 11, 465, 11,
+       465, 11, 465, 129, 1, 633, 47, 678,
+       681, 45, 675, 684, 0, 5, 7, 633,
+       3, 9, 47, 678, 681, 45, 675, 684,
+       0, 5, 7, 633, 3, 9, 49, 693,
+       696, 45, 690, 699, 0, 5, 7, 33,
+       537, 3, 9, 35, 549, 552, 546, 555,
+       870, 0, 5, 7, 540, 3, 9, 133,
+       135, 0, 137, 139, 0, 141, 0, 143,
+       145, 0, 558, 131, 1, 0, 0, 11,
+       465, 117, 115, 11, 465, 11, 465, 11,
+       465, 633, 47, 678, 681, 45, 675, 684,
+       0, 5, 7, 633, 3, 9, 47, 678,
+       681, 45, 675, 684, 0, 5, 7, 633,
+       3, 9, 49, 693, 696, 45, 690, 699,
+       0, 5, 7, 33, 537, 3, 9, 543,
+       117, 115, 11, 465, 11, 465, 11, 465,
+       633, 47, 678, 681, 45, 675, 684, 0,
+       5, 7, 633, 3, 9, 47, 678, 681,
+       45, 675, 684, 0, 5, 7, 633, 3,
+       9, 47, 678, 681, 45, 675, 684, 0,
        5, 7, 115, 3, 9, 117, 0, 5,
-       7, 3, 9, 865, 2441, 2489, 11, 463,
-       11, 463, 11, 463, 0, 5, 7, 3,
-       9, 631, 631, 415, 2417, 2421, 45, 1,
-       2413, 2425, 0, 5, 7, 115, 3, 9,
-       117, 0, 5, 7, 3, 9, 865, 2441,
-       2489, 11, 463, 11, 463, 53, 727, 730,
-       724, 733, 11, 463, 387, 393, 393, 393,
-       393, 393, 393, 0, 0, 0, 919, 0,
-       0, 931, 0, 0, 0, 0, 0, 0,
-       0, 0, 928, 0, 0, 0, 0, 934,
-       0, 0, 643, 631, 685, 45, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 922, 0, 0, 0,
-       925, 385, 383, 2224, 2227, 2221, 2230, 3349,
-       5387, 5392, 0, 5, 7, 389, 389, 389,
-       389, 389, 389, 389, 3, 9, 2233, 2453,
-       2501, 0, 0, 0, 157, 5407, 5407, 4452,
-       5924, 5930, 5918, 5936, 6207, 6361, 6369, 11,
-       463, 0, 0, 163, 0, 562, 562, 121,
-       123, 0, 125, 0, 37, 119, 391, 2239,
-       2242, 2236, 2245, 3353, 5397, 5402, 121, 123,
-       0, 125, 0, 565, 2601, 2605, 119, 2597,
-       2609, 4457, 5942, 5948, 0, 0, 0, 0,
-       0, 0, 0, 0, 161, 835, 0, 2593,
-       2593, 3061, 841, 105, 832, 4832, 6128, 6134,
-       841, 105, 6122, 6140, 6319, 6385, 6393, 832,
-       0, 0, 0, 0, 165, 0, 2593, 2593,
-       3085, 844, 105, 832, 4847, 6152, 6158, 844,
-       105, 6146, 6164, 6326, 6401, 6409, 832, 0,
-       0, 640, 631, 2837, 4732, 4737, 45, 49,
-       4727, 4742, 6080, 6305, 6312, 559, 0, 0,
-       0, 0, 0, 0, 0, 0, 155, 0,
-       3357, 3357, 568, 0, 395, 2613, 4467, 4472,
-       0, 4462, 4477, 5954, 6214, 6221, 395, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 3117, 4867, 4872,
-       4862, 4877, 6170, 6333, 6340, 0, 0, 0,
-       159, 0, 4882, 4882, 49, 45, 703, 2845,
-       2849, 45, 2841, 2853, 4747, 6086, 6092, 5407,
-       2589, 397, 631, 0, 0, 0, 0, 0,
-       670, 45, 0, 0, 874, 0, 877, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 883, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 895, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 898, 0, 0, 0, 0, 0,
-       0, 0, 0, 901, 0, 0, 0, 0,
-       0, 0, 904, 0, 0, 907, 0, 0,
-       0, 0, 0, 0, 0, 910, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       913, 0, 0, 916, 0, 0, 0, 0,
-       0, 0, 871, 0, 0, 0, 0, 0,
-       880, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 886, 0, 0, 889,
-       0, 0, 892, 399, 631, 0, 0, 0,
-       0, 0, 0, 685, 45, 0, 0, 0,
-       0, 0, 937, 0, 0, 0, 0, 0,
-       0, 0, 0, 940, 0, 0, 0, 934,
-       0, 0, 928, 0, 0, 0, 931, 0,
-       0, 946, 0, 0, 0, 925, 0, 0,
-       919, 0, 0, 0, 922, 0, 0, 943,
-       838, 832, 3041, 105, 604, 607, 604, 43,
-       613, 616, 610, 619, 0, 5, 7, 604,
-       3, 9, 43, 613, 616, 610, 619, 646,
-       0, 5, 7, 631, 3, 9, 51, 712,
-       715, 45, 709, 718, 0, 5, 7, 631,
-       3, 9, 2881, 51, 712, 715, 45, 59,
-       57, 55, 0, 61, 709, 718, 0, 5,
-       7, 631, 3, 9, 51, 712, 715, 45,
-       59, 57, 55, 0, 61, 709, 718, 0,
-       5, 7, 631, 3, 9, 51, 712, 715,
-       45, 59, 57, 55, 0, 61, 709, 718,
-       0, 5, 7, 631, 3, 9, 706, 45,
-       59, 57, 55, 0, 61, 2889, 45, 59,
-       57, 55, 0, 61, 2905, 4767, 11, 463,
-       2889, 45, 59, 57, 55, 0, 61, 739,
-       2913, 2917, 4767, 2909, 2921, 11, 463, 2889,
-       45, 59, 57, 55, 0, 61, 739, 2913,
-       2917, 4767, 2909, 2921, 11, 463, 2889, 45,
-       59, 57, 55, 0, 61, 739, 2913, 2917,
-       4767, 2909, 2921, 11, 463, 11, 463, 11,
-       463, 532, 35, 547, 550, 544, 553, 532,
-       0, 5, 7, 3, 9, 541, 11, 463,
-       604, 43, 613, 616, 610, 619, 0, 5,
-       7, 604, 3, 9, 607, 11, 463, 631,
-       49, 691, 694, 45, 688, 697, 0, 5,
-       7, 604, 3, 9, 607, 11, 463, 2957,
-       781, 35, 547, 550, 544, 553, 2585, 4442,
-       4447, 532, 0, 5, 7, 3, 9, 778,
-       2437, 2485, 11, 463, 832, 3065, 105, 2212,
-       3325, 365, 2140, 2143, 45, 2137, 2146, 0,
-       5, 7, 631, 0, 0, 3, 9, 369,
-       2164, 2167, 45, 2161, 2170, 0, 5, 7,
-       4722, 3, 9, 652, 2745, 2749, 0, 45,
-       2741, 2753, 0, 5, 7, 3, 9, 0,
-       5, 7, 3, 9, 631, 367, 2152, 2155,
-       45, 2149, 2158, 0, 5, 7, 631, 0,
-       0, 3, 9, 371, 2176, 2179, 45, 2173,
-       2182, 0, 5, 7, 4722, 3, 9, 655,
-       2761, 2765, 0, 45, 2757, 2769, 0, 5,
-       7, 3, 9, 0, 5, 7, 3, 9,
-       0, 4717, 6176, 658, 2777, 2781, 0, 45,
-       658, 2773, 2785, 4697, 6032, 6038, 0, 5,
-       7, 4717, 3, 9, 2209, 2449, 2497, 661,
-       2793, 2797, 0, 45, 661, 2789, 2801, 4702,
-       6044, 6050, 0, 5, 7, 4717, 3, 9,
-       2449, 2497, 664, 2809, 2813, 0, 45, 664,
-       2805, 2817, 4707, 6056, 6062, 0, 5, 7,
-       4717, 3, 9, 2449, 2497, 667, 2825, 2829,
-       0, 45, 2821, 2833, 4712, 6068, 6074, 0,
-       5, 7, 3, 9, 2449, 2497, 11, 463,
-       2737, 4682, 4687, 4572, 4677, 4692, 6026, 6291,
-       6298, 628, 11, 463, 2733, 4662, 4667, 4572,
-       2733, 4657, 4672, 6020, 6277, 6284, 628, 11,
-       463, 2729, 4642, 4647, 4572, 2729, 4637, 4652,
-       6014, 6263, 6270, 628, 11, 463, 2725, 4622,
-       4627, 4572, 2725, 4617, 4632, 6008, 6249, 6256,
-       628, 11, 463, 375, 2200, 2203, 2197, 2206,
-       11, 463, 2721, 4602, 4607, 4572, 4597, 4612,
-       628, 11, 463, 11, 463, 11, 463, 373,
-       2188, 2191, 2185, 2194, 11, 463, 2717, 4582,
-       4587, 4572, 4577, 4592, 628, 11, 463, 11,
-       463, 631, 49, 691, 694, 45, 688, 697,
-       0, 5, 7, 631, 3, 9, 49, 691,
-       694, 45, 688, 697, 0, 5, 7, 631,
-       3, 9, 49, 691, 694, 45, 688, 697,
-       0, 5, 7, 604, 3, 9, 607, 11,
-       463, 11, 463, 11, 463, 631, 49, 691,
-       694, 45, 688, 697, 0, 5, 7, 631,
-       3, 9, 49, 691, 694, 45, 688, 697,
-       532, 0, 5, 7, 3, 9, 35, 547,
-       550, 544, 553, 532, 0, 5, 7, 3,
-       9, 35, 547, 550, 544, 553, 532, 0,
-       5, 7, 3, 9, 35, 547, 550, 544,
-       553, 0, 5, 7, 604, 3, 9, 607,
-       11, 463, 11, 463, 11, 463, 11, 463,
-       11, 463, 403, 0, 5, 7, 3, 9,
-       631, 49, 691, 694, 45, 688, 697, 0,
-       5, 7, 401, 3, 9, 0, 5, 7,
-       3, 9, 129, 1, 11, 463, 11, 463,
-       11, 463, 859, 0, 847, 5, 7, 850,
-       853, 3, 9, 1, 418, 439, 111, 113,
-       0, 3033, 832, 105, 107, 631, 856, 3097,
-       3101, 45, 3093, 3105, 3089, 4852, 4857, 11,
-       463, 0, 832, 105, 109, 631, 49, 691,
-       694, 45, 688, 697, 0, 5, 7, 401,
-       3, 9, 0, 5, 7, 3, 9, 631,
-       47, 676, 679, 45, 673, 682, 862, 0,
+       7, 3, 9, 1, 420, 441, 11, 465,
+       11, 465, 11, 465, 11, 465, 633, 51,
+       714, 717, 45, 711, 720, 0, 5, 7,
+       633, 3, 9, 702, 45, 1, 11, 465,
+       633, 51, 714, 717, 45, 711, 720, 0,
+       5, 7, 633, 3, 9, 47, 678, 681,
+       45, 675, 684, 0, 5, 7, 633, 3,
+       9, 47, 678, 681, 45, 675, 684, 0,
        5, 7, 115, 3, 9, 117, 0, 5,
-       7, 3, 9, 1, 418, 439, 11, 463,
-       11, 463, 11, 463, 11, 463, 631, 47,
-       676, 679, 45, 673, 682, 0, 5, 7,
-       631, 3, 9, 47, 676, 679, 45, 673,
-       682, 0, 5, 7, 115, 3, 9, 117,
-       0, 5, 7, 3, 9, 1, 418, 439,
-       11, 463, 11, 463, 11, 463, 631, 47,
-       676, 679, 45, 673, 682, 949, 0, 5,
-       7, 147, 149, 151, 153, 3, 9, 0,
-       5, 7, 3, 9, 2701, 631, 47, 676,
-       679, 45, 673, 682, 0, 5, 7, 0,
-       3, 9, 3121, 0, 5, 7, 0, 5,
-       7, 0, 5, 7, 1, 3, 9, 418,
-       439, 3, 9, 418, 439, 3, 9, 418,
-       439, 952, 129, 11, 463, 11, 463, 11,
-       463, 11, 463, 11, 463, 0, 5, 7,
-       3, 9, 631, 47, 676, 679, 45, 673,
-       682, 3037, 0, 5, 7, 832, 3, 9,
-       4817, 105, 841, 3049, 3053, 841, 3049, 3053,
-       841, 3049, 3053, 3041, 3045, 3057, 4822, 4827,
-       3045, 3057, 4822, 4827, 3045, 3057, 4822, 4827,
-       11, 463, 11, 463, 0, 5, 7, 3,
-       9, 631, 47, 676, 679, 45, 673, 682,
-       0, 5, 7, 832, 3, 9, 105, 844,
-       3073, 3077, 844, 3073, 3077, 844, 3073, 3077,
-       3065, 3069, 3081, 4837, 4842, 3069, 3081, 4837,
-       4842, 3069, 3081, 4837, 4842, 11, 463, 11,
-       463, 0, 5, 7, 3, 9, 631, 47,
-       676, 679, 45, 673, 682, 0, 5, 7,
-       604, 3, 9, 43, 613, 616, 43, 613,
-       616, 43, 613, 616, 607, 610, 619, 2689,
-       2693, 610, 619, 2689, 2693, 610, 619, 2689,
-       2693, 11, 463, 11, 463, 11, 463, 955,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 167, 961, 964, 0, 0, 0, 958,
-       967, 0, 5, 7, 401, 3, 9, 0,
-       5, 7, 3, 9, 631, 47, 676, 679,
-       45, 673, 682, 0, 5, 7, 631, 3,
-       9, 51, 712, 715, 45, 709, 718, 760,
-       0, 5, 7, 745, 3, 9, 65, 751,
-       754, 63, 748, 757, 0, 5, 7, 745,
-       3, 9, 65, 751, 754, 63, 748, 757,
-       0, 5, 7, 631, 3, 9, 49, 691,
-       694, 45, 688, 697, 0, 5, 7, 604,
-       3, 9, 43, 613, 616, 610, 619, 0,
-       5, 7, 129, 3, 9, 1, 11, 463,
-       11, 463, 11, 463, 11, 463, 11, 463,
-       11, 463, 11, 463, 11, 463, 0, 0,
-       193, 1117, 1120, 1114, 1123, 0, 0, 0,
-       187, 1081, 1084, 1078, 1087, 0, 207, 1201,
-       1204, 1198, 1207, 0, 0, 0, 0, 0,
-       0, 257, 1501, 1504, 1498, 1507, 0, 0,
-       0, 0, 0, 0, 233, 1357, 1360, 1354,
-       1363, 231, 1345, 1348, 1342, 1351, 0, 0,
-       203, 1177, 1180, 1174, 1183, 0, 0, 0,
-       171, 985, 988, 982, 991, 0, 0, 0,
-       237, 1381, 1384, 1378, 1387, 0, 0, 0,
-       0, 0, 0, 221, 1285, 1288, 1282, 1291,
-       0, 0, 0, 0, 205, 1189, 1192, 1186,
-       1195, 0, 0, 0, 219, 1273, 1276, 1270,
-       1279, 209, 1213, 1216, 1210, 1219, 0, 0,
-       0, 0, 0, 251, 1465, 1468, 1462, 1471,
-       0, 253, 1477, 1480, 1474, 1483, 0, 0,
-       0, 0, 0, 177, 1021, 1024, 1018, 1027,
-       0, 0, 0, 261, 1525, 1528, 1522, 1531,
-       0, 0, 0, 0, 0, 0, 0, 213,
-       1237, 1240, 1234, 1243, 0, 0, 0, 191,
-       1105, 1108, 1102, 1111, 201, 1165, 1168, 1162,
-       1171, 0, 0, 0, 0, 0, 245, 1429,
-       1432, 1426, 1435, 0, 247, 1441, 1444, 1438,
-       1447, 0, 195, 1129, 1132, 1126, 1135, 249,
-       1453, 1456, 1450, 1459, 0, 0, 0, 0,
-       0, 179, 1033, 1036, 1030, 1039, 181, 1045,
-       1048, 1042, 1051, 0, 0, 0, 0, 0,
-       0, 199, 1153, 1156, 1150, 1159, 0, 243,
-       1417, 1420, 1414, 1423, 169, 973, 976, 0,
-       970, 979, 0, 217, 1261, 1264, 0, 1258,
-       1267, 223, 1297, 1300, 0, 1294, 1303, 0,
-       0, 0, 0, 225, 1309, 1312, 1306, 1315,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 235, 1369, 1372, 1366, 1375, 0, 0,
-       175, 1009, 1012, 1006, 1015, 0, 0, 0,
-       185, 1069, 1072, 1066, 1075, 0, 0, 0,
-       215, 1249, 1252, 1246, 1255, 189, 1093, 1096,
-       1090, 1099, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 229, 1333, 1336, 1330,
-       1339, 0, 173, 997, 1000, 994, 1003, 0,
-       241, 1405, 1408, 1402, 1411, 0, 197, 1141,
-       1144, 1138, 1147, 0, 0, 0, 211, 1225,
-       1228, 1222, 1231, 0, 0, 259, 1513, 1516,
-       1510, 1519, 0, 0, 0, 0, 0, 227,
-       1321, 1324, 1318, 1327, 0, 183, 1057, 1060,
-       1054, 1063, 0, 0, 2705, 631, 49, 691,
-       694, 45, 688, 697, 0, 0, 255, 1489,
-       1492, 1486, 1495, 0, 0, 0, 0, 0,
-       239, 1393, 1396, 1390, 1399, 604, 622, 1,
-       631, 49, 691, 694, 45, 688, 697, 0,
-       5, 7, 631, 3, 9, 47, 676, 679,
-       45, 673, 682, 0, 5, 7, 401, 3,
-       9, 0, 5, 7, 3, 9, 129, 1,
-       11, 463, 11, 463, 11, 463, 129, 1,
-       631, 47, 676, 679, 45, 673, 682, 0,
-       5, 7, 631, 3, 9, 47, 676, 679,
-       45, 673, 682, 0, 5, 7, 631, 3,
-       9, 49, 691, 694, 45, 688, 697, 0,
-       5, 7, 33, 535, 3, 9, 35, 547,
-       550, 544, 553, 868, 0, 5, 7, 538,
-       3, 9, 133, 135, 0, 137, 139, 0,
-       141, 0, 143, 145, 0, 556, 131, 1,
-       0, 0, 11, 463, 117, 115, 11, 463,
-       11, 463, 11, 463, 631, 47, 676, 679,
-       45, 673, 682, 0, 5, 7, 631, 3,
-       9, 47, 676, 679, 45, 673, 682, 0,
-       5, 7, 631, 3, 9, 49, 691, 694,
-       45, 688, 697, 0, 5, 7, 33, 535,
-       3, 9, 541, 117, 115, 11, 463, 11,
-       463, 11, 463, 631, 47, 676, 679, 45,
-       673, 682, 0, 5, 7, 631, 3, 9,
-       47, 676, 679, 45, 673, 682, 0, 5,
-       7, 631, 3, 9, 47, 676, 679, 45,
-       673, 682, 0, 5, 7, 115, 3, 9,
-       117, 0, 5, 7, 3, 9, 1, 418,
-       439, 11, 463, 11, 463, 11, 463, 11,
-       463, 631, 51, 712, 715, 45, 709, 718,
-       0, 5, 7, 631, 3, 9, 700, 45,
-       1, 11, 463, 631, 51, 712, 715, 45,
-       709, 718, 0, 5, 7, 631, 3, 9,
-       47, 676, 679, 45, 673, 682, 0, 5,
-       7, 631, 3, 9, 47, 676, 679, 45,
-       673, 682, 0, 5, 7, 115, 3, 9,
-       117, 0, 5, 7, 3, 9, 1, 418,
-       439, 11, 463, 11, 463, 11, 463, 11,
-       463, 631, 49, 691, 694, 45, 688, 697,
-       0, 5, 7, 832, 3, 9, 3041, 105,
-       11, 463, 631, 49, 691, 694, 45, 688,
-       697, 0, 5, 7, 2218, 3, 9, 117,
-       115, 117, 3113, 381, 115, 117, 115, 117,
-       3345, 3341, 11, 463, 2215, 117, 3337, 379,
-       115, 117, 3329, 2215, 117, 379, 115, 117,
-       3333, 631, 49, 691, 694, 45, 688, 697,
-       0, 5, 7, 631, 3, 9, 49, 691,
-       694, 45, 688, 697, 75, 0, 5, 7,
-       3, 9, 1, 11, 463, 11, 463, 631,
-       47, 676, 679, 45, 673, 682, 532, 0,
-       5, 7, 3, 9, 35, 547, 550, 544,
-       553, 75, 0, 5, 7, 3, 9, 1,
-       11, 463, 11, 463, 631, 49, 691, 694,
-       45, 688, 697, 0, 5, 7, 604, 3,
-       9, 625, 1, 11, 463, 595, 592, 0,
-       2661, 2665, 571, 466, 475, 2657, 2669, 592,
-       407, 2465, 2473, 3373, 3381, 2433, 2481, 3365,
-       3369, 4362, 4372, 2681, 592, 2465, 2473, 3013,
-       3013, 3013, 3013, 3013, 3013, 3013, 3013, 3013,
-       3013, 3013, 3013, 3013, 3013, 3013, 3013, 3013,
-       2433, 2481, 4547, 4562, 4807, 4807, 4807, 4807,
-       4807, 4807, 4807, 4807, 4807, 4807, 4807, 4807,
-       4807, 4807, 4807, 4807, 4807, 2673, 3009, 93,
-       4792, 4797, 3005, 2997, 3001, 4787, 4802, 2465,
-       2473, 2433, 2481, 481, 2533, 2541, 4417, 2549,
-       481, 2461, 2469, 2477, 4367, 5996, 6002, 6116,
-       6116, 6116, 6116, 6116, 6116, 6116, 6116, 6116,
-       6116, 6116, 6116, 6116, 6116, 6116, 6116, 6116,
-       4357
+       7, 3, 9, 1, 420, 441, 11, 465,
+       11, 465, 11, 465, 11, 465, 633, 49,
+       693, 696, 45, 690, 699, 0, 5, 7,
+       834, 3, 9, 3043, 105, 11, 465, 633,
+       49, 693, 696, 45, 690, 699, 0, 5,
+       7, 2220, 3, 9, 117, 115, 117, 3115,
+       383, 115, 117, 115, 117, 3351, 3347, 11,
+       465, 2217, 117, 3343, 381, 115, 117, 3335,
+       2217, 117, 381, 115, 117, 3339, 633, 49,
+       693, 696, 45, 690, 699, 0, 5, 7,
+       633, 3, 9, 49, 693, 696, 45, 690,
+       699, 75, 0, 5, 7, 3, 9, 1,
+       11, 465, 11, 465, 633, 47, 678, 681,
+       45, 675, 684, 534, 0, 5, 7, 3,
+       9, 35, 549, 552, 546, 555, 75, 0,
+       5, 7, 3, 9, 1, 11, 465, 11,
+       465, 633, 49, 693, 696, 45, 690, 699,
+       0, 5, 7, 606, 3, 9, 627, 1,
+       11, 465, 597, 594, 0, 2663, 2667, 573,
+       468, 477, 2659, 2671, 594, 409, 2467, 2475,
+       3379, 3387, 2435, 2483, 3371, 3375, 4368, 4378,
+       2683, 594, 2467, 2475, 3015, 3015, 3015, 3015,
+       3015, 3015, 3015, 3015, 3015, 3015, 3015, 3015,
+       3015, 3015, 3015, 3015, 3015, 2435, 2483, 4553,
+       4568, 4813, 4813, 4813, 4813, 4813, 4813, 4813,
+       4813, 4813, 4813, 4813, 4813, 4813, 4813, 4813,
+       4813, 4813, 2675, 3011, 93, 4798, 4803, 3007,
+       2999, 3003, 4793, 4808, 2467, 2475, 2435, 2483,
+       483, 2535, 2543, 4423, 2551, 483, 2463, 2471,
+       2479, 4373, 6022, 6028, 6142, 6142, 6142, 6142,
+       6142, 6142, 6142, 6142, 6142, 6142, 6142, 6142,
+       6142, 6142, 6142, 6142, 6142, 4363
 };
 
 static const short _zone_scanner_eof_actions[] = {
-       0, 2709, 2885, 413, 2263, 405, 2248, 15,
-       15, 405, 405, 2248, 2248, 2248, 4567, 6098,
-       2260, 413, 413, 2263, 2248, 2248, 413, 413,
-       413, 413, 413, 2263, 2263, 413, 413, 2263,
-       413, 413, 413, 2263, 413, 413, 413, 2263,
-       413, 413, 413, 413, 2263, 413, 413, 413,
-       2263, 413, 413, 413, 2263, 2263, 413, 413,
-       413, 413, 2263, 413, 2263, 413, 413, 413,
-       413, 2263, 413, 413, 413, 2263, 413, 413,
-       413, 413, 413, 413, 413, 413, 413, 413,
-       2263, 413, 413, 2263, 2263, 413, 413, 2263,
-       413, 2263, 413, 2263, 2263, 413, 413, 413,
-       413, 2263, 2263, 413, 413, 413, 413, 2263,
-       413, 2263, 2263, 413, 2263, 2263, 413, 413,
-       413, 413, 2263, 413, 413, 413, 413, 413,
-       413, 413, 413, 413, 2263, 413, 413, 2263,
-       413, 2263, 413, 413, 413, 2263, 2263, 413,
-       413, 413, 413, 413, 2263, 413, 2263, 413,
-       2263, 413, 2263, 413, 413, 413, 2263, 413,
-       413, 2263, 413, 413, 413, 2263, 413, 2263,
-       413, 413, 649, 2713, 413, 413, 2263, 413,
-       413, 413, 413, 413, 2263, 413, 2709, 413,
-       413, 649, 2885, 2885, 2885, 2885, 413, 15,
+       0, 2711, 2887, 415, 2265, 407, 2250, 15,
+       15, 407, 407, 2250, 2250, 2250, 4573, 6124,
+       2262, 415, 415, 2265, 2250, 2250, 415, 415,
+       415, 415, 415, 2265, 2265, 415, 415, 2265,
+       415, 415, 415, 2265, 415, 415, 415, 2265,
+       415, 415, 415, 415, 2265, 415, 415, 415,
+       2265, 415, 415, 415, 2265, 2265, 415, 415,
+       415, 415, 2265, 415, 2265, 415, 415, 415,
+       415, 2265, 415, 415, 415, 2265, 415, 415,
+       415, 415, 415, 415, 415, 415, 415, 415,
+       2265, 415, 415, 2265, 2265, 415, 415, 2265,
+       415, 2265, 415, 2265, 2265, 415, 415, 415,
+       415, 2265, 2265, 415, 415, 415, 415, 2265,
+       415, 2265, 2265, 415, 2265, 2265, 415, 415,
+       415, 415, 2265, 415, 415, 415, 415, 415,
+       415, 415, 415, 415, 2265, 415, 415, 2265,
+       415, 2265, 415, 415, 415, 2265, 2265, 415,
+       415, 415, 415, 415, 2265, 415, 2265, 415,
+       2265, 415, 2265, 415, 415, 415, 2265, 415,
+       415, 2265, 415, 415, 415, 2265, 415, 2265,
+       415, 415, 651, 2715, 415, 415, 2265, 415,
+       415, 415, 415, 415, 2265, 415, 2711, 415,
+       415, 651, 2887, 2887, 2887, 2887, 415, 15,
        95, 95, 95, 95, 95, 95, 95, 95,
-       41, 649, 0, 4552, 649, 413, 2885, 2885,
-       2885, 413, 2685, 2713, 3385, 2248, 2709, 15,
-       2248, 15, 4567, 3385, 3385, 3385, 3385, 3385,
-       3385, 3385, 3385, 3385, 3385, 3385, 3385, 3385,
-       3385, 3385, 3385, 2248, 3361, 95, 95, 95,
-       95, 95, 95, 95, 95, 95, 2677, 6242,
-       2709, 2260, 4557, 4567, 4557, 4557, 4557, 4557,
-       4557, 4557, 4557, 4557, 4557, 4557, 4557, 4557,
-       4557, 4557, 4557, 4557, 598, 4567, 2248, 15,
-       2248, 2248, 413, 413, 2263, 413, 413, 413,
-       2263, 413, 2263, 2248, 2248, 15, 2248, 2248,
-       2248, 2248, 405, 4567, 2248, 2248, 601, 601,
-       601, 601, 601, 601, 601, 601, 601, 601,
-       601, 601, 601, 601, 601, 601, 15, 2260,
-       601, 2260, 0, 0, 0, 31, 31, 31,
-       511, 511, 511, 511, 31, 31, 763, 763,
-       2949, 2949, 2949, 2949, 763, 763, 69, 2949,
-       2949, 2949, 2949, 77, 634, 4762, 484, 484,
-       4762, 2877, 4762, 77, 81, 81, 81, 487,
-       487, 487, 514, 514, 514, 514, 487, 81,
-       0, 85, 793, 799, 87, 799, 15, 15,
-       517, 517, 517, 517, 799, 15, 87, 0,
+       41, 651, 0, 4558, 651, 415, 2887, 2887,
+       2887, 415, 2687, 2715, 3391, 2250, 2711, 15,
+       2250, 15, 4573, 3391, 3391, 3391, 3391, 3391,
+       3391, 3391, 3391, 3391, 3391, 3391, 3391, 3391,
+       3391, 3391, 3391, 2250, 3367, 95, 95, 95,
+       95, 95, 95, 95, 95, 95, 2679, 6274,
+       2711, 2262, 4563, 4573, 4563, 4563, 4563, 4563,
+       4563, 4563, 4563, 4563, 4563, 4563, 4563, 4563,
+       4563, 4563, 4563, 4563, 600, 4573, 2250, 15,
+       2250, 2250, 415, 415, 2265, 415, 415, 415,
+       2265, 415, 2265, 2250, 2250, 15, 2250, 2250,
+       2250, 2250, 407, 4573, 2250, 2250, 603, 603,
+       603, 603, 603, 603, 603, 603, 603, 603,
+       603, 603, 603, 603, 603, 603, 15, 2262,
+       603, 2262, 0, 0, 0, 31, 31, 31,
+       513, 513, 513, 513, 31, 31, 765, 765,
+       2951, 2951, 2951, 2951, 765, 765, 69, 2951,
+       2951, 2951, 2951, 77, 636, 4768, 486, 486,
+       4768, 2879, 4768, 77, 81, 81, 81, 489,
+       489, 489, 516, 516, 516, 516, 489, 81,
+       0, 85, 795, 801, 87, 801, 15, 15,
+       519, 519, 519, 519, 801, 15, 87, 0,
        0, 127, 127, 127, 127, 127, 127, 127,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 363, 363, 363, 363,
-       363, 363, 363, 363, 377, 637, 637, 3109,
-       3109, 3109, 3109, 377, 377, 377, 637, 637,
-       3109, 3109, 3109, 3109, 377, 637, 377, 387,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 365, 365, 365, 365,
+       365, 365, 365, 365, 379, 639, 639, 3111,
+       3111, 3111, 3111, 379, 379, 379, 639, 639,
+       3111, 3111, 3111, 3111, 379, 639, 379, 389,
+       389, 389, 389, 389, 389, 389, 389, 389,
+       389, 389, 389, 389, 389, 389, 389, 389,
+       389, 389, 389, 389, 389, 389, 389, 389,
+       389, 389, 389, 389, 389, 645, 645, 389,
+       389, 389, 389, 389, 389, 389, 389, 389,
+       389, 389, 389, 389, 389, 389, 389, 389,
+       389, 389, 389, 389, 389, 389, 389, 387,
+       387, 387, 387, 387, 387, 387, 387, 387,
+       387, 387, 387, 387, 387, 387, 387, 387,
+       387, 387, 387, 387, 387, 387, 387, 387,
        387, 387, 387, 387, 387, 387, 387, 387,
        387, 387, 387, 387, 387, 387, 387, 387,
-       387, 387, 387, 387, 387, 387, 643, 643,
+       387, 387, 387, 837, 837, 837, 837, 837,
+       837, 387, 387, 387, 387, 387, 837, 837,
+       837, 837, 837, 837, 387, 387, 642, 642,
        387, 387, 387, 387, 387, 387, 387, 387,
        387, 387, 387, 387, 387, 387, 387, 387,
-       387, 387, 387, 385, 385, 385, 385, 385,
-       385, 385, 385, 385, 385, 385, 385, 385,
-       385, 385, 385, 385, 385, 385, 385, 385,
-       385, 385, 385, 385, 385, 385, 385, 385,
-       385, 385, 385, 385, 835, 835, 835, 835,
-       835, 835, 385, 385, 385, 385, 385, 835,
-       835, 835, 835, 835, 835, 385, 385, 640,
-       640, 385, 385, 385, 385, 385, 385, 385,
-       385, 385, 385, 385, 385, 385, 385, 385,
-       385, 385, 385, 385, 385, 385, 385, 385,
-       385, 385, 385, 385, 385, 385, 385, 385,
-       385, 385, 385, 385, 385, 640, 640, 640,
-       640, 385, 385, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 397, 397, 397, 397, 397,
-       397, 397, 397, 399, 399, 399, 399, 399,
+       387, 387, 387, 387, 387, 387, 387, 387,
+       387, 387, 387, 387, 387, 387, 387, 387,
+       387, 387, 387, 387, 387, 387, 387, 387,
+       642, 642, 642, 642, 387, 387, 399, 399,
+       399, 399, 399, 399, 399, 399, 399, 399,
+       399, 399, 399, 399, 399, 399, 399, 399,
+       399, 399, 399, 399, 399, 399, 399, 399,
+       399, 399, 399, 399, 399, 399, 399, 399,
+       399, 399, 399, 399, 399, 399, 399, 399,
+       399, 399, 399, 399, 399, 399, 399, 399,
+       399, 399, 399, 399, 399, 399, 399, 399,
+       399, 399, 399, 399, 399, 399, 399, 399,
        399, 399, 399, 399, 399, 399, 399, 399,
        399, 399, 399, 399, 399, 399, 399, 399,
        399, 399, 399, 399, 399, 399, 399, 399,
        399, 399, 399, 399, 399, 399, 399, 399,
-       399, 399, 399, 399, 838, 838, 405, 405,
-       405, 405, 405, 405, 646, 646, 646, 2881,
-       646, 2881, 646, 2881, 646, 2881, 2881, 2881,
-       2881, 405, 2881, 2881, 2881, 405, 2881, 2881,
-       2881, 405, 2881, 2881, 2881, 405, 405, 405,
-       405, 405, 405, 405, 405, 405, 405, 405,
-       405, 405, 646, 646, 405, 405, 405, 781,
-       781, 781, 781, 838, 838, 2212, 2212, 2212,
-       2212, 2212, 2212, 2212, 2212, 2212, 2212, 2212,
-       2212, 2212, 2212, 2212, 2212, 2212, 2212, 2212,
-       2212, 2212, 2212, 2212, 2212, 2212, 2212, 2212,
-       2212, 2212, 2212, 2212, 2212, 2212, 2212, 2212,
-       2212, 2212, 2212, 2212, 2212, 2212, 2212, 2212,
-       2212, 2212, 2212, 2212, 2212, 2212, 2212, 2212,
-       2212, 2212, 2212, 2212, 646, 646, 646, 646,
-       646, 646, 405, 405, 405, 405, 405, 646,
-       646, 646, 646, 405, 405, 405, 405, 405,
-       405, 405, 405, 405, 405, 405, 405, 405,
-       405, 405, 646, 646, 405, 405, 405, 405,
-       405, 405, 405, 859, 859, 859, 3033, 3033,
-       859, 859, 405, 859, 3033, 3033, 646, 646,
-       405, 405, 646, 646, 862, 862, 862, 862,
-       405, 405, 405, 646, 646, 646, 646, 862,
-       862, 862, 862, 405, 405, 646, 646, 949,
-       949, 2701, 2701, 949, 3121, 952, 952, 952,
-       952, 952, 952, 952, 949, 949, 949, 2701,
-       2701, 3037, 4817, 949, 949, 949, 2701, 2701,
-       3037, 4817, 949, 949, 949, 2701, 2701, 949,
-       3121, 949, 949, 405, 955, 955, 405, 405,
-       646, 646, 646, 646, 760, 760, 760, 760,
-       646, 646, 405, 405, 405, 405, 405, 405,
-       405, 405, 405, 405, 405, 405, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 955, 955,
-       955, 955, 955, 2705, 2705, 955, 955, 955,
-       955, 955, 955, 955, 955, 955, 405, 405,
-       405, 646, 646, 646, 646, 405, 405, 405,
-       405, 405, 405, 405, 405, 405, 646, 646,
-       646, 646, 646, 646, 862, 862, 868, 868,
-       868, 868, 868, 868, 868, 868, 868, 405,
-       868, 868, 868, 868, 868, 405, 862, 862,
-       405, 405, 405, 646, 646, 646, 646, 646,
-       646, 862, 862, 862, 862, 405, 405, 405,
-       646, 646, 646, 646, 646, 646, 862, 862,
-       862, 862, 405, 405, 405, 646, 646, 646,
-       646, 405, 405, 646, 646, 646, 646, 646,
-       646, 862, 862, 862, 862, 405, 405, 405,
-       646, 646, 838, 838, 405, 646, 646, 862,
-       862, 862, 862, 3113, 862, 862, 862, 862,
-       3345, 405, 862, 862, 3337, 862, 862, 3337,
-       862, 862, 3337, 862, 862, 3337, 646, 646,
-       646, 646, 405, 405, 405, 405, 646, 646,
-       405, 405, 405, 405, 405, 405, 646, 646,
-       405, 405, 405, 405, 0, 0, 0, 0,
-       93, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0, 0, 0
+       399, 399, 399, 399, 399, 399, 401, 401,
+       401, 401, 401, 401, 401, 401, 401, 401,
+       401, 401, 401, 401, 401, 401, 401, 401,
+       401, 401, 401, 401, 401, 401, 401, 401,
+       401, 401, 401, 401, 401, 401, 401, 401,
+       401, 401, 401, 401, 401, 401, 401, 840,
+       840, 407, 407, 407, 407, 407, 407, 648,
+       648, 648, 2883, 648, 2883, 648, 2883, 648,
+       2883, 2883, 2883, 2883, 407, 2883, 2883, 2883,
+       407, 2883, 2883, 2883, 407, 2883, 2883, 2883,
+       407, 407, 407, 407, 407, 407, 407, 407,
+       407, 407, 407, 407, 407, 648, 648, 407,
+       407, 407, 783, 783, 783, 783, 840, 840,
+       2214, 2214, 2214, 2214, 2214, 2214, 2214, 2214,
+       2214, 2214, 2214, 2214, 2214, 2214, 2214, 2214,
+       2214, 2214, 2214, 2214, 2214, 2214, 2214, 2214,
+       2214, 2214, 2214, 2214, 2214, 2214, 2214, 2214,
+       2214, 2214, 2214, 2214, 2214, 2214, 2214, 2214,
+       2214, 2214, 2214, 2214, 2214, 2214, 2214, 2214,
+       2214, 2214, 2214, 2214, 2214, 2214, 2214, 648,
+       648, 648, 648, 648, 648, 407, 407, 407,
+       407, 407, 648, 648, 648, 648, 407, 407,
+       407, 407, 407, 407, 407, 407, 407, 407,
+       407, 407, 407, 407, 407, 648, 648, 407,
+       407, 407, 407, 407, 407, 407, 861, 861,
+       861, 3035, 3035, 861, 861, 407, 861, 3035,
+       3035, 648, 648, 407, 407, 648, 648, 864,
+       864, 864, 864, 407, 407, 407, 648, 648,
+       648, 648, 864, 864, 864, 864, 407, 407,
+       648, 648, 951, 951, 2703, 2703, 951, 3127,
+       954, 954, 954, 954, 954, 954, 954, 951,
+       951, 951, 2703, 2703, 3039, 4823, 951, 951,
+       951, 2703, 2703, 3039, 4823, 951, 951, 951,
+       2703, 2703, 951, 3127, 951, 951, 407, 957,
+       957, 407, 407, 648, 648, 648, 648, 762,
+       762, 762, 762, 648, 648, 407, 407, 407,
+       407, 407, 407, 407, 407, 407, 407, 407,
+       407, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 957, 957, 957, 957, 957, 2707, 2707,
+       957, 957, 957, 957, 957, 957, 957, 957,
+       957, 407, 407, 407, 648, 648, 648, 648,
+       407, 407, 407, 407, 407, 407, 407, 407,
+       407, 648, 648, 648, 648, 648, 648, 864,
+       864, 870, 870, 870, 870, 870, 870, 870,
+       870, 870, 407, 870, 870, 870, 870, 870,
+       407, 864, 864, 407, 407, 407, 648, 648,
+       648, 648, 648, 648, 864, 864, 864, 864,
+       407, 407, 407, 648, 648, 648, 648, 648,
+       648, 864, 864, 864, 864, 407, 407, 407,
+       648, 648, 648, 648, 407, 407, 648, 648,
+       648, 648, 648, 648, 864, 864, 864, 864,
+       407, 407, 407, 648, 648, 840, 840, 407,
+       648, 648, 864, 864, 864, 864, 3115, 864,
+       864, 864, 864, 3351, 407, 864, 864, 3343,
+       864, 864, 3343, 864, 864, 3343, 864, 864,
+       3343, 648, 648, 648, 648, 407, 407, 407,
+       407, 648, 648, 407, 407, 407, 407, 407,
+       407, 648, 648, 407, 407, 407, 407, 0,
+       0, 0, 0, 93, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0,
+       0, 0, 0, 0, 0, 0, 0, 0
 };
 
 
@@ -6364,7 +6420,7 @@ int zs_init(
        memset(s, 0, sizeof(*s));
 
        // Nonzero initial scanner state.
-       s->cs = 1396;
+       s->cs = 1423;
 
        // Reset the file descriptor.
        s->file.descriptor = -1;
@@ -7011,7 +7067,7 @@ _match:
        }
        break;
        case 12:
-       { p--; {stack[top++] = cs; cs = 1396;goto _again;} }
+       { p--; {stack[top++] = cs; cs = 1423;goto _again;} }
        break;
        case 13:
        {
@@ -7708,7 +7764,7 @@ _match:
                        free(ss);
                } else {
                        s->state = ZS_STATE_INCLUDE;
-                       p--; cs = 1396; {p++; goto _out; }
+                       p--; cs = 1423; {p++; goto _out; }
                }
        }
        break;
@@ -8886,7 +8942,7 @@ _match:
        { p--; {stack[top++] = cs; cs = 559;goto _again;} }
        break;
        case 298:
-       { p--; {stack[top++] = cs; cs = 603;goto _again;} }
+       { p--; {stack[top++] = cs; cs = 615;goto _again;} }
        break;
        case 299:
        {
@@ -8901,10 +8957,10 @@ _match:
        }
        break;
        case 301:
-       { p--; {stack[top++] = cs; cs = 699;goto _again;} }
+       { p--; {stack[top++] = cs; cs = 726;goto _again;} }
        break;
        case 302:
-       { p--; {stack[top++] = cs; cs = 803;goto _again;} }
+       { p--; {stack[top++] = cs; cs = 830;goto _again;} }
        break;
        case 303:
        {
@@ -8922,85 +8978,85 @@ _match:
                p--;
                switch (s->r_type) {
                case KNOT_RRTYPE_A:
-                       {stack[top++] = cs; cs = 844;goto _again;}
+                       {stack[top++] = cs; cs = 871;goto _again;}
                case KNOT_RRTYPE_NS:
                case KNOT_RRTYPE_CNAME:
                case KNOT_RRTYPE_PTR:
                case KNOT_RRTYPE_DNAME:
-                       {stack[top++] = cs; cs = 846;goto _again;}
+                       {stack[top++] = cs; cs = 873;goto _again;}
                case KNOT_RRTYPE_SOA:
-                       {stack[top++] = cs; cs = 848;goto _again;}
+                       {stack[top++] = cs; cs = 875;goto _again;}
                case KNOT_RRTYPE_HINFO:
-                       {stack[top++] = cs; cs = 880;goto _again;}
+                       {stack[top++] = cs; cs = 907;goto _again;}
                case KNOT_RRTYPE_MINFO:
                case KNOT_RRTYPE_RP:
-                       {stack[top++] = cs; cs = 885;goto _again;}
+                       {stack[top++] = cs; cs = 912;goto _again;}
                case KNOT_RRTYPE_MX:
                case KNOT_RRTYPE_AFSDB:
                case KNOT_RRTYPE_RT:
                case KNOT_RRTYPE_KX:
                case KNOT_RRTYPE_LP:
-                       {stack[top++] = cs; cs = 890;goto _again;}
+                       {stack[top++] = cs; cs = 917;goto _again;}
                case KNOT_RRTYPE_TXT:
                case KNOT_RRTYPE_SPF:
-                       {stack[top++] = cs; cs = 895;goto _again;}
+                       {stack[top++] = cs; cs = 922;goto _again;}
                case KNOT_RRTYPE_AAAA:
-                       {stack[top++] = cs; cs = 899;goto _again;}
+                       {stack[top++] = cs; cs = 926;goto _again;}
                case KNOT_RRTYPE_LOC:
-                       {stack[top++] = cs; cs = 901;goto _again;}
+                       {stack[top++] = cs; cs = 928;goto _again;}
                case KNOT_RRTYPE_SRV:
-                       {stack[top++] = cs; cs = 956;goto _again;}
+                       {stack[top++] = cs; cs = 983;goto _again;}
                case KNOT_RRTYPE_NAPTR:
-                       {stack[top++] = cs; cs = 967;goto _again;}
+                       {stack[top++] = cs; cs = 994;goto _again;}
                case KNOT_RRTYPE_CERT:
-                       {stack[top++] = cs; cs = 984;goto _again;}
+                       {stack[top++] = cs; cs = 1011;goto _again;}
                case KNOT_RRTYPE_APL:
-                       {stack[top++] = cs; cs = 995;goto _again;}
+                       {stack[top++] = cs; cs = 1022;goto _again;}
                case KNOT_RRTYPE_DS:
                case KNOT_RRTYPE_CDS:
-                       {stack[top++] = cs; cs = 1006;goto _again;}
+                       {stack[top++] = cs; cs = 1033;goto _again;}
                case KNOT_RRTYPE_SSHFP:
-                       {stack[top++] = cs; cs = 1019;goto _again;}
+                       {stack[top++] = cs; cs = 1046;goto _again;}
                case KNOT_RRTYPE_IPSECKEY:
-                       {stack[top++] = cs; cs = 1029;goto _again;}
+                       {stack[top++] = cs; cs = 1056;goto _again;}
                case KNOT_RRTYPE_RRSIG:
-                       {stack[top++] = cs; cs = 1068;goto _again;}
+                       {stack[top++] = cs; cs = 1095;goto _again;}
                case KNOT_RRTYPE_NSEC:
-                       {stack[top++] = cs; cs = 1254;goto _again;}
+                       {stack[top++] = cs; cs = 1281;goto _again;}
                case KNOT_RRTYPE_KEY:
                case KNOT_RRTYPE_DNSKEY:
                case KNOT_RRTYPE_CDNSKEY:
-                       {stack[top++] = cs; cs = 1257;goto _again;}
+                       {stack[top++] = cs; cs = 1284;goto _again;}
                case KNOT_RRTYPE_DHCID:
                case KNOT_RRTYPE_OPENPGPKEY:
-                       {stack[top++] = cs; cs = 1268;goto _again;}
+                       {stack[top++] = cs; cs = 1295;goto _again;}
                case KNOT_RRTYPE_NSEC3:
-                       {stack[top++] = cs; cs = 1270;goto _again;}
+                       {stack[top++] = cs; cs = 1297;goto _again;}
                case KNOT_RRTYPE_NSEC3PARAM:
-                       {stack[top++] = cs; cs = 1299;goto _again;}
+                       {stack[top++] = cs; cs = 1326;goto _again;}
                case KNOT_RRTYPE_TLSA:
                case KNOT_RRTYPE_SMIMEA:
-                       {stack[top++] = cs; cs = 1312;goto _again;}
+                       {stack[top++] = cs; cs = 1339;goto _again;}
                case KNOT_RRTYPE_CSYNC:
-                       {stack[top++] = cs; cs = 1325;goto _again;}
+                       {stack[top++] = cs; cs = 1352;goto _again;}
                case KNOT_RRTYPE_ZONEMD:
-                       {stack[top++] = cs; cs = 1331;goto _again;}
+                       {stack[top++] = cs; cs = 1358;goto _again;}
                case KNOT_RRTYPE_NID:
                case KNOT_RRTYPE_L64:
-                       {stack[top++] = cs; cs = 1349;goto _again;}
+                       {stack[top++] = cs; cs = 1376;goto _again;}
                case KNOT_RRTYPE_L32:
-                       {stack[top++] = cs; cs = 1344;goto _again;}
+                       {stack[top++] = cs; cs = 1371;goto _again;}
                case KNOT_RRTYPE_EUI48:
-                       {stack[top++] = cs; cs = 1362;goto _again;}
+                       {stack[top++] = cs; cs = 1389;goto _again;}
                case KNOT_RRTYPE_EUI64:
-                       {stack[top++] = cs; cs = 1368;goto _again;}
+                       {stack[top++] = cs; cs = 1395;goto _again;}
                case KNOT_RRTYPE_URI:
-                       {stack[top++] = cs; cs = 1374;goto _again;}
+                       {stack[top++] = cs; cs = 1401;goto _again;}
                case KNOT_RRTYPE_CAA:
-                       {stack[top++] = cs; cs = 1382;goto _again;}
+                       {stack[top++] = cs; cs = 1409;goto _again;}
                case KNOT_RRTYPE_SVCB:
                case KNOT_RRTYPE_HTTPS:
-                       {stack[top++] = cs; cs = 1390;goto _again;}
+                       {stack[top++] = cs; cs = 1417;goto _again;}
                default:
                        WARN(ZS_CANNOT_TEXT_DATA);
                        {cs = 307;goto _again;}
diff --git a/src/libzscanner/scanner_body.rl b/src/libzscanner/scanner_body.rl
index a1ff46c8d580873aa70547919788b10c9060eca4..d838a4f67de19671e6a73020c67e06f75ace851c 100644 (file)
--- a/src/libzscanner/scanner_body.rl
+++ b/src/libzscanner/scanner_body.rl
@@ -1840,10 +1840,13 @@
        svcb_key_ipv4hint  = ("ipv4hint"        %_write16_4);
        svcb_key_ech       = ("ech"             %_write16_5);
        svcb_key_ipv6hint  = ("ipv6hint"        %_write16_6);
+       svcb_key_dohpath   = ("dohpath"         %_write16_7);
+       svcb_key_ohttp     = ("ohttp"           %_write16_8);
 
        mandat_value_ :=
                (svcb_key_generic | svcb_key_alpn | svcb_key_ndalpn | svcb_key_port |
-                svcb_key_ipv4hint | svcb_key_ech | svcb_key_ipv6hint
+                svcb_key_ipv4hint | svcb_key_ech | svcb_key_ipv6hint | svcb_key_dohpath |
+                svcb_key_ohttp
                ) >_rdata_2B_check $!_mandat_value_error %_ret . ([,\"] | all_wchar);
        mandat_value = alpha ${ fhold; fcall mandat_value_; };
 
@@ -1857,20 +1860,24 @@
        svcb_ipv4     = ((ipv4_addr_write . ("," . ipv4_addr_write)*) >_item_length2_init %_item_length2_exit);
        svcb_ech      = (base64_quartet+                              >_item_length2_init %_item_length2_exit);
        svcb_ipv6     = ((ipv6_addr_write . ("," . ipv6_addr_write)*) >_item_length2_init %_item_length2_exit);
+       svcb_dohpath  = (text                                         >_item_length2_init %_item_length2_exit);
 
        svcb_param_generic   = (svcb_key_generic   . svcb_generic);
-       svcb_param_mandatory = (svcb_key_mandatory . "=" . (svcb_mandat | ('\"' . svcb_mandat . '\"')));
-       svcb_param_alpn      = (svcb_key_alpn      . "=" . (svcb_alpn   | ('\"' . svcb_alpn   . '\"')));
+       svcb_param_mandatory = (svcb_key_mandatory . "=" . (svcb_mandat  | ('\"' . svcb_mandat  . '\"')));
+       svcb_param_alpn      = (svcb_key_alpn      . "=" . (svcb_alpn    | ('\"' . svcb_alpn    . '\"')));
        svcb_param_ndalpn    = (svcb_key_ndalpn    . svcb_empty);
-       svcb_param_port      = (svcb_key_port      . "=" . (svcb_port   | ('\"' . svcb_port   . '\"')));
-       svcb_param_ipv4hint  = (svcb_key_ipv4hint  . "=" . (svcb_ipv4   | ('\"' . svcb_ipv4   . '\"')));
-       svcb_param_ech       = (svcb_key_ech       . "=" . (svcb_ech    | ('\"' . svcb_ech    . '\"')));
-       svcb_param_ipv6hint  = (svcb_key_ipv6hint  . "=" . (svcb_ipv6   | ('\"' . svcb_ipv6   . '\"')));
+       svcb_param_port      = (svcb_key_port      . "=" . (svcb_port    | ('\"' . svcb_port    . '\"')));
+       svcb_param_ipv4hint  = (svcb_key_ipv4hint  . "=" . (svcb_ipv4    | ('\"' . svcb_ipv4    . '\"')));
+       svcb_param_ech       = (svcb_key_ech       . "=" . (svcb_ech     | ('\"' . svcb_ech     . '\"')));
+       svcb_param_ipv6hint  = (svcb_key_ipv6hint  . "=" . (svcb_ipv6    | ('\"' . svcb_ipv6    . '\"')));
+       svcb_param_dohpath   = (svcb_key_dohpath   . "=" . (svcb_dohpath | ('\"' . svcb_dohpath . '\"')));
+       svcb_param_ohttp     = (svcb_key_ohttp     . svcb_empty);
 
        svcb_param_any =
                (svcb_param_generic | svcb_param_mandatory | svcb_param_alpn |
                 svcb_param_ndalpn | svcb_param_port | svcb_param_ipv4hint |
-                svcb_param_ech | svcb_param_ipv6hint
+                svcb_param_ech | svcb_param_ipv6hint | svcb_param_dohpath |
+                svcb_param_ohttp
                ) >_svcb_param_init %_svcb_param_exit;
        svcb_params_ :=
                ((sep . svcb_param_any)* . sep?) >_svcb_params_init
diff --git a/tests-extra/tests/records/load/data/svcb.zone b/tests-extra/tests/records/load/data/svcb.zone
index 4e3f6e618ab7ccf557a496a478f2247a4c86ebab..06670fa20890721f8794d65a376ddb98a9150e8a 100644 (file)
--- a/tests-extra/tests/records/load/data/svcb.zone
+++ b/tests-extra/tests/records/load/data/svcb.zone
@@ -92,3 +92,9 @@ example12 SVCB 1 . alpn=foo\\\092,bar
 
 example20 SVCB 1 . alpn=\ 
 example21 SVCB 1 . alpn=a\ b
+
+example30 SVCB 1 . dohpath=/q{?dns}
+example31 SVCB 1 . dohpath="/dns-query{?dns}"
+
+;example40 SVCB 1 . ohttp
+example40 SVCB 1 . key8
diff --git a/tests/libzscanner/data/57_SVCB.in b/tests/libzscanner/data/57_SVCB.in
index 78c07a613900fdccd8921434cca7d69f73d1719d..e726aa496eed42b783ca98e55f1534a0871bb679 100644 (file)
--- a/tests/libzscanner/data/57_SVCB.in
+++ b/tests/libzscanner/data/57_SVCB.in
@@ -20,7 +20,10 @@ $TTL 1
 @      SVCB    1       .       ech="Zm9vYg=="
 @      SVCB    1       .       ipv6hint=::1
 @      SVCB    1       .       ipv6hint="::1"
-@      SVCB    1       .       key7
+@      SVCB    1       .       dohpath=/q{?dns}
+@      SVCB    1       .       dohpath="/dns-query{?dns}"
+@      SVCB    1       .       ohttp
+@      SVCB    1       .       key707
 @      SVCB    1       .       key65535
 @      SVCB    1       .       key65535=a
 @      SVCB    1       .       key65535="a"
@@ -90,6 +93,10 @@ example.com. SVCB    16 foo.example.org. alpn=f\\\092oo\092,bar,h2
 @      SVCB    1       .       ipv6hint=
 @      SVCB    1       .       ipv6hint=::1,,::2
 @      SVCB    1       .       ipv6hint=::W
+@      SVCB    1       .       dohpath
+@      SVCB    1       .       dohpath=
+@      SVCB    1       .       ohttp=
+@      SVCB    1       .       ohttp=x
 
 ; RFC KO examples
 example.com.   SVCB    1 foo.example.com. (
diff --git a/tests/libzscanner/data/57_SVCB.out b/tests/libzscanner/data/57_SVCB.out
index 3b701d217c63dea56943bedaf55e21714c97f945..33e1ffb4f09cdd657ee76312411f76a693aa32b6 100644 (file)
--- a/tests/libzscanner/data/57_SVCB.out
+++ b/tests/libzscanner/data/57_SVCB.out
@@ -110,7 +110,25 @@ OWNER=00
 CLASS=0001
 RRTTL=00000001
 RTYPE=0040
-RDATA=00010000070000
+RDATA=000100000700082F717B3F646E737D
+------
+OWNER=00
+CLASS=0001
+RRTTL=00000001
+RTYPE=0040
+RDATA=000100000700102F646E732D71756572797B3F646E737D
+------
+OWNER=00
+CLASS=0001
+RRTTL=00000001
+RTYPE=0040
+RDATA=00010000080000
+------
+OWNER=00
+CLASS=0001
+RRTTL=00000001
+RTYPE=0040
+RDATA=00010002C30000
 ------
 OWNER=00
 CLASS=0001
@@ -300,6 +318,14 @@ WARNG=ZS_BAD_ADDRESS_CHAR
 ------
 WARNG=ZS_BAD_ADDRESS_CHAR
 ------
+WARNG=ZS_BAD_SVCB_PARAM
+------
+WARNG=ZS_BAD_SVCB_PARAM
+------
+WARNG=ZS_BAD_SVCB_PARAM
+------
+WARNG=ZS_BAD_SVCB_PARAM
+------
 WARNG=ZS_DUPLICATE_SVCB_KEY
 ------
 WARNG=ZS_BAD_SVCB_PARAM
Mirror of https://gitlab.nic.cz/knot/knot-dns.git