[fidl] Fix method parameter name conflict

fidlgen change:
https://fuchsia-review.googlesource.com/c/fuchsia/+/342757

Bug: 41108
Change-Id: Ic981a5c9641e6a2890c223ad0b2384da63946ff9
diff --git a/src/syscall/zx/fidl/bindingstest/impl.go b/src/syscall/zx/fidl/bindingstest/impl.go
index 70e0c2b..a879f3b 100644
--- a/src/syscall/zx/fidl/bindingstest/impl.go
+++ b/src/syscall/zx/fidl/bindingstest/impl.go
@@ -1220,27 +1220,27 @@
 		In: in,
 	}
 	resp_ := &test1EchoResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(Test1EchoGenOrdinal, req_, resp_, Test1EchoOrdinal, Test1EchoGenOrdinal)
-	return resp_.Out, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(Test1EchoGenOrdinal, req_, resp_, Test1EchoOrdinal, Test1EchoGenOrdinal)
+	return resp_.Out, err_
 }
 
 func (p *Test1Interface) NoResponse() error {
 	var req_ _bindings.Message
-	err := ((*_bindings.ChannelProxy)(p)).Send(Test1NoResponseGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(Test1NoResponseGenOrdinal, req_)
+	return err_
 }
 
 func (p *Test1Interface) EmptyResponse() error {
 	var req_ _bindings.Message
 	var resp_ _bindings.Message
-	err := ((*_bindings.ChannelProxy)(p)).Call(Test1EmptyResponseGenOrdinal, req_, resp_, Test1EmptyResponseOrdinal, Test1EmptyResponseGenOrdinal)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(Test1EmptyResponseGenOrdinal, req_, resp_, Test1EmptyResponseOrdinal, Test1EmptyResponseGenOrdinal)
+	return err_
 }
 
 func (p *Test1Interface) ExpectSurprise() (string, error) {
 	resp_ := &test1SurpriseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(Test1SurpriseOrdinal, resp_, Test1SurpriseGenOrdinal)
-	return resp_.Foo, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Recv(Test1SurpriseOrdinal, resp_, Test1SurpriseGenOrdinal)
+	return resp_.Foo, err_
 }
 
 type Test1 interface {
diff --git a/src/syscall/zx/fidl/conformance/impl.go b/src/syscall/zx/fidl/conformance/impl.go
index 247fff8..8b5291b 100644
--- a/src/syscall/zx/fidl/conformance/impl.go
+++ b/src/syscall/zx/fidl/conformance/impl.go
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Code generated by tools/fidl/gidl-conformance-suite/regen.sh; DO NOT EDIT.
+// GENERATED FILE: Do not edit!
+//
+// To rebuild this file, invoke third_party/go/regen-fidl.
 
 // +build fuchsia
 
-//
-// Code generated by fidlgen; DO NOT EDIT.
-
 package conformance
 
 import (
@@ -16,255 +15,6 @@
 	_bindings "syscall/zx/fidl"
 )
 
-type TestXUnionInTable struct {
-	_     struct{}      `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
-	Value XUnionInTable `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mTestXUnionInTable = _bindings.CreateLazyMarshaler(TestXUnionInTable{})
-
-func (msg *TestXUnionInTable) Marshaler() _bindings.Marshaler {
-	return _mTestXUnionInTable
-}
-
-type InterfaceConfig struct {
-	_               struct{}        `fidl:"s,48,8" fidl_size_v1:"40" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"40" fidl_alignment_v1_no_ee:"8"`
-	Name            string          `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	IpAddressConfig IpAddressConfig `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
-}
-
-var _mInterfaceConfig = _bindings.CreateLazyMarshaler(InterfaceConfig{})
-
-func (msg *InterfaceConfig) Marshaler() _bindings.Marshaler {
-	return _mInterfaceConfig
-}
-
-type TestAddEthernetDeviceRequest struct {
-	_                   struct{}        `fidl:"s,72,8" fidl_size_v1:"64" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"64" fidl_alignment_v1_no_ee:"8"`
-	TopologicalPath     string          `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	Config              InterfaceConfig `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
-	ThisShouldBeAHandle uint32          `fidl:"64" fidl_offset_v1:"56" fidl_offset_v1_no_ee:"56"`
-}
-
-var _mTestAddEthernetDeviceRequest = _bindings.CreateLazyMarshaler(TestAddEthernetDeviceRequest{})
-
-func (msg *TestAddEthernetDeviceRequest) Marshaler() _bindings.Marshaler {
-	return _mTestAddEthernetDeviceRequest
-}
-
-type NodeAttributes struct {
-	_                struct{} `fidl:"s,56,8" fidl_size_v1:"56" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"56" fidl_alignment_v1_no_ee:"8"`
-	Mode             uint32   `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	Id               uint64   `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
-	ContentSize      uint64   `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
-	StorageSize      uint64   `fidl:"24" fidl_offset_v1:"24" fidl_offset_v1_no_ee:"24"`
-	LinkCount        uint64   `fidl:"32" fidl_offset_v1:"32" fidl_offset_v1_no_ee:"32"`
-	CreationTime     uint64   `fidl:"40" fidl_offset_v1:"40" fidl_offset_v1_no_ee:"40"`
-	ModificationTime uint64   `fidl:"48" fidl_offset_v1:"48" fidl_offset_v1_no_ee:"48"`
-}
-
-var _mNodeAttributes = _bindings.CreateLazyMarshaler(NodeAttributes{})
-
-func (msg *NodeAttributes) Marshaler() _bindings.Marshaler {
-	return _mNodeAttributes
-}
-
-type FileGetAttrResponse struct {
-	_          struct{}       `fidl:"s,64,8" fidl_size_v1:"64" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"64" fidl_alignment_v1_no_ee:"8"`
-	S          int32          `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	Attributes NodeAttributes `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
-}
-
-var _mFileGetAttrResponse = _bindings.CreateLazyMarshaler(FileGetAttrResponse{})
-
-func (msg *FileGetAttrResponse) Marshaler() _bindings.Marshaler {
-	return _mFileGetAttrResponse
-}
-
-type UnionWithBoundStringStruct struct {
-	_ struct{}             `fidl:"s,24,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
-	V UnionWithBoundString `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mUnionWithBoundStringStruct = _bindings.CreateLazyMarshaler(UnionWithBoundStringStruct{})
-
-func (msg *UnionWithBoundStringStruct) Marshaler() _bindings.Marshaler {
-	return _mUnionWithBoundStringStruct
-}
-
-type SingleVariantUnionStruct struct {
-	_ struct{}           `fidl:"s,8,4" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
-	U SingleVariantUnion `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mSingleVariantUnionStruct = _bindings.CreateLazyMarshaler(SingleVariantUnionStruct{})
-
-func (msg *SingleVariantUnionStruct) Marshaler() _bindings.Marshaler {
-	return _mSingleVariantUnionStruct
-}
-
-type ReverseOrdinalUnionStruct struct {
-	_ struct{}            `fidl:"s,16,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
-	U ReverseOrdinalUnion `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mReverseOrdinalUnionStruct = _bindings.CreateLazyMarshaler(ReverseOrdinalUnionStruct{})
-
-func (msg *ReverseOrdinalUnionStruct) Marshaler() _bindings.Marshaler {
-	return _mReverseOrdinalUnionStruct
-}
-
-type StructWithInt struct {
-	_ struct{} `fidl:"s,4,4" fidl_size_v1:"4" fidl_alignment_v1:"4" fidl_size_v1_no_ee:"4" fidl_alignment_v1_no_ee:"4"`
-	X int32    `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mStructWithInt = _bindings.CreateLazyMarshaler(StructWithInt{})
-
-func (msg *StructWithInt) Marshaler() _bindings.Marshaler {
-	return _mStructWithInt
-}
-
-type StructWithArrays struct {
-	_                 struct{}          `fidl:"s,120,8" fidl_size_v1:"120" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"120" fidl_alignment_v1_no_ee:"8"`
-	ArrInt            [2]int32          `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	ArrString         [2]string         `fidl:"8," fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
-	ArrNullableString [2]*string        `fidl:"40," fidl_offset_v1:"40" fidl_offset_v1_no_ee:"40"`
-	ArrStruct         [2]StructWithInt  `fidl:"72" fidl_offset_v1:"72" fidl_offset_v1_no_ee:"72"`
-	ArrNullableStruct [2]*StructWithInt `fidl:"80" fidl_offset_v1:"80" fidl_offset_v1_no_ee:"80"`
-	ArrArrInt         [2][3]int32       `fidl:"96" fidl_offset_v1:"96" fidl_offset_v1_no_ee:"96"`
-}
-
-var _mStructWithArrays = _bindings.CreateLazyMarshaler(StructWithArrays{})
-
-func (msg *StructWithArrays) Marshaler() _bindings.Marshaler {
-	return _mStructWithArrays
-}
-
-type StructWithVectors struct {
-	_                 struct{}         `fidl:"s,112,8" fidl_size_v1:"112" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"112" fidl_alignment_v1_no_ee:"8"`
-	VecEmpty          []int32          `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	VecInt            []int32          `fidl:"16," fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
-	VecString         []string         `fidl:"32,," fidl_offset_v1:"32" fidl_offset_v1_no_ee:"32"`
-	VecNullableString []*string        `fidl:"48,," fidl_offset_v1:"48" fidl_offset_v1_no_ee:"48"`
-	VecStruct         []StructWithInt  `fidl:"64," fidl_offset_v1:"64" fidl_offset_v1_no_ee:"64"`
-	VecNullableStruct []*StructWithInt `fidl:"80," fidl_offset_v1:"80" fidl_offset_v1_no_ee:"80"`
-	VecVecInt         [][]int32        `fidl:"96,," fidl_offset_v1:"96" fidl_offset_v1_no_ee:"96"`
-}
-
-var _mStructWithVectors = _bindings.CreateLazyMarshaler(StructWithVectors{})
-
-func (msg *StructWithVectors) Marshaler() _bindings.Marshaler {
-	return _mStructWithVectors
-}
-
-type EmptyStruct struct {
-	_ struct{} `fidl:"s,1,1" fidl_size_v1:"1" fidl_alignment_v1:"1" fidl_size_v1_no_ee:"1" fidl_alignment_v1_no_ee:"1"`
-}
-
-var _mEmptyStruct = _bindings.CreateLazyMarshaler(EmptyStruct{})
-
-func (msg *EmptyStruct) Marshaler() _bindings.Marshaler {
-	return _mEmptyStruct
-}
-
-type EmptyStructSandwich struct {
-	_      struct{}    `fidl:"s,40,8" fidl_size_v1:"40" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"40" fidl_alignment_v1_no_ee:"8"`
-	Before string      `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	Es     EmptyStruct `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
-	After  string      `fidl:"24," fidl_offset_v1:"24" fidl_offset_v1_no_ee:"24"`
-}
-
-var _mEmptyStructSandwich = _bindings.CreateLazyMarshaler(EmptyStructSandwich{})
-
-func (msg *EmptyStructSandwich) Marshaler() _bindings.Marshaler {
-	return _mEmptyStructSandwich
-}
-
-type Uint8Uint16Uint32Uint64 struct {
-	_  struct{} `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
-	F1 uint8    `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	F2 uint16   `fidl:"2" fidl_offset_v1:"2" fidl_offset_v1_no_ee:"2"`
-	F3 uint32   `fidl:"4" fidl_offset_v1:"4" fidl_offset_v1_no_ee:"4"`
-	F4 uint64   `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
-}
-
-var _mUint8Uint16Uint32Uint64 = _bindings.CreateLazyMarshaler(Uint8Uint16Uint32Uint64{})
-
-func (msg *Uint8Uint16Uint32Uint64) Marshaler() _bindings.Marshaler {
-	return _mUint8Uint16Uint32Uint64
-}
-
-type Uint64Uint32Uint16Uint8 struct {
-	_  struct{} `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
-	F1 uint64   `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	F2 uint32   `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
-	F3 uint16   `fidl:"12" fidl_offset_v1:"12" fidl_offset_v1_no_ee:"12"`
-	F4 uint8    `fidl:"14" fidl_offset_v1:"14" fidl_offset_v1_no_ee:"14"`
-}
-
-var _mUint64Uint32Uint16Uint8 = _bindings.CreateLazyMarshaler(Uint64Uint32Uint16Uint8{})
-
-func (msg *Uint64Uint32Uint16Uint8) Marshaler() _bindings.Marshaler {
-	return _mUint64Uint32Uint16Uint8
-}
-
-type Length2StringWrapper struct {
-	_             struct{} `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
-	Length2String string   `fidl:"0,2" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mLength2StringWrapper = _bindings.CreateLazyMarshaler(Length2StringWrapper{})
-
-func (msg *Length2StringWrapper) Marshaler() _bindings.Marshaler {
-	return _mLength2StringWrapper
-}
-
-type StringWrapper struct {
-	_   struct{} `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
-	Str string   `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mStringWrapper = _bindings.CreateLazyMarshaler(StringWrapper{})
-
-func (msg *StringWrapper) Marshaler() _bindings.Marshaler {
-	return _mStringWrapper
-}
-
-type StructOfSimpleTable struct {
-	_     struct{}    `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
-	Table SimpleTable `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mStructOfSimpleTable = _bindings.CreateLazyMarshaler(StructOfSimpleTable{})
-
-func (msg *StructOfSimpleTable) Marshaler() _bindings.Marshaler {
-	return _mStructOfSimpleTable
-}
-
-type SimpleTableThenUint64 struct {
-	_      struct{}    `fidl:"s,24,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
-	Table  SimpleTable `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	Number uint64      `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
-}
-
-var _mSimpleTableThenUint64 = _bindings.CreateLazyMarshaler(SimpleTableThenUint64{})
-
-func (msg *SimpleTableThenUint64) Marshaler() _bindings.Marshaler {
-	return _mSimpleTableThenUint64
-}
-
-type StructOfTableWithStringAndVector struct {
-	_     struct{}                 `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
-	Table TableWithStringAndVector `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-}
-
-var _mStructOfTableWithStringAndVector = _bindings.CreateLazyMarshaler(StructOfTableWithStringAndVector{})
-
-func (msg *StructOfTableWithStringAndVector) Marshaler() _bindings.Marshaler {
-	return _mStructOfTableWithStringAndVector
-}
-
 type ThreeByte struct {
 	_     struct{} `fidl:"s,3,1" fidl_size_v1:"3" fidl_alignment_v1:"1" fidl_size_v1_no_ee:"3" fidl_alignment_v1_no_ee:"1"`
 	Elem1 uint8    `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
@@ -360,6 +110,132 @@
 	return _mFiveByteInArray
 }
 
+type StructWithInt struct {
+	_ struct{} `fidl:"s,4,4" fidl_size_v1:"4" fidl_alignment_v1:"4" fidl_size_v1_no_ee:"4" fidl_alignment_v1_no_ee:"4"`
+	X int32    `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mStructWithInt = _bindings.CreateLazyMarshaler(StructWithInt{})
+
+func (msg *StructWithInt) Marshaler() _bindings.Marshaler {
+	return _mStructWithInt
+}
+
+type StructWithArrays struct {
+	_                 struct{}          `fidl:"s,120,8" fidl_size_v1:"120" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"120" fidl_alignment_v1_no_ee:"8"`
+	ArrInt            [2]int32          `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	ArrString         [2]string         `fidl:"8," fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
+	ArrNullableString [2]*string        `fidl:"40," fidl_offset_v1:"40" fidl_offset_v1_no_ee:"40"`
+	ArrStruct         [2]StructWithInt  `fidl:"72" fidl_offset_v1:"72" fidl_offset_v1_no_ee:"72"`
+	ArrNullableStruct [2]*StructWithInt `fidl:"80" fidl_offset_v1:"80" fidl_offset_v1_no_ee:"80"`
+	ArrArrInt         [2][3]int32       `fidl:"96" fidl_offset_v1:"96" fidl_offset_v1_no_ee:"96"`
+}
+
+var _mStructWithArrays = _bindings.CreateLazyMarshaler(StructWithArrays{})
+
+func (msg *StructWithArrays) Marshaler() _bindings.Marshaler {
+	return _mStructWithArrays
+}
+
+type StructWithVectors struct {
+	_                 struct{}         `fidl:"s,112,8" fidl_size_v1:"112" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"112" fidl_alignment_v1_no_ee:"8"`
+	VecEmpty          []int32          `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	VecInt            []int32          `fidl:"16," fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
+	VecString         []string         `fidl:"32,," fidl_offset_v1:"32" fidl_offset_v1_no_ee:"32"`
+	VecNullableString []*string        `fidl:"48,," fidl_offset_v1:"48" fidl_offset_v1_no_ee:"48"`
+	VecStruct         []StructWithInt  `fidl:"64," fidl_offset_v1:"64" fidl_offset_v1_no_ee:"64"`
+	VecNullableStruct []*StructWithInt `fidl:"80," fidl_offset_v1:"80" fidl_offset_v1_no_ee:"80"`
+	VecVecInt         [][]int32        `fidl:"96,," fidl_offset_v1:"96" fidl_offset_v1_no_ee:"96"`
+}
+
+var _mStructWithVectors = _bindings.CreateLazyMarshaler(StructWithVectors{})
+
+func (msg *StructWithVectors) Marshaler() _bindings.Marshaler {
+	return _mStructWithVectors
+}
+
+type TestXUnionInTable struct {
+	_     struct{}      `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	Value XUnionInTable `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mTestXUnionInTable = _bindings.CreateLazyMarshaler(TestXUnionInTable{})
+
+func (msg *TestXUnionInTable) Marshaler() _bindings.Marshaler {
+	return _mTestXUnionInTable
+}
+
+type InterfaceConfig struct {
+	_               struct{}        `fidl:"s,48,8" fidl_size_v1:"40" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"40" fidl_alignment_v1_no_ee:"8"`
+	Name            string          `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	IpAddressConfig IpAddressConfig `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
+}
+
+var _mInterfaceConfig = _bindings.CreateLazyMarshaler(InterfaceConfig{})
+
+func (msg *InterfaceConfig) Marshaler() _bindings.Marshaler {
+	return _mInterfaceConfig
+}
+
+type TestAddEthernetDeviceRequest struct {
+	_                   struct{}        `fidl:"s,72,8" fidl_size_v1:"64" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"64" fidl_alignment_v1_no_ee:"8"`
+	TopologicalPath     string          `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	Config              InterfaceConfig `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
+	ThisShouldBeAHandle uint32          `fidl:"64" fidl_offset_v1:"56" fidl_offset_v1_no_ee:"56"`
+}
+
+var _mTestAddEthernetDeviceRequest = _bindings.CreateLazyMarshaler(TestAddEthernetDeviceRequest{})
+
+func (msg *TestAddEthernetDeviceRequest) Marshaler() _bindings.Marshaler {
+	return _mTestAddEthernetDeviceRequest
+}
+
+type NodeAttributes struct {
+	_                struct{} `fidl:"s,56,8" fidl_size_v1:"56" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"56" fidl_alignment_v1_no_ee:"8"`
+	Mode             uint32   `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	Id               uint64   `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
+	ContentSize      uint64   `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
+	StorageSize      uint64   `fidl:"24" fidl_offset_v1:"24" fidl_offset_v1_no_ee:"24"`
+	LinkCount        uint64   `fidl:"32" fidl_offset_v1:"32" fidl_offset_v1_no_ee:"32"`
+	CreationTime     uint64   `fidl:"40" fidl_offset_v1:"40" fidl_offset_v1_no_ee:"40"`
+	ModificationTime uint64   `fidl:"48" fidl_offset_v1:"48" fidl_offset_v1_no_ee:"48"`
+}
+
+var _mNodeAttributes = _bindings.CreateLazyMarshaler(NodeAttributes{})
+
+func (msg *NodeAttributes) Marshaler() _bindings.Marshaler {
+	return _mNodeAttributes
+}
+
+type FileGetAttrResponse struct {
+	_          struct{}       `fidl:"s,64,8" fidl_size_v1:"64" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"64" fidl_alignment_v1_no_ee:"8"`
+	S          int32          `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	Attributes NodeAttributes `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
+}
+
+var _mFileGetAttrResponse = _bindings.CreateLazyMarshaler(FileGetAttrResponse{})
+
+func (msg *FileGetAttrResponse) Marshaler() _bindings.Marshaler {
+	return _mFileGetAttrResponse
+}
+
+type StructWithOptionals struct {
+	_   struct{}               `fidl:"s,104,8" fidl_size_v1:"128" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"128" fidl_alignment_v1_no_ee:"8"`
+	S   EmptyStruct            `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	S2  *EmptyStruct           `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
+	T   TableWithEmptyStruct   `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
+	Xu  XUnionWithEmptyStruct  `fidl:"32" fidl_offset_v1:"32" fidl_offset_v1_no_ee:"32"`
+	Xu2 *XUnionWithEmptyStruct `fidl:"56" fidl_offset_v1:"56" fidl_offset_v1_no_ee:"56"`
+	U   UnionWithEmptyStruct   `fidl:"80" fidl_offset_v1:"80" fidl_offset_v1_no_ee:"80"`
+	U2  *UnionWithEmptyStruct  `fidl:"96" fidl_offset_v1:"104" fidl_offset_v1_no_ee:"104"`
+}
+
+var _mStructWithOptionals = _bindings.CreateLazyMarshaler(StructWithOptionals{})
+
+func (msg *StructWithOptionals) Marshaler() _bindings.Marshaler {
+	return _mStructWithOptionals
+}
+
 type MyBool struct {
 	_     struct{} `fidl:"s,1,1" fidl_size_v1:"1" fidl_alignment_v1:"1" fidl_size_v1_no_ee:"1" fidl_alignment_v1_no_ee:"1"`
 	Value bool     `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
@@ -492,21 +368,122 @@
 	return _mMyFloat64
 }
 
-type StructWithOptionals struct {
-	_   struct{}               `fidl:"s,104,8" fidl_size_v1:"128" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"128" fidl_alignment_v1_no_ee:"8"`
-	S   EmptyStruct            `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
-	S2  *EmptyStruct           `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
-	T   TableWithEmptyStruct   `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
-	Xu  XUnionWithEmptyStruct  `fidl:"32" fidl_offset_v1:"32" fidl_offset_v1_no_ee:"32"`
-	Xu2 *XUnionWithEmptyStruct `fidl:"56" fidl_offset_v1:"56" fidl_offset_v1_no_ee:"56"`
-	U   UnionWithEmptyStruct   `fidl:"80" fidl_offset_v1:"80" fidl_offset_v1_no_ee:"80"`
-	U2  *UnionWithEmptyStruct  `fidl:"96" fidl_offset_v1:"104" fidl_offset_v1_no_ee:"104"`
+type Length2StringWrapper struct {
+	_             struct{} `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	Length2String string   `fidl:"0,2" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
 }
 
-var _mStructWithOptionals = _bindings.CreateLazyMarshaler(StructWithOptionals{})
+var _mLength2StringWrapper = _bindings.CreateLazyMarshaler(Length2StringWrapper{})
 
-func (msg *StructWithOptionals) Marshaler() _bindings.Marshaler {
-	return _mStructWithOptionals
+func (msg *Length2StringWrapper) Marshaler() _bindings.Marshaler {
+	return _mLength2StringWrapper
+}
+
+type StringWrapper struct {
+	_   struct{} `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	Str string   `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mStringWrapper = _bindings.CreateLazyMarshaler(StringWrapper{})
+
+func (msg *StringWrapper) Marshaler() _bindings.Marshaler {
+	return _mStringWrapper
+}
+
+type EmptyStruct struct {
+	_ struct{} `fidl:"s,1,1" fidl_size_v1:"1" fidl_alignment_v1:"1" fidl_size_v1_no_ee:"1" fidl_alignment_v1_no_ee:"1"`
+}
+
+var _mEmptyStruct = _bindings.CreateLazyMarshaler(EmptyStruct{})
+
+func (msg *EmptyStruct) Marshaler() _bindings.Marshaler {
+	return _mEmptyStruct
+}
+
+type EmptyStructSandwich struct {
+	_      struct{}    `fidl:"s,40,8" fidl_size_v1:"40" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"40" fidl_alignment_v1_no_ee:"8"`
+	Before string      `fidl:"0," fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	Es     EmptyStruct `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
+	After  string      `fidl:"24," fidl_offset_v1:"24" fidl_offset_v1_no_ee:"24"`
+}
+
+var _mEmptyStructSandwich = _bindings.CreateLazyMarshaler(EmptyStructSandwich{})
+
+func (msg *EmptyStructSandwich) Marshaler() _bindings.Marshaler {
+	return _mEmptyStructSandwich
+}
+
+type Uint8Uint16Uint32Uint64 struct {
+	_  struct{} `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	F1 uint8    `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	F2 uint16   `fidl:"2" fidl_offset_v1:"2" fidl_offset_v1_no_ee:"2"`
+	F3 uint32   `fidl:"4" fidl_offset_v1:"4" fidl_offset_v1_no_ee:"4"`
+	F4 uint64   `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
+}
+
+var _mUint8Uint16Uint32Uint64 = _bindings.CreateLazyMarshaler(Uint8Uint16Uint32Uint64{})
+
+func (msg *Uint8Uint16Uint32Uint64) Marshaler() _bindings.Marshaler {
+	return _mUint8Uint16Uint32Uint64
+}
+
+type Uint64Uint32Uint16Uint8 struct {
+	_  struct{} `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	F1 uint64   `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	F2 uint32   `fidl:"8" fidl_offset_v1:"8" fidl_offset_v1_no_ee:"8"`
+	F3 uint16   `fidl:"12" fidl_offset_v1:"12" fidl_offset_v1_no_ee:"12"`
+	F4 uint8    `fidl:"14" fidl_offset_v1:"14" fidl_offset_v1_no_ee:"14"`
+}
+
+var _mUint64Uint32Uint16Uint8 = _bindings.CreateLazyMarshaler(Uint64Uint32Uint16Uint8{})
+
+func (msg *Uint64Uint32Uint16Uint8) Marshaler() _bindings.Marshaler {
+	return _mUint64Uint32Uint16Uint8
+}
+
+type StructOfSimpleTable struct {
+	_     struct{}    `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	Table SimpleTable `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mStructOfSimpleTable = _bindings.CreateLazyMarshaler(StructOfSimpleTable{})
+
+func (msg *StructOfSimpleTable) Marshaler() _bindings.Marshaler {
+	return _mStructOfSimpleTable
+}
+
+type SimpleTableThenUint64 struct {
+	_      struct{}    `fidl:"s,24,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
+	Table  SimpleTable `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+	Number uint64      `fidl:"16" fidl_offset_v1:"16" fidl_offset_v1_no_ee:"16"`
+}
+
+var _mSimpleTableThenUint64 = _bindings.CreateLazyMarshaler(SimpleTableThenUint64{})
+
+func (msg *SimpleTableThenUint64) Marshaler() _bindings.Marshaler {
+	return _mSimpleTableThenUint64
+}
+
+type StructOfTableWithStringAndVector struct {
+	_     struct{}                 `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	Table TableWithStringAndVector `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mStructOfTableWithStringAndVector = _bindings.CreateLazyMarshaler(StructOfTableWithStringAndVector{})
+
+func (msg *StructOfTableWithStringAndVector) Marshaler() _bindings.Marshaler {
+	return _mStructOfTableWithStringAndVector
+}
+
+type StructOfReverseOrdinalTable struct {
+	_     struct{}            `fidl:"s,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	Table ReverseOrdinalTable `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mStructOfReverseOrdinalTable = _bindings.CreateLazyMarshaler(StructOfReverseOrdinalTable{})
+
+func (msg *StructOfReverseOrdinalTable) Marshaler() _bindings.Marshaler {
+	return _mStructOfReverseOrdinalTable
 }
 
 type StructSize16Align8 struct {
@@ -1032,6 +1009,39 @@
 	return _mCreateComponentRequest
 }
 
+type UnionWithBoundStringStruct struct {
+	_ struct{}             `fidl:"s,24,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
+	V UnionWithBoundString `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mUnionWithBoundStringStruct = _bindings.CreateLazyMarshaler(UnionWithBoundStringStruct{})
+
+func (msg *UnionWithBoundStringStruct) Marshaler() _bindings.Marshaler {
+	return _mUnionWithBoundStringStruct
+}
+
+type SingleVariantUnionStruct struct {
+	_ struct{}           `fidl:"s,8,4" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
+	U SingleVariantUnion `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mSingleVariantUnionStruct = _bindings.CreateLazyMarshaler(SingleVariantUnionStruct{})
+
+func (msg *SingleVariantUnionStruct) Marshaler() _bindings.Marshaler {
+	return _mSingleVariantUnionStruct
+}
+
+type ReverseOrdinalUnionStruct struct {
+	_ struct{}            `fidl:"s,16,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
+	U ReverseOrdinalUnion `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
+}
+
+var _mReverseOrdinalUnionStruct = _bindings.CreateLazyMarshaler(ReverseOrdinalUnionStruct{})
+
+func (msg *ReverseOrdinalUnionStruct) Marshaler() _bindings.Marshaler {
+	return _mReverseOrdinalUnionStruct
+}
+
 type Int64Struct struct {
 	_ struct{} `fidl:"s,8,8" fidl_size_v1:"8" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"8" fidl_alignment_v1_no_ee:"8"`
 	X int64    `fidl:"0" fidl_offset_v1:"0" fidl_offset_v1_no_ee:"0"`
@@ -1131,113 +1141,6 @@
 	return _u
 }
 
-type I_unionWithBoundStringTag uint32
-
-const (
-	_ I_unionWithBoundStringTag = iota
-	UnionWithBoundStringBoundFiveStr
-)
-
-type UnionWithBoundString struct {
-	I_unionWithBoundStringTag `fidl:"u,24,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
-	BoundFiveStr              string `fidl:"1,5"`
-}
-
-func (u *UnionWithBoundString) Which() I_unionWithBoundStringTag {
-	return u.I_unionWithBoundStringTag
-}
-
-func (u *UnionWithBoundString) SetBoundFiveStr(boundFiveStr string) {
-	u.I_unionWithBoundStringTag = UnionWithBoundStringBoundFiveStr
-	u.BoundFiveStr = boundFiveStr
-}
-
-func UnionWithBoundStringWithBoundFiveStr(boundFiveStr string) UnionWithBoundString {
-	var _u UnionWithBoundString
-	_u.SetBoundFiveStr(boundFiveStr)
-	return _u
-}
-
-type I_singleVariantUnionTag uint32
-
-const (
-	_ I_singleVariantUnionTag = iota
-	SingleVariantUnionX
-)
-
-type SingleVariantUnion struct {
-	I_singleVariantUnionTag `fidl:"u,8,4" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
-	X                       uint32 `fidl:"1"`
-}
-
-func (u *SingleVariantUnion) Which() I_singleVariantUnionTag {
-	return u.I_singleVariantUnionTag
-}
-
-func (u *SingleVariantUnion) SetX(x uint32) {
-	u.I_singleVariantUnionTag = SingleVariantUnionX
-	u.X = x
-}
-
-func SingleVariantUnionWithX(x uint32) SingleVariantUnion {
-	var _u SingleVariantUnion
-	_u.SetX(x)
-	return _u
-}
-
-type I_reverseOrdinalUnionTag uint32
-
-const (
-	_ I_reverseOrdinalUnionTag = iota
-	ReverseOrdinalUnionZ
-	ReverseOrdinalUnionY
-	ReverseOrdinalUnionX
-)
-
-type ReverseOrdinalUnion struct {
-	I_reverseOrdinalUnionTag `fidl:"u,16,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
-	Z                        uint32 `fidl:"1"`
-	Y                        bool   `fidl:"2"`
-	X                        int64  `fidl:"4"`
-}
-
-func (u *ReverseOrdinalUnion) Which() I_reverseOrdinalUnionTag {
-	return u.I_reverseOrdinalUnionTag
-}
-
-func (u *ReverseOrdinalUnion) SetZ(z uint32) {
-	u.I_reverseOrdinalUnionTag = ReverseOrdinalUnionZ
-	u.Z = z
-}
-
-func ReverseOrdinalUnionWithZ(z uint32) ReverseOrdinalUnion {
-	var _u ReverseOrdinalUnion
-	_u.SetZ(z)
-	return _u
-}
-
-func (u *ReverseOrdinalUnion) SetY(y bool) {
-	u.I_reverseOrdinalUnionTag = ReverseOrdinalUnionY
-	u.Y = y
-}
-
-func ReverseOrdinalUnionWithY(y bool) ReverseOrdinalUnion {
-	var _u ReverseOrdinalUnion
-	_u.SetY(y)
-	return _u
-}
-
-func (u *ReverseOrdinalUnion) SetX(x int64) {
-	u.I_reverseOrdinalUnionTag = ReverseOrdinalUnionX
-	u.X = x
-}
-
-func ReverseOrdinalUnionWithX(x int64) ReverseOrdinalUnion {
-	var _u ReverseOrdinalUnion
-	_u.SetX(x)
-	return _u
-}
-
 type I_unionWithEmptyStructTag uint32
 
 const (
@@ -1859,6 +1762,113 @@
 	return _u
 }
 
+type I_unionWithBoundStringTag uint32
+
+const (
+	_ I_unionWithBoundStringTag = iota
+	UnionWithBoundStringBoundFiveStr
+)
+
+type UnionWithBoundString struct {
+	I_unionWithBoundStringTag `fidl:"u,24,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
+	BoundFiveStr              string `fidl:"1,5"`
+}
+
+func (u *UnionWithBoundString) Which() I_unionWithBoundStringTag {
+	return u.I_unionWithBoundStringTag
+}
+
+func (u *UnionWithBoundString) SetBoundFiveStr(boundFiveStr string) {
+	u.I_unionWithBoundStringTag = UnionWithBoundStringBoundFiveStr
+	u.BoundFiveStr = boundFiveStr
+}
+
+func UnionWithBoundStringWithBoundFiveStr(boundFiveStr string) UnionWithBoundString {
+	var _u UnionWithBoundString
+	_u.SetBoundFiveStr(boundFiveStr)
+	return _u
+}
+
+type I_singleVariantUnionTag uint32
+
+const (
+	_ I_singleVariantUnionTag = iota
+	SingleVariantUnionX
+)
+
+type SingleVariantUnion struct {
+	I_singleVariantUnionTag `fidl:"u,8,4" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
+	X                       uint32 `fidl:"1"`
+}
+
+func (u *SingleVariantUnion) Which() I_singleVariantUnionTag {
+	return u.I_singleVariantUnionTag
+}
+
+func (u *SingleVariantUnion) SetX(x uint32) {
+	u.I_singleVariantUnionTag = SingleVariantUnionX
+	u.X = x
+}
+
+func SingleVariantUnionWithX(x uint32) SingleVariantUnion {
+	var _u SingleVariantUnion
+	_u.SetX(x)
+	return _u
+}
+
+type I_reverseOrdinalUnionTag uint32
+
+const (
+	_ I_reverseOrdinalUnionTag = iota
+	ReverseOrdinalUnionZ
+	ReverseOrdinalUnionY
+	ReverseOrdinalUnionX
+)
+
+type ReverseOrdinalUnion struct {
+	I_reverseOrdinalUnionTag `fidl:"u,16,8" fidl_size_v1:"24" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"24" fidl_alignment_v1_no_ee:"8"`
+	Z                        uint32 `fidl:"1"`
+	Y                        bool   `fidl:"2"`
+	X                        int64  `fidl:"4"`
+}
+
+func (u *ReverseOrdinalUnion) Which() I_reverseOrdinalUnionTag {
+	return u.I_reverseOrdinalUnionTag
+}
+
+func (u *ReverseOrdinalUnion) SetZ(z uint32) {
+	u.I_reverseOrdinalUnionTag = ReverseOrdinalUnionZ
+	u.Z = z
+}
+
+func ReverseOrdinalUnionWithZ(z uint32) ReverseOrdinalUnion {
+	var _u ReverseOrdinalUnion
+	_u.SetZ(z)
+	return _u
+}
+
+func (u *ReverseOrdinalUnion) SetY(y bool) {
+	u.I_reverseOrdinalUnionTag = ReverseOrdinalUnionY
+	u.Y = y
+}
+
+func ReverseOrdinalUnionWithY(y bool) ReverseOrdinalUnion {
+	var _u ReverseOrdinalUnion
+	_u.SetY(y)
+	return _u
+}
+
+func (u *ReverseOrdinalUnion) SetX(x int64) {
+	u.I_reverseOrdinalUnionTag = ReverseOrdinalUnionX
+	u.X = x
+}
+
+func ReverseOrdinalUnionWithX(x int64) ReverseOrdinalUnion {
+	var _u ReverseOrdinalUnion
+	_u.SetX(x)
+	return _u
+}
+
 type I_simpleUnionTag uint32
 
 const (
@@ -2293,6 +2303,36 @@
 	u.AfterPresent = false
 }
 
+type TableWithEmptyStruct struct {
+	_        struct{}    `fidl:"t,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	S        EmptyStruct `fidl:"1"`
+	SPresent bool
+}
+
+func (u *TableWithEmptyStruct) SetS(s EmptyStruct) {
+	u.S = s
+	u.SPresent = true
+}
+
+func (u *TableWithEmptyStruct) GetS() EmptyStruct {
+	return u.S
+}
+
+func (u *TableWithEmptyStruct) GetSWithDefault(_default EmptyStruct) EmptyStruct {
+	if !u.HasS() {
+		return _default
+	}
+	return u.S
+}
+
+func (u *TableWithEmptyStruct) HasS() bool {
+	return u.SPresent
+}
+
+func (u *TableWithEmptyStruct) ClearS() {
+	u.SPresent = false
+}
+
 type SimpleTable struct {
 	_        struct{} `fidl:"t,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
 	X        int64    `fidl:"1"`
@@ -2431,34 +2471,86 @@
 	u.BazPresent = false
 }
 
-type TableWithEmptyStruct struct {
-	_        struct{}    `fidl:"t,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
-	S        EmptyStruct `fidl:"1"`
-	SPresent bool
+type ReverseOrdinalTable struct {
+	_        struct{} `fidl:"t,16,8" fidl_size_v1:"16" fidl_alignment_v1:"8" fidl_size_v1_no_ee:"16" fidl_alignment_v1_no_ee:"8"`
+	Z        int64    `fidl:"1"`
+	ZPresent bool
+	Y        int64 `fidl:"2"`
+	YPresent bool
+	X        int64 `fidl:"4"`
+	XPresent bool
 }
 
-func (u *TableWithEmptyStruct) SetS(s EmptyStruct) {
-	u.S = s
-	u.SPresent = true
+func (u *ReverseOrdinalTable) SetZ(z int64) {
+	u.Z = z
+	u.ZPresent = true
 }
 
-func (u *TableWithEmptyStruct) GetS() EmptyStruct {
-	return u.S
+func (u *ReverseOrdinalTable) GetZ() int64 {
+	return u.Z
 }
 
-func (u *TableWithEmptyStruct) GetSWithDefault(_default EmptyStruct) EmptyStruct {
-	if !u.HasS() {
+func (u *ReverseOrdinalTable) GetZWithDefault(_default int64) int64 {
+	if !u.HasZ() {
 		return _default
 	}
-	return u.S
+	return u.Z
 }
 
-func (u *TableWithEmptyStruct) HasS() bool {
-	return u.SPresent
+func (u *ReverseOrdinalTable) HasZ() bool {
+	return u.ZPresent
 }
 
-func (u *TableWithEmptyStruct) ClearS() {
-	u.SPresent = false
+func (u *ReverseOrdinalTable) ClearZ() {
+	u.ZPresent = false
+}
+
+func (u *ReverseOrdinalTable) SetY(y int64) {
+	u.Y = y
+	u.YPresent = true
+}
+
+func (u *ReverseOrdinalTable) GetY() int64 {
+	return u.Y
+}
+
+func (u *ReverseOrdinalTable) GetYWithDefault(_default int64) int64 {
+	if !u.HasY() {
+		return _default
+	}
+	return u.Y
+}
+
+func (u *ReverseOrdinalTable) HasY() bool {
+	return u.YPresent
+}
+
+func (u *ReverseOrdinalTable) ClearY() {
+	u.YPresent = false
+}
+
+func (u *ReverseOrdinalTable) SetX(x int64) {
+	u.X = x
+	u.XPresent = true
+}
+
+func (u *ReverseOrdinalTable) GetX() int64 {
+	return u.X
+}
+
+func (u *ReverseOrdinalTable) GetXWithDefault(_default int64) int64 {
+	if !u.HasX() {
+		return _default
+	}
+	return u.X
+}
+
+func (u *ReverseOrdinalTable) HasX() bool {
+	return u.XPresent
+}
+
+func (u *ReverseOrdinalTable) ClearX() {
+	u.XPresent = false
 }
 
 type TableStructWithReservedSandwich struct {
diff --git a/src/syscall/zx/io/impl.go b/src/syscall/zx/io/impl.go
index 6abdfc0..b18b860 100644
--- a/src/syscall/zx/io/impl.go
+++ b/src/syscall/zx/io/impl.go
@@ -672,8 +672,8 @@
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(NodeCloneGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(NodeCloneGenOrdinal, req_)
+	return err_
 }
 
 // Terminates connection with object.
@@ -682,8 +682,8 @@
 func (p *NodeInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeCloseGenOrdinal, req_, resp_, NodeCloseOrdinal, NodeCloseGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(NodeCloseGenOrdinal, req_, resp_, NodeCloseOrdinal, NodeCloseGenOrdinal)
+	return resp_.S, err_
 }
 
 // Returns extra information about the type of the object.
@@ -693,8 +693,8 @@
 func (p *NodeInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeDescribeGenOrdinal, req_, resp_, NodeDescribeOrdinal, NodeDescribeGenOrdinal)
-	return resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(NodeDescribeGenOrdinal, req_, resp_, NodeDescribeOrdinal, NodeDescribeGenOrdinal)
+	return resp_.Info, err_
 }
 
 // An event produced eagerly by a FIDL server if requested by `OPEN_FLAG_DESCRIBE`.
@@ -704,8 +704,8 @@
 // (the same as would be returned by `Describe`).
 func (p *NodeInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
 	resp_ := &nodeOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(NodeOnOpenOrdinal, resp_, NodeOnOpenGenOrdinal)
-	return resp_.S, resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Recv(NodeOnOpenOrdinal, resp_, NodeOnOpenGenOrdinal)
+	return resp_.S, resp_.Info, err_
 }
 
 // Synchronizes updates to the node to the underlying media, if it exists.
@@ -714,8 +714,8 @@
 func (p *NodeInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeSyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeSyncGenOrdinal, req_, resp_, NodeSyncOrdinal, NodeSyncGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(NodeSyncGenOrdinal, req_, resp_, NodeSyncOrdinal, NodeSyncGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires information about the node.
@@ -724,8 +724,8 @@
 func (p *NodeInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeGetAttrGenOrdinal, req_, resp_, NodeGetAttrOrdinal, NodeGetAttrGenOrdinal)
-	return resp_.S, resp_.Attributes, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(NodeGetAttrGenOrdinal, req_, resp_, NodeGetAttrOrdinal, NodeGetAttrGenOrdinal)
+	return resp_.S, resp_.Attributes, err_
 }
 
 // Updates information about the node.
@@ -738,8 +738,8 @@
 		Attributes: attributes,
 	}
 	resp_ := &nodeSetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeSetAttrGenOrdinal, req_, resp_, NodeSetAttrOrdinal, NodeSetAttrGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(NodeSetAttrGenOrdinal, req_, resp_, NodeSetAttrOrdinal, NodeSetAttrGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires the `Directory.Open` rights and flags used to access this file.
@@ -750,8 +750,8 @@
 func (p *NodeInterface) NodeGetFlags() (int32, uint32, error) {
 	var req_ _bindings.Message
 	resp_ := &nodeNodeGetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeNodeGetFlagsGenOrdinal, req_, resp_, NodeNodeGetFlagsOrdinal, NodeNodeGetFlagsGenOrdinal)
-	return resp_.S, resp_.Flags, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(NodeNodeGetFlagsGenOrdinal, req_, resp_, NodeNodeGetFlagsOrdinal, NodeNodeGetFlagsGenOrdinal)
+	return resp_.S, resp_.Flags, err_
 }
 
 // Changes the `Directory.Open` flags used to access the file.
@@ -766,8 +766,8 @@
 		Flags: flags,
 	}
 	resp_ := &nodeNodeSetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(NodeNodeSetFlagsGenOrdinal, req_, resp_, NodeNodeSetFlagsOrdinal, NodeNodeSetFlagsGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(NodeNodeSetFlagsGenOrdinal, req_, resp_, NodeNodeSetFlagsOrdinal, NodeNodeSetFlagsGenOrdinal)
+	return resp_.S, err_
 }
 
 // Node defines the minimal interface for entities which can be accessed in a filesystem.
@@ -1338,8 +1338,8 @@
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(FileCloneGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(FileCloneGenOrdinal, req_)
+	return err_
 }
 
 // Terminates connection with object.
@@ -1348,8 +1348,8 @@
 func (p *FileInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &fileCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileCloseGenOrdinal, req_, resp_, FileCloseOrdinal, FileCloseGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileCloseGenOrdinal, req_, resp_, FileCloseOrdinal, FileCloseGenOrdinal)
+	return resp_.S, err_
 }
 
 // Returns extra information about the type of the object.
@@ -1359,8 +1359,8 @@
 func (p *FileInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &fileDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileDescribeGenOrdinal, req_, resp_, FileDescribeOrdinal, FileDescribeGenOrdinal)
-	return resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileDescribeGenOrdinal, req_, resp_, FileDescribeOrdinal, FileDescribeGenOrdinal)
+	return resp_.Info, err_
 }
 
 // An event produced eagerly by a FIDL server if requested by `OPEN_FLAG_DESCRIBE`.
@@ -1370,8 +1370,8 @@
 // (the same as would be returned by `Describe`).
 func (p *FileInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
 	resp_ := &fileOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(FileOnOpenOrdinal, resp_, FileOnOpenGenOrdinal)
-	return resp_.S, resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Recv(FileOnOpenOrdinal, resp_, FileOnOpenGenOrdinal)
+	return resp_.S, resp_.Info, err_
 }
 
 // Synchronizes updates to the node to the underlying media, if it exists.
@@ -1380,8 +1380,8 @@
 func (p *FileInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &fileSyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileSyncGenOrdinal, req_, resp_, FileSyncOrdinal, FileSyncGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileSyncGenOrdinal, req_, resp_, FileSyncOrdinal, FileSyncGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires information about the node.
@@ -1390,8 +1390,8 @@
 func (p *FileInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &fileGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetAttrGenOrdinal, req_, resp_, FileGetAttrOrdinal, FileGetAttrGenOrdinal)
-	return resp_.S, resp_.Attributes, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileGetAttrGenOrdinal, req_, resp_, FileGetAttrOrdinal, FileGetAttrGenOrdinal)
+	return resp_.S, resp_.Attributes, err_
 }
 
 // Updates information about the node.
@@ -1404,8 +1404,8 @@
 		Attributes: attributes,
 	}
 	resp_ := &fileSetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileSetAttrGenOrdinal, req_, resp_, FileSetAttrOrdinal, FileSetAttrGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileSetAttrGenOrdinal, req_, resp_, FileSetAttrOrdinal, FileSetAttrGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires the `Directory.Open` rights and flags used to access this file.
@@ -1416,8 +1416,8 @@
 func (p *FileInterface) NodeGetFlags() (int32, uint32, error) {
 	var req_ _bindings.Message
 	resp_ := &fileNodeGetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileNodeGetFlagsGenOrdinal, req_, resp_, FileNodeGetFlagsOrdinal, FileNodeGetFlagsGenOrdinal)
-	return resp_.S, resp_.Flags, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileNodeGetFlagsGenOrdinal, req_, resp_, FileNodeGetFlagsOrdinal, FileNodeGetFlagsGenOrdinal)
+	return resp_.S, resp_.Flags, err_
 }
 
 // Changes the `Directory.Open` flags used to access the file.
@@ -1432,8 +1432,8 @@
 		Flags: flags,
 	}
 	resp_ := &fileNodeSetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileNodeSetFlagsGenOrdinal, req_, resp_, FileNodeSetFlagsOrdinal, FileNodeSetFlagsGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileNodeSetFlagsGenOrdinal, req_, resp_, FileNodeSetFlagsOrdinal, FileNodeSetFlagsGenOrdinal)
+	return resp_.S, err_
 }
 
 // Reads `count` bytes at the seek offset.
@@ -1445,8 +1445,8 @@
 		Count: count,
 	}
 	resp_ := &fileReadResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileReadGenOrdinal, req_, resp_, FileReadOrdinal, FileReadGenOrdinal)
-	return resp_.S, resp_.Data, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileReadGenOrdinal, req_, resp_, FileReadOrdinal, FileReadGenOrdinal)
+	return resp_.S, resp_.Data, err_
 }
 
 // Reads `count` bytes at the provided offset.
@@ -1459,8 +1459,8 @@
 		Offset: offset,
 	}
 	resp_ := &fileReadAtResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileReadAtGenOrdinal, req_, resp_, FileReadAtOrdinal, FileReadAtGenOrdinal)
-	return resp_.S, resp_.Data, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileReadAtGenOrdinal, req_, resp_, FileReadAtOrdinal, FileReadAtGenOrdinal)
+	return resp_.S, resp_.Data, err_
 }
 
 // Writes data at the seek offset.
