diff --git a/client/keys.generated.go b/client/keys.generated.go
index 237fdbe8ffd1..bc672f102e0f 100644
--- a/client/keys.generated.go
+++ b/client/keys.generated.go
@@ -1,48 +1,39 @@
-// ************************************************************
-// DO NOT EDIT.
-// THIS FILE IS AUTO-GENERATED BY codecgen.
-// ************************************************************
+// Code generated by codecgen - DO NOT EDIT.
 
 package client
 
 import (
 	"errors"
-	"fmt"
-	"reflect"
-	"runtime"
-	time "time"
-
 	codec1978 "github.com/ugorji/go/codec"
+	"runtime"
+	"strconv"
+	"time"
 )
 
 const (
 	// ----- content types ----
-	codecSelferC_UTF87612 = 1
-	codecSelferC_RAW7612  = 0
+	codecSelferCcUTF87467 = 1
+	codecSelferCcRAW7467  = 0
 	// ----- value types used ----
-	codecSelferValueTypeArray7612 = 10
-	codecSelferValueTypeMap7612   = 9
-	// ----- containerStateValues ----
-	codecSelfer_containerMapKey7612    = 2
-	codecSelfer_containerMapValue7612  = 3
-	codecSelfer_containerMapEnd7612    = 4
-	codecSelfer_containerArrayElem7612 = 6
-	codecSelfer_containerArrayEnd7612  = 7
+	codecSelferValueTypeArray7467  = 10
+	codecSelferValueTypeMap7467    = 9
+	codecSelferValueTypeString7467 = 6
+	codecSelferValueTypeInt7467    = 2
+	codecSelferValueTypeUint7467   = 3
+	codecSelferValueTypeFloat7467  = 4
+	codecSelferBitsize7467         = uint8(32 << (^uint(0) >> 63))
 )
 
 var (
-	codecSelferBitsize7612                         = uint8(reflect.TypeOf(uint(0)).Bits())
-	codecSelferOnlyMapOrArrayEncodeToStructErr7612 = errors.New(`only encoded map or array can be decoded into a struct`)
+	errCodecSelferOnlyMapOrArrayEncodeToStruct7467 = errors.New(`only encoded map or array can be decoded into a struct`)
 )
 
-type codecSelfer7612 struct{}
+type codecSelfer7467 struct{}
 
 func init() {
 	if codec1978.GenVersion != 8 {
 		_, file, _, _ := runtime.Caller(0)
-		err := fmt.Errorf("codecgen version mismatch: current: %v, need %v. Re-generate file: %v",
-			8, codec1978.GenVersion, file)
-		panic(err)
+		panic("codecgen version mismatch: current: 8, need " + strconv.FormatInt(int64(codec1978.GenVersion), 10) + ". Re-generate file: " + file)
 	}
 	if false { // reference the types, but skip this branch at build/run time
 		var v0 time.Duration
@@ -51,21 +42,20 @@ func init() {
 }
 
 func (x *Error) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(4)
 			} else {
@@ -73,18 +63,14 @@ func (x *Error) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
 					r.EncodeInt(int64(x.Code))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("errorCode"))
+				r.EncodeString(codecSelferCcUTF87467, `errorCode`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
 					r.EncodeInt(int64(x.Code))
@@ -92,56 +78,44 @@ func (x *Error) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Message))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Message))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("message"))
+				r.EncodeString(codecSelferCcUTF87467, `message`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Message))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Message))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Cause))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Cause))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("cause"))
+				r.EncodeString(codecSelferCcUTF87467, `cause`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Cause))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Cause))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym13 := z.EncBinary()
-				_ = yym13
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.Index))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("index"))
+				r.EncodeString(codecSelferCcUTF87467, `index`)
 				r.WriteMapElemValue()
-				yym14 := z.EncBinary()
-				_ = yym14
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.Index))
@@ -157,23 +131,22 @@ func (x *Error) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Error) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -181,17 +154,15 @@ func (x *Error) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *Error) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -204,57 +175,32 @@ func (x *Error) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "errorCode":
 			if r.TryDecodeAsNil() {
 				x.Code = 0
 			} else {
-				yyv4 := &x.Code
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*int)(yyv4)) = int(r.DecodeInt(codecSelferBitsize7612))
-				}
+				x.Code = (int)(z.C.IntV(r.DecodeInt64(), codecSelferBitsize7467))
 			}
 		case "message":
 			if r.TryDecodeAsNil() {
 				x.Message = ""
 			} else {
-				yyv6 := &x.Message
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*string)(yyv6)) = r.DecodeString()
-				}
+				x.Message = (string)(r.DecodeString())
 			}
 		case "cause":
 			if r.TryDecodeAsNil() {
 				x.Cause = ""
 			} else {
-				yyv8 := &x.Cause
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*string)(yyv8)) = r.DecodeString()
-				}
+				x.Cause = (string)(r.DecodeString())
 			}
 		case "index":
 			if r.TryDecodeAsNil() {
 				x.Index = 0
 			} else {
-				yyv10 := &x.Index
-				yym11 := z.DecBinary()
-				_ = yym11
-				if false {
-				} else {
-					*((*uint64)(yyv10)) = uint64(r.DecodeUint(64))
-				}
+				x.Index = (uint64)(r.DecodeUint64())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -264,19 +210,19 @@ func (x *Error) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Error) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	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 yyj8 int
+	var yyb8 bool
+	var yyhl8 bool = l >= 0
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -284,21 +230,15 @@ func (x *Error) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Code = 0
 	} else {
-		yyv13 := &x.Code
-		yym14 := z.DecBinary()
-		_ = yym14
-		if false {
-		} else {
-			*((*int)(yyv13)) = int(r.DecodeInt(codecSelferBitsize7612))
-		}
+		x.Code = (int)(z.C.IntV(r.DecodeInt64(), codecSelferBitsize7467))
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -306,21 +246,15 @@ func (x *Error) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Message = ""
 	} else {
-		yyv15 := &x.Message
-		yym16 := z.DecBinary()
-		_ = yym16
-		if false {
-		} else {
-			*((*string)(yyv15)) = r.DecodeString()
-		}
+		x.Message = (string)(r.DecodeString())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -328,21 +262,15 @@ func (x *Error) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Cause = ""
 	} else {
-		yyv17 := &x.Cause
-		yym18 := z.DecBinary()
-		_ = yym18
-		if false {
-		} else {
-			*((*string)(yyv17)) = r.DecodeString()
-		}
+		x.Cause = (string)(r.DecodeString())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -350,72 +278,63 @@ func (x *Error) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Index = 0
 	} else {
-		yyv19 := &x.Index
-		yym20 := z.DecBinary()
-		_ = yym20
-		if false {
-		} else {
-			*((*uint64)(yyv19)) = uint64(r.DecodeUint(64))
-		}
+		x.Index = (uint64)(r.DecodeUint64())
 	}
 	for {
-		yyj12++
-		if yyhl12 {
-			yyb12 = yyj12 > l
+		yyj8++
+		if yyhl8 {
+			yyb8 = yyj8 > l
 		} else {
-			yyb12 = r.CheckBreak()
+			yyb8 = r.CheckBreak()
 		}
-		if yyb12 {
+		if yyb8 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj12-1, "")
+		z.DecStructFieldNotFound(yyj8-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x PrevExistType) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
-	yym1 := z.EncBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.EncExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.EncExtension(x, yyxt1)
 	} else {
-		r.EncodeString(codecSelferC_UTF87612, string(x))
+		r.EncodeString(codecSelferCcUTF87467, string(x))
 	}
 }
 
 func (x *PrevExistType) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
