diff --git a/db/db.gen.go b/db/db.gen.go
index f8cdcf5a..8d06e7e8 100644
--- a/db/db.gen.go
+++ b/db/db.gen.go
@@ -11,23 +11,23 @@ import (
 
 const (
 	// ----- content types ----
-	codecSelferCcUTF88981 = 1
-	codecSelferCcRAW8981  = 255
+	codecSelferCcUTF88297 = 1
+	codecSelferCcRAW8297  = 255
 	// ----- value types used ----
-	codecSelferValueTypeArray8981  = 10
-	codecSelferValueTypeMap8981    = 9
-	codecSelferValueTypeString8981 = 6
-	codecSelferValueTypeInt8981    = 2
-	codecSelferValueTypeUint8981   = 3
-	codecSelferValueTypeFloat8981  = 4
-	codecSelferBitsize8981         = uint8(32 << (^uint(0) >> 63))
+	codecSelferValueTypeArray8297  = 10
+	codecSelferValueTypeMap8297    = 9
+	codecSelferValueTypeString8297 = 6
+	codecSelferValueTypeInt8297    = 2
+	codecSelferValueTypeUint8297   = 3
+	codecSelferValueTypeFloat8297  = 4
+	codecSelferBitsize8297         = uint8(32 << (^uint(0) >> 63))
 )
 
 var (
-	errCodecSelferOnlyMapOrArrayEncodeToStruct8981 = errors.New(`only encoded map or array can be decoded into a struct`)
+	errCodecSelferOnlyMapOrArrayEncodeToStruct8297 = errors.New(`only encoded map or array can be decoded into a struct`)
 )
 
-type codecSelfer8981 struct{}
+type codecSelfer8297 struct{}
 
 func init() {
 	if codec1978.GenVersion != 10 {
@@ -40,7 +40,7 @@ func init() {
 }
 
 func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer8981
+	var h codecSelfer8297
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -78,10 +78,10 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 				if yyq2[0] {
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Time))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Time))
 					}
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF88981, "")
+					r.EncodeStringEnc(codecSelferCcUTF88297, "")
 				}
 			} else {
 				if yyq2[0] {
@@ -89,12 +89,12 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 					if z.IsJSONHandle() {
 						z.WriteStr("\"time\"")
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, `time`)
+						r.EncodeStringEnc(codecSelferCcUTF88297, `time`)
 					}
 					r.WriteMapElemValue()
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Time))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Time))
 					}
 				}
 			}
@@ -103,10 +103,10 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 				if yyq2[1] {
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Status))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Status))
 					}
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF88981, "")
+					r.EncodeStringEnc(codecSelferCcUTF88297, "")
 				}
 			} else {
 				if yyq2[1] {
@@ -114,12 +114,12 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 					if z.IsJSONHandle() {
 						z.WriteStr("\"status\"")
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, `status`)
+						r.EncodeStringEnc(codecSelferCcUTF88297, `status`)
 					}
 					r.WriteMapElemValue()
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Status))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Status))
 					}
 				}
 			}
@@ -128,10 +128,10 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 				if yyq2[2] {
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Detail))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Detail))
 					}
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF88981, "")
+					r.EncodeStringEnc(codecSelferCcUTF88297, "")
 				}
 			} else {
 				if yyq2[2] {
@@ -139,12 +139,12 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 					if z.IsJSONHandle() {
 						z.WriteStr("\"detail\"")
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, `detail`)
+						r.EncodeStringEnc(codecSelferCcUTF88297, `detail`)
 					}
 					r.WriteMapElemValue()
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Detail))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Detail))
 					}
 				}
 			}
@@ -168,7 +168,7 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 					if z.IsJSONHandle() {
 						z.WriteStr("\"result\"")
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, `result`)
+						r.EncodeStringEnc(codecSelferCcUTF88297, `result`)
 					}
 					r.WriteMapElemValue()
 					if x.Result == nil {
@@ -191,7 +191,7 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer8981
+	var h codecSelfer8297
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -199,14 +199,14 @@ func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap8981 {
+		if yyct2 == codecSelferValueTypeMap8297 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray8981 {
+		} else if yyct2 == codecSelferValueTypeArray8297 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -214,13 +214,13 @@ func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct8981)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct8297)
 		}
 	}
 }
 
 func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer8981
+	var h codecSelfer8297
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -273,7 +273,7 @@ func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer8981
+	var h codecSelfer8297
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj9 int
@@ -363,7 +363,7 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer8981
+	var h codecSelfer8297
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -400,10 +400,10 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
 				if yyq2[0] {
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Query))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Query))
 					}
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF88981, "")
+					r.EncodeStringEnc(codecSelferCcUTF88297, "")
 				}
 			} else {
 				if yyq2[0] {
@@ -411,12 +411,12 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
 					if z.IsJSONHandle() {
 						z.WriteStr("\"query\"")
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, `query`)
+						r.EncodeStringEnc(codecSelferCcUTF88297, `query`)
 					}
 					r.WriteMapElemValue()
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Query))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Query))
 					}
 				}
 			}
@@ -425,10 +425,10 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
 				if yyq2[1] {
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Action))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Action))
 					}
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF88981, "")
+					r.EncodeStringEnc(codecSelferCcUTF88297, "")
 				}
 			} else {
 				if yyq2[1] {
@@ -436,12 +436,12 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
 					if z.IsJSONHandle() {
 						z.WriteStr("\"action\"")
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, `action`)
+						r.EncodeStringEnc(codecSelferCcUTF88297, `action`)
 					}
 					r.WriteMapElemValue()
 					if false {
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, string(x.Action))
+						r.EncodeStringEnc(codecSelferCcUTF88297, string(x.Action))
 					}
 				}
 			}
@@ -465,7 +465,7 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
 					if z.IsJSONHandle() {
 						z.WriteStr("\"result\"")
 					} else {
-						r.EncodeStringEnc(codecSelferCcUTF88981, `result`)
+						r.EncodeStringEnc(codecSelferCcUTF88297, `result`)
 					}
 					r.WriteMapElemValue()
 					if x.Result == nil {
@@ -488,7 +488,7 @@ func (x *Dispatch) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Dispatch) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer8981
+	var h codecSelfer8297
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -496,14 +496,14 @@ func (x *Dispatch) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap8981 {
+		if yyct2 == codecSelferValueTypeMap8297 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray8981 {
+		} else if yyct2 == codecSelferValueTypeArray8297 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -511,13 +511,13 @@ func (x *Dispatch) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct8981)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct8297)
 		}
 	}
 }
 
 func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer8981