@@ -1472,8 +1472,8 @@
 		Data: data,
 	}
 	resp_ := &fileWriteResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteGenOrdinal, req_, resp_, FileWriteOrdinal, FileWriteGenOrdinal)
-	return resp_.S, resp_.Actual, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileWriteGenOrdinal, req_, resp_, FileWriteOrdinal, FileWriteGenOrdinal)
+	return resp_.S, resp_.Actual, err_
 }
 
 // Writes data to the provided offset.
@@ -1486,8 +1486,8 @@
 		Offset: offset,
 	}
 	resp_ := &fileWriteAtResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteAtGenOrdinal, req_, resp_, FileWriteAtOrdinal, FileWriteAtGenOrdinal)
-	return resp_.S, resp_.Actual, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileWriteAtGenOrdinal, req_, resp_, FileWriteAtOrdinal, FileWriteAtGenOrdinal)
+	return resp_.S, resp_.Actual, err_
 }
 
 // Moves the offset at which the next invocation of `Read()` or `Write()` will
@@ -1500,8 +1500,8 @@
 		Start:  start,
 	}
 	resp_ := &fileSeekResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileSeekGenOrdinal, req_, resp_, FileSeekOrdinal, FileSeekGenOrdinal)
-	return resp_.S, resp_.Offset, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileSeekGenOrdinal, req_, resp_, FileSeekOrdinal, FileSeekGenOrdinal)
+	return resp_.S, resp_.Offset, err_
 }
 
 // Shrinks the file size to 'length' bytes.