-		*((*string)(x)) = r.DecodeString()
+		*x = (PrevExistType)(r.DecodeString())
 	}
 }
 
 func (x *WatcherOptions) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(2)
 			} else {
@@ -423,18 +342,14 @@ func (x *WatcherOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.AfterIndex))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("AfterIndex"))
+				r.EncodeString(codecSelferCcUTF87467, `AfterIndex`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.AfterIndex))
@@ -442,18 +357,14 @@ func (x *WatcherOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Recursive"))
+				r.EncodeString(codecSelferCcUTF87467, `Recursive`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
@@ -469,23 +380,22 @@ func (x *WatcherOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *WatcherOptions) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -493,17 +403,15 @@ func (x *WatcherOptions) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *WatcherOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -516,33 +424,20 @@ func (x *WatcherOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "AfterIndex":
 			if r.TryDecodeAsNil() {
 				x.AfterIndex = 0
 			} else {
-				yyv4 := &x.AfterIndex
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*uint64)(yyv4)) = uint64(r.DecodeUint(64))
-				}
+				x.AfterIndex = (uint64)(r.DecodeUint64())
 			}
 		case "Recursive":
 			if r.TryDecodeAsNil() {
 				x.Recursive = false
 			} else {
-				yyv6 := &x.Recursive
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*bool)(yyv6)) = r.DecodeBool()
-				}
+				x.Recursive = (bool)(r.DecodeBool())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -552,19 +447,19 @@ func (x *WatcherOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *WatcherOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj8 int
-	var yyb8 bool
-	var yyhl8 bool = l >= 0
-	yyj8++
-	if yyhl8 {
-		yyb8 = yyj8 > l
+	var yyj6 int
+	var yyb6 bool
+	var yyhl6 bool = l >= 0
+	yyj6++
+	if yyhl6 {
+		yyb6 = yyj6 > l
 	} else {
-		yyb8 = r.CheckBreak()
+		yyb6 = r.CheckBreak()
 	}
-	if yyb8 {
+	if yyb6 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -572,21 +467,15 @@ func (x *WatcherOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.AfterIndex = 0
 	} else {
-		yyv9 := &x.AfterIndex
-		yym10 := z.DecBinary()
-		_ = yym10
-		if false {
-		} else {
-			*((*uint64)(yyv9)) = uint64(r.DecodeUint(64))
-		}
+		x.AfterIndex = (uint64)(r.DecodeUint64())
 	}
-	yyj8++
-	if yyhl8 {
-		yyb8 = yyj8 > l
+	yyj6++
+	if yyhl6 {
+		yyb6 = yyj6 > l
 	} else {
-		yyb8 = r.CheckBreak()
+		yyb6 = r.CheckBreak()
 	}
-	if yyb8 {
+	if yyb6 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -594,46 +483,39 @@ func (x *WatcherOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Recursive = false
 	} else {
-		yyv11 := &x.Recursive
-		yym12 := z.DecBinary()
-		_ = yym12
-		if false {
-		} else {
-			*((*bool)(yyv11)) = r.DecodeBool()
-		}
+		x.Recursive = (bool)(r.DecodeBool())
 	}
 	for {
-		yyj8++
-		if yyhl8 {
-			yyb8 = yyj8 > l
+		yyj6++
+		if yyhl6 {
+			yyb6 = yyj6 > l
 		} else {
-			yyb8 = r.CheckBreak()
+			yyb6 = r.CheckBreak()
 		}
-		if yyb8 {
+		if yyb6 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj8-1, "")
+		z.DecStructFieldNotFound(yyj6-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *CreateInOrderOptions) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(1)
 			} else {
@@ -641,21 +523,19 @@ func (x *CreateInOrderOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
-				} else if z.HasExtensions() && z.EncExt(x.TTL) {
+				} else if yyxt4 := z.Extension(z.I2Rtid(x.TTL)); yyxt4 != nil {
+					z.EncExtension(x.TTL, yyxt4)
 				} else {
 					r.EncodeInt(int64(x.TTL))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("TTL"))
+				r.EncodeString(codecSelferCcUTF87467, `TTL`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
-				} else if z.HasExtensions() && z.EncExt(x.TTL) {
+				} else if yyxt5 := z.Extension(z.I2Rtid(x.TTL)); yyxt5 != nil {
+					z.EncExtension(x.TTL, yyxt5)
 				} else {
 					r.EncodeInt(int64(x.TTL))
 				}
@@ -670,23 +550,22 @@ func (x *CreateInOrderOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *CreateInOrderOptions) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -694,17 +573,15 @@ func (x *CreateInOrderOptions) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *CreateInOrderOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -717,21 +594,18 @@ func (x *CreateInOrderOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "TTL":
 			if r.TryDecodeAsNil() {
 				x.TTL = 0
 			} else {
-				yyv4 := &x.TTL
-				yym5 := z.DecBinary()
-				_ = yym5
 				if false {
-				} else if z.HasExtensions() && z.DecExt(yyv4) {
+				} else if yyxt5 := z.Extension(z.I2Rtid(x.TTL)); yyxt5 != nil {
+					z.DecExtension(x.TTL, yyxt5)
 				} else {
-					*((*int64)(yyv4)) = int64(r.DecodeInt(64))
+					x.TTL = (time.Duration)(r.DecodeInt64())
 				}
 			}
 		default:
@@ -742,7 +616,7 @@ func (x *CreateInOrderOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decode
 }
 
 func (x *CreateInOrderOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj6 int
@@ -762,13 +636,11 @@ func (x *CreateInOrderOptions) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 	if r.TryDecodeAsNil() {
 		x.TTL = 0
 	} else {
-		yyv7 := &x.TTL
-		yym8 := z.DecBinary()
-		_ = yym8
 		if false {
-		} else if z.HasExtensions() && z.DecExt(yyv7) {
+		} else if yyxt8 := z.Extension(z.I2Rtid(x.TTL)); yyxt8 != nil {
+			z.DecExtension(x.TTL, yyxt8)
 		} else {
-			*((*int64)(yyv7)) = int64(r.DecodeInt(64))
+			x.TTL = (time.Duration)(r.DecodeInt64())
 		}
 	}
 	for {
@@ -788,21 +660,20 @@ func (x *CreateInOrderOptions) codecDecodeSelfFromArray(l int, d *codec1978.Deco
 }
 
 func (x *SetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(7)
 			} else {
@@ -810,37 +681,29 @@ func (x *SetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.PrevValue))
+					r.EncodeString(codecSelferCcUTF87467, string(x.PrevValue))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevValue"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevValue`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.PrevValue))
+					r.EncodeString(codecSelferCcUTF87467, string(x.PrevValue))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.PrevIndex))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevIndex"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevIndex`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.PrevIndex))
@@ -851,45 +714,39 @@ func (x *SetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 				x.PrevExist.CodecEncodeSelf(e)
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevExist"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevExist`)
 				r.WriteMapElemValue()
 				x.PrevExist.CodecEncodeSelf(e)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym13 := z.EncBinary()
-				_ = yym13
 				if false {
-				} else if z.HasExtensions() && z.EncExt(x.TTL) {
+				} else if yyxt13 := z.Extension(z.I2Rtid(x.TTL)); yyxt13 != nil {
+					z.EncExtension(x.TTL, yyxt13)
 				} else {
 					r.EncodeInt(int64(x.TTL))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("TTL"))
+				r.EncodeString(codecSelferCcUTF87467, `TTL`)
 				r.WriteMapElemValue()
-				yym14 := z.EncBinary()
-				_ = yym14
 				if false {
-				} else if z.HasExtensions() && z.EncExt(x.TTL) {
+				} else if yyxt14 := z.Extension(z.I2Rtid(x.TTL)); yyxt14 != nil {
+					z.EncExtension(x.TTL, yyxt14)
 				} else {
 					r.EncodeInt(int64(x.TTL))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym16 := z.EncBinary()
-				_ = yym16
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Refresh))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Refresh"))
+				r.EncodeString(codecSelferCcUTF87467, `Refresh`)
 				r.WriteMapElemValue()
-				yym17 := z.EncBinary()
-				_ = yym17
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Refresh))
@@ -897,18 +754,14 @@ func (x *SetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym19 := z.EncBinary()
-				_ = yym19
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Dir))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Dir"))
+				r.EncodeString(codecSelferCcUTF87467, `Dir`)
 				r.WriteMapElemValue()
-				yym20 := z.EncBinary()
-				_ = yym20
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Dir))
@@ -916,18 +769,14 @@ func (x *SetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym22 := z.EncBinary()
-				_ = yym22
 				if false {
 				} else {
 					r.EncodeBool(bool(x.NoValueOnSuccess))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("NoValueOnSuccess"))
+				r.EncodeString(codecSelferCcUTF87467, `NoValueOnSuccess`)
 				r.WriteMapElemValue()
-				yym23 := z.EncBinary()
-				_ = yym23
 				if false {
 				} else {
 					r.EncodeBool(bool(x.NoValueOnSuccess))
@@ -943,23 +792,22 @@ func (x *SetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *SetOptions) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -967,17 +815,15 @@ func (x *SetOptions) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *SetOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -990,89 +836,55 @@ func (x *SetOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "PrevValue":
 			if r.TryDecodeAsNil() {
 				x.PrevValue = ""
 			} else {
-				yyv4 := &x.PrevValue
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.PrevValue = (string)(r.DecodeString())
 			}
 		case "PrevIndex":
 			if r.TryDecodeAsNil() {
 				x.PrevIndex = 0
 			} else {
-				yyv6 := &x.PrevIndex
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*uint64)(yyv6)) = uint64(r.DecodeUint(64))
-				}
+				x.PrevIndex = (uint64)(r.DecodeUint64())
 			}
 		case "PrevExist":
 			if r.TryDecodeAsNil() {
 				x.PrevExist = ""
 			} else {
-				yyv8 := &x.PrevExist
-				yyv8.CodecDecodeSelf(d)
+				x.PrevExist.CodecDecodeSelf(d)
 			}
 		case "TTL":
 			if r.TryDecodeAsNil() {
 				x.TTL = 0
 			} else {
-				yyv9 := &x.TTL
-				yym10 := z.DecBinary()
-				_ = yym10
 				if false {
-				} else if z.HasExtensions() && z.DecExt(yyv9) {
+				} else if yyxt8 := z.Extension(z.I2Rtid(x.TTL)); yyxt8 != nil {
+					z.DecExtension(x.TTL, yyxt8)
 				} else {
-					*((*int64)(yyv9)) = int64(r.DecodeInt(64))
+					x.TTL = (time.Duration)(r.DecodeInt64())
 				}
 			}
 		case "Refresh":
 			if r.TryDecodeAsNil() {
 				x.Refresh = false
 			} else {
-				yyv11 := &x.Refresh
-				yym12 := z.DecBinary()
-				_ = yym12
-				if false {
-				} else {
-					*((*bool)(yyv11)) = r.DecodeBool()
-				}
+				x.Refresh = (bool)(r.DecodeBool())
 			}
 		case "Dir":
 			if r.TryDecodeAsNil() {
 				x.Dir = false
 			} else {
-				yyv13 := &x.Dir
-				yym14 := z.DecBinary()
-				_ = yym14
-				if false {
-				} else {
-					*((*bool)(yyv13)) = r.DecodeBool()
-				}
+				x.Dir = (bool)(r.DecodeBool())
 			}
 		case "NoValueOnSuccess":
 			if r.TryDecodeAsNil() {
 				x.NoValueOnSuccess = false
 			} else {
-				yyv15 := &x.NoValueOnSuccess
-				yym16 := z.DecBinary()
-				_ = yym16
-				if false {
-				} else {
-					*((*bool)(yyv15)) = r.DecodeBool()
-				}
+				x.NoValueOnSuccess = (bool)(r.DecodeBool())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -1082,19 +894,19 @@ func (x *SetOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *SetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj17 int
-	var yyb17 bool
-	var yyhl17 bool = l >= 0
-	yyj17++
-	if yyhl17 {
-		yyb17 = yyj17 > l
+	var yyj12 int
+	var yyb12 bool
+	var yyhl12 bool = l >= 0
+	yyj12++
+	if yyhl12 {
+		yyb12 = yyj12 > l
 	} else {
-		yyb17 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb17 {
+	if yyb12 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1102,21 +914,15 @@ func (x *SetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevValue = ""
 	} else {
-		yyv18 := &x.PrevValue
-		yym19 := z.DecBinary()
-		_ = yym19
-		if false {
-		} else {
-			*((*string)(yyv18)) = r.DecodeString()
-		}
+		x.PrevValue = (string)(r.DecodeString())
 	}
-	yyj17++
-	if yyhl17 {
-		yyb17 = yyj17 > l
+	yyj12++
+	if yyhl12 {
+		yyb12 = yyj12 > l
 	} else {
-		yyb17 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb17 {
+	if yyb12 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1124,21 +930,15 @@ func (x *SetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevIndex = 0
 	} else {
-		yyv20 := &x.PrevIndex
-		yym21 := z.DecBinary()
-		_ = yym21
-		if false {
-		} else {
-			*((*uint64)(yyv20)) = uint64(r.DecodeUint(64))
-		}
+		x.PrevIndex = (uint64)(r.DecodeUint64())
 	}
-	yyj17++
-	if yyhl17 {
-		yyb17 = yyj17 > l
+	yyj12++
+	if yyhl12 {
+		yyb12 = yyj12 > l
 	} else {
-		yyb17 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb17 {
+	if yyb12 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1146,16 +946,15 @@ func (x *SetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevExist = ""
 	} else {
-		yyv22 := &x.PrevExist
-		yyv22.CodecDecodeSelf(d)
+		x.PrevExist.CodecDecodeSelf(d)
 	}
-	yyj17++
-	if yyhl17 {
-		yyb17 = yyj17 > l
+	yyj12++
+	if yyhl12 {
+		yyb12 = yyj12 > l
 	} else {
-		yyb17 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb17 {
+	if yyb12 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1163,22 +962,20 @@ func (x *SetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.TTL = 0
 	} else {
-		yyv23 := &x.TTL
-		yym24 := z.DecBinary()
-		_ = yym24
 		if false {
-		} else if z.HasExtensions() && z.DecExt(yyv23) {
+		} else if yyxt17 := z.Extension(z.I2Rtid(x.TTL)); yyxt17 != nil {
+			z.DecExtension(x.TTL, yyxt17)
 		} else {
-			*((*int64)(yyv23)) = int64(r.DecodeInt(64))
+			x.TTL = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj17++
-	if yyhl17 {
-		yyb17 = yyj17 > l
+	yyj12++
+	if yyhl12 {
+		yyb12 = yyj12 > l
 	} else {
-		yyb17 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb17 {
+	if yyb12 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1186,21 +983,15 @@ func (x *SetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Refresh = false
 	} else {
-		yyv25 := &x.Refresh
-		yym26 := z.DecBinary()
-		_ = yym26
-		if false {
-		} else {
-			*((*bool)(yyv25)) = r.DecodeBool()
-		}
+		x.Refresh = (bool)(r.DecodeBool())
 	}
-	yyj17++
-	if yyhl17 {
-		yyb17 = yyj17 > l
+	yyj12++
+	if yyhl12 {
+		yyb12 = yyj12 > l
 	} else {
-		yyb17 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb17 {
+	if yyb12 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1208,21 +999,15 @@ func (x *SetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Dir = false
 	} else {
-		yyv27 := &x.Dir
-		yym28 := z.DecBinary()
-		_ = yym28
-		if false {
-		} else {
-			*((*bool)(yyv27)) = r.DecodeBool()
-		}
+		x.Dir = (bool)(r.DecodeBool())
 	}
-	yyj17++
-	if yyhl17 {
-		yyb17 = yyj17 > l
+	yyj12++
+	if yyhl12 {
+		yyb12 = yyj12 > l
 	} else {
-		yyb17 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb17 {
+	if yyb12 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1230,46 +1015,39 @@ func (x *SetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.NoValueOnSuccess = false
 	} else {
-		yyv29 := &x.NoValueOnSuccess
-		yym30 := z.DecBinary()
-		_ = yym30
-		if false {
-		} else {
-			*((*bool)(yyv29)) = r.DecodeBool()
-		}
+		x.NoValueOnSuccess = (bool)(r.DecodeBool())
 	}
 	for {
-		yyj17++
-		if yyhl17 {
-			yyb17 = yyj17 > l
+		yyj12++
+		if yyhl12 {
+			yyb12 = yyj12 > l
 		} else {
-			yyb17 = r.CheckBreak()
+			yyb12 = r.CheckBreak()
 		}
-		if yyb17 {
+		if yyb12 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj17-1, "")
+		z.DecStructFieldNotFound(yyj12-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *GetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(3)
 			} else {
@@ -1277,18 +1055,14 @@ func (x *GetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Recursive"))
+				r.EncodeString(codecSelferCcUTF87467, `Recursive`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
@@ -1296,18 +1070,14 @@ func (x *GetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Sort))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Sort"))
+				r.EncodeString(codecSelferCcUTF87467, `Sort`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Sort))
@@ -1315,18 +1085,14 @@ func (x *GetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Quorum))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Quorum"))
+				r.EncodeString(codecSelferCcUTF87467, `Quorum`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Quorum))
@@ -1342,23 +1108,22 @@ func (x *GetOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *GetOptions) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -1366,17 +1131,15 @@ func (x *GetOptions) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *GetOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -1389,45 +1152,26 @@ func (x *GetOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "Recursive":
 			if r.TryDecodeAsNil() {
 				x.Recursive = false
 			} else {
-				yyv4 := &x.Recursive
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*bool)(yyv4)) = r.DecodeBool()
-				}
+				x.Recursive = (bool)(r.DecodeBool())
 			}
 		case "Sort":
 			if r.TryDecodeAsNil() {
 				x.Sort = false
 			} else {
-				yyv6 := &x.Sort
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*bool)(yyv6)) = r.DecodeBool()
-				}
+				x.Sort = (bool)(r.DecodeBool())
 			}
 		case "Quorum":
 			if r.TryDecodeAsNil() {
 				x.Quorum = false
 			} else {
-				yyv8 := &x.Quorum
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*bool)(yyv8)) = r.DecodeBool()
-				}
+				x.Quorum = (bool)(r.DecodeBool())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -1437,19 +1181,19 @@ func (x *GetOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *GetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj10 int
-	var yyb10 bool
-	var yyhl10 bool = l >= 0
-	yyj10++
-	if yyhl10 {
-		yyb10 = yyj10 > l
+	var yyj7 int
+	var yyb7 bool
+	var yyhl7 bool = l >= 0
+	yyj7++
+	if yyhl7 {
+		yyb7 = yyj7 > l
 	} else {
-		yyb10 = r.CheckBreak()
+		yyb7 = r.CheckBreak()
 	}
-	if yyb10 {
+	if yyb7 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1457,21 +1201,15 @@ func (x *GetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Recursive = false
 	} else {
-		yyv11 := &x.Recursive
-		yym12 := z.DecBinary()
-		_ = yym12
-		if false {
-		} else {
-			*((*bool)(yyv11)) = r.DecodeBool()
-		}
+		x.Recursive = (bool)(r.DecodeBool())
 	}
-	yyj10++
-	if yyhl10 {
-		yyb10 = yyj10 > l
+	yyj7++
+	if yyhl7 {
+		yyb7 = yyj7 > l
 	} else {
-		yyb10 = r.CheckBreak()
+		yyb7 = r.CheckBreak()
 	}
-	if yyb10 {
+	if yyb7 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1479,21 +1217,15 @@ func (x *GetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Sort = false
 	} else {
-		yyv13 := &x.Sort
-		yym14 := z.DecBinary()
-		_ = yym14
-		if false {
-		} else {
-			*((*bool)(yyv13)) = r.DecodeBool()
-		}
+		x.Sort = (bool)(r.DecodeBool())
 	}
-	yyj10++
-	if yyhl10 {
-		yyb10 = yyj10 > l
+	yyj7++
+	if yyhl7 {
+		yyb7 = yyj7 > l
 	} else {
-		yyb10 = r.CheckBreak()
+		yyb7 = r.CheckBreak()
 	}
-	if yyb10 {
+	if yyb7 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1501,46 +1233,39 @@ func (x *GetOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Quorum = false
 	} else {
-		yyv15 := &x.Quorum
-		yym16 := z.DecBinary()
-		_ = yym16
-		if false {
-		} else {
-			*((*bool)(yyv15)) = r.DecodeBool()
-		}
+		x.Quorum = (bool)(r.DecodeBool())
 	}
 	for {
-		yyj10++
-		if yyhl10 {
-			yyb10 = yyj10 > l
+		yyj7++
+		if yyhl7 {
+			yyb7 = yyj7 > l
 		} else {
-			yyb10 = r.CheckBreak()
+			yyb7 = r.CheckBreak()
 		}
-		if yyb10 {
+		if yyb7 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj10-1, "")
+		z.DecStructFieldNotFound(yyj7-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *DeleteOptions) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(4)
 			} else {
@@ -1548,37 +1273,29 @@ func (x *DeleteOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.PrevValue))
+					r.EncodeString(codecSelferCcUTF87467, string(x.PrevValue))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevValue"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevValue`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.PrevValue))
+					r.EncodeString(codecSelferCcUTF87467, string(x.PrevValue))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.PrevIndex))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevIndex"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevIndex`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.PrevIndex))
@@ -1586,18 +1303,14 @@ func (x *DeleteOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Recursive"))
+				r.EncodeString(codecSelferCcUTF87467, `Recursive`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
@@ -1605,18 +1318,14 @@ func (x *DeleteOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym13 := z.EncBinary()
-				_ = yym13
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Dir))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Dir"))
+				r.EncodeString(codecSelferCcUTF87467, `Dir`)
 				r.WriteMapElemValue()
-				yym14 := z.EncBinary()
-				_ = yym14
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Dir))
@@ -1632,23 +1341,22 @@ func (x *DeleteOptions) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *DeleteOptions) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -1656,17 +1364,15 @@ func (x *DeleteOptions) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *DeleteOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -1679,57 +1385,32 @@ func (x *DeleteOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "PrevValue":
 			if r.TryDecodeAsNil() {
 				x.PrevValue = ""
 			} else {
-				yyv4 := &x.PrevValue
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.PrevValue = (string)(r.DecodeString())
 			}
 		case "PrevIndex":
 			if r.TryDecodeAsNil() {
 				x.PrevIndex = 0
 			} else {
-				yyv6 := &x.PrevIndex
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*uint64)(yyv6)) = uint64(r.DecodeUint(64))
-				}
+				x.PrevIndex = (uint64)(r.DecodeUint64())
 			}
 		case "Recursive":
 			if r.TryDecodeAsNil() {
 				x.Recursive = false
 			} else {
-				yyv8 := &x.Recursive
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*bool)(yyv8)) = r.DecodeBool()
-				}
+				x.Recursive = (bool)(r.DecodeBool())
 			}
 		case "Dir":
 			if r.TryDecodeAsNil() {
 				x.Dir = false
 			} else {
-				yyv10 := &x.Dir
-				yym11 := z.DecBinary()
-				_ = yym11
-				if false {
-				} else {
-					*((*bool)(yyv10)) = r.DecodeBool()
-				}
+				x.Dir = (bool)(r.DecodeBool())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -1739,19 +1420,19 @@ func (x *DeleteOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *DeleteOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	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 yyj8 int
+	var yyb8 bool
+	var yyhl8 bool = l >= 0
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1759,21 +1440,15 @@ func (x *DeleteOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevValue = ""
 	} else {
-		yyv13 := &x.PrevValue
-		yym14 := z.DecBinary()
-		_ = yym14
-		if false {
-		} else {
-			*((*string)(yyv13)) = r.DecodeString()
-		}
+		x.PrevValue = (string)(r.DecodeString())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1781,21 +1456,15 @@ func (x *DeleteOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevIndex = 0
 	} else {
-		yyv15 := &x.PrevIndex
-		yym16 := z.DecBinary()
-		_ = yym16
-		if false {
-		} else {
-			*((*uint64)(yyv15)) = uint64(r.DecodeUint(64))
-		}
+		x.PrevIndex = (uint64)(r.DecodeUint64())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1803,21 +1472,15 @@ func (x *DeleteOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Recursive = false
 	} else {
-		yyv17 := &x.Recursive
-		yym18 := z.DecBinary()
-		_ = yym18
-		if false {
-		} else {
-			*((*bool)(yyv17)) = r.DecodeBool()
-		}
+		x.Recursive = (bool)(r.DecodeBool())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -1825,46 +1488,39 @@ func (x *DeleteOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Dir = false
 	} else {
-		yyv19 := &x.Dir
-		yym20 := z.DecBinary()
-		_ = yym20
-		if false {
-		} else {
-			*((*bool)(yyv19)) = r.DecodeBool()
-		}
+		x.Dir = (bool)(r.DecodeBool())
 	}
 	for {
-		yyj12++
-		if yyhl12 {
-			yyb12 = yyj12 > l
+		yyj8++
+		if yyhl8 {
+			yyb8 = yyj8 > l
 		} else {
-			yyb12 = r.CheckBreak()
+			yyb8 = r.CheckBreak()
 		}
-		if yyb12 {
+		if yyb8 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj12-1, "")
+		z.DecStructFieldNotFound(yyj8-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(3)
 			} else {
@@ -1872,21 +1528,17 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Action))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Action))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("action"))
+				r.EncodeString(codecSelferCcUTF87467, `action`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Action))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Action))
 				}
 			}
 			var yyn6 bool
@@ -1909,7 +1561,7 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("node"))
+				r.EncodeString(codecSelferCcUTF87467, `node`)
 				r.WriteMapElemValue()
 				if yyn6 {
 					r.EncodeNil()
@@ -1941,7 +1593,7 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("prevNode"))
+				r.EncodeString(codecSelferCcUTF87467, `prevNode`)
 				r.WriteMapElemValue()
 				if yyn9 {
 					r.EncodeNil()
@@ -1963,23 +1615,22 @@ func (x *Response) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -1987,17 +1638,15 @@ func (x *Response) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -2010,48 +1659,37 @@ func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "action":
 			if r.TryDecodeAsNil() {
 				x.Action = ""
 			} else {
-				yyv4 := &x.Action
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.Action = (string)(r.DecodeString())
 			}
 		case "node":
-			if x.Node == nil {
-				x.Node = new(Node)
-			}
 			if r.TryDecodeAsNil() {
-				if x.Node != nil {
+				if true && x.Node != nil {
 					x.Node = nil
 				}
 			} else {
 				if x.Node == nil {
 					x.Node = new(Node)
 				}
+
 				x.Node.CodecDecodeSelf(d)
 			}
 		case "prevNode":
-			if x.PrevNode == nil {
-				x.PrevNode = new(Node)
-			}
 			if r.TryDecodeAsNil() {
-				if x.PrevNode != nil {
+				if true && x.PrevNode != nil {
 					x.PrevNode = nil
 				}
 			} else {
 				if x.PrevNode == nil {
 					x.PrevNode = new(Node)
 				}
+
 				x.PrevNode.CodecDecodeSelf(d)
 			}
 		default:
@@ -2062,19 +1700,19 @@ func (x *Response) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj8 int
-	var yyb8 bool
-	var yyhl8 bool = l >= 0
-	yyj8++
-	if yyhl8 {
-		yyb8 = yyj8 > l
+	var yyj7 int
+	var yyb7 bool
+	var yyhl7 bool = l >= 0
+	yyj7++
+	if yyhl7 {
+		yyb7 = yyj7 > l
 	} else {
-		yyb8 = r.CheckBreak()
+		yyb7 = r.CheckBreak()
 	}
-	if yyb8 {
+	if yyb7 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -2082,134 +1720,124 @@ func (x *Response) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Action = ""
 	} else {
-		yyv9 := &x.Action
-		yym10 := z.DecBinary()
-		_ = yym10
-		if false {
-		} else {
-			*((*string)(yyv9)) = r.DecodeString()
-		}
+		x.Action = (string)(r.DecodeString())
 	}
-	if x.Node == nil {
-		x.Node = new(Node)
-	}
-	yyj8++
-	if yyhl8 {
-		yyb8 = yyj8 > l
+	yyj7++
+	if yyhl7 {
+		yyb7 = yyj7 > l
 	} else {
-		yyb8 = r.CheckBreak()
+		yyb7 = r.CheckBreak()
 	}
-	if yyb8 {
+	if yyb7 {
 		r.ReadArrayEnd()
 		return
 	}
 	r.ReadArrayElem()
 	if r.TryDecodeAsNil() {
-		if x.Node != nil {
+		if true && x.Node != nil {
 			x.Node = nil
 		}
 	} else {
 		if x.Node == nil {
 			x.Node = new(Node)
 		}
+
 		x.Node.CodecDecodeSelf(d)
 	}
-	if x.PrevNode == nil {
-		x.PrevNode = new(Node)
-	}
-	yyj8++
-	if yyhl8 {
-		yyb8 = yyj8 > l
+	yyj7++
+	if yyhl7 {
+		yyb7 = yyj7 > l
 	} else {
-		yyb8 = r.CheckBreak()
+		yyb7 = r.CheckBreak()
 	}
-	if yyb8 {
+	if yyb7 {
 		r.ReadArrayEnd()
 		return
 	}
 	r.ReadArrayElem()
 	if r.TryDecodeAsNil() {
-		if x.PrevNode != nil {
+		if true && x.PrevNode != nil {
 			x.PrevNode = nil
 		}
 	} else {
 		if x.PrevNode == nil {
 			x.PrevNode = new(Node)
 		}
+
 		x.PrevNode.CodecDecodeSelf(d)
 	}
 	for {
-		yyj8++
-		if yyhl8 {
-			yyb8 = yyj8 > l
+		yyj7++
+		if yyhl7 {
+			yyb7 = yyj7 > l
 		} else {
-			yyb8 = r.CheckBreak()
+			yyb7 = r.CheckBreak()
 		}
-		if yyb8 {
+		if yyb7 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj8-1, "")
+		z.DecStructFieldNotFound(yyj7-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
-			var yyq2 [8]bool
-			_ = yyq2
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
-			yyq2[1] = x.Dir != false
-			yyq2[6] = x.Expiration != nil
-			yyq2[7] = x.TTL != 0
+			const yyr2 bool = false // struct tag has 'toArray'
+			var yyq2 = [8]bool{     // should field at this index be written?
+				true,                // Key
+				x.Dir,               // Dir
+				true,                // Value
+				true,                // Nodes
+				true,                // CreatedIndex
+				true,                // ModifiedIndex
+				x.Expiration != nil, // Expiration
+				x.TTL != 0,          // TTL
+			}
+			_ = yyq2
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(8)
 			} else {
-				var yynn2 = 5
+				var yynn2 int
 				for _, b := range yyq2 {
 					if b {
 						yynn2++
 					}
 				}
 				r.WriteMapStart(yynn2)
+				yynn2 = 0
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("key"))
+				r.EncodeString(codecSelferCcUTF87467, `key`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
 				if yyq2[1] {
-					yym7 := z.EncBinary()
-					_ = yym7
 					if false {
 					} else {
 						r.EncodeBool(bool(x.Dir))
@@ -2220,10 +1848,8 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 			} else {
 				if yyq2[1] {
 					r.WriteMapElemKey()
-					r.EncodeString(codecSelferC_UTF87612, string("dir"))
+					r.EncodeString(codecSelferCcUTF87467, `dir`)
 					r.WriteMapElemValue()
-					yym8 := z.EncBinary()
-					_ = yym8
 					if false {
 					} else {
 						r.EncodeBool(bool(x.Dir))
@@ -2232,21 +1858,17 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Value))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Value))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("value"))
+				r.EncodeString(codecSelferCcUTF87467, `value`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Value))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Value))
 				}
 			}
 			if yyr2 || yy2arr2 {
@@ -2258,7 +1880,7 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("nodes"))
+				r.EncodeString(codecSelferCcUTF87467, `nodes`)
 				r.WriteMapElemValue()
 				if x.Nodes == nil {
 					r.EncodeNil()
@@ -2268,18 +1890,14 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym16 := z.EncBinary()
-				_ = yym16
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.CreatedIndex))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("createdIndex"))
+				r.EncodeString(codecSelferCcUTF87467, `createdIndex`)
 				r.WriteMapElemValue()
-				yym17 := z.EncBinary()
-				_ = yym17
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.CreatedIndex))
@@ -2287,18 +1905,14 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym19 := z.EncBinary()
-				_ = yym19
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.ModifiedIndex))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("modifiedIndex"))
+				r.EncodeString(codecSelferCcUTF87467, `modifiedIndex`)
 				r.WriteMapElemValue()
-				yym20 := z.EncBinary()
-				_ = yym20
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.ModifiedIndex))
@@ -2320,18 +1934,9 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 						if x.Expiration == nil {
 							r.EncodeNil()
 						} else {
-							yym22 := z.EncBinary()
-							_ = yym22
 							if false {
-							} else if yym23 := z.TimeRtidIfBinc(); yym23 != 0 {
-								r.EncodeBuiltin(yym23, x.Expiration)
-							} else if z.HasExtensions() && z.EncExt(x.Expiration) {
-							} else if yym22 {
-								z.EncBinaryMarshal(x.Expiration)
-							} else if !yym22 && z.IsJSONHandle() {
-								z.EncJSONMarshal(x.Expiration)
 							} else {
-								z.EncFallback(x.Expiration)
+								r.EncodeTime(x.Expiration)
 							}
 						}
 					} else {
@@ -2341,7 +1946,7 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 			} else {
 				if yyq2[6] {
 					r.WriteMapElemKey()
-					r.EncodeString(codecSelferC_UTF87612, string("expiration"))
+					r.EncodeString(codecSelferCcUTF87467, `expiration`)
 					r.WriteMapElemValue()
 					if yyn21 {
 						r.EncodeNil()
@@ -2349,18 +1954,9 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 						if x.Expiration == nil {
 							r.EncodeNil()
 						} else {
-							yym24 := z.EncBinary()
-							_ = yym24
 							if false {
-							} else if yym25 := z.TimeRtidIfBinc(); yym25 != 0 {
-								r.EncodeBuiltin(yym25, x.Expiration)
-							} else if z.HasExtensions() && z.EncExt(x.Expiration) {
-							} else if yym24 {
-								z.EncBinaryMarshal(x.Expiration)
-							} else if !yym24 && z.IsJSONHandle() {
-								z.EncJSONMarshal(x.Expiration)
 							} else {
-								z.EncFallback(x.Expiration)
+								r.EncodeTime(x.Expiration)
 							}
 						}
 					}
@@ -2369,8 +1965,6 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
 				if yyq2[7] {
-					yym27 := z.EncBinary()
-					_ = yym27
 					if false {
 					} else {
 						r.EncodeInt(int64(x.TTL))
@@ -2381,10 +1975,8 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 			} else {
 				if yyq2[7] {
 					r.WriteMapElemKey()
-					r.EncodeString(codecSelferC_UTF87612, string("ttl"))
+					r.EncodeString(codecSelferCcUTF87467, `ttl`)
 					r.WriteMapElemValue()
-					yym28 := z.EncBinary()
-					_ = yym28
 					if false {
 					} else {
 						r.EncodeInt(int64(x.TTL))
@@ -2401,23 +1993,22 @@ func (x *Node) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Node) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -2425,17 +2016,15 @@ func (x *Node) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *Node) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -2448,114 +2037,65 @@ func (x *Node) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "key":
 			if r.TryDecodeAsNil() {
 				x.Key = ""
 			} else {
-				yyv4 := &x.Key
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.Key = (string)(r.DecodeString())
 			}
 		case "dir":
 			if r.TryDecodeAsNil() {
 				x.Dir = false
 			} else {
-				yyv6 := &x.Dir
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*bool)(yyv6)) = r.DecodeBool()
-				}
+				x.Dir = (bool)(r.DecodeBool())
 			}
 		case "value":
 			if r.TryDecodeAsNil() {
 				x.Value = ""
 			} else {
-				yyv8 := &x.Value
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*string)(yyv8)) = r.DecodeString()
-				}
+				x.Value = (string)(r.DecodeString())
 			}
 		case "nodes":
 			if r.TryDecodeAsNil() {
 				x.Nodes = nil
 			} else {
-				yyv10 := &x.Nodes
-				yyv10.CodecDecodeSelf(d)
+				x.Nodes.CodecDecodeSelf(d)
 			}
 		case "createdIndex":
 			if r.TryDecodeAsNil() {
 				x.CreatedIndex = 0
 			} else {
-				yyv11 := &x.CreatedIndex
-				yym12 := z.DecBinary()
-				_ = yym12
-				if false {
-				} else {
-					*((*uint64)(yyv11)) = uint64(r.DecodeUint(64))
-				}
+				x.CreatedIndex = (uint64)(r.DecodeUint64())
 			}
 		case "modifiedIndex":
 			if r.TryDecodeAsNil() {
 				x.ModifiedIndex = 0
 			} else {
-				yyv13 := &x.ModifiedIndex
-				yym14 := z.DecBinary()
-				_ = yym14
-				if false {
-				} else {
-					*((*uint64)(yyv13)) = uint64(r.DecodeUint(64))
-				}
+				x.ModifiedIndex = (uint64)(r.DecodeUint64())
 			}
 		case "expiration":
-			if x.Expiration == nil {
-				x.Expiration = new(time.Time)
-			}
 			if r.TryDecodeAsNil() {
-				if x.Expiration != nil {
+				if true && x.Expiration != nil {
 					x.Expiration = nil
 				}
 			} else {
 				if x.Expiration == nil {
 					x.Expiration = new(time.Time)
 				}
-				yym16 := z.DecBinary()
-				_ = yym16
+
 				if false {
-				} else if yym17 := z.TimeRtidIfBinc(); yym17 != 0 {
-					r.DecodeBuiltin(yym17, x.Expiration)
-				} else if z.HasExtensions() && z.DecExt(x.Expiration) {
-				} else if yym16 {
-					z.DecBinaryUnmarshal(x.Expiration)
-				} else if !yym16 && z.IsJSONHandle() {
-					z.DecJSONUnmarshal(x.Expiration)
 				} else {
-					z.DecFallback(x.Expiration, false)
+					*x.Expiration = r.DecodeTime()
 				}
 			}
 		case "ttl":
 			if r.TryDecodeAsNil() {
 				x.TTL = 0
 			} else {
-				yyv18 := &x.TTL
-				yym19 := z.DecBinary()
-				_ = yym19
-				if false {
-				} else {
-					*((*int64)(yyv18)) = int64(r.DecodeInt(64))
-				}
+				x.TTL = (int64)(r.DecodeInt64())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -2565,19 +2105,19 @@ func (x *Node) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *Node) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj20 int
-	var yyb20 bool
-	var yyhl20 bool = l >= 0
-	yyj20++
-	if yyhl20 {
-		yyb20 = yyj20 > l
+	var yyj13 int
+	var yyb13 bool
+	var yyhl13 bool = l >= 0
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb20 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb20 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -2585,21 +2125,15 @@ func (x *Node) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Key = ""
 	} else {
-		yyv21 := &x.Key
-		yym22 := z.DecBinary()
-		_ = yym22
-		if false {
-		} else {
-			*((*string)(yyv21)) = r.DecodeString()
-		}
+		x.Key = (string)(r.DecodeString())
 	}
-	yyj20++
-	if yyhl20 {
-		yyb20 = yyj20 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb20 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb20 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -2607,21 +2141,15 @@ func (x *Node) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Dir = false
 	} else {
-		yyv23 := &x.Dir
-		yym24 := z.DecBinary()
-		_ = yym24
-		if false {
-		} else {
-			*((*bool)(yyv23)) = r.DecodeBool()
-		}
+		x.Dir = (bool)(r.DecodeBool())
 	}
-	yyj20++
-	if yyhl20 {
-		yyb20 = yyj20 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb20 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb20 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -2629,21 +2157,15 @@ func (x *Node) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Value = ""
 	} else {
-		yyv25 := &x.Value
-		yym26 := z.DecBinary()
-		_ = yym26
-		if false {
-		} else {
-			*((*string)(yyv25)) = r.DecodeString()
-		}
+		x.Value = (string)(r.DecodeString())
 	}
-	yyj20++
-	if yyhl20 {
-		yyb20 = yyj20 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb20 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb20 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -2651,16 +2173,15 @@ func (x *Node) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Nodes = nil
 	} else {
-		yyv27 := &x.Nodes
-		yyv27.CodecDecodeSelf(d)
+		x.Nodes.CodecDecodeSelf(d)
 	}
-	yyj20++
-	if yyhl20 {
-		yyb20 = yyj20 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb20 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb20 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -2668,21 +2189,15 @@ func (x *Node) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.CreatedIndex = 0
 	} else {
-		yyv28 := &x.CreatedIndex
-		yym29 := z.DecBinary()
-		_ = yym29
-		if false {
-		} else {
-			*((*uint64)(yyv28)) = uint64(r.DecodeUint(64))
-		}
+		x.CreatedIndex = (uint64)(r.DecodeUint64())
 	}
-	yyj20++
-	if yyhl20 {
-		yyb20 = yyj20 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb20 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb20 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -2690,57 +2205,40 @@ func (x *Node) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.ModifiedIndex = 0
 	} else {
-		yyv30 := &x.ModifiedIndex
-		yym31 := z.DecBinary()
-		_ = yym31
-		if false {
-		} else {
-			*((*uint64)(yyv30)) = uint64(r.DecodeUint(64))
-		}
-	}
-	if x.Expiration == nil {
-		x.Expiration = new(time.Time)
+		x.ModifiedIndex = (uint64)(r.DecodeUint64())
 	}
-	yyj20++
-	if yyhl20 {
-		yyb20 = yyj20 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb20 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb20 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
 	r.ReadArrayElem()
 	if r.TryDecodeAsNil() {
-		if x.Expiration != nil {
+		if true && x.Expiration != nil {
 			x.Expiration = nil
 		}
 	} else {
 		if x.Expiration == nil {
 			x.Expiration = new(time.Time)
 		}
-		yym33 := z.DecBinary()
-		_ = yym33
+
 		if false {
-		} else if yym34 := z.TimeRtidIfBinc(); yym34 != 0 {
-			r.DecodeBuiltin(yym34, x.Expiration)
-		} else if z.HasExtensions() && z.DecExt(x.Expiration) {
-		} else if yym33 {
-			z.DecBinaryUnmarshal(x.Expiration)
-		} else if !yym33 && z.IsJSONHandle() {
-			z.DecJSONUnmarshal(x.Expiration)
 		} else {
-			z.DecFallback(x.Expiration, false)
+			*x.Expiration = r.DecodeTime()
 		}
 	}
-	yyj20++
-	if yyhl20 {
-		yyb20 = yyj20 > l
+	yyj13++
+	if yyhl13 {
+		yyb13 = yyj13 > l
 	} else {
-		yyb20 = r.CheckBreak()
+		yyb13 = r.CheckBreak()
 	}
-	if yyb20 {
+	if yyb13 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -2748,41 +2246,34 @@ func (x *Node) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.TTL = 0
 	} else {
-		yyv35 := &x.TTL
-		yym36 := z.DecBinary()
-		_ = yym36
-		if false {
-		} else {
-			*((*int64)(yyv35)) = int64(r.DecodeInt(64))
-		}
+		x.TTL = (int64)(r.DecodeInt64())
 	}
 	for {
-		yyj20++
-		if yyhl20 {
-			yyb20 = yyj20 > l
+		yyj13++
+		if yyhl13 {
+			yyb13 = yyj13 > l
 		} else {
-			yyb20 = r.CheckBreak()
+			yyb13 = r.CheckBreak()
 		}
-		if yyb20 {
+		if yyb13 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj20-1, "")
+		z.DecStructFieldNotFound(yyj13-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x Nodes) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			h.encNodes((Nodes)(x), e)
 		}
@@ -2790,34 +2281,32 @@ func (x Nodes) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *Nodes) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		h.decNodes((*Nodes)(x), d)
 	}
 }
 
 func (x *httpKeysAPI) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(0)
 			} else {
@@ -2833,23 +2322,22 @@ func (x *httpKeysAPI) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *httpKeysAPI) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -2857,17 +2345,15 @@ func (x *httpKeysAPI) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *httpKeysAPI) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -2880,8 +2366,7 @@ func (x *httpKeysAPI) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		default:
@@ -2892,7 +2377,7 @@ func (x *httpKeysAPI) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *httpKeysAPI) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -2915,21 +2400,20 @@ func (x *httpKeysAPI) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *httpWatcher) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(0)
 			} else {
@@ -2945,23 +2429,22 @@ func (x *httpWatcher) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *httpWatcher) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -2969,17 +2452,15 @@ func (x *httpWatcher) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *httpWatcher) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -2992,8 +2473,7 @@ func (x *httpWatcher) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		default:
@@ -3004,7 +2484,7 @@ func (x *httpWatcher) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *httpWatcher) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 	var yyj4 int
@@ -3027,21 +2507,20 @@ func (x *httpWatcher) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 }
 
 func (x *getAction) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(5)
 			} else {
@@ -3049,56 +2528,44 @@ func (x *getAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Prefix"))
+				r.EncodeString(codecSelferCcUTF87467, `Prefix`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Key"))
+				r.EncodeString(codecSelferCcUTF87467, `Key`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Recursive"))
+				r.EncodeString(codecSelferCcUTF87467, `Recursive`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
@@ -3106,18 +2573,14 @@ func (x *getAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym13 := z.EncBinary()
-				_ = yym13
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Sorted))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Sorted"))
+				r.EncodeString(codecSelferCcUTF87467, `Sorted`)
 				r.WriteMapElemValue()
-				yym14 := z.EncBinary()
-				_ = yym14
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Sorted))
@@ -3125,18 +2588,14 @@ func (x *getAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym16 := z.EncBinary()
-				_ = yym16
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Quorum))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Quorum"))
+				r.EncodeString(codecSelferCcUTF87467, `Quorum`)
 				r.WriteMapElemValue()
-				yym17 := z.EncBinary()
-				_ = yym17
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Quorum))
@@ -3152,23 +2611,22 @@ func (x *getAction) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *getAction) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -3176,17 +2634,15 @@ func (x *getAction) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *getAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -3199,69 +2655,38 @@ func (x *getAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "Prefix":
 			if r.TryDecodeAsNil() {
 				x.Prefix = ""
 			} else {
-				yyv4 := &x.Prefix
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.Prefix = (string)(r.DecodeString())
 			}
 		case "Key":
 			if r.TryDecodeAsNil() {
 				x.Key = ""
 			} else {
-				yyv6 := &x.Key
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*string)(yyv6)) = r.DecodeString()
-				}
+				x.Key = (string)(r.DecodeString())
 			}
 		case "Recursive":
 			if r.TryDecodeAsNil() {
 				x.Recursive = false
 			} else {
-				yyv8 := &x.Recursive
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*bool)(yyv8)) = r.DecodeBool()
-				}
+				x.Recursive = (bool)(r.DecodeBool())
 			}
 		case "Sorted":
 			if r.TryDecodeAsNil() {
 				x.Sorted = false
 			} else {
-				yyv10 := &x.Sorted
-				yym11 := z.DecBinary()
-				_ = yym11
-				if false {
-				} else {
-					*((*bool)(yyv10)) = r.DecodeBool()
-				}
+				x.Sorted = (bool)(r.DecodeBool())
 			}
 		case "Quorum":
 			if r.TryDecodeAsNil() {
 				x.Quorum = false
 			} else {
-				yyv12 := &x.Quorum
-				yym13 := z.DecBinary()
-				_ = yym13
-				if false {
-				} else {
-					*((*bool)(yyv12)) = r.DecodeBool()
-				}
+				x.Quorum = (bool)(r.DecodeBool())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -3271,19 +2696,19 @@ func (x *getAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *getAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	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 yyj9 int
+	var yyb9 bool
+	var yyhl9 bool = l >= 0
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3291,21 +2716,15 @@ func (x *getAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Prefix = ""
 	} else {
-		yyv15 := &x.Prefix
-		yym16 := z.DecBinary()
-		_ = yym16
-		if false {
-		} else {
-			*((*string)(yyv15)) = r.DecodeString()
-		}
+		x.Prefix = (string)(r.DecodeString())
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3313,21 +2732,15 @@ func (x *getAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Key = ""
 	} else {
-		yyv17 := &x.Key
-		yym18 := z.DecBinary()
-		_ = yym18
-		if false {
-		} else {
-			*((*string)(yyv17)) = r.DecodeString()
-		}
+		x.Key = (string)(r.DecodeString())
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3335,21 +2748,15 @@ func (x *getAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Recursive = false
 	} else {
-		yyv19 := &x.Recursive
-		yym20 := z.DecBinary()
-		_ = yym20
-		if false {
-		} else {
-			*((*bool)(yyv19)) = r.DecodeBool()
-		}
+		x.Recursive = (bool)(r.DecodeBool())
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3357,68 +2764,55 @@ func (x *getAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Sorted = false
 	} else {
-		yyv21 := &x.Sorted
-		yym22 := z.DecBinary()
-		_ = yym22
-		if false {
-		} else {
-			*((*bool)(yyv21)) = r.DecodeBool()
-		}
+		x.Sorted = (bool)(r.DecodeBool())
 	}
-	yyj14++
-	if yyhl14 {
-		yyb14 = yyj14 > l
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb14 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb14 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
 	r.ReadArrayElem()
 	if r.TryDecodeAsNil() {
-		x.Quorum = false
-	} else {
-		yyv23 := &x.Quorum
-		yym24 := z.DecBinary()
-		_ = yym24
-		if false {
-		} else {
-			*((*bool)(yyv23)) = r.DecodeBool()
-		}
+		x.Quorum = false
+	} else {
+		x.Quorum = (bool)(r.DecodeBool())
 	}
 	for {
-		yyj14++
-		if yyhl14 {
-			yyb14 = yyj14 > l
+		yyj9++
+		if yyhl9 {
+			yyb9 = yyj9 > l
 		} else {
-			yyb14 = r.CheckBreak()
+			yyb9 = r.CheckBreak()
 		}
-		if yyb14 {
+		if yyb9 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj14-1, "")
+		z.DecStructFieldNotFound(yyj9-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *waitAction) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(4)
 			} else {
@@ -3426,56 +2820,44 @@ func (x *waitAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Prefix"))
+				r.EncodeString(codecSelferCcUTF87467, `Prefix`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Key"))
+				r.EncodeString(codecSelferCcUTF87467, `Key`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.WaitIndex))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("WaitIndex"))
+				r.EncodeString(codecSelferCcUTF87467, `WaitIndex`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.WaitIndex))
@@ -3483,18 +2865,14 @@ func (x *waitAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym13 := z.EncBinary()
-				_ = yym13
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Recursive"))
+				r.EncodeString(codecSelferCcUTF87467, `Recursive`)
 				r.WriteMapElemValue()
-				yym14 := z.EncBinary()
-				_ = yym14
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
@@ -3510,23 +2888,22 @@ func (x *waitAction) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *waitAction) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -3534,17 +2911,15 @@ func (x *waitAction) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *waitAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -3557,57 +2932,32 @@ func (x *waitAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "Prefix":
 			if r.TryDecodeAsNil() {
 				x.Prefix = ""
 			} else {
-				yyv4 := &x.Prefix
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.Prefix = (string)(r.DecodeString())
 			}
 		case "Key":
 			if r.TryDecodeAsNil() {
 				x.Key = ""
 			} else {
-				yyv6 := &x.Key
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*string)(yyv6)) = r.DecodeString()
-				}
+				x.Key = (string)(r.DecodeString())
 			}
 		case "WaitIndex":
 			if r.TryDecodeAsNil() {
 				x.WaitIndex = 0
 			} else {
-				yyv8 := &x.WaitIndex
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*uint64)(yyv8)) = uint64(r.DecodeUint(64))
-				}
+				x.WaitIndex = (uint64)(r.DecodeUint64())
 			}
 		case "Recursive":
 			if r.TryDecodeAsNil() {
 				x.Recursive = false
 			} else {
-				yyv10 := &x.Recursive
-				yym11 := z.DecBinary()
-				_ = yym11
-				if false {
-				} else {
-					*((*bool)(yyv10)) = r.DecodeBool()
-				}
+				x.Recursive = (bool)(r.DecodeBool())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -3617,19 +2967,19 @@ func (x *waitAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *waitAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	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 yyj8 int
+	var yyb8 bool
+	var yyhl8 bool = l >= 0
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3637,21 +2987,15 @@ func (x *waitAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Prefix = ""
 	} else {
-		yyv13 := &x.Prefix
-		yym14 := z.DecBinary()
-		_ = yym14
-		if false {
-		} else {
-			*((*string)(yyv13)) = r.DecodeString()
-		}
+		x.Prefix = (string)(r.DecodeString())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3659,21 +3003,15 @@ func (x *waitAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Key = ""
 	} else {
-		yyv15 := &x.Key
-		yym16 := z.DecBinary()
-		_ = yym16
-		if false {
-		} else {
-			*((*string)(yyv15)) = r.DecodeString()
-		}
+		x.Key = (string)(r.DecodeString())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3681,21 +3019,15 @@ func (x *waitAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.WaitIndex = 0
 	} else {
-		yyv17 := &x.WaitIndex
-		yym18 := z.DecBinary()
-		_ = yym18
-		if false {
-		} else {
-			*((*uint64)(yyv17)) = uint64(r.DecodeUint(64))
-		}
+		x.WaitIndex = (uint64)(r.DecodeUint64())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj8++
+	if yyhl8 {
+		yyb8 = yyj8 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb8 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb8 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -3703,46 +3035,39 @@ func (x *waitAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Recursive = false
 	} else {
-		yyv19 := &x.Recursive
-		yym20 := z.DecBinary()
-		_ = yym20
-		if false {
-		} else {
-			*((*bool)(yyv19)) = r.DecodeBool()
-		}
+		x.Recursive = (bool)(r.DecodeBool())
 	}
 	for {
-		yyj12++
-		if yyhl12 {
-			yyb12 = yyj12 > l
+		yyj8++
+		if yyhl8 {
+			yyb8 = yyj8 > l
 		} else {
-			yyb12 = r.CheckBreak()
+			yyb8 = r.CheckBreak()
 		}
-		if yyb12 {
+		if yyb8 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj12-1, "")
+		z.DecStructFieldNotFound(yyj8-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *setAction) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(10)
 			} else {
@@ -3750,94 +3075,74 @@ func (x *setAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Prefix"))
+				r.EncodeString(codecSelferCcUTF87467, `Prefix`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Key"))
+				r.EncodeString(codecSelferCcUTF87467, `Key`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Value))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Value))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Value"))
+				r.EncodeString(codecSelferCcUTF87467, `Value`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Value))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Value))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym13 := z.EncBinary()
-				_ = yym13
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.PrevValue))
+					r.EncodeString(codecSelferCcUTF87467, string(x.PrevValue))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevValue"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevValue`)
 				r.WriteMapElemValue()
-				yym14 := z.EncBinary()
-				_ = yym14
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.PrevValue))
+					r.EncodeString(codecSelferCcUTF87467, string(x.PrevValue))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym16 := z.EncBinary()
-				_ = yym16
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.PrevIndex))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevIndex"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevIndex`)
 				r.WriteMapElemValue()