+	var h codecSelfer8297
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -564,7 +564,7 @@ func (x *Dispatch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Dispatch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer8981
+	var h codecSelfer8297
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj8 int
diff --git a/sql/ast.gen.go b/sql/ast.gen.go
index e00c414a..344e1f15 100644
--- a/sql/ast.gen.go
+++ b/sql/ast.gen.go
@@ -13,23 +13,23 @@ import (
 
 const (
 	// ----- content types ----
-	codecSelferCcUTF86491 = 1
-	codecSelferCcRAW6491  = 255
+	codecSelferCcUTF85519 = 1
+	codecSelferCcRAW5519  = 255
 	// ----- value types used ----
-	codecSelferValueTypeArray6491  = 10
-	codecSelferValueTypeMap6491    = 9
-	codecSelferValueTypeString6491 = 6
-	codecSelferValueTypeInt6491    = 2
-	codecSelferValueTypeUint6491   = 3
-	codecSelferValueTypeFloat6491  = 4
-	codecSelferBitsize6491         = uint8(32 << (^uint(0) >> 63))
+	codecSelferValueTypeArray5519  = 10
+	codecSelferValueTypeMap5519    = 9
+	codecSelferValueTypeString5519 = 6
+	codecSelferValueTypeInt5519    = 2
+	codecSelferValueTypeUint5519   = 3
+	codecSelferValueTypeFloat5519  = 4
+	codecSelferBitsize5519         = uint8(32 << (^uint(0) >> 63))
 )
 
 var (
-	errCodecSelferOnlyMapOrArrayEncodeToStruct6491 = errors.New(`only encoded map or array can be decoded into a struct`)
+	errCodecSelferOnlyMapOrArrayEncodeToStruct5519 = errors.New(`only encoded map or array can be decoded into a struct`)
 )
 
-type codecSelfer6491 struct{}
+type codecSelfer5519 struct{}
 
 func init() {
 	if codec1978.GenVersion != 10 {
@@ -45,7 +45,7 @@ func init() {
 }
 
 func (x *Query) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -76,7 +76,7 @@ func (x *Query) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Statements\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Statements`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Statements`)
 				}
 				r.WriteMapElemValue()
 				if x.Statements == nil {
@@ -95,7 +95,7 @@ func (x *Query) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Query) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -103,14 +103,14 @@ func (x *Query) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -118,13 +118,13 @@ func (x *Query) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Query) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -156,7 +156,7 @@ func (x *Query) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Query) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -195,7 +195,7 @@ func (x *Query) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Statements) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -211,7 +211,7 @@ func (x Statements) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Statements) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -223,7 +223,7 @@ func (x *Statements) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *UseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -246,38 +246,38 @@ func (x *UseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.NS))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.NS))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"NS\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `NS`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `NS`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.NS))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.NS))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.DB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.DB))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"DB\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `DB`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `DB`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.DB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.DB))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -290,7 +290,7 @@ func (x *UseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *UseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -298,14 +298,14 @@ func (x *UseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -313,13 +313,13 @@ func (x *UseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *UseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -357,7 +357,7 @@ func (x *UseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *UseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -412,7 +412,7 @@ func (x *UseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *OptStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -435,19 +435,19 @@ func (x *OptStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Name))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Name))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Name))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Name))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -461,7 +461,7 @@ func (x *OptStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -479,7 +479,7 @@ func (x *OptStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *OptStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -487,14 +487,14 @@ func (x *OptStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -502,13 +502,13 @@ func (x *OptStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *OptStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -546,7 +546,7 @@ func (x *OptStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *OptStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -601,7 +601,7 @@ func (x *OptStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *BeginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -630,7 +630,7 @@ func (x *BeginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *BeginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -638,14 +638,14 @@ func (x *BeginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -653,13 +653,13 @@ func (x *BeginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *BeginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -685,7 +685,7 @@ func (x *BeginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *BeginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -708,7 +708,7 @@ func (x *BeginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *CancelStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -737,7 +737,7 @@ func (x *CancelStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *CancelStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -745,14 +745,14 @@ func (x *CancelStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -760,13 +760,13 @@ func (x *CancelStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *CancelStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -792,7 +792,7 @@ func (x *CancelStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *CancelStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -815,7 +815,7 @@ func (x *CancelStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 }
 
 func (x *CommitStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -844,7 +844,7 @@ func (x *CommitStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *CommitStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -852,14 +852,14 @@ func (x *CommitStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -867,13 +867,13 @@ func (x *CommitStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *CommitStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -899,7 +899,7 @@ func (x *CommitStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *CommitStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -922,7 +922,7 @@ func (x *CommitStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 }
 
 func (x *InfoStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -958,7 +958,7 @@ func (x *InfoStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Kind\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Kind`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Kind`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -995,7 +995,7 @@ func (x *InfoStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -1018,7 +1018,7 @@ func (x *InfoStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *InfoStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -1026,14 +1026,14 @@ func (x *InfoStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -1041,13 +1041,13 @@ func (x *InfoStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *InfoStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -1098,7 +1098,7 @@ func (x *InfoStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *InfoStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj7 int
@@ -1166,7 +1166,7 @@ func (x *InfoStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *RunStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -1196,7 +1196,7 @@ func (x *RunStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"RW\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `RW`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `RW`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -1221,7 +1221,7 @@ func (x *RunStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -1245,7 +1245,7 @@ func (x *RunStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RunStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -1253,14 +1253,14 @@ func (x *RunStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -1268,13 +1268,13 @@ func (x *RunStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RunStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -1317,7 +1317,7 @@ func (x *RunStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *RunStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj7 int
@@ -1377,7 +1377,7 @@ func (x *RunStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -1407,7 +1407,7 @@ func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"RW\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `RW`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `RW`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -1438,7 +1438,7 @@ func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -1468,7 +1468,7 @@ func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -1492,7 +1492,7 @@ func (x *LetStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *LetStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -1500,14 +1500,14 @@ func (x *LetStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -1515,13 +1515,13 @@ func (x *LetStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *LetStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -1576,7 +1576,7 @@ func (x *LetStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *LetStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj8 int
@@ -1658,7 +1658,7 @@ func (x *LetStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -1681,76 +1681,76 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.ID))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.ID))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"ID\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `ID`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `ID`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.ID))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.ID))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.FB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.FB))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"FB\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `FB`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `FB`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.FB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.FB))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.NS))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.NS))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"NS\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `NS`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `NS`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.NS))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.NS))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.DB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.DB))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"DB\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `DB`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `DB`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.DB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.DB))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -1764,7 +1764,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Diff\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Diff`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Diff`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -1784,7 +1784,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -1805,7 +1805,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -1831,7 +1831,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Cond\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Cond`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Cond`)
 				}
 				r.WriteMapElemValue()
 				if x.Cond == nil {
@@ -1857,7 +1857,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Fetch\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Fetch`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Fetch`)
 				}
 				r.WriteMapElemValue()
 				if x.Fetch == nil {
@@ -1876,7 +1876,7 @@ func (x *LiveStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *LiveStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -1884,14 +1884,14 @@ func (x *LiveStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -1899,13 +1899,13 @@ func (x *LiveStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *LiveStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -1990,7 +1990,7 @@ func (x *LiveStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *LiveStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj14 int
@@ -2162,7 +2162,7 @@ func (x *LiveStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *KillStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -2185,19 +2185,19 @@ func (x *KillStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.FB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.FB))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"FB\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `FB`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `FB`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.FB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.FB))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -2212,7 +2212,7 @@ func (x *KillStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -2231,7 +2231,7 @@ func (x *KillStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *KillStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -2239,14 +2239,14 @@ func (x *KillStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -2254,13 +2254,13 @@ func (x *KillStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *KillStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -2298,7 +2298,7 @@ func (x *KillStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *KillStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -2353,7 +2353,7 @@ func (x *KillStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *ReturnStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -2383,7 +2383,7 @@ func (x *ReturnStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"RW\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `RW`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `RW`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -2403,7 +2403,7 @@ func (x *ReturnStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -2422,7 +2422,7 @@ func (x *ReturnStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *ReturnStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -2430,14 +2430,14 @@ func (x *ReturnStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -2445,13 +2445,13 @@ func (x *ReturnStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *ReturnStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -2489,7 +2489,7 @@ func (x *ReturnStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *ReturnStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -2544,7 +2544,7 @@ func (x *ReturnStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 }
 
 func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -2574,7 +2574,7 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"RW\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `RW`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `RW`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -2594,7 +2594,7 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Cond\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Cond`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Cond`)
 				}
 				r.WriteMapElemValue()
 				if x.Cond == nil {
@@ -2615,7 +2615,7 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Then\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Then`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Then`)
 				}
 				r.WriteMapElemValue()
 				if x.Then == nil {
@@ -2641,7 +2641,7 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Else\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Else`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Else`)
 				}
 				r.WriteMapElemValue()
 				if x.Else == nil {
@@ -2665,7 +2665,7 @@ func (x *IfelseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *IfelseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -2673,14 +2673,14 @@ func (x *IfelseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -2688,13 +2688,13 @@ func (x *IfelseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *IfelseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -2749,7 +2749,7 @@ func (x *IfelseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *IfelseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj9 int
@@ -2841,7 +2841,7 @@ func (x *IfelseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 }
 
 func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -2856,9 +2856,9 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 			_, _ = yysep2, yy2arr2
 			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
-				r.WriteArrayStart(13)
+				r.WriteArrayStart(12)
 			} else {
-				r.WriteMapStart(13)
+				r.WriteMapStart(12)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
@@ -2871,7 +2871,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"RW\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `RW`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `RW`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -2891,7 +2891,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -2912,7 +2912,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -2938,7 +2938,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Cond\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Cond`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Cond`)
 				}
 				r.WriteMapElemValue()
 				if x.Cond == nil {
@@ -2964,7 +2964,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Split\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Split`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Split`)
 				}
 				r.WriteMapElemValue()
 				if x.Split == nil {
@@ -2985,7 +2985,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Group\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Group`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Group`)
 				}
 				r.WriteMapElemValue()
 				if x.Group == nil {
@@ -3006,7 +3006,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Order\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Order`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Order`)
 				}
 				r.WriteMapElemValue()
 				if x.Order == nil {
@@ -3032,7 +3032,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Limit\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Limit`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Limit`)
 				}
 				r.WriteMapElemValue()
 				if x.Limit == nil {
@@ -3063,7 +3063,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Start\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Start`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Start`)
 				}
 				r.WriteMapElemValue()
 				if x.Start == nil {
@@ -3089,7 +3089,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Fetch\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Fetch`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Fetch`)
 				}
 				r.WriteMapElemValue()
 				if x.Fetch == nil {
@@ -3115,7 +3115,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Version\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Version`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Version`)
 				}
 				r.WriteMapElemValue()
 				if x.Version == nil {
@@ -3142,7 +3142,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Timeout\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Timeout`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Timeout`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -3152,25 +3152,6 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 					r.EncodeInt(int64(x.Timeout))
 				}
 			}
-			if yyr2 || yy2arr2 {
-				r.WriteArrayElem()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			} else {
-				r.WriteMapElemKey()
-				if z.IsJSONHandle() {
-					z.WriteStr("\"Parallel\"")
-				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Parallel`)
-				}
-				r.WriteMapElemValue()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayEnd()
 			} else {
@@ -3181,7 +3162,7 @@ func (x *SelectStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *SelectStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -3189,14 +3170,14 @@ func (x *SelectStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -3204,13 +3185,13 @@ func (x *SelectStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *SelectStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -3325,12 +3306,6 @@ func (x *SelectStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 					x.Timeout = (time.Duration)(r.DecodeInt64())
 				}
 			}
-		case "Parallel":
-			if r.TryDecodeAsNil() {
-				x.Parallel = false
-			} else {
-				x.Parallel = (bool)(r.DecodeBool())
-			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -3339,19 +3314,19 @@ func (x *SelectStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj22 int
-	var yyb22 bool
-	var yyhl22 bool = l >= 0
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	var yyj21 int
+	var yyb21 bool
+	var yyhl21 bool = l >= 0
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3361,13 +3336,13 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.RW = (bool)(r.DecodeBool())
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3377,13 +3352,13 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.Expr.CodecDecodeSelf(d)
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3393,13 +3368,13 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.What.CodecDecodeSelf(d)
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3408,19 +3383,19 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Cond = nil
 	} else {
 		if false {
-		} else if yyxt27 := z.Extension(z.I2Rtid(x.Cond)); yyxt27 != nil {
-			z.DecExtension(x.Cond, yyxt27)
+		} else if yyxt26 := z.Extension(z.I2Rtid(x.Cond)); yyxt26 != nil {
+			z.DecExtension(x.Cond, yyxt26)
 		} else {
 			z.DecFallback(&x.Cond, true)
 		}
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3430,13 +3405,13 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.Split.CodecDecodeSelf(d)
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3446,13 +3421,13 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.Group.CodecDecodeSelf(d)
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3462,13 +3437,13 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.Order.CodecDecodeSelf(d)
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3477,19 +3452,19 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Limit = nil
 	} else {
 		if false {
-		} else if yyxt32 := z.Extension(z.I2Rtid(x.Limit)); yyxt32 != nil {
-			z.DecExtension(x.Limit, yyxt32)
+		} else if yyxt31 := z.Extension(z.I2Rtid(x.Limit)); yyxt31 != nil {
+			z.DecExtension(x.Limit, yyxt31)
 		} else {
 			z.DecFallback(&x.Limit, true)
 		}
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3498,19 +3473,19 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Start = nil
 	} else {
 		if false {
-		} else if yyxt34 := z.Extension(z.I2Rtid(x.Start)); yyxt34 != nil {
-			z.DecExtension(x.Start, yyxt34)
+		} else if yyxt33 := z.Extension(z.I2Rtid(x.Start)); yyxt33 != nil {
+			z.DecExtension(x.Start, yyxt33)
 		} else {
 			z.DecFallback(&x.Start, true)
 		}
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3520,13 +3495,13 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.Fetch.CodecDecodeSelf(d)
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3535,19 +3510,19 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Version = nil
 	} else {
 		if false {
-		} else if yyxt37 := z.Extension(z.I2Rtid(x.Version)); yyxt37 != nil {
-			z.DecExtension(x.Version, yyxt37)
+		} else if yyxt36 := z.Extension(z.I2Rtid(x.Version)); yyxt36 != nil {
+			z.DecExtension(x.Version, yyxt36)
 		} else {
 			z.DecFallback(&x.Version, true)
 		}
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
+	yyj21++
+	if yyhl21 {
+		yyb21 = yyj21 > l
 	} else {
-		yyb22 = r.CheckBreak()
+		yyb21 = r.CheckBreak()
 	}
-	if yyb22 {
+	if yyb21 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3556,46 +3531,30 @@ func (x *SelectStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Timeout = 0
 	} else {
 		if false {
-		} else if yyxt39 := z.Extension(z.I2Rtid(x.Timeout)); yyxt39 != nil {
-			z.DecExtension(x.Timeout, yyxt39)
+		} else if yyxt38 := z.Extension(z.I2Rtid(x.Timeout)); yyxt38 != nil {
+			z.DecExtension(x.Timeout, yyxt38)
 		} else {
 			x.Timeout = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj22++
-	if yyhl22 {
-		yyb22 = yyj22 > l
-	} else {
-		yyb22 = r.CheckBreak()
-	}
-	if yyb22 {
-		r.ReadArrayEnd()
-		return
-	}
-	r.ReadArrayElem()
-	if r.TryDecodeAsNil() {
-		x.Parallel = false
-	} else {
-		x.Parallel = (bool)(r.DecodeBool())
-	}
 	for {
-		yyj22++
-		if yyhl22 {
-			yyb22 = yyj22 > l
+		yyj21++
+		if yyhl21 {
+			yyb21 = yyj21 > l
 		} else {
-			yyb22 = r.CheckBreak()
+			yyb21 = r.CheckBreak()
 		}
-		if yyb22 {
+		if yyb21 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj22-1, "")
+		z.DecStructFieldNotFound(yyj21-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -3610,9 +3569,9 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 			_, _ = yysep2, yy2arr2
 			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
-				r.WriteArrayStart(5)
+				r.WriteArrayStart(4)
 			} else {
-				r.WriteMapStart(5)
+				r.WriteMapStart(4)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
@@ -3626,7 +3585,7 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -3652,7 +3611,7 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -3683,7 +3642,7 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Echo\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Echo`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Echo`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -3710,7 +3669,7 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Timeout\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Timeout`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Timeout`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -3720,25 +3679,6 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 					r.EncodeInt(int64(x.Timeout))
 				}
 			}
-			if yyr2 || yy2arr2 {
-				r.WriteArrayElem()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			} else {
-				r.WriteMapElemKey()
-				if z.IsJSONHandle() {
-					z.WriteStr("\"Parallel\"")
-				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Parallel`)
-				}
-				r.WriteMapElemValue()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayEnd()
 			} else {
@@ -3749,7 +3689,7 @@ func (x *CreateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *CreateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -3757,14 +3697,14 @@ func (x *CreateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -3772,13 +3712,13 @@ func (x *CreateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *CreateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -3837,12 +3777,6 @@ func (x *CreateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 					x.Timeout = (time.Duration)(r.DecodeInt64())
 				}
 			}
-		case "Parallel":
-			if r.TryDecodeAsNil() {
-				x.Parallel = false
-			} else {
-				x.Parallel = (bool)(r.DecodeBool())
-			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -3851,19 +3785,19 @@ func (x *CreateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *CreateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj12 int
-	var yyb12 bool
-	var yyhl12 bool = l >= 0
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	var yyj11 int
+	var yyb11 bool
+	var yyhl11 bool = l >= 0
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3873,13 +3807,13 @@ func (x *CreateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.What.CodecDecodeSelf(d)
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3888,19 +3822,19 @@ func (x *CreateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Data = nil
 	} else {
 		if false {
-		} else if yyxt15 := z.Extension(z.I2Rtid(x.Data)); yyxt15 != nil {
-			z.DecExtension(x.Data, yyxt15)
+		} else if yyxt14 := z.Extension(z.I2Rtid(x.Data)); yyxt14 != nil {
+			z.DecExtension(x.Data, yyxt14)
 		} else {
 			z.DecFallback(&x.Data, true)
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3909,21 +3843,21 @@ func (x *CreateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Echo = 0
 	} else {
 		if false {
-		} else if yyxt17 := z.Extension(z.I2Rtid(x.Echo)); yyxt17 != nil {
-			z.DecExtension(x.Echo, yyxt17)
+		} else if yyxt16 := z.Extension(z.I2Rtid(x.Echo)); yyxt16 != nil {
+			z.DecExtension(x.Echo, yyxt16)
 		} else if z.DecBinary() {
 			z.DecBinaryUnmarshal(&x.Echo)
 		} else {
 			x.Echo = (Token)(z.C.IntV(r.DecodeInt64(), 16))
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3932,46 +3866,30 @@ func (x *CreateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Timeout = 0
 	} else {
 		if false {
-		} else if yyxt19 := z.Extension(z.I2Rtid(x.Timeout)); yyxt19 != nil {
-			z.DecExtension(x.Timeout, yyxt19)
+		} else if yyxt18 := z.Extension(z.I2Rtid(x.Timeout)); yyxt18 != nil {
+			z.DecExtension(x.Timeout, yyxt18)
 		} else {
 			x.Timeout = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
-	} else {
-		yyb12 = r.CheckBreak()
-	}
-	if yyb12 {
-		r.ReadArrayEnd()
-		return
-	}
-	r.ReadArrayElem()
-	if r.TryDecodeAsNil() {
-		x.Parallel = false
-	} else {
-		x.Parallel = (bool)(r.DecodeBool())
-	}
 	for {
-		yyj12++
-		if yyhl12 {
-			yyb12 = yyj12 > l
+		yyj11++
+		if yyhl11 {
+			yyb11 = yyj11 > l
 		} else {
-			yyb12 = r.CheckBreak()
+			yyb11 = r.CheckBreak()
 		}
-		if yyb12 {
+		if yyb11 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj12-1, "")
+		z.DecStructFieldNotFound(yyj11-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -3986,9 +3904,9 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 			_, _ = yysep2, yy2arr2
 			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
-				r.WriteArrayStart(6)
+				r.WriteArrayStart(5)
 			} else {
-				r.WriteMapStart(6)
+				r.WriteMapStart(5)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
@@ -4002,7 +3920,7 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -4028,7 +3946,7 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -4059,7 +3977,7 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Cond\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Cond`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Cond`)
 				}
 				r.WriteMapElemValue()
 				if x.Cond == nil {
@@ -4090,7 +4008,7 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Echo\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Echo`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Echo`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -4117,7 +4035,7 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Timeout\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Timeout`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Timeout`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -4127,25 +4045,6 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 					r.EncodeInt(int64(x.Timeout))
 				}
 			}
-			if yyr2 || yy2arr2 {
-				r.WriteArrayElem()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			} else {
-				r.WriteMapElemKey()
-				if z.IsJSONHandle() {
-					z.WriteStr("\"Parallel\"")
-				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Parallel`)
-				}
-				r.WriteMapElemValue()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayEnd()
 			} else {
@@ -4156,7 +4055,7 @@ func (x *UpdateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *UpdateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -4164,14 +4063,14 @@ func (x *UpdateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -4179,13 +4078,13 @@ func (x *UpdateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *UpdateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -4255,12 +4154,6 @@ func (x *UpdateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 					x.Timeout = (time.Duration)(r.DecodeInt64())
 				}
 			}
-		case "Parallel":
-			if r.TryDecodeAsNil() {
-				x.Parallel = false
-			} else {
-				x.Parallel = (bool)(r.DecodeBool())
-			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -4269,19 +4162,19 @@ func (x *UpdateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *UpdateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj14 int
-	var yyb14 bool
-	var yyhl14 bool = l >= 0
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	var yyj13 int
+	var yyb13 bool
+	var yyhl13 bool = l >= 0
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4291,13 +4184,13 @@ func (x *UpdateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.What.CodecDecodeSelf(d)
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4306,19 +4199,19 @@ func (x *UpdateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Data = nil
 	} else {
 		if false {
-		} else if yyxt17 := z.Extension(z.I2Rtid(x.Data)); yyxt17 != nil {
-			z.DecExtension(x.Data, yyxt17)
+		} else if yyxt16 := z.Extension(z.I2Rtid(x.Data)); yyxt16 != nil {
+			z.DecExtension(x.Data, yyxt16)
 		} else {
 			z.DecFallback(&x.Data, true)
 		}
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4327,19 +4220,19 @@ func (x *UpdateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Cond = nil
 	} else {
 		if false {
-		} else if yyxt19 := z.Extension(z.I2Rtid(x.Cond)); yyxt19 != nil {
-			z.DecExtension(x.Cond, yyxt19)
+		} else if yyxt18 := z.Extension(z.I2Rtid(x.Cond)); yyxt18 != nil {
+			z.DecExtension(x.Cond, yyxt18)
 		} else {
 			z.DecFallback(&x.Cond, true)
 		}
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4348,21 +4241,21 @@ func (x *UpdateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Echo = 0
 	} else {
 		if false {
-		} else if yyxt21 := z.Extension(z.I2Rtid(x.Echo)); yyxt21 != nil {
-			z.DecExtension(x.Echo, yyxt21)
+		} else if yyxt20 := z.Extension(z.I2Rtid(x.Echo)); yyxt20 != nil {
+			z.DecExtension(x.Echo, yyxt20)
 		} else if z.DecBinary() {
 			z.DecBinaryUnmarshal(&x.Echo)
 		} else {
 			x.Echo = (Token)(z.C.IntV(r.DecodeInt64(), 16))
 		}
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4371,46 +4264,30 @@ func (x *UpdateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Timeout = 0
 	} else {
 		if false {
-		} else if yyxt23 := z.Extension(z.I2Rtid(x.Timeout)); yyxt23 != nil {
-			z.DecExtension(x.Timeout, yyxt23)
+		} else if yyxt22 := z.Extension(z.I2Rtid(x.Timeout)); yyxt22 != nil {
+			z.DecExtension(x.Timeout, yyxt22)
 		} else {
 			x.Timeout = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
-	} else {
-		yyb14 = r.CheckBreak()
-	}
-	if yyb14 {
-		r.ReadArrayEnd()
-		return
-	}
-	r.ReadArrayElem()
-	if r.TryDecodeAsNil() {
-		x.Parallel = false
-	} else {
-		x.Parallel = (bool)(r.DecodeBool())
-	}
 	for {
-		yyj14++
-		if yyhl14 {
-			yyb14 = yyj14 > l
+		yyj13++
+		if yyhl13 {
+			yyb13 = yyj13 > l
 		} else {
-			yyb14 = r.CheckBreak()
+			yyb13 = r.CheckBreak()
 		}
-		if yyb14 {
+		if yyb13 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj14-1, "")
+		z.DecStructFieldNotFound(yyj13-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -4425,9 +4302,9 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 			_, _ = yysep2, yy2arr2
 			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
-				r.WriteArrayStart(5)
+				r.WriteArrayStart(4)
 			} else {
-				r.WriteMapStart(5)
+				r.WriteMapStart(4)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
@@ -4441,7 +4318,7 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -4467,7 +4344,7 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Cond\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Cond`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Cond`)
 				}
 				r.WriteMapElemValue()
 				if x.Cond == nil {
@@ -4498,7 +4375,7 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Echo\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Echo`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Echo`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -4525,7 +4402,7 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Timeout\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Timeout`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Timeout`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -4535,25 +4412,6 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 					r.EncodeInt(int64(x.Timeout))
 				}
 			}
-			if yyr2 || yy2arr2 {
-				r.WriteArrayElem()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			} else {
-				r.WriteMapElemKey()
-				if z.IsJSONHandle() {
-					z.WriteStr("\"Parallel\"")
-				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Parallel`)
-				}
-				r.WriteMapElemValue()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayEnd()
 			} else {
@@ -4564,7 +4422,7 @@ func (x *DeleteStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DeleteStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -4572,14 +4430,14 @@ func (x *DeleteStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -4587,13 +4445,13 @@ func (x *DeleteStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DeleteStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -4652,12 +4510,6 @@ func (x *DeleteStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 					x.Timeout = (time.Duration)(r.DecodeInt64())
 				}
 			}
-		case "Parallel":
-			if r.TryDecodeAsNil() {
-				x.Parallel = false
-			} else {
-				x.Parallel = (bool)(r.DecodeBool())
-			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -4666,19 +4518,19 @@ func (x *DeleteStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *DeleteStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj12 int
-	var yyb12 bool
-	var yyhl12 bool = l >= 0
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	var yyj11 int
+	var yyb11 bool
+	var yyhl11 bool = l >= 0
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4688,13 +4540,13 @@ func (x *DeleteStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.What.CodecDecodeSelf(d)
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4703,19 +4555,19 @@ func (x *DeleteStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Cond = nil
 	} else {
 		if false {
-		} else if yyxt15 := z.Extension(z.I2Rtid(x.Cond)); yyxt15 != nil {
-			z.DecExtension(x.Cond, yyxt15)
+		} else if yyxt14 := z.Extension(z.I2Rtid(x.Cond)); yyxt14 != nil {
+			z.DecExtension(x.Cond, yyxt14)
 		} else {
 			z.DecFallback(&x.Cond, true)
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4724,21 +4576,21 @@ func (x *DeleteStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Echo = 0
 	} else {
 		if false {
-		} else if yyxt17 := z.Extension(z.I2Rtid(x.Echo)); yyxt17 != nil {
-			z.DecExtension(x.Echo, yyxt17)
+		} else if yyxt16 := z.Extension(z.I2Rtid(x.Echo)); yyxt16 != nil {
+			z.DecExtension(x.Echo, yyxt16)
 		} else if z.DecBinary() {
 			z.DecBinaryUnmarshal(&x.Echo)
 		} else {
 			x.Echo = (Token)(z.C.IntV(r.DecodeInt64(), 16))
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4747,46 +4599,30 @@ func (x *DeleteStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Timeout = 0
 	} else {
 		if false {
-		} else if yyxt19 := z.Extension(z.I2Rtid(x.Timeout)); yyxt19 != nil {
-			z.DecExtension(x.Timeout, yyxt19)
+		} else if yyxt18 := z.Extension(z.I2Rtid(x.Timeout)); yyxt18 != nil {
+			z.DecExtension(x.Timeout, yyxt18)
 		} else {
 			x.Timeout = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
-	} else {
-		yyb12 = r.CheckBreak()
-	}
-	if yyb12 {
-		r.ReadArrayEnd()
-		return
-	}
-	r.ReadArrayElem()
-	if r.TryDecodeAsNil() {
-		x.Parallel = false
-	} else {
-		x.Parallel = (bool)(r.DecodeBool())
-	}
 	for {
-		yyj12++
-		if yyhl12 {
-			yyb12 = yyj12 > l
+		yyj11++
+		if yyhl11 {
+			yyb11 = yyj11 > l
 		} else {
-			yyb12 = r.CheckBreak()
+			yyb11 = r.CheckBreak()
 		}
-		if yyb12 {
+		if yyb11 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj12-1, "")
+		z.DecStructFieldNotFound(yyj11-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -4801,9 +4637,9 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 			_, _ = yysep2, yy2arr2
 			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
-				r.WriteArrayStart(8)
+				r.WriteArrayStart(7)
 			} else {
-				r.WriteMapStart(8)
+				r.WriteMapStart(7)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
@@ -4822,7 +4658,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Type\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Type`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Type`)
 				}
 				r.WriteMapElemValue()
 				if x.Type == nil {
@@ -4848,7 +4684,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"From\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `From`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `From`)
 				}
 				r.WriteMapElemValue()
 				if x.From == nil {
@@ -4869,7 +4705,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"With\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `With`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `With`)
 				}
 				r.WriteMapElemValue()
 				if x.With == nil {
@@ -4895,7 +4731,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -4920,7 +4756,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Uniq\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Uniq`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Uniq`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -4945,7 +4781,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Echo\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Echo`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Echo`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -4972,7 +4808,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Timeout\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Timeout`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Timeout`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -4982,25 +4818,6 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 					r.EncodeInt(int64(x.Timeout))
 				}
 			}
-			if yyr2 || yy2arr2 {
-				r.WriteArrayElem()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			} else {
-				r.WriteMapElemKey()
-				if z.IsJSONHandle() {
-					z.WriteStr("\"Parallel\"")
-				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Parallel`)
-				}
-				r.WriteMapElemValue()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayEnd()
 			} else {
@@ -5011,7 +4828,7 @@ func (x *RelateStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RelateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -5019,14 +4836,14 @@ func (x *RelateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -5034,13 +4851,13 @@ func (x *RelateStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RelateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -5122,12 +4939,6 @@ func (x *RelateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 					x.Timeout = (time.Duration)(r.DecodeInt64())
 				}
 			}
-		case "Parallel":
-			if r.TryDecodeAsNil() {
-				x.Parallel = false
-			} else {
-				x.Parallel = (bool)(r.DecodeBool())
-			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -5136,19 +4947,19 @@ func (x *RelateStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj16 int
-	var yyb16 bool
-	var yyhl16 bool = l >= 0
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	var yyj15 int
+	var yyb15 bool
+	var yyhl15 bool = l >= 0
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5157,19 +4968,19 @@ func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Type = nil
 	} else {
 		if false {
-		} else if yyxt18 := z.Extension(z.I2Rtid(x.Type)); yyxt18 != nil {
-			z.DecExtension(x.Type, yyxt18)
+		} else if yyxt17 := z.Extension(z.I2Rtid(x.Type)); yyxt17 != nil {
+			z.DecExtension(x.Type, yyxt17)
 		} else {
 			z.DecFallback(&x.Type, true)
 		}
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5179,13 +4990,13 @@ func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.From.CodecDecodeSelf(d)
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5195,13 +5006,13 @@ func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.With.CodecDecodeSelf(d)
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5210,19 +5021,19 @@ func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Data = nil
 	} else {
 		if false {
-		} else if yyxt22 := z.Extension(z.I2Rtid(x.Data)); yyxt22 != nil {
-			z.DecExtension(x.Data, yyxt22)
+		} else if yyxt21 := z.Extension(z.I2Rtid(x.Data)); yyxt21 != nil {
+			z.DecExtension(x.Data, yyxt21)
 		} else {
 			z.DecFallback(&x.Data, true)
 		}
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5232,13 +5043,13 @@ func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 	} else {
 		x.Uniq = (bool)(r.DecodeBool())
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5247,21 +5058,21 @@ func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Echo = 0
 	} else {
 		if false {
-		} else if yyxt25 := z.Extension(z.I2Rtid(x.Echo)); yyxt25 != nil {
-			z.DecExtension(x.Echo, yyxt25)
+		} else if yyxt24 := z.Extension(z.I2Rtid(x.Echo)); yyxt24 != nil {
+			z.DecExtension(x.Echo, yyxt24)
 		} else if z.DecBinary() {
 			z.DecBinaryUnmarshal(&x.Echo)
 		} else {
 			x.Echo = (Token)(z.C.IntV(r.DecodeInt64(), 16))
 		}
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5270,46 +5081,30 @@ func (x *RelateStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Timeout = 0
 	} else {
 		if false {
-		} else if yyxt27 := z.Extension(z.I2Rtid(x.Timeout)); yyxt27 != nil {
-			z.DecExtension(x.Timeout, yyxt27)
+		} else if yyxt26 := z.Extension(z.I2Rtid(x.Timeout)); yyxt26 != nil {
+			z.DecExtension(x.Timeout, yyxt26)
 		} else {
 			x.Timeout = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
-	} else {
-		yyb16 = r.CheckBreak()
-	}
-	if yyb16 {
-		r.ReadArrayEnd()
-		return
-	}
-	r.ReadArrayElem()
-	if r.TryDecodeAsNil() {
-		x.Parallel = false
-	} else {
-		x.Parallel = (bool)(r.DecodeBool())
-	}
 	for {
-		yyj16++
-		if yyhl16 {
-			yyb16 = yyj16 > l
+		yyj15++
+		if yyhl15 {
+			yyb15 = yyj15 > l
 		} else {
-			yyb16 = r.CheckBreak()
+			yyb15 = r.CheckBreak()
 		}
-		if yyb16 {
+		if yyb15 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj16-1, "")
+		z.DecStructFieldNotFound(yyj15-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -5324,9 +5119,9 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 			_, _ = yysep2, yy2arr2
 			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
-				r.WriteArrayStart(5)
+				r.WriteArrayStart(4)
 			} else {
-				r.WriteMapStart(5)
+				r.WriteMapStart(4)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
@@ -5345,7 +5140,7 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -5382,7 +5177,7 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Into\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Into`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Into`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -5412,7 +5207,7 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Echo\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Echo`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Echo`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -5439,7 +5234,7 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Timeout\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Timeout`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Timeout`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -5449,25 +5244,6 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 					r.EncodeInt(int64(x.Timeout))
 				}
 			}
-			if yyr2 || yy2arr2 {
-				r.WriteArrayElem()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			} else {
-				r.WriteMapElemKey()
-				if z.IsJSONHandle() {
-					z.WriteStr("\"Parallel\"")
-				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Parallel`)
-				}
-				r.WriteMapElemValue()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayEnd()
 			} else {
@@ -5478,7 +5254,7 @@ func (x *InsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *InsertStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -5486,14 +5262,14 @@ func (x *InsertStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -5501,13 +5277,13 @@ func (x *InsertStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *InsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -5572,12 +5348,6 @@ func (x *InsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 					x.Timeout = (time.Duration)(r.DecodeInt64())
 				}
 			}
-		case "Parallel":
-			if r.TryDecodeAsNil() {
-				x.Parallel = false
-			} else {
-				x.Parallel = (bool)(r.DecodeBool())
-			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -5586,19 +5356,19 @@ func (x *InsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *InsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj12 int
-	var yyb12 bool
-	var yyhl12 bool = l >= 0
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	var yyj11 int
+	var yyb11 bool
+	var yyhl11 bool = l >= 0
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5607,19 +5377,19 @@ func (x *InsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Data = nil
 	} else {
 		if false {
-		} else if yyxt14 := z.Extension(z.I2Rtid(x.Data)); yyxt14 != nil {
-			z.DecExtension(x.Data, yyxt14)
+		} else if yyxt13 := z.Extension(z.I2Rtid(x.Data)); yyxt13 != nil {
+			z.DecExtension(x.Data, yyxt13)
 		} else {
 			z.DecFallback(&x.Data, true)
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5635,13 +5405,13 @@ func (x *InsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 
 		x.Into.CodecDecodeSelf(d)
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5650,21 +5420,21 @@ func (x *InsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Echo = 0
 	} else {
 		if false {
-		} else if yyxt17 := z.Extension(z.I2Rtid(x.Echo)); yyxt17 != nil {
-			z.DecExtension(x.Echo, yyxt17)
+		} else if yyxt16 := z.Extension(z.I2Rtid(x.Echo)); yyxt16 != nil {
+			z.DecExtension(x.Echo, yyxt16)
 		} else if z.DecBinary() {
 			z.DecBinaryUnmarshal(&x.Echo)
 		} else {
 			x.Echo = (Token)(z.C.IntV(r.DecodeInt64(), 16))
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5673,46 +5443,30 @@ func (x *InsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Timeout = 0
 	} else {
 		if false {
-		} else if yyxt19 := z.Extension(z.I2Rtid(x.Timeout)); yyxt19 != nil {
-			z.DecExtension(x.Timeout, yyxt19)
+		} else if yyxt18 := z.Extension(z.I2Rtid(x.Timeout)); yyxt18 != nil {
+			z.DecExtension(x.Timeout, yyxt18)
 		} else {
 			x.Timeout = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
-	} else {
-		yyb12 = r.CheckBreak()
-	}
-	if yyb12 {
-		r.ReadArrayEnd()
-		return
-	}
-	r.ReadArrayElem()
-	if r.TryDecodeAsNil() {
-		x.Parallel = false
-	} else {
-		x.Parallel = (bool)(r.DecodeBool())
-	}
 	for {
-		yyj12++
-		if yyhl12 {
-			yyb12 = yyj12 > l
+		yyj11++
+		if yyhl11 {
+			yyb11 = yyj11 > l
 		} else {
-			yyb12 = r.CheckBreak()
+			yyb11 = r.CheckBreak()
 		}
-		if yyb12 {
+		if yyb11 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj12-1, "")
+		z.DecStructFieldNotFound(yyj11-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -5727,9 +5481,9 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 			_, _ = yysep2, yy2arr2
 			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
-				r.WriteArrayStart(5)
+				r.WriteArrayStart(4)
 			} else {
-				r.WriteMapStart(5)
+				r.WriteMapStart(4)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
@@ -5748,7 +5502,7 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -5785,7 +5539,7 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Into\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Into`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Into`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -5815,7 +5569,7 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Echo\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Echo`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Echo`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -5842,7 +5596,7 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Timeout\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Timeout`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Timeout`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -5852,25 +5606,6 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 					r.EncodeInt(int64(x.Timeout))
 				}
 			}
-			if yyr2 || yy2arr2 {
-				r.WriteArrayElem()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			} else {
-				r.WriteMapElemKey()
-				if z.IsJSONHandle() {
-					z.WriteStr("\"Parallel\"")
-				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Parallel`)
-				}
-				r.WriteMapElemValue()
-				if false {
-				} else {
-					r.EncodeBool(bool(x.Parallel))
-				}
-			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayEnd()
 			} else {
@@ -5881,7 +5616,7 @@ func (x *UpsertStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *UpsertStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -5889,14 +5624,14 @@ func (x *UpsertStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -5904,13 +5639,13 @@ func (x *UpsertStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *UpsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -5975,12 +5710,6 @@ func (x *UpsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 					x.Timeout = (time.Duration)(r.DecodeInt64())
 				}
 			}
-		case "Parallel":
-			if r.TryDecodeAsNil() {
-				x.Parallel = false
-			} else {
-				x.Parallel = (bool)(r.DecodeBool())
-			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -5989,19 +5718,19 @@ func (x *UpsertStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *UpsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj12 int
-	var yyb12 bool
-	var yyhl12 bool = l >= 0
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	var yyj11 int
+	var yyb11 bool
+	var yyhl11 bool = l >= 0
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -6010,19 +5739,19 @@ func (x *UpsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Data = nil
 	} else {
 		if false {
-		} else if yyxt14 := z.Extension(z.I2Rtid(x.Data)); yyxt14 != nil {
-			z.DecExtension(x.Data, yyxt14)
+		} else if yyxt13 := z.Extension(z.I2Rtid(x.Data)); yyxt13 != nil {
+			z.DecExtension(x.Data, yyxt13)
 		} else {
 			z.DecFallback(&x.Data, true)
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -6038,13 +5767,13 @@ func (x *UpsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 
 		x.Into.CodecDecodeSelf(d)
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -6053,21 +5782,21 @@ func (x *UpsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Echo = 0
 	} else {
 		if false {
-		} else if yyxt17 := z.Extension(z.I2Rtid(x.Echo)); yyxt17 != nil {
-			z.DecExtension(x.Echo, yyxt17)
+		} else if yyxt16 := z.Extension(z.I2Rtid(x.Echo)); yyxt16 != nil {
+			z.DecExtension(x.Echo, yyxt16)
 		} else if z.DecBinary() {
 			z.DecBinaryUnmarshal(&x.Echo)
 		} else {
 			x.Echo = (Token)(z.C.IntV(r.DecodeInt64(), 16))
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb11 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -6076,46 +5805,30 @@ func (x *UpsertStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 		x.Timeout = 0
 	} else {
 		if false {
-		} else if yyxt19 := z.Extension(z.I2Rtid(x.Timeout)); yyxt19 != nil {
-			z.DecExtension(x.Timeout, yyxt19)
+		} else if yyxt18 := z.Extension(z.I2Rtid(x.Timeout)); yyxt18 != nil {
+			z.DecExtension(x.Timeout, yyxt18)
 		} else {
 			x.Timeout = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
-	} else {
-		yyb12 = r.CheckBreak()
-	}
-	if yyb12 {
-		r.ReadArrayEnd()
-		return
-	}
-	r.ReadArrayElem()
-	if r.TryDecodeAsNil() {
-		x.Parallel = false
-	} else {
-		x.Parallel = (bool)(r.DecodeBool())
-	}
 	for {
-		yyj12++
-		if yyhl12 {
-			yyb12 = yyj12 > l
+		yyj11++
+		if yyhl11 {
+			yyb11 = yyj11 > l
 		} else {
-			yyb12 = r.CheckBreak()
+			yyb11 = r.CheckBreak()
 		}
-		if yyb12 {
+		if yyb11 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj12-1, "")
+		z.DecStructFieldNotFound(yyj11-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *DefineNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -6157,7 +5870,7 @@ func (x *DefineNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -6180,7 +5893,7 @@ func (x *DefineNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineNamespaceStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -6188,14 +5901,14 @@ func (x *DefineNamespaceStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -6203,13 +5916,13 @@ func (x *DefineNamespaceStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -6247,7 +5960,7 @@ func (x *DefineNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.De
 }
 
 func (x *DefineNamespaceStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -6292,7 +6005,7 @@ func (x *DefineNamespaceStatement) codecDecodeSelfFromArray(l int, d *codec1978.
 }
 
 func (x *RemoveNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -6334,7 +6047,7 @@ func (x *RemoveNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -6357,7 +6070,7 @@ func (x *RemoveNamespaceStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveNamespaceStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -6365,14 +6078,14 @@ func (x *RemoveNamespaceStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -6380,13 +6093,13 @@ func (x *RemoveNamespaceStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -6424,7 +6137,7 @@ func (x *RemoveNamespaceStatement) codecDecodeSelfFromMap(l int, d *codec1978.De
 }
 
 func (x *RemoveNamespaceStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -6469,7 +6182,7 @@ func (x *RemoveNamespaceStatement) codecDecodeSelfFromArray(l int, d *codec1978.
 }
 
 func (x *DefineDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -6511,7 +6224,7 @@ func (x *DefineDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -6534,7 +6247,7 @@ func (x *DefineDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineDatabaseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -6542,14 +6255,14 @@ func (x *DefineDatabaseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -6557,13 +6270,13 @@ func (x *DefineDatabaseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -6601,7 +6314,7 @@ func (x *DefineDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Dec
 }
 
 func (x *DefineDatabaseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -6646,7 +6359,7 @@ func (x *DefineDatabaseStatement) codecDecodeSelfFromArray(l int, d *codec1978.D
 }
 
 func (x *RemoveDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -6688,7 +6401,7 @@ func (x *RemoveDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -6711,7 +6424,7 @@ func (x *RemoveDatabaseStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveDatabaseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -6719,14 +6432,14 @@ func (x *RemoveDatabaseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -6734,13 +6447,13 @@ func (x *RemoveDatabaseStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -6778,7 +6491,7 @@ func (x *RemoveDatabaseStatement) codecDecodeSelfFromMap(l int, d *codec1978.Dec
 }
 
 func (x *RemoveDatabaseStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -6823,7 +6536,7 @@ func (x *RemoveDatabaseStatement) codecDecodeSelfFromArray(l int, d *codec1978.D
 }
 
 func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -6859,7 +6572,7 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Kind\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Kind`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Kind`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -6896,7 +6609,7 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"User\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `User`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `User`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -6924,7 +6637,7 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Pass\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Pass`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Pass`)
 				}
 				r.WriteMapElemValue()
 				if x.Pass == nil {
@@ -6951,7 +6664,7 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Hash\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Hash`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Hash`)
 				}
 				r.WriteMapElemValue()
 				if x.Hash == nil {
@@ -6978,7 +6691,7 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Code\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Code`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Code`)
 				}
 				r.WriteMapElemValue()
 				if x.Code == nil {
@@ -7000,7 +6713,7 @@ func (x *DefineLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineLoginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -7008,14 +6721,14 @@ func (x *DefineLoginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -7023,13 +6736,13 @@ func (x *DefineLoginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -7107,7 +6820,7 @@ func (x *DefineLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *DefineLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj13 int
@@ -7232,7 +6945,7 @@ func (x *DefineLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *RemoveLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -7268,7 +6981,7 @@ func (x *RemoveLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Kind\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Kind`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Kind`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -7305,7 +7018,7 @@ func (x *RemoveLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"User\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `User`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `User`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -7328,7 +7041,7 @@ func (x *RemoveLoginStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveLoginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -7336,14 +7049,14 @@ func (x *RemoveLoginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -7351,13 +7064,13 @@ func (x *RemoveLoginStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -7408,7 +7121,7 @@ func (x *RemoveLoginStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *RemoveLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj7 int
@@ -7476,7 +7189,7 @@ func (x *RemoveLoginStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -7512,7 +7225,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Kind\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Kind`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Kind`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -7549,7 +7262,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -7585,7 +7298,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if yyn9 {
@@ -7602,19 +7315,19 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Type))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Type))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Type\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Type`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Type`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Type))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Type))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -7632,7 +7345,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Code\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Code`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Code`)
 				}
 				r.WriteMapElemValue()
 				if x.Code == nil {
@@ -7654,7 +7367,7 @@ func (x *DefineTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineTokenStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -7662,14 +7375,14 @@ func (x *DefineTokenStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -7677,13 +7390,13 @@ func (x *DefineTokenStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -7761,7 +7474,7 @@ func (x *DefineTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *DefineTokenStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj11 int
@@ -7886,7 +7599,7 @@ func (x *DefineTokenStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -7922,7 +7635,7 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Kind\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Kind`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Kind`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -7959,7 +7672,7 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -7995,7 +7708,7 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if yyn9 {
@@ -8018,7 +7731,7 @@ func (x *RemoveTokenStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveTokenStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -8026,14 +7739,14 @@ func (x *RemoveTokenStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -8041,13 +7754,13 @@ func (x *RemoveTokenStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -8110,7 +7823,7 @@ func (x *RemoveTokenStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *RemoveTokenStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj8 int
@@ -8200,7 +7913,7 @@ func (x *RemoveTokenStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -8242,7 +7955,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -8268,7 +7981,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Time\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Time`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Time`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -8293,7 +8006,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Code\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Code`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Code`)
 				}
 				r.WriteMapElemValue()
 				if x.Code == nil {
@@ -8322,7 +8035,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Signup\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Signup`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Signup`)
 				}
 				r.WriteMapElemValue()
 				if x.Signup == nil {
@@ -8353,7 +8066,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Signin\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Signin`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Signin`)
 				}
 				r.WriteMapElemValue()
 				if x.Signin == nil {
@@ -8384,7 +8097,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Connect\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Connect`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Connect`)
 				}
 				r.WriteMapElemValue()
 				if x.Connect == nil {
@@ -8415,7 +8128,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"OnSignup\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `OnSignup`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `OnSignup`)
 				}
 				r.WriteMapElemValue()
 				if x.OnSignup == nil {
@@ -8446,7 +8159,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"OnSignin\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `OnSignin`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `OnSignin`)
 				}
 				r.WriteMapElemValue()
 				if x.OnSignin == nil {
@@ -8470,7 +8183,7 @@ func (x *DefineScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineScopeStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -8478,14 +8191,14 @@ func (x *DefineScopeStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -8493,13 +8206,13 @@ func (x *DefineScopeStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -8612,7 +8325,7 @@ func (x *DefineScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *DefineScopeStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj19 int
@@ -8802,7 +8515,7 @@ func (x *DefineScopeStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *RemoveScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -8844,7 +8557,7 @@ func (x *RemoveScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -8867,7 +8580,7 @@ func (x *RemoveScopeStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveScopeStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -8875,14 +8588,14 @@ func (x *RemoveScopeStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -8890,13 +8603,13 @@ func (x *RemoveScopeStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -8934,7 +8647,7 @@ func (x *RemoveScopeStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *RemoveScopeStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -8979,7 +8692,7 @@ func (x *RemoveScopeStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -9021,7 +8734,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -9046,7 +8759,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -9066,7 +8779,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Full\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Full`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Full`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -9085,7 +8798,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Vers\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Vers`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Vers`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -9104,7 +8817,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Drop\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Drop`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Drop`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -9123,7 +8836,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Lock\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Lock`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Lock`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -9143,7 +8856,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -9164,7 +8877,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"From\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `From`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `From`)
 				}
 				r.WriteMapElemValue()
 				if x.From == nil {
@@ -9190,7 +8903,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Cond\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Cond`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Cond`)
 				}
 				r.WriteMapElemValue()
 				if x.Cond == nil {
@@ -9216,7 +8929,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Group\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Group`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Group`)
 				}
 				r.WriteMapElemValue()
 				if x.Group == nil {
@@ -9242,7 +8955,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Perms\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Perms`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Perms`)
 				}
 				r.WriteMapElemValue()
 				if x.Perms == nil {
@@ -9266,7 +8979,7 @@ func (x *DefineTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineTableStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -9274,14 +8987,14 @@ func (x *DefineTableStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -9289,13 +9002,13 @@ func (x *DefineTableStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -9403,7 +9116,7 @@ func (x *DefineTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *DefineTableStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj17 int
@@ -9618,7 +9331,7 @@ func (x *DefineTableStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *RemoveTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -9649,7 +9362,7 @@ func (x *RemoveTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -9668,7 +9381,7 @@ func (x *RemoveTableStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveTableStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -9676,14 +9389,14 @@ func (x *RemoveTableStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -9691,13 +9404,13 @@ func (x *RemoveTableStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -9729,7 +9442,7 @@ func (x *RemoveTableStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *RemoveTableStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -9768,7 +9481,7 @@ func (x *RemoveTableStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -9810,7 +9523,7 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -9835,7 +9548,7 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -9861,7 +9574,7 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"When\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `When`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `When`)
 				}
 				r.WriteMapElemValue()
 				if x.When == nil {
@@ -9892,7 +9605,7 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Then\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Then`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Then`)
 				}
 				r.WriteMapElemValue()
 				if x.Then == nil {
@@ -9916,7 +9629,7 @@ func (x *DefineEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineEventStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -9924,14 +9637,14 @@ func (x *DefineEventStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -9939,13 +9652,13 @@ func (x *DefineEventStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -10011,7 +9724,7 @@ func (x *DefineEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *DefineEventStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj10 int
@@ -10114,7 +9827,7 @@ func (x *DefineEventStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -10156,7 +9869,7 @@ func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -10181,7 +9894,7 @@ func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -10200,7 +9913,7 @@ func (x *RemoveEventStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveEventStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -10208,14 +9921,14 @@ func (x *RemoveEventStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -10223,13 +9936,13 @@ func (x *RemoveEventStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -10273,7 +9986,7 @@ func (x *RemoveEventStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *RemoveEventStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -10334,7 +10047,7 @@ func (x *RemoveEventStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -10376,7 +10089,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -10401,7 +10114,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -10427,7 +10140,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Perms\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Perms`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Perms`)
 				}
 				r.WriteMapElemValue()
 				if x.Perms == nil {
@@ -10445,38 +10158,38 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Type))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Type))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Type\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Type`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Type`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Type))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Type))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Kind))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Kind))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Kind\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Kind`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Kind`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Kind))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Kind))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -10496,7 +10209,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Value\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Value`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Value`)
 				}
 				r.WriteMapElemValue()
 				if x.Value == nil {
@@ -10527,7 +10240,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Assert\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Assert`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Assert`)
 				}
 				r.WriteMapElemValue()
 				if x.Assert == nil {
@@ -10552,7 +10265,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Priority\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Priority`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Priority`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -10570,7 +10283,7 @@ func (x *DefineFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineFieldStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -10578,14 +10291,14 @@ func (x *DefineFieldStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -10593,13 +10306,13 @@ func (x *DefineFieldStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -10694,7 +10407,7 @@ func (x *DefineFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *DefineFieldStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj15 int
@@ -10866,7 +10579,7 @@ func (x *DefineFieldStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -10908,7 +10621,7 @@ func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -10933,7 +10646,7 @@ func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -10952,7 +10665,7 @@ func (x *RemoveFieldStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveFieldStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -10960,14 +10673,14 @@ func (x *RemoveFieldStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -10975,13 +10688,13 @@ func (x *RemoveFieldStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -11025,7 +10738,7 @@ func (x *RemoveFieldStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *RemoveFieldStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -11086,7 +10799,7 @@ func (x *RemoveFieldStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -11128,7 +10841,7 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -11153,7 +10866,7 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -11174,7 +10887,7 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Cols\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Cols`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Cols`)
 				}
 				r.WriteMapElemValue()
 				if x.Cols == nil {
@@ -11194,7 +10907,7 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Uniq\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Uniq`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Uniq`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -11212,7 +10925,7 @@ func (x *DefineIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DefineIndexStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -11220,14 +10933,14 @@ func (x *DefineIndexStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -11235,13 +10948,13 @@ func (x *DefineIndexStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DefineIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -11297,7 +11010,7 @@ func (x *DefineIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *DefineIndexStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj8 int
@@ -11390,7 +11103,7 @@ func (x *DefineIndexStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -11432,7 +11145,7 @@ func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -11457,7 +11170,7 @@ func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -11476,7 +11189,7 @@ func (x *RemoveIndexStatement) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *RemoveIndexStatement) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -11484,14 +11197,14 @@ func (x *RemoveIndexStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -11499,13 +11212,13 @@ func (x *RemoveIndexStatement) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *RemoveIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -11549,7 +11262,7 @@ func (x *RemoveIndexStatement) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *RemoveIndexStatement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -11610,7 +11323,7 @@ func (x *RemoveIndexStatement) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x Exprs) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -11626,7 +11339,7 @@ func (x Exprs) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Exprs) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -11638,7 +11351,7 @@ func (x *Exprs) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *All) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -11667,7 +11380,7 @@ func (x *All) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *All) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -11675,14 +11388,14 @@ func (x *All) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -11690,13 +11403,13 @@ func (x *All) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *All) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -11722,7 +11435,7 @@ func (x *All) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *All) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -11745,7 +11458,7 @@ func (x *All) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *Any) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -11774,7 +11487,7 @@ func (x *Any) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Any) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -11782,14 +11495,14 @@ func (x *Any) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -11797,13 +11510,13 @@ func (x *Any) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Any) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -11829,7 +11542,7 @@ func (x *Any) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Any) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -11852,7 +11565,7 @@ func (x *Any) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *Null) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -11881,7 +11594,7 @@ func (x *Null) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Null) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -11889,14 +11602,14 @@ func (x *Null) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -11904,13 +11617,13 @@ func (x *Null) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Null) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -11936,7 +11649,7 @@ func (x *Null) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Null) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -11959,7 +11672,7 @@ func (x *Null) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *Void) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -11988,7 +11701,7 @@ func (x *Void) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Void) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -11996,14 +11709,14 @@ func (x *Void) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -12011,13 +11724,13 @@ func (x *Void) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Void) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -12043,7 +11756,7 @@ func (x *Void) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Void) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -12066,7 +11779,7 @@ func (x *Void) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *Empty) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -12095,7 +11808,7 @@ func (x *Empty) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Empty) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -12103,14 +11816,14 @@ func (x *Empty) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -12118,13 +11831,13 @@ func (x *Empty) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Empty) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -12150,7 +11863,7 @@ func (x *Empty) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Empty) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -12173,7 +11886,7 @@ func (x *Empty) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *Field) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -12209,7 +11922,7 @@ func (x *Field) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -12227,38 +11940,38 @@ func (x *Field) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Field))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Field))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Field\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Field`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Field`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Field))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Field))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Alias))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Alias))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Alias\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Alias`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Alias`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Alias))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Alias))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -12271,7 +11984,7 @@ func (x *Field) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Field) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -12279,14 +11992,14 @@ func (x *Field) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -12294,13 +12007,13 @@ func (x *Field) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Field) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -12349,7 +12062,7 @@ func (x *Field) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Field) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj8 int
@@ -12425,7 +12138,7 @@ func (x *Field) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Fields) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -12441,7 +12154,7 @@ func (x Fields) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Fields) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -12453,7 +12166,7 @@ func (x *Fields) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Group) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -12489,7 +12202,7 @@ func (x *Group) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -12513,7 +12226,7 @@ func (x *Group) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Group) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -12521,14 +12234,14 @@ func (x *Group) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -12536,13 +12249,13 @@ func (x *Group) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Group) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -12579,7 +12292,7 @@ func (x *Group) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Group) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -12623,7 +12336,7 @@ func (x *Group) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Groups) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -12639,7 +12352,7 @@ func (x Groups) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Groups) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -12651,7 +12364,7 @@ func (x *Groups) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Order) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -12687,7 +12400,7 @@ func (x *Order) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -12712,7 +12425,7 @@ func (x *Order) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Dir\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Dir`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Dir`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -12736,7 +12449,7 @@ func (x *Order) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Tag\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Tag`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Tag`)
 				}
 				r.WriteMapElemValue()
 				yy12 := &x.Tag
@@ -12759,7 +12472,7 @@ func (x *Order) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Order) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -12767,14 +12480,14 @@ func (x *Order) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -12782,13 +12495,13 @@ func (x *Order) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Order) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -12844,7 +12557,7 @@ func (x *Order) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Order) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj9 int
@@ -12927,7 +12640,7 @@ func (x *Order) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Orders) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -12943,7 +12656,7 @@ func (x Orders) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Orders) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -12955,7 +12668,7 @@ func (x *Orders) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Fetch) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -12991,7 +12704,7 @@ func (x *Fetch) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -13015,7 +12728,7 @@ func (x *Fetch) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Fetch) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -13023,14 +12736,14 @@ func (x *Fetch) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -13038,13 +12751,13 @@ func (x *Fetch) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Fetch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -13081,7 +12794,7 @@ func (x *Fetch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Fetch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -13125,7 +12838,7 @@ func (x *Fetch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Fetchs) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -13141,7 +12854,7 @@ func (x Fetchs) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Fetchs) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -13153,7 +12866,7 @@ func (x *Fetchs) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *SubExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -13189,7 +12902,7 @@ func (x *SubExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -13213,7 +12926,7 @@ func (x *SubExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *SubExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -13221,14 +12934,14 @@ func (x *SubExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -13236,13 +12949,13 @@ func (x *SubExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *SubExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -13279,7 +12992,7 @@ func (x *SubExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *SubExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -13323,7 +13036,7 @@ func (x *SubExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *MultExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -13357,7 +13070,7 @@ func (x *MultExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -13379,7 +13092,7 @@ func (x *MultExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *MultExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -13387,14 +13100,14 @@ func (x *MultExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -13402,13 +13115,13 @@ func (x *MultExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *MultExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -13443,7 +13156,7 @@ func (x *MultExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *MultExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -13485,7 +13198,7 @@ func (x *MultExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *FuncExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -13508,19 +13221,19 @@ func (x *FuncExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Name))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Name))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.Name))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.Name))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -13535,7 +13248,7 @@ func (x *FuncExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Args\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Args`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Args`)
 				}
 				r.WriteMapElemValue()
 				if x.Args == nil {
@@ -13555,7 +13268,7 @@ func (x *FuncExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Aggr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Aggr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Aggr`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -13573,7 +13286,7 @@ func (x *FuncExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *FuncExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -13581,14 +13294,14 @@ func (x *FuncExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -13596,13 +13309,13 @@ func (x *FuncExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *FuncExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -13646,7 +13359,7 @@ func (x *FuncExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *FuncExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj7 int
@@ -13717,7 +13430,7 @@ func (x *FuncExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *ItemExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -13753,7 +13466,7 @@ func (x *ItemExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"LHS\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `LHS`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `LHS`)
 				}
 				r.WriteMapElemValue()
 				if x.LHS == nil {
@@ -13784,7 +13497,7 @@ func (x *ItemExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Op\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Op`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Op`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -13815,7 +13528,7 @@ func (x *ItemExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"RHS\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `RHS`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `RHS`)
 				}
 				r.WriteMapElemValue()
 				if x.RHS == nil {
@@ -13839,7 +13552,7 @@ func (x *ItemExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *ItemExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -13847,14 +13560,14 @@ func (x *ItemExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -13862,13 +13575,13 @@ func (x *ItemExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *ItemExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -13929,7 +13642,7 @@ func (x *ItemExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *ItemExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj10 int
@@ -14017,7 +13730,7 @@ func (x *ItemExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *BinaryExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -14053,7 +13766,7 @@ func (x *BinaryExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"LHS\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `LHS`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `LHS`)
 				}
 				r.WriteMapElemValue()
 				if x.LHS == nil {
@@ -14084,7 +13797,7 @@ func (x *BinaryExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Op\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Op`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Op`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -14115,7 +13828,7 @@ func (x *BinaryExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"RHS\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `RHS`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `RHS`)
 				}
 				r.WriteMapElemValue()
 				if x.RHS == nil {
@@ -14139,7 +13852,7 @@ func (x *BinaryExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *BinaryExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -14147,14 +13860,14 @@ func (x *BinaryExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -14162,13 +13875,13 @@ func (x *BinaryExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *BinaryExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -14229,7 +13942,7 @@ func (x *BinaryExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *BinaryExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj10 int
@@ -14317,7 +14030,7 @@ func (x *BinaryExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 }
 
 func (x *PathExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -14348,7 +14061,7 @@ func (x *PathExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Expr\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Expr`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Expr`)
 				}
 				r.WriteMapElemValue()
 				if x.Expr == nil {
@@ -14367,7 +14080,7 @@ func (x *PathExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *PathExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -14375,14 +14088,14 @@ func (x *PathExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -14390,13 +14103,13 @@ func (x *PathExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *PathExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -14428,7 +14141,7 @@ func (x *PathExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *PathExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -14467,7 +14180,7 @@ func (x *PathExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *PartExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -14503,7 +14216,7 @@ func (x *PartExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Part\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Part`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Part`)
 				}
 				r.WriteMapElemValue()
 				if x.Part == nil {
@@ -14527,7 +14240,7 @@ func (x *PartExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *PartExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -14535,14 +14248,14 @@ func (x *PartExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -14550,13 +14263,13 @@ func (x *PartExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *PartExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -14593,7 +14306,7 @@ func (x *PartExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *PartExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -14637,7 +14350,7 @@ func (x *PartExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *JoinExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -14673,7 +14386,7 @@ func (x *JoinExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Join\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Join`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Join`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -14697,7 +14410,7 @@ func (x *JoinExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *JoinExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -14705,14 +14418,14 @@ func (x *JoinExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -14720,13 +14433,13 @@ func (x *JoinExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *JoinExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -14765,7 +14478,7 @@ func (x *JoinExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *JoinExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -14811,7 +14524,7 @@ func (x *JoinExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -14842,7 +14555,7 @@ func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"What\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `What`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `What`)
 				}
 				r.WriteMapElemValue()
 				if x.What == nil {
@@ -14874,7 +14587,7 @@ func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Name\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Name`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Name`)
 				}
 				r.WriteMapElemValue()
 				if yyn6 {
@@ -14904,7 +14617,7 @@ func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Cond\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Cond`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Cond`)
 				}
 				r.WriteMapElemValue()
 				if x.Cond == nil {
@@ -14928,7 +14641,7 @@ func (x *SubpExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *SubpExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -14936,14 +14649,14 @@ func (x *SubpExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -14951,13 +14664,13 @@ func (x *SubpExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *SubpExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -15012,7 +14725,7 @@ func (x *SubpExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *SubpExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj8 int
@@ -15094,7 +14807,7 @@ func (x *SubpExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *PermExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -15130,7 +14843,7 @@ func (x *PermExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Select\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Select`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Select`)
 				}
 				r.WriteMapElemValue()
 				if x.Select == nil {
@@ -15161,7 +14874,7 @@ func (x *PermExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Create\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Create`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Create`)
 				}
 				r.WriteMapElemValue()
 				if x.Create == nil {
@@ -15192,7 +14905,7 @@ func (x *PermExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Update\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Update`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Update`)
 				}
 				r.WriteMapElemValue()
 				if x.Update == nil {
@@ -15223,7 +14936,7 @@ func (x *PermExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Delete\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Delete`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Delete`)
 				}
 				r.WriteMapElemValue()
 				if x.Delete == nil {
@@ -15247,7 +14960,7 @@ func (x *PermExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *PermExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -15255,14 +14968,14 @@ func (x *PermExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -15270,13 +14983,13 @@ func (x *PermExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *PermExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -15346,7 +15059,7 @@ func (x *PermExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *PermExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj12 int
@@ -15453,7 +15166,7 @@ func (x *PermExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *DataExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -15487,7 +15200,7 @@ func (x *DataExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -15509,7 +15222,7 @@ func (x *DataExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DataExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -15517,14 +15230,14 @@ func (x *DataExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -15532,13 +15245,13 @@ func (x *DataExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DataExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -15573,7 +15286,7 @@ func (x *DataExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *DataExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -15615,7 +15328,7 @@ func (x *DataExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *DiffExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -15651,7 +15364,7 @@ func (x *DiffExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -15675,7 +15388,7 @@ func (x *DiffExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DiffExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -15683,14 +15396,14 @@ func (x *DiffExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -15698,13 +15411,13 @@ func (x *DiffExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *DiffExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -15741,7 +15454,7 @@ func (x *DiffExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *DiffExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -15785,7 +15498,7 @@ func (x *DiffExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *MergeExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -15821,7 +15534,7 @@ func (x *MergeExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -15845,7 +15558,7 @@ func (x *MergeExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *MergeExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -15853,14 +15566,14 @@ func (x *MergeExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -15868,13 +15581,13 @@ func (x *MergeExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *MergeExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -15911,7 +15624,7 @@ func (x *MergeExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *MergeExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -15955,7 +15668,7 @@ func (x *MergeExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
 }
 
 func (x *ContentExpression) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -15991,7 +15704,7 @@ func (x *ContentExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"Data\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `Data`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `Data`)
 				}
 				r.WriteMapElemValue()
 				if x.Data == nil {
@@ -16015,7 +15728,7 @@ func (x *ContentExpression) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *ContentExpression) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16023,14 +15736,14 @@ func (x *ContentExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -16038,13 +15751,13 @@ func (x *ContentExpression) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *ContentExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -16081,7 +15794,7 @@ func (x *ContentExpression) codecDecodeSelfFromMap(l int, d *codec1978.Decoder)
 }
 
 func (x *ContentExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -16125,7 +15838,7 @@ func (x *ContentExpression) codecDecodeSelfFromArray(l int, d *codec1978.Decoder
 }
 
 func (x Params) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16141,7 +15854,7 @@ func (x Params) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Params) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16153,7 +15866,7 @@ func (x *Params) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Param) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16176,19 +15889,19 @@ func (x *Param) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.VA))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.VA))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"VA\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `VA`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `VA`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.VA))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.VA))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -16201,7 +15914,7 @@ func (x *Param) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Param) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16209,14 +15922,14 @@ func (x *Param) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -16224,13 +15937,13 @@ func (x *Param) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Param) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -16262,7 +15975,7 @@ func (x *Param) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Param) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -16301,7 +16014,7 @@ func (x *Param) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Idents) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16317,7 +16030,7 @@ func (x Idents) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Idents) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16329,7 +16042,7 @@ func (x *Idents) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Ident) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16352,19 +16065,19 @@ func (x *Ident) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.VA))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.VA))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"VA\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `VA`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `VA`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.VA))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.VA))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -16377,7 +16090,7 @@ func (x *Ident) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Ident) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16385,14 +16098,14 @@ func (x *Ident) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -16400,13 +16113,13 @@ func (x *Ident) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Ident) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -16438,7 +16151,7 @@ func (x *Ident) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Ident) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -16477,7 +16190,7 @@ func (x *Ident) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Values) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16493,7 +16206,7 @@ func (x Values) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Values) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16505,7 +16218,7 @@ func (x *Values) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Value) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16528,19 +16241,19 @@ func (x *Value) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.VA))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.VA))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"VA\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `VA`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `VA`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.VA))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.VA))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -16553,7 +16266,7 @@ func (x *Value) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Value) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16561,14 +16274,14 @@ func (x *Value) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -16576,13 +16289,13 @@ func (x *Value) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Value) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -16614,7 +16327,7 @@ func (x *Value) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Value) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -16653,7 +16366,7 @@ func (x *Value) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Regexs) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16669,7 +16382,7 @@ func (x Regexs) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Regexs) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16681,7 +16394,7 @@ func (x *Regexs) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Regex) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16704,19 +16417,19 @@ func (x *Regex) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.VA))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.VA))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"VA\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `VA`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `VA`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.VA))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.VA))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -16729,7 +16442,7 @@ func (x *Regex) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Regex) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16737,14 +16450,14 @@ func (x *Regex) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -16752,13 +16465,13 @@ func (x *Regex) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Regex) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -16790,7 +16503,7 @@ func (x *Regex) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Regex) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -16829,7 +16542,7 @@ func (x *Regex) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Tables) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16845,7 +16558,7 @@ func (x Tables) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Tables) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16857,7 +16570,7 @@ func (x *Tables) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Table) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -16880,19 +16593,19 @@ func (x *Table) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.TB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.TB))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"TB\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `TB`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `TB`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.TB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.TB))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -16905,7 +16618,7 @@ func (x *Table) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Table) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -16913,14 +16626,14 @@ func (x *Table) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -16928,13 +16641,13 @@ func (x *Table) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Table) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -16966,7 +16679,7 @@ func (x *Table) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Table) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj5 int
@@ -17005,7 +16718,7 @@ func (x *Table) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Batchs) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -17021,7 +16734,7 @@ func (x Batchs) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Batchs) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -17033,7 +16746,7 @@ func (x *Batchs) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Batch) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -17056,19 +16769,19 @@ func (x *Batch) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.TB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.TB))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"TB\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `TB`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `TB`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.TB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.TB))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -17086,7 +16799,7 @@ func (x *Batch) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"BA\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `BA`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `BA`)
 				}
 				r.WriteMapElemValue()
 				if x.BA == nil {
@@ -17108,7 +16821,7 @@ func (x *Batch) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Batch) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -17116,14 +16829,14 @@ func (x *Batch) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -17131,13 +16844,13 @@ func (x *Batch) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Batch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -17178,7 +16891,7 @@ func (x *Batch) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Batch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj7 int
@@ -17236,7 +16949,7 @@ func (x *Batch) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Models) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -17252,7 +16965,7 @@ func (x Models) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Models) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -17264,7 +16977,7 @@ func (x *Models) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Model) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -17287,19 +17000,19 @@ func (x *Model) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.TB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.TB))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"TB\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `TB`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `TB`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.TB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.TB))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -17313,7 +17026,7 @@ func (x *Model) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"MIN\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `MIN`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `MIN`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -17332,7 +17045,7 @@ func (x *Model) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"INC\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `INC`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `INC`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -17351,7 +17064,7 @@ func (x *Model) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"MAX\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `MAX`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `MAX`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -17369,7 +17082,7 @@ func (x *Model) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Model) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -17377,14 +17090,14 @@ func (x *Model) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -17392,13 +17105,13 @@ func (x *Model) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Model) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -17448,7 +17161,7 @@ func (x *Model) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Model) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj8 int
@@ -17535,7 +17248,7 @@ func (x *Model) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Things) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -17551,7 +17264,7 @@ func (x Things) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Things) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -17563,7 +17276,7 @@ func (x *Things) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Thing) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -17588,19 +17301,19 @@ func (x *Thing) CodecEncodeSelf(e *codec1978.Encoder) {
 				r.WriteArrayElem()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.TB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.TB))
 				}
 			} else {
 				r.WriteMapElemKey()
 				if z.IsJSONHandle() {
 					z.WriteStr("\"TB\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `TB`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `TB`)
 				}
 				r.WriteMapElemValue()
 				if false {
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, string(x.TB))
+					r.EncodeStringEnc(codecSelferCcUTF85519, string(x.TB))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -17618,7 +17331,7 @@ func (x *Thing) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"ID\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `ID`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `ID`)
 				}
 				r.WriteMapElemValue()
 				if x.ID == nil {
@@ -17640,7 +17353,7 @@ func (x *Thing) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Thing) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -17648,14 +17361,14 @@ func (x *Thing) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -17663,13 +17376,13 @@ func (x *Thing) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Thing) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -17710,7 +17423,7 @@ func (x *Thing) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Thing) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj7 int
@@ -17768,7 +17481,7 @@ func (x *Thing) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Points) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -17784,7 +17497,7 @@ func (x Points) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Points) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -17796,7 +17509,7 @@ func (x *Points) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Point) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -17828,7 +17541,7 @@ func (x *Point) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"LA\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `LA`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `LA`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -17847,7 +17560,7 @@ func (x *Point) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"LO\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `LO`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `LO`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -17865,7 +17578,7 @@ func (x *Point) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Point) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -17873,14 +17586,14 @@ func (x *Point) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -17888,13 +17601,13 @@ func (x *Point) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Point) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -17932,7 +17645,7 @@ func (x *Point) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Point) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -17987,7 +17700,7 @@ func (x *Point) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Circles) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -18003,7 +17716,7 @@ func (x Circles) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Circles) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -18015,7 +17728,7 @@ func (x *Circles) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Circle) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -18059,7 +17772,7 @@ func (x *Circle) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"CE\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `CE`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `CE`)
 				}
 				r.WriteMapElemValue()
 				if yyn3 {
@@ -18083,7 +17796,7 @@ func (x *Circle) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"RA\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `RA`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `RA`)
 				}
 				r.WriteMapElemValue()
 				if false {
@@ -18101,7 +17814,7 @@ func (x *Circle) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Circle) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -18109,14 +17822,14 @@ func (x *Circle) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -18124,13 +17837,13 @@ func (x *Circle) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Circle) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -18174,7 +17887,7 @@ func (x *Circle) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Circle) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -18235,7 +17948,7 @@ func (x *Circle) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x Polygons) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -18251,7 +17964,7 @@ func (x Polygons) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Polygons) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -18263,7 +17976,7 @@ func (x *Polygons) CodecDecodeSelf(d *codec1978.Decoder) {
 }
 
 func (x *Polygon) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
@@ -18299,7 +18012,7 @@ func (x *Polygon) CodecEncodeSelf(e *codec1978.Encoder) {
 				if z.IsJSONHandle() {
 					z.WriteStr("\"PS\"")
 				} else {
-					r.EncodeStringEnc(codecSelferCcUTF86491, `PS`)
+					r.EncodeStringEnc(codecSelferCcUTF85519, `PS`)
 				}
 				r.WriteMapElemValue()
 				if x.PS == nil {
@@ -18321,7 +18034,7 @@ func (x *Polygon) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Polygon) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	if false {
@@ -18329,14 +18042,14 @@ func (x *Polygon) CodecDecodeSelf(d *codec1978.Decoder) {
 		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap6491 {
+		if yyct2 == codecSelferValueTypeMap5519 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray6491 {
+		} else if yyct2 == codecSelferValueTypeArray5519 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -18344,13 +18057,13 @@ func (x *Polygon) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct6491)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct5519)
 		}
 	}
 }
 
 func (x *Polygon) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyhl3 bool = l >= 0
@@ -18385,7 +18098,7 @@ func (x *Polygon) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Polygon) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer6491
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -18426,8 +18139,8 @@ func (x *Polygon) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	r.ReadArrayEnd()
 }
 
-func (x codecSelfer6491) encStatements(v Statements, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encStatements(v Statements, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -18447,8 +18160,8 @@ func (x codecSelfer6491) encStatements(v Statements, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decStatements(v *Statements, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decStatements(v *Statements, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -18533,8 +18246,8 @@ func (x codecSelfer6491) decStatements(v *Statements, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encExprs(v Exprs, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encExprs(v Exprs, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -18554,8 +18267,8 @@ func (x codecSelfer6491) encExprs(v Exprs, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decExprs(v *Exprs, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decExprs(v *Exprs, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -18640,8 +18353,8 @@ func (x codecSelfer6491) decExprs(v *Exprs, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encFields(v Fields, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encFields(v Fields, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -18656,8 +18369,8 @@ func (x codecSelfer6491) encFields(v Fields, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decFields(v *Fields, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decFields(v *Fields, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -18740,8 +18453,8 @@ func (x codecSelfer6491) decFields(v *Fields, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encGroups(v Groups, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encGroups(v Groups, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -18756,8 +18469,8 @@ func (x codecSelfer6491) encGroups(v Groups, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decGroups(v *Groups, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decGroups(v *Groups, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -18840,8 +18553,8 @@ func (x codecSelfer6491) decGroups(v *Groups, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encOrders(v Orders, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encOrders(v Orders, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -18856,8 +18569,8 @@ func (x codecSelfer6491) encOrders(v Orders, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decOrders(v *Orders, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decOrders(v *Orders, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -18940,8 +18653,8 @@ func (x codecSelfer6491) decOrders(v *Orders, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encFetchs(v Fetchs, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encFetchs(v Fetchs, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -18956,8 +18669,8 @@ func (x codecSelfer6491) encFetchs(v Fetchs, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decFetchs(v *Fetchs, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decFetchs(v *Fetchs, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19040,8 +18753,8 @@ func (x codecSelfer6491) decFetchs(v *Fetchs, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encSliceExpr(v []Expr, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encSliceExpr(v []Expr, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19061,8 +18774,8 @@ func (x codecSelfer6491) encSliceExpr(v []Expr, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decSliceExpr(v *[]Expr, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decSliceExpr(v *[]Expr, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19147,8 +18860,8 @@ func (x codecSelfer6491) decSliceExpr(v *[]Expr, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encSlicePtrtoItemExpression(v []*ItemExpression, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encSlicePtrtoItemExpression(v []*ItemExpression, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19163,8 +18876,8 @@ func (x codecSelfer6491) encSlicePtrtoItemExpression(v []*ItemExpression, e *cod
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decSlicePtrtoItemExpression(v *[]*ItemExpression, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decSlicePtrtoItemExpression(v *[]*ItemExpression, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19247,8 +18960,8 @@ func (x codecSelfer6491) decSlicePtrtoItemExpression(v *[]*ItemExpression, d *co
 	}
 }
 
-func (x codecSelfer6491) encParams(v Params, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encParams(v Params, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19263,8 +18976,8 @@ func (x codecSelfer6491) encParams(v Params, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decParams(v *Params, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decParams(v *Params, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19347,8 +19060,8 @@ func (x codecSelfer6491) decParams(v *Params, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encIdents(v Idents, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encIdents(v Idents, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19363,8 +19076,8 @@ func (x codecSelfer6491) encIdents(v Idents, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decIdents(v *Idents, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decIdents(v *Idents, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19447,8 +19160,8 @@ func (x codecSelfer6491) decIdents(v *Idents, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encValues(v Values, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encValues(v Values, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19463,8 +19176,8 @@ func (x codecSelfer6491) encValues(v Values, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decValues(v *Values, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decValues(v *Values, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19547,8 +19260,8 @@ func (x codecSelfer6491) decValues(v *Values, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encRegexs(v Regexs, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encRegexs(v Regexs, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19563,8 +19276,8 @@ func (x codecSelfer6491) encRegexs(v Regexs, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decRegexs(v *Regexs, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decRegexs(v *Regexs, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19647,8 +19360,8 @@ func (x codecSelfer6491) decRegexs(v *Regexs, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encTables(v Tables, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encTables(v Tables, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19663,8 +19376,8 @@ func (x codecSelfer6491) encTables(v Tables, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decTables(v *Tables, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decTables(v *Tables, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19747,8 +19460,8 @@ func (x codecSelfer6491) decTables(v *Tables, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encBatchs(v Batchs, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encBatchs(v Batchs, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19763,8 +19476,8 @@ func (x codecSelfer6491) encBatchs(v Batchs, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decBatchs(v *Batchs, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decBatchs(v *Batchs, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19847,8 +19560,8 @@ func (x codecSelfer6491) decBatchs(v *Batchs, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encSlicePtrtoThing(v []*Thing, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encSlicePtrtoThing(v []*Thing, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19863,8 +19576,8 @@ func (x codecSelfer6491) encSlicePtrtoThing(v []*Thing, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decSlicePtrtoThing(v *[]*Thing, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decSlicePtrtoThing(v *[]*Thing, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -19947,8 +19660,8 @@ func (x codecSelfer6491) decSlicePtrtoThing(v *[]*Thing, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encModels(v Models, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encModels(v Models, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -19963,8 +19676,8 @@ func (x codecSelfer6491) encModels(v Models, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decModels(v *Models, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decModels(v *Models, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -20047,8 +19760,8 @@ func (x codecSelfer6491) decModels(v *Models, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encThings(v Things, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encThings(v Things, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -20063,8 +19776,8 @@ func (x codecSelfer6491) encThings(v Things, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decThings(v *Things, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decThings(v *Things, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -20147,8 +19860,8 @@ func (x codecSelfer6491) decThings(v *Things, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encPoints(v Points, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encPoints(v Points, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -20163,8 +19876,8 @@ func (x codecSelfer6491) encPoints(v Points, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decPoints(v *Points, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decPoints(v *Points, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -20247,8 +19960,8 @@ func (x codecSelfer6491) decPoints(v *Points, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encCircles(v Circles, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encCircles(v Circles, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -20263,8 +19976,8 @@ func (x codecSelfer6491) encCircles(v Circles, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decCircles(v *Circles, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decCircles(v *Circles, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -20347,8 +20060,8 @@ func (x codecSelfer6491) decCircles(v *Circles, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encPolygons(v Polygons, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encPolygons(v Polygons, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -20363,8 +20076,8 @@ func (x codecSelfer6491) encPolygons(v Polygons, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decPolygons(v *Polygons, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decPolygons(v *Polygons, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -20447,8 +20160,8 @@ func (x codecSelfer6491) decPolygons(v *Polygons, d *codec1978.Decoder) {
 	}
 }
 
-func (x codecSelfer6491) encSlicePtrtoPoint(v []*Point, e *codec1978.Encoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) encSlicePtrtoPoint(v []*Point, e *codec1978.Encoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -20463,8 +20176,8 @@ func (x codecSelfer6491) encSlicePtrtoPoint(v []*Point, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer6491) decSlicePtrtoPoint(v *[]*Point, d *codec1978.Decoder) {
-	var h codecSelfer6491
+func (x codecSelfer5519) decSlicePtrtoPoint(v *[]*Point, d *codec1978.Decoder) {
+	var h codecSelfer5519
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
diff --git a/sql/ast.go b/sql/ast.go
index 94f07fae..009ddca1 100644
--- a/sql/ast.go
+++ b/sql/ast.go
@@ -160,77 +160,70 @@ type IfelseStatement struct {
 
 // SelectStatement represents a SQL SELECT statement.
 type SelectStatement struct {
-	RW       bool
-	Expr     Fields
-	What     Exprs
-	Cond     Expr
-	Split    Idents
-	Group    Groups
-	Order    Orders
-	Limit    Expr
-	Start    Expr
-	Fetch    Fetchs
-	Version  Expr
-	Timeout  time.Duration
-	Parallel bool
+	RW      bool
+	Expr    Fields
+	What    Exprs
+	Cond    Expr
+	Split   Idents
+	Group   Groups
+	Order   Orders
+	Limit   Expr
+	Start   Expr
+	Fetch   Fetchs
+	Version Expr
+	Timeout time.Duration
 }
 
 // CreateStatement represents a SQL CREATE statement.
 type CreateStatement struct {
-	What     Exprs
-	Data     Expr
-	Echo     Token
-	Timeout  time.Duration
-	Parallel bool
+	What    Exprs
+	Data    Expr
+	Echo    Token
+	Timeout time.Duration
 }
 
 // UpdateStatement represents a SQL UPDATE statement.
 type UpdateStatement struct {
-	What     Exprs
-	Data     Expr
-	Cond     Expr
-	Echo     Token
-	Timeout  time.Duration
-	Parallel bool
+	What    Exprs
+	Data    Expr
+	Cond    Expr
+	Echo    Token
+	Timeout time.Duration
 }
 
 // DeleteStatement represents a SQL DELETE statement.
 type DeleteStatement struct {
-	What     Exprs
-	Cond     Expr
-	Echo     Token
-	Timeout  time.Duration
-	Parallel bool
+	What    Exprs
+	Cond    Expr
+	Echo    Token
+	Timeout time.Duration
 }
 
 // RelateStatement represents a SQL RELATE statement.
 type RelateStatement struct {
-	Type     Expr
-	From     Exprs
-	With     Exprs
-	Data     Expr
-	Uniq     bool
-	Echo     Token
-	Timeout  time.Duration
-	Parallel bool
+	Type    Expr
+	From    Exprs
+	With    Exprs
+	Data    Expr
+	Uniq    bool
+	Echo    Token
+	Timeout time.Duration
 }
 
 // InsertStatement represents a SQL INSERT statement.
 type InsertStatement struct {
-	Data     Expr
-	Into     *Table
-	Echo     Token
-	Timeout  time.Duration
-	Parallel bool
+	Data    Expr
+	Into    *Table
+	Echo    Token
+	Timeout time.Duration
 }
 
 // UpsertStatement represents a SQL UPSERT statement.
 type UpsertStatement struct {
-	Data     Expr
-	Into     *Table
-	Echo     Token
-	Timeout  time.Duration
-	Parallel bool
+	Data    Expr
+	Into    *Table
+	Echo    Token
+	Timeout time.Duration
 }
 
 // --------------------------------------------------
diff --git a/sql/create.go b/sql/create.go
index e9a5a205..5d1cf848 100644
--- a/sql/create.go
+++ b/sql/create.go
@@ -34,10 +34,6 @@ func (p *parser) parseCreateStatement() (stmt *CreateStatement, err error) {
 		return nil, err
 	}
 
-	if stmt.Parallel, err = p.parseParallel(); err != nil {
-		return nil, err
-	}
-
 	return
 
 }
diff --git a/sql/delete.go b/sql/delete.go
index 10cec11a..0c2d1afa 100644
--- a/sql/delete.go
+++ b/sql/delete.go
@@ -36,10 +36,6 @@ func (p *parser) parseDeleteStatement() (stmt *DeleteStatement, err error) {
 		return nil, err
 	}
 
-	if stmt.Parallel, err = p.parseParallel(); err != nil {
-		return nil, err
-	}
-
 	return
 
 }
diff --git a/sql/insert.go b/sql/insert.go
index 7a186163..7d10d2b7 100644
--- a/sql/insert.go
+++ b/sql/insert.go
@@ -40,10 +40,6 @@ func (p *parser) parseInsertStatement() (stmt *InsertStatement, err error) {
 		return nil, err
 	}
 
-	if stmt.Parallel, err = p.parseParallel(); err != nil {
-		return nil, err
-	}
-
 	return
 
 }
diff --git a/sql/relate.go b/sql/relate.go
index 2af9fb62..3e6f5959 100644
--- a/sql/relate.go
+++ b/sql/relate.go
@@ -78,10 +78,6 @@ func (p *parser) parseRelateStatement() (stmt *RelateStatement, err error) {
 		return nil, err
 	}
 
-	if stmt.Parallel, err = p.parseParallel(); err != nil {
-		return nil, err
-	}
-
 	return
 
 }
diff --git a/sql/select.go b/sql/select.go
index 7ddeb4f7..3c8a1e9e 100644
--- a/sql/select.go
+++ b/sql/select.go
@@ -75,10 +75,6 @@ func (p *parser) parseSelectStatement() (stmt *SelectStatement, err error) {
 		return nil, err
 	}
 
-	if stmt.Parallel, err = p.parseParallel(); err != nil {
-		return nil, err
-	}
-
 	if err = checkExpression(aggrs, stmt.Expr, stmt.Group); err != nil {
 		return nil, err
 	}
diff --git a/sql/sql_test.go b/sql/sql_test.go
index e1598bcf..bdecee11 100644
--- a/sql/sql_test.go
+++ b/sql/sql_test.go
@@ -455,9 +455,8 @@ func Test_Parse_Queries_Let(t *testing.T) {
 				RW:   true,
 				Name: &Ident{"name"},
 				What: &SubExpression{Expr: &CreateStatement{
-					What:     Exprs{&Ident{"person"}},
-					Echo:     AFTER,
-					Parallel: true,
+					What: Exprs{&Ident{"person"}},
+					Echo: AFTER,
 				}},
 			}}},
 		},
@@ -566,9 +565,8 @@ func Test_Parse_Queries_Return(t *testing.T) {
 			res: &Query{Statements: []Statement{&ReturnStatement{
 				RW: true,
 				What: Exprs{&SubExpression{Expr: &CreateStatement{
-					What:     Exprs{&Ident{"person"}},
-					Echo:     AFTER,
-					Parallel: true,
+					What: Exprs{&Ident{"person"}},
+					Echo: AFTER,
 				}}},
 			}}},
 		},
@@ -613,10 +611,9 @@ func Test_Parse_Queries_Select(t *testing.T) {
 		{
 			sql: `SELECT * FROM person`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
 			}}},
 		},
 		{
@@ -638,205 +635,183 @@ func Test_Parse_Queries_Select(t *testing.T) {
 		{
 			sql: "SELECT * FROM 111",
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{float64(111)},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{float64(111)},
 			}}},
 		},
 		{
 			sql: "SELECT * FROM `111`",
 			str: "SELECT * FROM 111",
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"111"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"111"}},
 			}}},
 		},
 		{
 			sql: "SELECT * FROM `2006-01-02`",
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"2006-01-02"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"2006-01-02"}},
 			}}},
 		},
 		{
 			sql: "SELECT * FROM `2006-01-02T15:04:05+07:00`",
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"2006-01-02T15:04:05+07:00"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"2006-01-02T15:04:05+07:00"}},
 			}}},
 		},
 		{
 			sql: "SELECT * FROM `2006-01-02T15:04:05.999999999+07:00`",
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"2006-01-02T15:04:05.999999999+07:00"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"2006-01-02T15:04:05.999999999+07:00"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person, tweet`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}, &Ident{"tweet"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}, &Ident{"tweet"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:1a`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: "1a"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: "1a"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨1a⟩`,
 			str: `SELECT * FROM person:1a`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: "1a"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: "1a"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:123456`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: float64(123456)}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: float64(123456)}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨123456⟩`,
 			str: `SELECT * FROM person:123456`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: float64(123456)}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: float64(123456)}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:123.456`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: float64(123.456)}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: float64(123.456)}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨123.456⟩`,
 			str: `SELECT * FROM person:123.456`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: float64(123.456)}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: float64(123.456)}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:123.456.789.012`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: "123.456.789.012"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: "123.456.789.012"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨123.456.789.012⟩`,
 			str: `SELECT * FROM person:123.456.789.012`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: "123.456.789.012"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: "123.456.789.012"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨1987-06-22⟩`,
 			str: `SELECT * FROM person:⟨1987-06-22T00:00:00Z⟩`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: date}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: date}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨1987-06-22T08:30:30.511Z⟩`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: nano}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: nano}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨A250C5A3-948F-4657-88AD-FF5F27B5B24E⟩`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: "A250C5A3-948F-4657-88AD-FF5F27B5B24E"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: "A250C5A3-948F-4657-88AD-FF5F27B5B24E"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨8250C5A3-948F-4657-88AD-FF5F27B5B24E⟩`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: "8250C5A3-948F-4657-88AD-FF5F27B5B24E"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: "8250C5A3-948F-4657-88AD-FF5F27B5B24E"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person:⟨Tobie Morgan Hitchcock⟩`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "person", ID: "Tobie Morgan Hitchcock"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "person", ID: "Tobie Morgan Hitchcock"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM ⟨email addresses⟩:⟨tobie@abcum.com⟩`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "email addresses", ID: "tobie@abcum.com"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "email addresses", ID: "tobie@abcum.com"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM ⟨email addresses⟩:⟨tobie+spam@abcum.com⟩`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Thing{TB: "email addresses", ID: "tobie+spam@abcum.com"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Thing{TB: "email addresses", ID: "tobie+spam@abcum.com"}},
 			}}},
 		},
 		{
@@ -847,8 +822,7 @@ func Test_Parse_Queries_Select(t *testing.T) {
 					{Expr: &All{}, Field: "*"},
 					{Expr: &Ident{"temp"}, Field: "test", Alias: "test"},
 				},
-				What:     []Expr{&Ident{"person"}},
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
 			}}},
 		},
 		{
@@ -858,8 +832,7 @@ func Test_Parse_Queries_Select(t *testing.T) {
 				Expr: []*Field{
 					{Expr: &Ident{"email addresses"}, Field: "emails", Alias: "emails"},
 				},
-				What:     []Expr{&Ident{"person"}},
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
 			}}},
 		},
 		{
@@ -869,8 +842,7 @@ func Test_Parse_Queries_Select(t *testing.T) {
 				Expr: []*Field{
 					{Expr: &Ident{"emails"}, Field: "email addresses", Alias: "email addresses"},
 				},
-				What:     []Expr{&Ident{"person"}},
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
 			}}},
 		},
 		{
@@ -881,41 +853,36 @@ func Test_Parse_Queries_Select(t *testing.T) {
 					{Expr: &All{}, Field: "*"},
 				},
 				What: Exprs{&SubExpression{Expr: &CreateStatement{
-					What:     Exprs{&Ident{"person"}},
-					Echo:     AFTER,
-					Parallel: true,
+					What: Exprs{&Ident{"person"}},
+					Echo: AFTER,
 				}}},
-				Parallel: true,
 			}}},
 		},
 		{
 			sql: "SELECT * FROM person WHERE id = \"\x0A\"",
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"id"}, Op: EQ, RHS: &Value{"\n"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"id"}, Op: EQ, RHS: &Value{"\n"}},
 			}}},
 		},
 		{
 			sql: "SELECT * FROM person WHERE id = \"\x0D\"",
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"id"}, Op: EQ, RHS: &Value{"\r"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"id"}, Op: EQ, RHS: &Value{"\r"}},
 			}}},
 		},
 		{
 			sql: "SELECT * FROM person WHERE id = \"\b\n\r\t\"",
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"id"}, Op: EQ, RHS: &Value{"\b\n\r\t"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"id"}, Op: EQ, RHS: &Value{"\b\n\r\t"}},
 			}}},
 		},
 		{
@@ -925,11 +892,10 @@ func Test_Parse_Queries_Select(t *testing.T) {
 		{
 			sql: `SELECT * FROM person WHERE id`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &Ident{"id"},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &Ident{"id"},
 			}}},
 		},
 		{
@@ -939,117 +905,106 @@ func Test_Parse_Queries_Select(t *testing.T) {
 		{
 			sql: `SELECT * FROM person WHERE id = 1`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"id"}, Op: EQ, RHS: float64(1)},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"id"}, Op: EQ, RHS: float64(1)},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old = EMPTY`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: &Empty{}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: &Empty{}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old != EMPTY`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: NEQ, RHS: &Empty{}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: NEQ, RHS: &Empty{}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old = MISSING`,
 			str: `SELECT * FROM person WHERE old = VOID`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: &Void{}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: &Void{}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old != MISSING`,
 			str: `SELECT * FROM person WHERE old != VOID`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: NEQ, RHS: &Void{}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: NEQ, RHS: &Void{}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old IS EMPTY`,
 			str: `SELECT * FROM person WHERE old = EMPTY`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: &Empty{}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: &Empty{}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old IS NOT EMPTY`,
 			str: `SELECT * FROM person WHERE old != EMPTY`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: NEQ, RHS: &Empty{}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: NEQ, RHS: &Empty{}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old IS MISSING`,
 			str: `SELECT * FROM person WHERE old = VOID`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: &Void{}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: &Void{}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old IS NOT MISSING`,
 			str: `SELECT * FROM person WHERE old != VOID`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: NEQ, RHS: &Void{}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: NEQ, RHS: &Void{}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old = true`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: true},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: true},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE old = false`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: false},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"old"}, Op: EQ, RHS: false},
 			}}},
 		},
 		{
@@ -1095,7 +1050,6 @@ func Test_Parse_Queries_Select(t *testing.T) {
 						},
 					},
 				},
-				Parallel: true,
 			}}},
 		},
 		{
@@ -1117,7 +1071,6 @@ func Test_Parse_Queries_Select(t *testing.T) {
 					Op:  EQ,
 					RHS: float64(10),
 				},
-				Parallel: true,
 			}}},
 		},
 		{
@@ -1139,7 +1092,6 @@ func Test_Parse_Queries_Select(t *testing.T) {
 					Op:  EQ,
 					RHS: float64(14),
 				},
-				Parallel: true,
 			}}},
 		},
 		{
@@ -1165,7 +1117,6 @@ func Test_Parse_Queries_Select(t *testing.T) {
 					Op:  EQ,
 					RHS: float64(18),
 				},
-				Parallel: true,
 			}}},
 		},
 		{
@@ -1191,7 +1142,6 @@ func Test_Parse_Queries_Select(t *testing.T) {
 					Op:  EQ,
 					RHS: float64(17),
 				},
-				Parallel: true,
 			}}},
 		},
 		{
@@ -1219,62 +1169,56 @@ func Test_Parse_Queries_Select(t *testing.T) {
 					Op:  EQ,
 					RHS: float64(32),
 				},
-				Parallel: true,
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE test IN ["London","Paris"]`,
 			str: `SELECT * FROM person WHERE test ∈ ["London","Paris"]`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"test"}, Op: INS, RHS: []interface{}{"London", "Paris"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"test"}, Op: INS, RHS: []interface{}{"London", "Paris"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE test IS IN ["London","Paris"]`,
 			str: `SELECT * FROM person WHERE test ∈ ["London","Paris"]`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"test"}, Op: INS, RHS: []interface{}{"London", "Paris"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"test"}, Op: INS, RHS: []interface{}{"London", "Paris"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE test IS NOT IN ["London","Paris"]`,
 			str: `SELECT * FROM person WHERE test ∉ ["London","Paris"]`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"test"}, Op: NIS, RHS: []interface{}{"London", "Paris"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"test"}, Op: NIS, RHS: []interface{}{"London", "Paris"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE ["London","Paris"] CONTAINS test`,
 			str: `SELECT * FROM person WHERE ["London","Paris"] ∋ test`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: []interface{}{"London", "Paris"}, Op: SIN, RHS: &Ident{"test"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: []interface{}{"London", "Paris"}, Op: SIN, RHS: &Ident{"test"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE ["London","Paris"] CONTAINS NOT test`,
 			str: `SELECT * FROM person WHERE ["London","Paris"] ∌ test`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: []interface{}{"London", "Paris"}, Op: SNI, RHS: &Ident{"test"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: []interface{}{"London", "Paris"}, Op: SNI, RHS: &Ident{"test"}},
 			}}},
 		},
 		{
@@ -1284,31 +1228,28 @@ func Test_Parse_Queries_Select(t *testing.T) {
 		{
 			sql: `SELECT * FROM person WHERE test = {"name":"London"}`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"test"}, Op: EQ, RHS: map[string]interface{}{"name": "London"}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"test"}, Op: EQ, RHS: map[string]interface{}{"name": "London"}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person WHERE test = {"name":{"f":"first","l":"last"}}`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Cond:     &BinaryExpression{LHS: &Ident{"test"}, Op: EQ, RHS: map[string]interface{}{"name": map[string]interface{}{"f": "first", "l": "last"}}},
-				Parallel: true,
+				RW:   false,
+				Expr: []*Field{{Expr: &All{}, Field: "*"}},
+				What: []Expr{&Ident{"person"}},
+				Cond: &BinaryExpression{LHS: &Ident{"test"}, Op: EQ, RHS: map[string]interface{}{"name": map[string]interface{}{"f": "first", "l": "last"}}},
 			}}},
 		},
 		{
 			sql: `SELECT * FROM person TIMEOUT 1s`,
 			res: &Query{Statements: []Statement{&SelectStatement{
-				RW:       false,
-				Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-				What:     []Expr{&Ident{"person"}},
-				Timeout:  1 * time.Second,
-				Parallel: true,
+				RW:      false,
+				Expr:    []*Field{{Expr: &All{}, Field: "*"}},
+				What:    []Expr{&Ident{"person"}},
+				Timeout: 1 * time.Second,
 			}}},
 		},
 		{
@@ -1376,9 +1317,8 @@ func Test_Parse_Queries_Create(t *testing.T) {
 		{
 			sql: `CREATE person`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1392,19 +1332,17 @@ func Test_Parse_Queries_Create(t *testing.T) {
 		{
 			sql: `CREATE person SET firstname = VOID`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Void{}}}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Void{}}}},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `CREATE person SET firstname = EMPTY`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Empty{}}}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Empty{}}}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1414,10 +1352,9 @@ func Test_Parse_Queries_Create(t *testing.T) {
 		{
 			sql: `CREATE person SET firstname = "Tobie"`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Value{"Tobie"}}}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Value{"Tobie"}}}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1435,10 +1372,9 @@ func Test_Parse_Queries_Create(t *testing.T) {
 		{
 			sql: `CREATE person MERGE {"firstname":"Tobie"}`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &MergeExpression{Data: map[string]interface{}{"firstname": "Tobie"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &MergeExpression{Data: map[string]interface{}{"firstname": "Tobie"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1456,10 +1392,9 @@ func Test_Parse_Queries_Create(t *testing.T) {
 		{
 			sql: `CREATE person CONTENT {"firstname":"Tobie"}`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &ContentExpression{Data: map[string]interface{}{"firstname": "Tobie"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &ContentExpression{Data: map[string]interface{}{"firstname": "Tobie"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1469,35 +1404,31 @@ func Test_Parse_Queries_Create(t *testing.T) {
 		{
 			sql: `CREATE person RETURN NONE`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     NONE,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: NONE,
 			}}},
 		},
 		{
 			sql: `CREATE person RETURN BEFORE`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     BEFORE,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: BEFORE,
 			}}},
 		},
 		{
 			sql: `CREATE person RETURN AFTER`,
 			str: `CREATE person`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `CREATE person TIMEOUT 1s`,
 			res: &Query{Statements: []Statement{&CreateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     AFTER,
-				Timeout:  1 * time.Second,
-				Parallel: true,
+				What:    []Expr{&Ident{"person"}},
+				Echo:    AFTER,
+				Timeout: 1 * time.Second,
 			}}},
 		},
 		{
@@ -1526,9 +1457,8 @@ func Test_Parse_Queries_Update(t *testing.T) {
 		{
 			sql: `UPDATE person`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1542,19 +1472,17 @@ func Test_Parse_Queries_Update(t *testing.T) {
 		{
 			sql: `UPDATE person SET firstname = VOID`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Void{}}}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Void{}}}},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `UPDATE person SET firstname = EMPTY`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Empty{}}}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Empty{}}}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1564,10 +1492,9 @@ func Test_Parse_Queries_Update(t *testing.T) {
 		{
 			sql: `UPDATE person SET firstname = "Tobie"`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Value{"Tobie"}}}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"firstname"}, Op: EQ, RHS: &Value{"Tobie"}}}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1585,10 +1512,9 @@ func Test_Parse_Queries_Update(t *testing.T) {
 		{
 			sql: `UPDATE person DIFF []`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &DiffExpression{Data: []interface{}{}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &DiffExpression{Data: []interface{}{}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1606,10 +1532,9 @@ func Test_Parse_Queries_Update(t *testing.T) {
 		{
 			sql: `UPDATE person MERGE {"firstname":"Tobie"}`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &MergeExpression{Data: map[string]interface{}{"firstname": "Tobie"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &MergeExpression{Data: map[string]interface{}{"firstname": "Tobie"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1627,10 +1552,9 @@ func Test_Parse_Queries_Update(t *testing.T) {
 		{
 			sql: `UPDATE person CONTENT {"firstname":"Tobie"}`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Data:     &ContentExpression{Data: map[string]interface{}{"firstname": "Tobie"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Data: &ContentExpression{Data: map[string]interface{}{"firstname": "Tobie"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1640,35 +1564,31 @@ func Test_Parse_Queries_Update(t *testing.T) {
 		{
 			sql: `UPDATE person RETURN NONE`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     NONE,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: NONE,
 			}}},
 		},
 		{
 			sql: `UPDATE person RETURN BEFORE`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     BEFORE,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: BEFORE,
 			}}},
 		},
 		{
 			sql: `UPDATE person RETURN AFTER`,
 			str: `UPDATE person`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `UPDATE person TIMEOUT 1s`,
 			res: &Query{Statements: []Statement{&UpdateStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     AFTER,
-				Timeout:  1 * time.Second,
-				Parallel: true,
+				What:    []Expr{&Ident{"person"}},
+				Echo:    AFTER,
+				Timeout: 1 * time.Second,
 			}}},
 		},
 		{
@@ -1701,9 +1621,8 @@ func Test_Parse_Queries_Delete(t *testing.T) {
 		{
 			sql: `DELETE person`,
 			res: &Query{Statements: []Statement{&DeleteStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     NONE,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: NONE,
 			}}},
 		},
 		{
@@ -1714,34 +1633,30 @@ func Test_Parse_Queries_Delete(t *testing.T) {
 			sql: `DELETE person RETURN NONE`,
 			str: `DELETE person`,
 			res: &Query{Statements: []Statement{&DeleteStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     NONE,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: NONE,
 			}}},
 		},
 		{
 			sql: `DELETE person RETURN BEFORE`,
 			res: &Query{Statements: []Statement{&DeleteStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     BEFORE,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: BEFORE,
 			}}},
 		},
 		{
 			sql: `DELETE person RETURN AFTER`,
 			res: &Query{Statements: []Statement{&DeleteStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     AFTER,
-				Parallel: true,
+				What: []Expr{&Ident{"person"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `DELETE person TIMEOUT 1s`,
 			res: &Query{Statements: []Statement{&DeleteStatement{
-				What:     []Expr{&Ident{"person"}},
-				Echo:     NONE,
-				Timeout:  1 * time.Second,
-				Parallel: true,
+				What:    []Expr{&Ident{"person"}},
+				Echo:    NONE,
+				Timeout: 1 * time.Second,
 			}}},
 		},
 		{
@@ -1794,45 +1709,41 @@ func Test_Parse_Queries_Relate(t *testing.T) {
 		{
 			sql: `RELATE person -> purchase -> item`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Echo:     AFTER,
-				Parallel: true,
+				Type: &Table{"purchase"},
+				From: []Expr{&Ident{"person"}},
+				With: []Expr{&Ident{"item"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `RELATE item <- purchase <- person`,
 			str: `RELATE person -> purchase -> item`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Echo:     AFTER,
-				Parallel: true,
+				Type: &Table{"purchase"},
+				From: []Expr{&Ident{"person"}},
+				With: []Expr{&Ident{"item"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `RELATE person -> purchase -> item UNIQUE`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Uniq:     true,
-				Echo:     AFTER,
-				Parallel: true,
+				Type: &Table{"purchase"},
+				From: []Expr{&Ident{"person"}},
+				With: []Expr{&Ident{"item"}},
+				Uniq: true,
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `RELATE item <- purchase <- person UNIQUE`,
 			str: `RELATE person -> purchase -> item UNIQUE`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Uniq:     true,
-				Echo:     AFTER,
-				Parallel: true,
+				Type: &Table{"purchase"},
+				From: []Expr{&Ident{"person"}},
+				With: []Expr{&Ident{"item"}},
+				Uniq: true,
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1846,12 +1757,11 @@ func Test_Parse_Queries_Relate(t *testing.T) {
 		{
 			sql: `RELATE person -> purchase -> item SET public = true`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Data:     &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"public"}, Op: EQ, RHS: true}}},
-				Echo:     AFTER,
-				Parallel: true,
+				Type: &Table{"purchase"},
+				From: []Expr{&Ident{"person"}},
+				With: []Expr{&Ident{"item"}},
+				Data: &DataExpression{Data: []*ItemExpression{{LHS: &Ident{"public"}, Op: EQ, RHS: true}}},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1861,43 +1771,39 @@ func Test_Parse_Queries_Relate(t *testing.T) {
 		{
 			sql: `RELATE person -> purchase -> item RETURN NONE`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Echo:     NONE,
-				Parallel: true,
+				Type: &Table{"purchase"},
+				From: []Expr{&Ident{"person"}},
+				With: []Expr{&Ident{"item"}},
+				Echo: NONE,
 			}}},
 		},
 		{
 			sql: `RELATE person -> purchase -> item RETURN BEFORE`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Echo:     BEFORE,
-				Parallel: true,
+				Type: &Table{"purchase"},
+				From: []Expr{&Ident{"person"}},
+				With: []Expr{&Ident{"item"}},
+				Echo: BEFORE,
 			}}},
 		},
 		{
 			sql: `RELATE person -> purchase -> item RETURN AFTER`,
 			str: `RELATE person -> purchase -> item`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Echo:     AFTER,
-				Parallel: true,
+				Type: &Table{"purchase"},
+				From: []Expr{&Ident{"person"}},
+				With: []Expr{&Ident{"item"}},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `RELATE person -> purchase -> item TIMEOUT 1s`,
 			res: &Query{Statements: []Statement{&RelateStatement{
-				Type:     &Table{"purchase"},
-				From:     []Expr{&Ident{"person"}},
-				With:     []Expr{&Ident{"item"}},
-				Echo:     AFTER,
-				Timeout:  1 * time.Second,
-				Parallel: true,
+				Type:    &Table{"purchase"},
+				From:    []Expr{&Ident{"person"}},
+				With:    []Expr{&Ident{"item"}},
+				Echo:    AFTER,
+				Timeout: 1 * time.Second,
 			}}},
 		},
 		{
@@ -1934,10 +1840,9 @@ func Test_Parse_Queries_Insert(t *testing.T) {
 		{
 			sql: `INSERT ["one","two","tre"] INTO person`,
 			res: &Query{Statements: []Statement{&InsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     AFTER,
-				Parallel: true,
+				Data: []interface{}{"one", "two", "tre"},
+				Into: &Table{"person"},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -1947,39 +1852,35 @@ func Test_Parse_Queries_Insert(t *testing.T) {
 		{
 			sql: `INSERT ["one","two","tre"] INTO person RETURN NONE`,
 			res: &Query{Statements: []Statement{&InsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     NONE,
-				Parallel: true,
+				Data: []interface{}{"one", "two", "tre"},
+				Into: &Table{"person"},
+				Echo: NONE,
 			}}},
 		},
 		{
 			sql: `INSERT ["one","two","tre"] INTO person RETURN BEFORE`,
 			res: &Query{Statements: []Statement{&InsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     BEFORE,
-				Parallel: true,
+				Data: []interface{}{"one", "two", "tre"},
+				Into: &Table{"person"},
+				Echo: BEFORE,
 			}}},
 		},
 		{
 			sql: `INSERT ["one","two","tre"] INTO person RETURN AFTER`,
 			str: `INSERT ["one","two","tre"] INTO person`,
 			res: &Query{Statements: []Statement{&InsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     AFTER,
-				Parallel: true,
+				Data: []interface{}{"one", "two", "tre"},
+				Into: &Table{"person"},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `INSERT ["one","two","tre"] INTO person TIMEOUT 1s`,
 			res: &Query{Statements: []Statement{&InsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     AFTER,
-				Timeout:  1 * time.Second,
-				Parallel: true,
+				Data:    []interface{}{"one", "two", "tre"},
+				Into:    &Table{"person"},
+				Echo:    AFTER,
+				Timeout: 1 * time.Second,
 			}}},
 		},
 		{
@@ -2016,10 +1917,9 @@ func Test_Parse_Queries_Upsert(t *testing.T) {
 		{
 			sql: `UPSERT ["one","two","tre"] INTO person`,
 			res: &Query{Statements: []Statement{&UpsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     AFTER,
-				Parallel: true,
+				Data: []interface{}{"one", "two", "tre"},
+				Into: &Table{"person"},
+				Echo: AFTER,
 			}}},
 		},
 		{
@@ -2029,39 +1929,35 @@ func Test_Parse_Queries_Upsert(t *testing.T) {
 		{
 			sql: `UPSERT ["one","two","tre"] INTO person RETURN NONE`,
 			res: &Query{Statements: []Statement{&UpsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     NONE,
-				Parallel: true,
+				Data: []interface{}{"one", "two", "tre"},
+				Into: &Table{"person"},
+				Echo: NONE,
 			}}},
 		},
 		{
 			sql: `UPSERT ["one","two","tre"] INTO person RETURN BEFORE`,
 			res: &Query{Statements: []Statement{&UpsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     BEFORE,
-				Parallel: true,
+				Data: []interface{}{"one", "two", "tre"},
+				Into: &Table{"person"},
+				Echo: BEFORE,
 			}}},
 		},
 		{
 			sql: `UPSERT ["one","two","tre"] INTO person RETURN AFTER`,
 			str: `UPSERT ["one","two","tre"] INTO person`,
 			res: &Query{Statements: []Statement{&UpsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     AFTER,
-				Parallel: true,
+				Data: []interface{}{"one", "two", "tre"},
+				Into: &Table{"person"},
+				Echo: AFTER,
 			}}},
 		},
 		{
 			sql: `UPSERT ["one","two","tre"] INTO person TIMEOUT 1s`,
 			res: &Query{Statements: []Statement{&UpsertStatement{
-				Data:     []interface{}{"one", "two", "tre"},
-				Into:     &Table{"person"},
-				Echo:     AFTER,
-				Timeout:  1 * time.Second,
-				Parallel: true,
+				Data:    []interface{}{"one", "two", "tre"},
+				Into:    &Table{"person"},
+				Echo:    AFTER,
+				Timeout: 1 * time.Second,
 			}}},
 		},
 		{
@@ -2416,9 +2312,8 @@ func Test_Parse_Queries_Define(t *testing.T) {
 				Name: &Ident{"test"},
 				Signup: &SubExpression{
 					Expr: &CreateStatement{
-						What:     Exprs{&Ident{"person"}},
-						Echo:     AFTER,
-						Parallel: true,
+						What: Exprs{&Ident{"person"}},
+						Echo: AFTER,
 					},
 				},
 			}}},
@@ -2433,9 +2328,8 @@ func Test_Parse_Queries_Define(t *testing.T) {
 				Name: &Ident{"test"},
 				Signin: &SubExpression{
 					Expr: &SelectStatement{
-						Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-						What:     []Expr{&Ident{"person"}},
-						Parallel: true,
+						Expr: []*Field{{Expr: &All{}, Field: "*"}},
+						What: []Expr{&Ident{"person"}},
 					},
 				},
 			}}},
@@ -2450,10 +2344,9 @@ func Test_Parse_Queries_Define(t *testing.T) {
 				Name: &Ident{"test"},
 				Connect: &SubExpression{
 					Expr: &SelectStatement{
-						RW:       false,
-						Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-						What:     []Expr{&Param{"id"}},
-						Parallel: true,
+						RW:   false,
+						Expr: []*Field{{Expr: &All{}, Field: "*"}},
+						What: []Expr{&Param{"id"}},
 					},
 				},
 			}}},
@@ -2464,25 +2357,22 @@ func Test_Parse_Queries_Define(t *testing.T) {
 				Name: &Ident{"test"},
 				Signup: &SubExpression{
 					Expr: &CreateStatement{
-						What:     []Expr{&Ident{"tester"}},
-						Echo:     AFTER,
-						Parallel: true,
+						What: []Expr{&Ident{"tester"}},
+						Echo: AFTER,
 					},
 				},
 				Signin: &SubExpression{
 					Expr: &SelectStatement{
-						RW:       false,
-						Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-						What:     []Expr{&Ident{"tester"}},
-						Parallel: true,
+						RW:   false,
+						Expr: []*Field{{Expr: &All{}, Field: "*"}},
+						What: []Expr{&Ident{"tester"}},
 					},
 				},
 				Connect: &SubExpression{
 					Expr: &SelectStatement{
-						RW:       false,
-						Expr:     []*Field{{Expr: &All{}, Field: "*"}},
-						What:     []Expr{&Param{"id"}},
-						Parallel: true,
+						RW:   false,
+						Expr: []*Field{{Expr: &All{}, Field: "*"}},
+						What: []Expr{&Param{"id"}},
 					},
 				},
 			}}},
@@ -2706,8 +2596,7 @@ func Test_Parse_Queries_Define(t *testing.T) {
 									RHS: true,
 								},
 							}},
-							Echo:     AFTER,
-							Parallel: true,
+							Echo: AFTER,
 						},
 					},
 				},
@@ -2734,8 +2623,7 @@ func Test_Parse_Queries_Define(t *testing.T) {
 									RHS: true,
 								},
 							}},
-							Echo:     AFTER,
-							Parallel: true,
+							Echo: AFTER,
 						},
 						&UpdateStatement{
 							What: Exprs{&Param{"this"}},
@@ -2746,8 +2634,7 @@ func Test_Parse_Queries_Define(t *testing.T) {
 									RHS: true,
 								},
 							}},
-							Echo:     AFTER,
-							Parallel: true,
+							Echo: AFTER,
 						},
 					},
 				},
diff --git a/sql/update.go b/sql/update.go
index 40fdea90..ad2e8662 100644
--- a/sql/update.go
+++ b/sql/update.go
@@ -38,10 +38,6 @@ func (p *parser) parseUpdateStatement() (stmt *UpdateStatement, err error) {
 		return nil, err
 	}
 
-	if stmt.Parallel, err = p.parseParallel(); err != nil {
-		return nil, err
-	}
-
 	return
 
 }
diff --git a/sql/upsert.go b/sql/upsert.go
index 542258d0..a2c62142 100644
--- a/sql/upsert.go
+++ b/sql/upsert.go
@@ -40,10 +40,6 @@ func (p *parser) parseUpsertStatement() (stmt *UpsertStatement, err error) {
 		return nil, err
 	}
 
-	if stmt.Parallel, err = p.parseParallel(); err != nil {
-		return nil, err
-	}
-
 	return
 
 }