@@ -1512,8 +1512,8 @@
 		Length: length,
 	}
 	resp_ := &fileTruncateResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileTruncateGenOrdinal, req_, resp_, FileTruncateOrdinal, FileTruncateGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileTruncateGenOrdinal, req_, resp_, FileTruncateOrdinal, FileTruncateGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires the `Directory.Open` rights and flags used to access this file.
@@ -1522,8 +1522,8 @@
 func (p *FileInterface) GetFlags() (int32, uint32, error) {
 	var req_ _bindings.Message
 	resp_ := &fileGetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetFlagsGenOrdinal, req_, resp_, FileGetFlagsOrdinal, FileGetFlagsGenOrdinal)
-	return resp_.S, resp_.Flags, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileGetFlagsGenOrdinal, req_, resp_, FileGetFlagsOrdinal, FileGetFlagsGenOrdinal)
+	return resp_.S, resp_.Flags, err_
 }
 
 // Changes the `Directory.Open` flags used to access the file.
@@ -1536,8 +1536,8 @@
 		Flags: flags,
 	}
 	resp_ := &fileSetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileSetFlagsGenOrdinal, req_, resp_, FileSetFlagsOrdinal, FileSetFlagsGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileSetFlagsGenOrdinal, req_, resp_, FileSetFlagsOrdinal, FileSetFlagsGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires a buffer representing this file, if there is one, with the