-				yym17 := z.EncBinary()
-				_ = yym17
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.PrevIndex))
@@ -3848,45 +3153,39 @@ func (x *setAction) CodecEncodeSelf(e *codec1978.Encoder) {
 				x.PrevExist.CodecEncodeSelf(e)
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevExist"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevExist`)
 				r.WriteMapElemValue()
 				x.PrevExist.CodecEncodeSelf(e)
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym22 := z.EncBinary()
-				_ = yym22
 				if false {
-				} else if z.HasExtensions() && z.EncExt(x.TTL) {
+				} else if yyxt22 := z.Extension(z.I2Rtid(x.TTL)); yyxt22 != nil {
+					z.EncExtension(x.TTL, yyxt22)
 				} else {
 					r.EncodeInt(int64(x.TTL))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("TTL"))
+				r.EncodeString(codecSelferCcUTF87467, `TTL`)
 				r.WriteMapElemValue()
-				yym23 := z.EncBinary()
-				_ = yym23
 				if false {
-				} else if z.HasExtensions() && z.EncExt(x.TTL) {
+				} else if yyxt23 := z.Extension(z.I2Rtid(x.TTL)); yyxt23 != nil {
+					z.EncExtension(x.TTL, yyxt23)
 				} else {
 					r.EncodeInt(int64(x.TTL))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym25 := z.EncBinary()
-				_ = yym25
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Refresh))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Refresh"))
+				r.EncodeString(codecSelferCcUTF87467, `Refresh`)
 				r.WriteMapElemValue()