@@ -1554,8 +1554,8 @@
 		Flags: flags,
 	}
 	resp_ := &fileGetBufferResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(FileGetBufferGenOrdinal, req_, resp_, FileGetBufferOrdinal, FileGetBufferGenOrdinal)
-	return resp_.S, resp_.Buffer, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(FileGetBufferGenOrdinal, req_, resp_, FileGetBufferOrdinal, FileGetBufferGenOrdinal)
+	return resp_.S, resp_.Buffer, err_
 }
 
 // File defines the interface of a node which contains a flat layout of data.
@@ -1912,8 +1912,8 @@
 	req_ := &directoryWatcherOnEventRequest{
 		Events: events,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryWatcherOnEventGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(DirectoryWatcherOnEventGenOrdinal, req_)
+	return err_
 }
 
 // DirectoryWatcher transmits messages from a filesystem server
@@ -2309,8 +2309,8 @@
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryCloneGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(DirectoryCloneGenOrdinal, req_)
+	return err_
 }
 
 // Terminates connection with object.
@@ -2319,8 +2319,8 @@
 func (p *DirectoryInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryCloseGenOrdinal, req_, resp_, DirectoryCloseOrdinal, DirectoryCloseGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryCloseGenOrdinal, req_, resp_, DirectoryCloseOrdinal, DirectoryCloseGenOrdinal)
+	return resp_.S, err_
 }
 
 // Returns extra information about the type of the object.
@@ -2330,8 +2330,8 @@
 func (p *DirectoryInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryDescribeGenOrdinal, req_, resp_, DirectoryDescribeOrdinal, DirectoryDescribeGenOrdinal)
-	return resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryDescribeGenOrdinal, req_, resp_, DirectoryDescribeOrdinal, DirectoryDescribeGenOrdinal)
+	return resp_.Info, err_
 }
 
 // An event produced eagerly by a FIDL server if requested by `OPEN_FLAG_DESCRIBE`.
@@ -2341,8 +2341,8 @@
 // (the same as would be returned by `Describe`).
 func (p *DirectoryInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
 	resp_ := &directoryOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryOnOpenOrdinal, resp_, DirectoryOnOpenGenOrdinal)
-	return resp_.S, resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryOnOpenOrdinal, resp_, DirectoryOnOpenGenOrdinal)
+	return resp_.S, resp_.Info, err_
 }
 
 // Synchronizes updates to the node to the underlying media, if it exists.
@@ -2351,8 +2351,8 @@
 func (p *DirectoryInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directorySyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySyncGenOrdinal, req_, resp_, DirectorySyncOrdinal, DirectorySyncGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectorySyncGenOrdinal, req_, resp_, DirectorySyncOrdinal, DirectorySyncGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires information about the node.
@@ -2361,8 +2361,8 @@
 func (p *DirectoryInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetAttrGenOrdinal, req_, resp_, DirectoryGetAttrOrdinal, DirectoryGetAttrGenOrdinal)
-	return resp_.S, resp_.Attributes, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetAttrGenOrdinal, req_, resp_, DirectoryGetAttrOrdinal, DirectoryGetAttrGenOrdinal)
+	return resp_.S, resp_.Attributes, err_
 }
 
 // Updates information about the node.