-				yym26 := z.EncBinary()
-				_ = yym26
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Refresh))
@@ -3894,18 +3193,14 @@ func (x *setAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym28 := z.EncBinary()
-				_ = yym28
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Dir))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Dir"))
+				r.EncodeString(codecSelferCcUTF87467, `Dir`)
 				r.WriteMapElemValue()
-				yym29 := z.EncBinary()
-				_ = yym29
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Dir))
@@ -3913,18 +3208,14 @@ func (x *setAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym31 := z.EncBinary()
-				_ = yym31
 				if false {
 				} else {
 					r.EncodeBool(bool(x.NoValueOnSuccess))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("NoValueOnSuccess"))
+				r.EncodeString(codecSelferCcUTF87467, `NoValueOnSuccess`)
 				r.WriteMapElemValue()
-				yym32 := z.EncBinary()
-				_ = yym32
 				if false {
 				} else {
 					r.EncodeBool(bool(x.NoValueOnSuccess))
@@ -3940,23 +3231,22 @@ func (x *setAction) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *setAction) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -3964,17 +3254,15 @@ func (x *setAction) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *setAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -3987,125 +3275,73 @@ func (x *setAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "Prefix":
 			if r.TryDecodeAsNil() {
 				x.Prefix = ""
 			} else {
-				yyv4 := &x.Prefix
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.Prefix = (string)(r.DecodeString())
 			}
 		case "Key":
 			if r.TryDecodeAsNil() {
 				x.Key = ""
 			} else {
-				yyv6 := &x.Key
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*string)(yyv6)) = r.DecodeString()
-				}
+				x.Key = (string)(r.DecodeString())
 			}
 		case "Value":
 			if r.TryDecodeAsNil() {
 				x.Value = ""
 			} else {
-				yyv8 := &x.Value
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*string)(yyv8)) = r.DecodeString()
-				}
+				x.Value = (string)(r.DecodeString())
 			}
 		case "PrevValue":
 			if r.TryDecodeAsNil() {
 				x.PrevValue = ""
 			} else {
-				yyv10 := &x.PrevValue
-				yym11 := z.DecBinary()
-				_ = yym11
-				if false {
-				} else {
-					*((*string)(yyv10)) = r.DecodeString()
-				}
+				x.PrevValue = (string)(r.DecodeString())
 			}
 		case "PrevIndex":
 			if r.TryDecodeAsNil() {
 				x.PrevIndex = 0
 			} else {
-				yyv12 := &x.PrevIndex
-				yym13 := z.DecBinary()
-				_ = yym13
-				if false {
-				} else {
-					*((*uint64)(yyv12)) = uint64(r.DecodeUint(64))
-				}
+				x.PrevIndex = (uint64)(r.DecodeUint64())
 			}
 		case "PrevExist":
 			if r.TryDecodeAsNil() {
 				x.PrevExist = ""
 			} else {
-				yyv14 := &x.PrevExist
-				yyv14.CodecDecodeSelf(d)
+				x.PrevExist.CodecDecodeSelf(d)
 			}
 		case "TTL":
 			if r.TryDecodeAsNil() {
 				x.TTL = 0
 			} else {
-				yyv15 := &x.TTL
-				yym16 := z.DecBinary()
-				_ = yym16
 				if false {
-				} else if z.HasExtensions() && z.DecExt(yyv15) {
+				} else if yyxt11 := z.Extension(z.I2Rtid(x.TTL)); yyxt11 != nil {
+					z.DecExtension(x.TTL, yyxt11)
 				} else {
-					*((*int64)(yyv15)) = int64(r.DecodeInt(64))
+					x.TTL = (time.Duration)(r.DecodeInt64())
 				}
 			}
 		case "Refresh":
 			if r.TryDecodeAsNil() {
 				x.Refresh = false
 			} else {
-				yyv17 := &x.Refresh
-				yym18 := z.DecBinary()
-				_ = yym18
-				if false {
-				} else {
-					*((*bool)(yyv17)) = r.DecodeBool()
-				}
+				x.Refresh = (bool)(r.DecodeBool())
 			}
 		case "Dir":
 			if r.TryDecodeAsNil() {
 				x.Dir = false
 			} else {
-				yyv19 := &x.Dir
-				yym20 := z.DecBinary()
-				_ = yym20
-				if false {
-				} else {
-					*((*bool)(yyv19)) = r.DecodeBool()
-				}
+				x.Dir = (bool)(r.DecodeBool())
 			}
 		case "NoValueOnSuccess":
 			if r.TryDecodeAsNil() {
 				x.NoValueOnSuccess = false
 			} else {
-				yyv21 := &x.NoValueOnSuccess
-				yym22 := z.DecBinary()
-				_ = yym22
-				if false {
-				} else {
-					*((*bool)(yyv21)) = r.DecodeBool()
-				}
+				x.NoValueOnSuccess = (bool)(r.DecodeBool())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -4115,19 +3351,19 @@ func (x *setAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj23 int
-	var yyb23 bool
-	var yyhl23 bool = l >= 0
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	var yyj15 int
+	var yyb15 bool
+	var yyhl15 bool = l >= 0
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4135,21 +3371,15 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Prefix = ""
 	} else {
-		yyv24 := &x.Prefix
-		yym25 := z.DecBinary()
-		_ = yym25
-		if false {
-		} else {
-			*((*string)(yyv24)) = r.DecodeString()
-		}
+		x.Prefix = (string)(r.DecodeString())
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4157,21 +3387,15 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Key = ""
 	} else {
-		yyv26 := &x.Key
-		yym27 := z.DecBinary()
-		_ = yym27
-		if false {
-		} else {
-			*((*string)(yyv26)) = r.DecodeString()
-		}
+		x.Key = (string)(r.DecodeString())
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4179,21 +3403,15 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Value = ""
 	} else {
-		yyv28 := &x.Value
-		yym29 := z.DecBinary()
-		_ = yym29
-		if false {
-		} else {
-			*((*string)(yyv28)) = r.DecodeString()
-		}
+		x.Value = (string)(r.DecodeString())
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4201,21 +3419,15 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevValue = ""
 	} else {
-		yyv30 := &x.PrevValue
-		yym31 := z.DecBinary()
-		_ = yym31
-		if false {
-		} else {
-			*((*string)(yyv30)) = r.DecodeString()
-		}
+		x.PrevValue = (string)(r.DecodeString())
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4223,21 +3435,15 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevIndex = 0
 	} else {
-		yyv32 := &x.PrevIndex
-		yym33 := z.DecBinary()
-		_ = yym33
-		if false {
-		} else {
-			*((*uint64)(yyv32)) = uint64(r.DecodeUint(64))
-		}
+		x.PrevIndex = (uint64)(r.DecodeUint64())
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4245,16 +3451,15 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevExist = ""
 	} else {
-		yyv34 := &x.PrevExist
-		yyv34.CodecDecodeSelf(d)
+		x.PrevExist.CodecDecodeSelf(d)
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4262,22 +3467,20 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.TTL = 0
 	} else {
-		yyv35 := &x.TTL
-		yym36 := z.DecBinary()
-		_ = yym36
 		if false {
-		} else if z.HasExtensions() && z.DecExt(yyv35) {
+		} else if yyxt23 := z.Extension(z.I2Rtid(x.TTL)); yyxt23 != nil {
+			z.DecExtension(x.TTL, yyxt23)
 		} else {
-			*((*int64)(yyv35)) = int64(r.DecodeInt(64))
+			x.TTL = (time.Duration)(r.DecodeInt64())
 		}
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4285,21 +3488,15 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Refresh = false
 	} else {
-		yyv37 := &x.Refresh
-		yym38 := z.DecBinary()
-		_ = yym38
-		if false {
-		} else {
-			*((*bool)(yyv37)) = r.DecodeBool()
-		}
+		x.Refresh = (bool)(r.DecodeBool())
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4307,21 +3504,15 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Dir = false
 	} else {
-		yyv39 := &x.Dir
-		yym40 := z.DecBinary()
-		_ = yym40
-		if false {
-		} else {
-			*((*bool)(yyv39)) = r.DecodeBool()
-		}
+		x.Dir = (bool)(r.DecodeBool())
 	}
-	yyj23++
-	if yyhl23 {
-		yyb23 = yyj23 > l
+	yyj15++
+	if yyhl15 {
+		yyb15 = yyj15 > l
 	} else {
-		yyb23 = r.CheckBreak()
+		yyb15 = r.CheckBreak()
 	}
-	if yyb23 {
+	if yyb15 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4329,46 +3520,39 @@ func (x *setAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.NoValueOnSuccess = false
 	} else {
-		yyv41 := &x.NoValueOnSuccess
-		yym42 := z.DecBinary()
-		_ = yym42
-		if false {
-		} else {
-			*((*bool)(yyv41)) = r.DecodeBool()
-		}
+		x.NoValueOnSuccess = (bool)(r.DecodeBool())
 	}
 	for {
-		yyj23++
-		if yyhl23 {
-			yyb23 = yyj23 > l
+		yyj15++
+		if yyhl15 {
+			yyb15 = yyj15 > l
 		} else {
-			yyb23 = r.CheckBreak()
+			yyb15 = r.CheckBreak()
 		}
-		if yyb23 {
+		if yyb15 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj23-1, "")
+		z.DecStructFieldNotFound(yyj15-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *deleteAction) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(6)
 			} else {
@@ -4376,75 +3560,59 @@ func (x *deleteAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Prefix"))
+				r.EncodeString(codecSelferCcUTF87467, `Prefix`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Key"))
+				r.EncodeString(codecSelferCcUTF87467, `Key`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Key))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Key))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.PrevValue))
+					r.EncodeString(codecSelferCcUTF87467, string(x.PrevValue))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevValue"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevValue`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.PrevValue))
+					r.EncodeString(codecSelferCcUTF87467, string(x.PrevValue))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym13 := z.EncBinary()
-				_ = yym13
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.PrevIndex))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("PrevIndex"))
+				r.EncodeString(codecSelferCcUTF87467, `PrevIndex`)
 				r.WriteMapElemValue()