@@ -2375,8 +2375,8 @@
 		Attributes: attributes,
 	}
 	resp_ := &directorySetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySetAttrGenOrdinal, req_, resp_, DirectorySetAttrOrdinal, DirectorySetAttrGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectorySetAttrGenOrdinal, req_, resp_, DirectorySetAttrOrdinal, DirectorySetAttrGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires the `Directory.Open` rights and flags used to access this file.
@@ -2387,8 +2387,8 @@
 func (p *DirectoryInterface) NodeGetFlags() (int32, uint32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryNodeGetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryNodeGetFlagsGenOrdinal, req_, resp_, DirectoryNodeGetFlagsOrdinal, DirectoryNodeGetFlagsGenOrdinal)
-	return resp_.S, resp_.Flags, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryNodeGetFlagsGenOrdinal, req_, resp_, DirectoryNodeGetFlagsOrdinal, DirectoryNodeGetFlagsGenOrdinal)
+	return resp_.S, resp_.Flags, err_
 }
 
 // Changes the `Directory.Open` flags used to access the file.
@@ -2403,8 +2403,8 @@
 		Flags: flags,
 	}
 	resp_ := &directoryNodeSetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryNodeSetFlagsGenOrdinal, req_, resp_, DirectoryNodeSetFlagsOrdinal, DirectoryNodeSetFlagsGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryNodeSetFlagsGenOrdinal, req_, resp_, DirectoryNodeSetFlagsOrdinal, DirectoryNodeSetFlagsGenOrdinal)
+	return resp_.S, err_
 }
 
 // Opens a new object relative to this directory object.
@@ -2436,8 +2436,8 @@
 		Path:   path,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryOpenGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(DirectoryOpenGenOrdinal, req_)
+	return err_
 }
 
 // Detaches an object from this directory object.
@@ -2472,8 +2472,8 @@
 		Path: path,
 	}
 	resp_ := &directoryUnlinkResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryUnlinkGenOrdinal, req_, resp_, DirectoryUnlinkOrdinal, DirectoryUnlinkGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryUnlinkGenOrdinal, req_, resp_, DirectoryUnlinkOrdinal, DirectoryUnlinkGenOrdinal)
+	return resp_.S, err_
 }
 
 // Reads a collection of variably sized dirents into a buffer.
@@ -2503,8 +2503,8 @@
 		MaxBytes: maxBytes,
 	}
 	resp_ := &directoryReadDirentsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryReadDirentsGenOrdinal, req_, resp_, DirectoryReadDirentsOrdinal, DirectoryReadDirentsGenOrdinal)
-	return resp_.S, resp_.Dirents, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryReadDirentsGenOrdinal, req_, resp_, DirectoryReadDirentsOrdinal, DirectoryReadDirentsGenOrdinal)
+	return resp_.S, resp_.Dirents, err_
 }
 
 // Resets the directory seek offset.
@@ -2513,8 +2513,8 @@
 func (p *DirectoryInterface) Rewind() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryRewindResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRewindGenOrdinal, req_, resp_, DirectoryRewindOrdinal, DirectoryRewindGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRewindGenOrdinal, req_, resp_, DirectoryRewindOrdinal, DirectoryRewindGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires a token to a Directory which can be used to identify
@@ -2524,8 +2524,8 @@
 func (p *DirectoryInterface) GetToken() (int32, _zx.Handle, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryGetTokenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetTokenGenOrdinal, req_, resp_, DirectoryGetTokenOrdinal, DirectoryGetTokenGenOrdinal)
-	return resp_.S, resp_.Token, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetTokenGenOrdinal, req_, resp_, DirectoryGetTokenOrdinal, DirectoryGetTokenGenOrdinal)
+	return resp_.S, resp_.Token, err_
 }
 
 // Renames an object named src to the name dst, in a directory represented by token.
@@ -2543,8 +2543,8 @@
 		Dst:            dst,
 	}
 	resp_ := &directoryRenameResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRenameGenOrdinal, req_, resp_, DirectoryRenameOrdinal, DirectoryRenameGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRenameGenOrdinal, req_, resp_, DirectoryRenameOrdinal, DirectoryRenameGenOrdinal)
+	return resp_.S, err_
 }
 
 // Creates a link to an object named src by the name dst, within a directory represented by
@@ -2564,8 +2564,8 @@
 		Dst:            dst,
 	}
 	resp_ := &directoryLinkResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryLinkGenOrdinal, req_, resp_, DirectoryLinkOrdinal, DirectoryLinkGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryLinkGenOrdinal, req_, resp_, DirectoryLinkOrdinal, DirectoryLinkGenOrdinal)
+	return resp_.S, err_
 }
 
 // Watches a directory, receiving events of added messages on the
@@ -2594,8 +2594,8 @@
 		Watcher: watcher,
 	}
 	resp_ := &directoryWatchResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryWatchGenOrdinal, req_, resp_, DirectoryWatchOrdinal, DirectoryWatchGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryWatchGenOrdinal, req_, resp_, DirectoryWatchOrdinal, DirectoryWatchGenOrdinal)
+	return resp_.S, err_
 }
 
 // Directory defines a node which is capable of containing other Objects.
@@ -3429,8 +3429,8 @@
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminCloneGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminCloneGenOrdinal, req_)
+	return err_
 }
 
 // Terminates connection with object.
@@ -3439,8 +3439,8 @@
 func (p *DirectoryAdminInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminCloseGenOrdinal, req_, resp_, DirectoryAdminCloseOrdinal, DirectoryAdminCloseGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminCloseGenOrdinal, req_, resp_, DirectoryAdminCloseOrdinal, DirectoryAdminCloseGenOrdinal)
+	return resp_.S, err_
 }
 
 // Returns extra information about the type of the object.
@@ -3450,8 +3450,8 @@
 func (p *DirectoryAdminInterface) Describe() (NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminDescribeGenOrdinal, req_, resp_, DirectoryAdminDescribeOrdinal, DirectoryAdminDescribeGenOrdinal)
-	return resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminDescribeGenOrdinal, req_, resp_, DirectoryAdminDescribeOrdinal, DirectoryAdminDescribeGenOrdinal)
+	return resp_.Info, err_
 }
 
 // An event produced eagerly by a FIDL server if requested by `OPEN_FLAG_DESCRIBE`.
@@ -3461,8 +3461,8 @@
 // (the same as would be returned by `Describe`).
 func (p *DirectoryAdminInterface) ExpectOnOpen() (int32, *NodeInfo, error) {
 	resp_ := &directoryAdminOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryAdminOnOpenOrdinal, resp_, DirectoryAdminOnOpenGenOrdinal)
-	return resp_.S, resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Recv(DirectoryAdminOnOpenOrdinal, resp_, DirectoryAdminOnOpenGenOrdinal)
+	return resp_.S, resp_.Info, err_
 }
 
 // Synchronizes updates to the node to the underlying media, if it exists.
@@ -3471,8 +3471,8 @@
 func (p *DirectoryAdminInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminSyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSyncGenOrdinal, req_, resp_, DirectoryAdminSyncOrdinal, DirectoryAdminSyncGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSyncGenOrdinal, req_, resp_, DirectoryAdminSyncOrdinal, DirectoryAdminSyncGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires information about the node.
@@ -3481,8 +3481,8 @@
 func (p *DirectoryAdminInterface) GetAttr() (int32, NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetAttrGenOrdinal, req_, resp_, DirectoryAdminGetAttrOrdinal, DirectoryAdminGetAttrGenOrdinal)
-	return resp_.S, resp_.Attributes, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetAttrGenOrdinal, req_, resp_, DirectoryAdminGetAttrOrdinal, DirectoryAdminGetAttrGenOrdinal)
+	return resp_.S, resp_.Attributes, err_
 }
 
 // Updates information about the node.
@@ -3495,8 +3495,8 @@
 		Attributes: attributes,
 	}
 	resp_ := &directoryAdminSetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSetAttrGenOrdinal, req_, resp_, DirectoryAdminSetAttrOrdinal, DirectoryAdminSetAttrGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSetAttrGenOrdinal, req_, resp_, DirectoryAdminSetAttrOrdinal, DirectoryAdminSetAttrGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires the `Directory.Open` rights and flags used to access this file.
@@ -3507,8 +3507,8 @@
 func (p *DirectoryAdminInterface) NodeGetFlags() (int32, uint32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminNodeGetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminNodeGetFlagsGenOrdinal, req_, resp_, DirectoryAdminNodeGetFlagsOrdinal, DirectoryAdminNodeGetFlagsGenOrdinal)
-	return resp_.S, resp_.Flags, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminNodeGetFlagsGenOrdinal, req_, resp_, DirectoryAdminNodeGetFlagsOrdinal, DirectoryAdminNodeGetFlagsGenOrdinal)
+	return resp_.S, resp_.Flags, err_
 }
 
 // Changes the `Directory.Open` flags used to access the file.
@@ -3523,8 +3523,8 @@
 		Flags: flags,
 	}
 	resp_ := &directoryAdminNodeSetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminNodeSetFlagsGenOrdinal, req_, resp_, DirectoryAdminNodeSetFlagsOrdinal, DirectoryAdminNodeSetFlagsGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminNodeSetFlagsGenOrdinal, req_, resp_, DirectoryAdminNodeSetFlagsOrdinal, DirectoryAdminNodeSetFlagsGenOrdinal)
+	return resp_.S, err_
 }
 
 // Opens a new object relative to this directory object.
@@ -3556,8 +3556,8 @@
 		Path:   path,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminOpenGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(DirectoryAdminOpenGenOrdinal, req_)
+	return err_
 }
 
 // Detaches an object from this directory object.
@@ -3592,8 +3592,8 @@
 		Path: path,
 	}
 	resp_ := &directoryAdminUnlinkResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnlinkGenOrdinal, req_, resp_, DirectoryAdminUnlinkOrdinal, DirectoryAdminUnlinkGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnlinkGenOrdinal, req_, resp_, DirectoryAdminUnlinkOrdinal, DirectoryAdminUnlinkGenOrdinal)
+	return resp_.S, err_
 }
 
 // Reads a collection of variably sized dirents into a buffer.
@@ -3623,8 +3623,8 @@
 		MaxBytes: maxBytes,
 	}
 	resp_ := &directoryAdminReadDirentsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminReadDirentsGenOrdinal, req_, resp_, DirectoryAdminReadDirentsOrdinal, DirectoryAdminReadDirentsGenOrdinal)
-	return resp_.S, resp_.Dirents, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminReadDirentsGenOrdinal, req_, resp_, DirectoryAdminReadDirentsOrdinal, DirectoryAdminReadDirentsGenOrdinal)
+	return resp_.S, resp_.Dirents, err_
 }
 
 // Resets the directory seek offset.
@@ -3633,8 +3633,8 @@
 func (p *DirectoryAdminInterface) Rewind() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminRewindResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRewindGenOrdinal, req_, resp_, DirectoryAdminRewindOrdinal, DirectoryAdminRewindGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRewindGenOrdinal, req_, resp_, DirectoryAdminRewindOrdinal, DirectoryAdminRewindGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires a token to a Directory which can be used to identify
@@ -3644,8 +3644,8 @@
 func (p *DirectoryAdminInterface) GetToken() (int32, _zx.Handle, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminGetTokenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetTokenGenOrdinal, req_, resp_, DirectoryAdminGetTokenOrdinal, DirectoryAdminGetTokenGenOrdinal)
-	return resp_.S, resp_.Token, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetTokenGenOrdinal, req_, resp_, DirectoryAdminGetTokenOrdinal, DirectoryAdminGetTokenGenOrdinal)
+	return resp_.S, resp_.Token, err_
 }
 
 // Renames an object named src to the name dst, in a directory represented by token.
@@ -3663,8 +3663,8 @@
 		Dst:            dst,
 	}
 	resp_ := &directoryAdminRenameResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRenameGenOrdinal, req_, resp_, DirectoryAdminRenameOrdinal, DirectoryAdminRenameGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRenameGenOrdinal, req_, resp_, DirectoryAdminRenameOrdinal, DirectoryAdminRenameGenOrdinal)
+	return resp_.S, err_
 }
 
 // Creates a link to an object named src by the name dst, within a directory represented by
@@ -3684,8 +3684,8 @@
 		Dst:            dst,
 	}
 	resp_ := &directoryAdminLinkResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminLinkGenOrdinal, req_, resp_, DirectoryAdminLinkOrdinal, DirectoryAdminLinkGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminLinkGenOrdinal, req_, resp_, DirectoryAdminLinkOrdinal, DirectoryAdminLinkGenOrdinal)
+	return resp_.S, err_
 }
 
 // Watches a directory, receiving events of added messages on the
@@ -3714,8 +3714,8 @@
 		Watcher: watcher,
 	}
 	resp_ := &directoryAdminWatchResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminWatchGenOrdinal, req_, resp_, DirectoryAdminWatchOrdinal, DirectoryAdminWatchGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminWatchGenOrdinal, req_, resp_, DirectoryAdminWatchOrdinal, DirectoryAdminWatchGenOrdinal)
+	return resp_.S, err_
 }
 
 // Mount a channel representing a remote filesystem onto this directory.
@@ -3727,8 +3727,8 @@
 		Remote: remote,
 	}
 	resp_ := &directoryAdminMountResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountGenOrdinal, req_, resp_, DirectoryAdminMountOrdinal, DirectoryAdminMountGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountGenOrdinal, req_, resp_, DirectoryAdminMountOrdinal, DirectoryAdminMountGenOrdinal)
+	return resp_.S, err_
 }
 
 // Atomically create a directory with a provided path, and mount the
@@ -3740,8 +3740,8 @@
 		Flags:  flags,
 	}
 	resp_ := &directoryAdminMountAndCreateResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountAndCreateGenOrdinal, req_, resp_, DirectoryAdminMountAndCreateOrdinal, DirectoryAdminMountAndCreateGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountAndCreateGenOrdinal, req_, resp_, DirectoryAdminMountAndCreateOrdinal, DirectoryAdminMountAndCreateGenOrdinal)
+	return resp_.S, err_
 }
 
 // Unmount this filesystem. After this function returns successfully,
@@ -3749,8 +3749,8 @@
 func (p *DirectoryAdminInterface) Unmount() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminUnmountResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountGenOrdinal, req_, resp_, DirectoryAdminUnmountOrdinal, DirectoryAdminUnmountGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountGenOrdinal, req_, resp_, DirectoryAdminUnmountOrdinal, DirectoryAdminUnmountGenOrdinal)
+	return resp_.S, err_
 }
 
 // Detach a node which was previously attached to this directory
@@ -3758,24 +3758,24 @@
 func (p *DirectoryAdminInterface) UnmountNode() (int32, DirectoryInterface, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminUnmountNodeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountNodeGenOrdinal, req_, resp_, DirectoryAdminUnmountNodeOrdinal, DirectoryAdminUnmountNodeGenOrdinal)
-	return resp_.S, resp_.Remote, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountNodeGenOrdinal, req_, resp_, DirectoryAdminUnmountNodeOrdinal, DirectoryAdminUnmountNodeGenOrdinal)
+	return resp_.S, resp_.Remote, err_
 }
 
 // Query the filesystem for filesystem-specific information.
 func (p *DirectoryAdminInterface) QueryFilesystem() (int32, *FilesystemInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminQueryFilesystemResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminQueryFilesystemGenOrdinal, req_, resp_, DirectoryAdminQueryFilesystemOrdinal, DirectoryAdminQueryFilesystemGenOrdinal)