-				yym14 := z.EncBinary()
-				_ = yym14
 				if false {
 				} else {
 					r.EncodeUint(uint64(x.PrevIndex))
@@ -4452,18 +3620,14 @@ func (x *deleteAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym16 := z.EncBinary()
-				_ = yym16
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Dir))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Dir"))
+				r.EncodeString(codecSelferCcUTF87467, `Dir`)
 				r.WriteMapElemValue()
-				yym17 := z.EncBinary()
-				_ = yym17
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Dir))
@@ -4471,18 +3635,14 @@ func (x *deleteAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym19 := z.EncBinary()
-				_ = yym19
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Recursive"))
+				r.EncodeString(codecSelferCcUTF87467, `Recursive`)
 				r.WriteMapElemValue()
-				yym20 := z.EncBinary()
-				_ = yym20
 				if false {
 				} else {
 					r.EncodeBool(bool(x.Recursive))
@@ -4498,23 +3658,22 @@ func (x *deleteAction) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *deleteAction) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -4522,17 +3681,15 @@ func (x *deleteAction) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *deleteAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -4545,81 +3702,44 @@ func (x *deleteAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "Prefix":
 			if r.TryDecodeAsNil() {
 				x.Prefix = ""
 			} else {
-				yyv4 := &x.Prefix
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.Prefix = (string)(r.DecodeString())
 			}
 		case "Key":
 			if r.TryDecodeAsNil() {
 				x.Key = ""
 			} else {
-				yyv6 := &x.Key
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*string)(yyv6)) = r.DecodeString()
-				}
+				x.Key = (string)(r.DecodeString())
 			}
 		case "PrevValue":
 			if r.TryDecodeAsNil() {
 				x.PrevValue = ""
 			} else {
-				yyv8 := &x.PrevValue
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*string)(yyv8)) = r.DecodeString()
-				}
+				x.PrevValue = (string)(r.DecodeString())
 			}
 		case "PrevIndex":
 			if r.TryDecodeAsNil() {
 				x.PrevIndex = 0
 			} else {
-				yyv10 := &x.PrevIndex
-				yym11 := z.DecBinary()
-				_ = yym11
-				if false {
-				} else {
-					*((*uint64)(yyv10)) = uint64(r.DecodeUint(64))
-				}
+				x.PrevIndex = (uint64)(r.DecodeUint64())
 			}
 		case "Dir":
 			if r.TryDecodeAsNil() {
 				x.Dir = false
 			} else {
-				yyv12 := &x.Dir
-				yym13 := z.DecBinary()
-				_ = yym13
-				if false {
-				} else {
-					*((*bool)(yyv12)) = r.DecodeBool()
-				}
+				x.Dir = (bool)(r.DecodeBool())
 			}
 		case "Recursive":
 			if r.TryDecodeAsNil() {
 				x.Recursive = false
 			} else {
-				yyv14 := &x.Recursive
-				yym15 := z.DecBinary()
-				_ = yym15
-				if false {
-				} else {
-					*((*bool)(yyv14)) = r.DecodeBool()
-				}
+				x.Recursive = (bool)(r.DecodeBool())
 			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
@@ -4629,19 +3749,19 @@ func (x *deleteAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 }
 
 func (x *deleteAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	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 yyj10 int
+	var yyb10 bool
+	var yyhl10 bool = l >= 0
+	yyj10++
+	if yyhl10 {
+		yyb10 = yyj10 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb10 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb10 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4649,21 +3769,15 @@ func (x *deleteAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Prefix = ""
 	} else {
-		yyv17 := &x.Prefix
-		yym18 := z.DecBinary()
-		_ = yym18
-		if false {
-		} else {
-			*((*string)(yyv17)) = r.DecodeString()
-		}
+		x.Prefix = (string)(r.DecodeString())
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj10++
+	if yyhl10 {
+		yyb10 = yyj10 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb10 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb10 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4671,21 +3785,15 @@ func (x *deleteAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Key = ""
 	} else {
-		yyv19 := &x.Key
-		yym20 := z.DecBinary()
-		_ = yym20
-		if false {
-		} else {
-			*((*string)(yyv19)) = r.DecodeString()
-		}
+		x.Key = (string)(r.DecodeString())
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj10++
+	if yyhl10 {
+		yyb10 = yyj10 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb10 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb10 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4693,21 +3801,15 @@ func (x *deleteAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevValue = ""
 	} else {
-		yyv21 := &x.PrevValue
-		yym22 := z.DecBinary()
-		_ = yym22
-		if false {
-		} else {
-			*((*string)(yyv21)) = r.DecodeString()
-		}
+		x.PrevValue = (string)(r.DecodeString())
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj10++
+	if yyhl10 {
+		yyb10 = yyj10 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb10 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb10 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4715,21 +3817,15 @@ func (x *deleteAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.PrevIndex = 0
 	} else {
-		yyv23 := &x.PrevIndex
-		yym24 := z.DecBinary()
-		_ = yym24
-		if false {
-		} else {
-			*((*uint64)(yyv23)) = uint64(r.DecodeUint(64))
-		}
+		x.PrevIndex = (uint64)(r.DecodeUint64())
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj10++
+	if yyhl10 {
+		yyb10 = yyj10 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb10 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb10 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4737,21 +3833,15 @@ func (x *deleteAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Dir = false
 	} else {
-		yyv25 := &x.Dir
-		yym26 := z.DecBinary()
-		_ = yym26
-		if false {
-		} else {
-			*((*bool)(yyv25)) = r.DecodeBool()
-		}
+		x.Dir = (bool)(r.DecodeBool())
 	}
-	yyj16++
-	if yyhl16 {
-		yyb16 = yyj16 > l
+	yyj10++
+	if yyhl10 {
+		yyb10 = yyj10 > l
 	} else {
-		yyb16 = r.CheckBreak()
+		yyb10 = r.CheckBreak()
 	}
-	if yyb16 {
+	if yyb10 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -4759,46 +3849,39 @@ func (x *deleteAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Recursive = false
 	} else {
-		yyv27 := &x.Recursive
-		yym28 := z.DecBinary()
-		_ = yym28
-		if false {
-		} else {
-			*((*bool)(yyv27)) = r.DecodeBool()
-		}
+		x.Recursive = (bool)(r.DecodeBool())
 	}
 	for {
-		yyj16++
-		if yyhl16 {
-			yyb16 = yyj16 > l
+		yyj10++
+		if yyhl10 {
+			yyb10 = yyj10 > l
 		} else {
-			yyb16 = r.CheckBreak()
+			yyb10 = r.CheckBreak()
 		}
-		if yyb16 {
+		if yyb10 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj16-1, "")
+		z.DecStructFieldNotFound(yyj10-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
 func (x *createInOrderAction) CodecEncodeSelf(e *codec1978.Encoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	if x == nil {
 		r.EncodeNil()
 	} else {
-		yym1 := z.EncBinary()
-		_ = yym1
 		if false {
-		} else if z.HasExtensions() && z.EncExt(x) {
+		} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+			z.EncExtension(x, yyxt1)
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
 			_, _ = yysep2, yy2arr2
-			const yyr2 bool = false
+			const yyr2 bool = false // struct tag has 'toArray'
 			if yyr2 || yy2arr2 {
 				r.WriteArrayStart(4)
 			} else {
@@ -4806,78 +3889,64 @@ func (x *createInOrderAction) CodecEncodeSelf(e *codec1978.Encoder) {
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym4 := z.EncBinary()
-				_ = yym4
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Prefix"))
+				r.EncodeString(codecSelferCcUTF87467, `Prefix`)
 				r.WriteMapElemValue()
-				yym5 := z.EncBinary()
-				_ = yym5
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Prefix))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Prefix))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym7 := z.EncBinary()
-				_ = yym7
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Dir))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Dir))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Dir"))
+				r.EncodeString(codecSelferCcUTF87467, `Dir`)
 				r.WriteMapElemValue()
-				yym8 := z.EncBinary()
-				_ = yym8
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Dir))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Dir))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym10 := z.EncBinary()
-				_ = yym10
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Value))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Value))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("Value"))
+				r.EncodeString(codecSelferCcUTF87467, `Value`)
 				r.WriteMapElemValue()
-				yym11 := z.EncBinary()
-				_ = yym11
 				if false {
 				} else {
-					r.EncodeString(codecSelferC_UTF87612, string(x.Value))
+					r.EncodeString(codecSelferCcUTF87467, string(x.Value))
 				}
 			}
 			if yyr2 || yy2arr2 {
 				r.WriteArrayElem()
-				yym13 := z.EncBinary()
-				_ = yym13
 				if false {
-				} else if z.HasExtensions() && z.EncExt(x.TTL) {
+				} else if yyxt13 := z.Extension(z.I2Rtid(x.TTL)); yyxt13 != nil {
+					z.EncExtension(x.TTL, yyxt13)
 				} else {
 					r.EncodeInt(int64(x.TTL))
 				}
 			} else {
 				r.WriteMapElemKey()
-				r.EncodeString(codecSelferC_UTF87612, string("TTL"))
+				r.EncodeString(codecSelferCcUTF87467, `TTL`)
 				r.WriteMapElemValue()
-				yym14 := z.EncBinary()
-				_ = yym14
 				if false {
-				} else if z.HasExtensions() && z.EncExt(x.TTL) {
+				} else if yyxt14 := z.Extension(z.I2Rtid(x.TTL)); yyxt14 != nil {
+					z.EncExtension(x.TTL, yyxt14)
 				} else {
 					r.EncodeInt(int64(x.TTL))
 				}
@@ -4892,23 +3961,22 @@ func (x *createInOrderAction) CodecEncodeSelf(e *codec1978.Encoder) {
 }
 
 func (x *createInOrderAction) CodecDecodeSelf(d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	yym1 := z.DecBinary()
-	_ = yym1
 	if false {
-	} else if z.HasExtensions() && z.DecExt(x) {
+	} else if yyxt1 := z.Extension(z.I2Rtid(x)); yyxt1 != nil {
+		z.DecExtension(x, yyxt1)
 	} else {
 		yyct2 := r.ContainerType()
-		if yyct2 == codecSelferValueTypeMap7612 {
+		if yyct2 == codecSelferValueTypeMap7467 {
 			yyl2 := r.ReadMapStart()
 			if yyl2 == 0 {
 				r.ReadMapEnd()
 			} else {
 				x.codecDecodeSelfFromMap(yyl2, d)
 			}
-		} else if yyct2 == codecSelferValueTypeArray7612 {
+		} else if yyct2 == codecSelferValueTypeArray7467 {
 			yyl2 := r.ReadArrayStart()
 			if yyl2 == 0 {
 				r.ReadArrayEnd()
@@ -4916,17 +3984,15 @@ func (x *createInOrderAction) CodecDecodeSelf(d *codec1978.Decoder) {
 				x.codecDecodeSelfFromArray(yyl2, d)
 			}
 		} else {
-			panic(codecSelferOnlyMapOrArrayEncodeToStructErr7612)
+			panic(errCodecSelferOnlyMapOrArrayEncodeToStruct7467)
 		}
 	}
 }
 
 func (x *createInOrderAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yys3Slc = z.DecScratchBuffer() // default slice to decode into
-	_ = yys3Slc
 	var yyhl3 bool = l >= 0
 	for yyj3 := 0; ; yyj3++ {
 		if yyhl3 {
@@ -4939,57 +4005,36 @@ func (x *createInOrderAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder
 			}
 		}
 		r.ReadMapElemKey()
-		yys3Slc = r.DecodeStringAsBytes()
-		yys3 := string(yys3Slc)
+		yys3 := z.StringView(r.DecodeStringAsBytes())
 		r.ReadMapElemValue()
 		switch yys3 {
 		case "Prefix":
 			if r.TryDecodeAsNil() {
 				x.Prefix = ""
 			} else {
-				yyv4 := &x.Prefix
-				yym5 := z.DecBinary()
-				_ = yym5
-				if false {
-				} else {
-					*((*string)(yyv4)) = r.DecodeString()
-				}
+				x.Prefix = (string)(r.DecodeString())
 			}
 		case "Dir":
 			if r.TryDecodeAsNil() {
 				x.Dir = ""
 			} else {
-				yyv6 := &x.Dir
-				yym7 := z.DecBinary()
-				_ = yym7
-				if false {
-				} else {
-					*((*string)(yyv6)) = r.DecodeString()
-				}
+				x.Dir = (string)(r.DecodeString())
 			}
 		case "Value":
 			if r.TryDecodeAsNil() {
 				x.Value = ""
 			} else {
-				yyv8 := &x.Value
-				yym9 := z.DecBinary()
-				_ = yym9
-				if false {
-				} else {
-					*((*string)(yyv8)) = r.DecodeString()
-				}
+				x.Value = (string)(r.DecodeString())
 			}
 		case "TTL":
 			if r.TryDecodeAsNil() {
 				x.TTL = 0
 			} else {
-				yyv10 := &x.TTL
-				yym11 := z.DecBinary()
-				_ = yym11
 				if false {
-				} else if z.HasExtensions() && z.DecExt(yyv10) {
+				} else if yyxt8 := z.Extension(z.I2Rtid(x.TTL)); yyxt8 != nil {
+					z.DecExtension(x.TTL, yyxt8)
 				} else {
-					*((*int64)(yyv10)) = int64(r.DecodeInt(64))
+					x.TTL = (time.Duration)(r.DecodeInt64())
 				}
 			}
 		default:
@@ -5000,19 +4045,19 @@ func (x *createInOrderAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder
 }
 
 func (x *createInOrderAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
-	var h codecSelfer7612
+	var h codecSelfer7467
 	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 yyj9 int
+	var yyb9 bool
+	var yyhl9 bool = l >= 0
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5020,21 +4065,15 @@ func (x *createInOrderAction) codecDecodeSelfFromArray(l int, d *codec1978.Decod
 	if r.TryDecodeAsNil() {
 		x.Prefix = ""
 	} else {
-		yyv13 := &x.Prefix
-		yym14 := z.DecBinary()
-		_ = yym14
-		if false {
-		} else {
-			*((*string)(yyv13)) = r.DecodeString()
-		}
+		x.Prefix = (string)(r.DecodeString())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5042,21 +4081,15 @@ func (x *createInOrderAction) codecDecodeSelfFromArray(l int, d *codec1978.Decod
 	if r.TryDecodeAsNil() {
 		x.Dir = ""
 	} else {
-		yyv15 := &x.Dir
-		yym16 := z.DecBinary()
-		_ = yym16
-		if false {
-		} else {
-			*((*string)(yyv15)) = r.DecodeString()
-		}
+		x.Dir = (string)(r.DecodeString())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5064,21 +4097,15 @@ func (x *createInOrderAction) codecDecodeSelfFromArray(l int, d *codec1978.Decod
 	if r.TryDecodeAsNil() {
 		x.Value = ""
 	} else {
-		yyv17 := &x.Value
-		yym18 := z.DecBinary()
-		_ = yym18
-		if false {
-		} else {
-			*((*string)(yyv17)) = r.DecodeString()
-		}
+		x.Value = (string)(r.DecodeString())
 	}
-	yyj12++
-	if yyhl12 {
-		yyb12 = yyj12 > l
+	yyj9++
+	if yyhl9 {
+		yyb9 = yyj9 > l
 	} else {
-		yyb12 = r.CheckBreak()
+		yyb9 = r.CheckBreak()
 	}
-	if yyb12 {
+	if yyb9 {
 		r.ReadArrayEnd()
 		return
 	}
@@ -5086,33 +4113,31 @@ func (x *createInOrderAction) codecDecodeSelfFromArray(l int, d *codec1978.Decod
 	if r.TryDecodeAsNil() {
 		x.TTL = 0
 	} else {
-		yyv19 := &x.TTL
-		yym20 := z.DecBinary()
-		_ = yym20
 		if false {
-		} else if z.HasExtensions() && z.DecExt(yyv19) {
+		} else if yyxt14 := z.Extension(z.I2Rtid(x.TTL)); yyxt14 != nil {
+			z.DecExtension(x.TTL, yyxt14)
 		} else {
-			*((*int64)(yyv19)) = int64(r.DecodeInt(64))
+			x.TTL = (time.Duration)(r.DecodeInt64())
 		}
 	}
 	for {
-		yyj12++
-		if yyhl12 {
-			yyb12 = yyj12 > l
+		yyj9++
+		if yyhl9 {
+			yyb9 = yyj9 > l
 		} else {
-			yyb12 = r.CheckBreak()
+			yyb9 = r.CheckBreak()
 		}
-		if yyb12 {
+		if yyb9 {
 			break
 		}
 		r.ReadArrayElem()
-		z.DecStructFieldNotFound(yyj12-1, "")
+		z.DecStructFieldNotFound(yyj9-1, "")
 	}
 	r.ReadArrayEnd()
 }
 
-func (x codecSelfer7612) encNodes(v Nodes, e *codec1978.Encoder) {
-	var h codecSelfer7612
+func (x codecSelfer7467) encNodes(v Nodes, e *codec1978.Encoder) {
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperEncoder(e)
 	_, _, _ = h, z, r
 	r.WriteArrayStart(len(v))
@@ -5127,8 +4152,8 @@ func (x codecSelfer7612) encNodes(v Nodes, e *codec1978.Encoder) {
 	r.WriteArrayEnd()
 }
 
-func (x codecSelfer7612) decNodes(v *Nodes, d *codec1978.Decoder) {
-	var h codecSelfer7612
+func (x codecSelfer7467) decNodes(v *Nodes, d *codec1978.Decoder) {
+	var h codecSelfer7467
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
 
@@ -5165,7 +4190,7 @@ func (x codecSelfer7612) decNodes(v *Nodes, d *codec1978.Decoder) {
 		var yyj1 int
 		// var yydn1 bool
 		for ; (yyhl1 && yyj1 < yyl1) || !(yyhl1 || r.CheckBreak()); yyj1++ {
-			if yyj1 == 0 && len(yyv1) == 0 {
+			if yyj1 == 0 && yyv1 == nil {
 				if yyhl1 {
 					yyrl1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 8)
 				} else {
@@ -5175,9 +4200,7 @@ func (x codecSelfer7612) decNodes(v *Nodes, d *codec1978.Decoder) {
 				yyc1 = true
 			}
 			yyh1.ElemContainerState(yyj1)
-			// yydn1 = r.TryDecodeAsNil()
 
-			// if indefinite, etc, then expand the slice if necessary
 			var yydb1 bool
 			if yyj1 >= len(yyv1) {
 				yyv1 = append(yyv1, nil)
@@ -5188,15 +4211,12 @@ func (x codecSelfer7612) decNodes(v *Nodes, d *codec1978.Decoder) {
 				z.DecSwallow()
 			} else {
 				if r.TryDecodeAsNil() {
-					if yyv1[yyj1] != nil {
-						*yyv1[yyj1] = Node{}
-					}
+					yyv1[yyj1] = nil
 				} else {
 					if yyv1[yyj1] == nil {
 						yyv1[yyj1] = new(Node)
 					}
-					yyw2 := yyv1[yyj1]
-					yyw2.CodecDecodeSelf(d)
+					yyv1[yyj1].CodecDecodeSelf(d)
 				}
 
 			}
@@ -5214,5 +4234,4 @@ func (x codecSelfer7612) decNodes(v *Nodes, d *codec1978.Decoder) {
 	if yyc1 {
 		*v = yyv1
 	}
-
 }