-	return resp_.S, resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminQueryFilesystemGenOrdinal, req_, resp_, DirectoryAdminQueryFilesystemOrdinal, DirectoryAdminQueryFilesystemGenOrdinal)
+	return resp_.S, resp_.Info, err_
 }
 
 // Acquire the path to the device backing this filesystem, if there is one.
 func (p *DirectoryAdminInterface) GetDevicePath() (int32, *string, error) {
 	var req_ _bindings.Message
 	resp_ := &directoryAdminGetDevicePathResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetDevicePathGenOrdinal, req_, resp_, DirectoryAdminGetDevicePathOrdinal, DirectoryAdminGetDevicePathGenOrdinal)
-	return resp_.S, resp_.Path, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetDevicePathGenOrdinal, req_, resp_, DirectoryAdminGetDevicePathOrdinal, DirectoryAdminGetDevicePathGenOrdinal)
+	return resp_.S, resp_.Path, err_
 }
 
 // DirectoryAdmin defines a directory which is capable of handling
diff --git a/src/syscall/zx/net/impl.go b/src/syscall/zx/net/impl.go
index 6b56c7e..61ff75a 100644
--- a/src/syscall/zx/net/impl.go
+++ b/src/syscall/zx/net/impl.go
@@ -365,8 +365,8 @@
 		Flags:  flags,
 		Object: object,
 	}
-	err := ((*_bindings.ChannelProxy)(p)).Send(ControlCloneGenOrdinal, req_)
-	return err
+	err_ := ((*_bindings.ChannelProxy)(p)).Send(ControlCloneGenOrdinal, req_)
+	return err_
 }
 
 // Terminates connection with object.
@@ -375,8 +375,8 @@
 func (p *ControlInterface) Close() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &controlCloseResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlCloseGenOrdinal, req_, resp_, ControlCloseOrdinal, ControlCloseGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlCloseGenOrdinal, req_, resp_, ControlCloseOrdinal, ControlCloseGenOrdinal)
+	return resp_.S, err_
 }
 
 // Returns extra information about the type of the object.
@@ -386,8 +386,8 @@
 func (p *ControlInterface) Describe() (fuchsiaio.NodeInfo, error) {
 	var req_ _bindings.Message
 	resp_ := &controlDescribeResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlDescribeGenOrdinal, req_, resp_, ControlDescribeOrdinal, ControlDescribeGenOrdinal)
-	return resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlDescribeGenOrdinal, req_, resp_, ControlDescribeOrdinal, ControlDescribeGenOrdinal)
+	return resp_.Info, err_
 }
 
 // An event produced eagerly by a FIDL server if requested by `OPEN_FLAG_DESCRIBE`.
@@ -397,8 +397,8 @@
 // (the same as would be returned by `Describe`).
 func (p *ControlInterface) ExpectOnOpen() (int32, *fuchsiaio.NodeInfo, error) {
 	resp_ := &controlOnOpenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Recv(ControlOnOpenOrdinal, resp_, ControlOnOpenGenOrdinal)
-	return resp_.S, resp_.Info, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Recv(ControlOnOpenOrdinal, resp_, ControlOnOpenGenOrdinal)
+	return resp_.S, resp_.Info, err_
 }
 
 // Synchronizes updates to the node to the underlying media, if it exists.
@@ -407,8 +407,8 @@
 func (p *ControlInterface) Sync() (int32, error) {
 	var req_ _bindings.Message
 	resp_ := &controlSyncResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSyncGenOrdinal, req_, resp_, ControlSyncOrdinal, ControlSyncGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlSyncGenOrdinal, req_, resp_, ControlSyncOrdinal, ControlSyncGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires information about the node.
@@ -417,8 +417,8 @@
 func (p *ControlInterface) GetAttr() (int32, fuchsiaio.NodeAttributes, error) {
 	var req_ _bindings.Message
 	resp_ := &controlGetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetAttrGenOrdinal, req_, resp_, ControlGetAttrOrdinal, ControlGetAttrGenOrdinal)
-	return resp_.S, resp_.Attributes, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlGetAttrGenOrdinal, req_, resp_, ControlGetAttrOrdinal, ControlGetAttrGenOrdinal)
+	return resp_.S, resp_.Attributes, err_
 }
 
 // Updates information about the node.
@@ -431,8 +431,8 @@
 		Attributes: attributes,
 	}
 	resp_ := &controlSetAttrResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetAttrGenOrdinal, req_, resp_, ControlSetAttrOrdinal, ControlSetAttrGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlSetAttrGenOrdinal, req_, resp_, ControlSetAttrOrdinal, ControlSetAttrGenOrdinal)
+	return resp_.S, err_
 }
 
 // Acquires the `Directory.Open` rights and flags used to access this file.
@@ -443,8 +443,8 @@
 func (p *ControlInterface) NodeGetFlags() (int32, uint32, error) {
 	var req_ _bindings.Message
 	resp_ := &controlNodeGetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlNodeGetFlagsGenOrdinal, req_, resp_, ControlNodeGetFlagsOrdinal, ControlNodeGetFlagsGenOrdinal)
-	return resp_.S, resp_.Flags, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlNodeGetFlagsGenOrdinal, req_, resp_, ControlNodeGetFlagsOrdinal, ControlNodeGetFlagsGenOrdinal)
+	return resp_.S, resp_.Flags, err_
 }
 
 // Changes the `Directory.Open` flags used to access the file.
@@ -459,8 +459,8 @@
 		Flags: flags,
 	}
 	resp_ := &controlNodeSetFlagsResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlNodeSetFlagsGenOrdinal, req_, resp_, ControlNodeSetFlagsOrdinal, ControlNodeSetFlagsGenOrdinal)
-	return resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlNodeSetFlagsGenOrdinal, req_, resp_, ControlNodeSetFlagsOrdinal, ControlNodeSetFlagsGenOrdinal)
+	return resp_.S, err_
 }
 
 // Sets the local address used for the socket.
@@ -469,8 +469,8 @@
 		Addr: addr,
 	}
 	resp_ := &controlBindResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlBindGenOrdinal, req_, resp_, ControlBindOrdinal, ControlBindGenOrdinal)
-	return resp_.Code, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlBindGenOrdinal, req_, resp_, ControlBindOrdinal, ControlBindGenOrdinal)
+	return resp_.Code, err_
 }
 
 // Initiates a connection to a remote address.
@@ -479,8 +479,8 @@
 		Addr: addr,
 	}
 	resp_ := &controlConnectResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlConnectGenOrdinal, req_, resp_, ControlConnectOrdinal, ControlConnectGenOrdinal)
-	return resp_.Code, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlConnectGenOrdinal, req_, resp_, ControlConnectOrdinal, ControlConnectGenOrdinal)
+	return resp_.Code, err_
 }
 
 // Begins listening for new incoming connections. At most `backlog` connections will be
@@ -490,8 +490,8 @@
 		Backlog: backlog,
 	}
 	resp_ := &controlListenResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlListenGenOrdinal, req_, resp_, ControlListenOrdinal, ControlListenGenOrdinal)
-	return resp_.Code, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlListenGenOrdinal, req_, resp_, ControlListenOrdinal, ControlListenGenOrdinal)
+	return resp_.Code, err_
 }
 
 // Accepts a buffered incoming connection.
@@ -500,24 +500,24 @@
 		Flags: flags,
 	}
 	resp_ := &controlAcceptResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlAcceptGenOrdinal, req_, resp_, ControlAcceptOrdinal, ControlAcceptGenOrdinal)
-	return resp_.Code, resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlAcceptGenOrdinal, req_, resp_, ControlAcceptOrdinal, ControlAcceptGenOrdinal)
+	return resp_.Code, resp_.S, err_
 }
 
 // Retrieves the local socket address.
 func (p *ControlInterface) GetSockName() (int16, []uint8, error) {
 	var req_ _bindings.Message
 	resp_ := &controlGetSockNameResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockNameGenOrdinal, req_, resp_, ControlGetSockNameOrdinal, ControlGetSockNameGenOrdinal)
-	return resp_.Code, resp_.Addr, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockNameGenOrdinal, req_, resp_, ControlGetSockNameOrdinal, ControlGetSockNameGenOrdinal)
+	return resp_.Code, resp_.Addr, err_
 }
 
 // Retrieves the remote socket address.
 func (p *ControlInterface) GetPeerName() (int16, []uint8, error) {
 	var req_ _bindings.Message
 	resp_ := &controlGetPeerNameResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetPeerNameGenOrdinal, req_, resp_, ControlGetPeerNameOrdinal, ControlGetPeerNameGenOrdinal)
-	return resp_.Code, resp_.Addr, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlGetPeerNameGenOrdinal, req_, resp_, ControlGetPeerNameOrdinal, ControlGetPeerNameGenOrdinal)
+	return resp_.Code, resp_.Addr, err_
 }
 
 // Sets the value of a socket option.
@@ -528,8 +528,8 @@
 		Optval:  optval,
 	}
 	resp_ := &controlSetSockOptResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetSockOptGenOrdinal, req_, resp_, ControlSetSockOptOrdinal, ControlSetSockOptGenOrdinal)
-	return resp_.Code, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlSetSockOptGenOrdinal, req_, resp_, ControlSetSockOptOrdinal, ControlSetSockOptGenOrdinal)
+	return resp_.Code, err_
 }
 
 // Retrieves the value of a socket option.
@@ -539,8 +539,8 @@
 		Optname: optname,
 	}
 	resp_ := &controlGetSockOptResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockOptGenOrdinal, req_, resp_, ControlGetSockOptOrdinal, ControlGetSockOptGenOrdinal)
-	return resp_.Code, resp_.Optval, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockOptGenOrdinal, req_, resp_, ControlGetSockOptOrdinal, ControlGetSockOptGenOrdinal)
+	return resp_.Code, resp_.Optval, err_
 }
 
 // The control plane for a network socket.
@@ -873,8 +873,8 @@
 		Protocol: protocol,
 	}
 	resp_ := &providerSocketResponse{}
-	err := ((*_bindings.ChannelProxy)(p)).Call(ProviderSocketGenOrdinal, req_, resp_, ProviderSocketOrdinal, ProviderSocketGenOrdinal)
-	return resp_.Code, resp_.S, err
+	err_ := ((*_bindings.ChannelProxy)(p)).Call(ProviderSocketGenOrdinal, req_, resp_, ProviderSocketOrdinal, ProviderSocketGenOrdinal)
+	return resp_.Code, resp_.S, err_
 }
 
 // Provider implements the POSIX sockets API.