diff --git a/gir/cmd/gir-generate/gendata/gendata.go b/gir/cmd/gir-generate/gendata/gendata.go
index c75357b6d..87d3644f5 100644
--- a/gir/cmd/gir-generate/gendata/gendata.go
+++ b/gir/cmd/gir-generate/gendata/gendata.go
@@ -406,8 +406,8 @@ func GLibVariantIter(nsgen *girgen.NamespaceGenerator) error {
 			_variant := (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_variant)),
-				C.g_variant_unref,
-				(*C.GVariant)(unsafe.Pointer(_cret)),
+				func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+				unsafe.Pointer(_cret),
 			)
 			return _variant, nil
 		}
@@ -429,8 +429,8 @@ func GLibVariantIter(nsgen *girgen.NamespaceGenerator) error {
 				variant := (*Variant)(gextras.NewStructNative(unsafe.Pointer(item)))
 				runtime.AddCleanup(
 					gextras.StructIntern(unsafe.Pointer(variant)),
-					C.g_variant_unref,
-					(*C.GVariant)(unsafe.Pointer(item)),
+					func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+					unsafe.Pointer(item),
 				)
 
 				return variant
@@ -563,8 +563,8 @@ func GioArrayUseBytes(nsgen *girgen.NamespaceGenerator) error {
 			_bytes := (*Bytes)(gextras.NewStructNative(unsafe.Pointer(v)))
 			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_bytes)),
-				C.g_bytes_unref,
-				(*C.GBytes)(unsafe.Pointer(v)),
+				func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+				unsafe.Pointer(v),
 			)
 
 			return _bytes
diff --git a/gir/girgen/types/typeconv/c-go.go b/gir/girgen/types/typeconv/c-go.go
index a554e45aa..f6be7593f 100644
--- a/gir/girgen/types/typeconv/c-go.go
+++ b/gir/girgen/types/typeconv/c-go.go
@@ -431,14 +431,15 @@ func (conv *Converter) cgoConverter(value *ValueConverted) bool {
 		value.header.NeedsExternGLib()
 		value.header.NeedsGLibObject()
 
-		value.p.LineTmpl(value, `<.Out.Set> =
-			<- .OutPtr 1>coreglib.ValueFromNative(unsafe.Pointer(<.InNamePtr 1>))`)
-
-		// Set this to be freed if we have the ownership now.
+		valueFunc := "ValueFromNative"
 		if value.ShouldFree() {
-			value.header.Import("runtime")
-			value.p.Linef("runtime.AddCleanup(%s, C.g_value_unset, (*C.GValue)(unsafe.Pointer(v.Native())))", value.OutName)
+			valueFunc = "ValueFromNativeOwned"
 		}
+
+		value.p.Printf("%s =", value.Out.Set)
+		value.p.Printf("  %scoreglib.%s(unsafe.Pointer(%s))", value.OutPtr(1), valueFunc, value.InNamePtr(1))
+		value.p.EmptyLine()
+
 		return true
 
 	case "GObject.Object", "GObject.InitiallyUnowned":
@@ -498,11 +499,11 @@ func (conv *Converter) cgoConverter(value *ValueConverted) bool {
 			value.p.Linef("C.%s(%s)", ref, value.InNamePtr(1))
 		}
 
-		value.p.Linef("runtime.AddCleanup(%s%s, func(v %s%s) {",
-			value.OutInPtr(1), value.OutName, value.OutPtr(1), value.Out.Type)
-		value.p.Linef("C.%s((%s%s)(unsafe.Pointer(v.Native())))",
-			unref, value.InPtr(1), value.In.Type)
-		value.p.Linef("}, %s%s)", value.OutInPtr(1), value.OutName)
+		value.p.Linef("runtime.AddCleanup(")
+		value.p.Linef("  %s%s,", value.OutInPtr(1), value.OutName)
+		value.p.Linef("  func(p unsafe.Pointer) { C.%s((%s%s)(p)) },", unref, value.InPtr(1), value.In.Type)
+		value.p.Linef("  unsafe.Pointer(%s),", value.InNamePtr(1))
+		value.p.Linef(")")
 
 		return true
 	}
@@ -640,9 +641,7 @@ func (conv *Converter) cgoConverter(value *ValueConverted) bool {
 			value.header.Import("runtime")
 			value.p.Linef("runtime.AddCleanup(")
 			value.p.Linef("  gextras.StructIntern(unsafe.Pointer(%s%s)),", value.OutInPtr(1), value.OutName)
-			value.p.Linef("  func(ptr unsafe.Pointer) {")
-			value.p.Linef("    %s", types.RecordPrintFree(value.conv.fgen, value.Resolved.Extern, "ptr"))
-			value.p.Linef("  },")
+			value.p.Linef("  func(ptr unsafe.Pointer) { %s },", types.RecordPrintFree(value.conv.fgen, value.Resolved.Extern, "ptr"))
 			value.p.Linef("  unsafe.Pointer(%s),", value.InNamePtr(1))
 			value.p.Linef(")")
 		}
diff --git a/pkg/atk/atk.go b/pkg/atk/atk.go
index 42b0e940a..a131b5323 100644
--- a/pkg/atk/atk.go
+++ b/pkg/atk/atk.go
@@ -7294,11 +7294,10 @@ func (streamable *StreamableContent) Stream(mimeType string) *glib.IOChannel {
 	var _ioChannel *glib.IOChannel // out
 
 	_ioChannel = (*glib.IOChannel)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ioChannel)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_io_channel_unref((*C.GIOChannel)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_io_channel_unref((*C.GIOChannel)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ioChannel
@@ -7428,11 +7427,10 @@ func (streamable *StreamableContent) stream(mimeType string) *glib.IOChannel {
 	var _ioChannel *glib.IOChannel // out
 
 	_ioChannel = (*glib.IOChannel)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ioChannel)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_io_channel_unref((*C.GIOChannel)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_io_channel_unref((*C.GIOChannel)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ioChannel
@@ -10115,11 +10113,10 @@ func (text *Text) BoundedRanges(rect *TextRectangle, coordType CoordType, xClipT
 		_textRanges = make([]*TextRange, i)
 		for i := range src {
 			_textRanges[i] = (*TextRange)(gextras.NewStructNative(unsafe.Pointer(src[i])))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_textRanges[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.free(intern.C)
-				},
+				func(ptr unsafe.Pointer) { C.free(ptr) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -10959,11 +10956,10 @@ func (text *Text) boundedRanges(rect *TextRectangle, coordType CoordType, xClipT
 		_textRanges = make([]*TextRange, i)
 		for i := range src {
 			_textRanges[i] = (*TextRange)(gextras.NewStructNative(unsafe.Pointer(src[i])))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_textRanges[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.free(intern.C)
-				},
+				func(ptr unsafe.Pointer) { C.free(ptr) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -12136,11 +12132,10 @@ func (obj *Value) Range() *Range {
 
 	if _cret != nil {
 		__range = (*Range)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(__range)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.atk_range_free((*C.AtkRange)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.atk_range_free((*C.AtkRange)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -12170,11 +12165,10 @@ func (obj *Value) SubRanges() []*Range {
 		src := (*C.AtkRange)(v)
 		var dst *Range // out
 		dst = (*Range)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.atk_range_free((*C.AtkRange)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.atk_range_free((*C.AtkRange)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_sList = append(_sList, dst)
 	})
@@ -12430,11 +12424,10 @@ func (obj *Value) _range() *Range {
 
 	if _cret != nil {
 		__range = (*Range)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(__range)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.atk_range_free((*C.AtkRange)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.atk_range_free((*C.AtkRange)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -12467,11 +12460,10 @@ func (obj *Value) subRanges() []*Range {
 		src := (*C.AtkRange)(v)
 		var dst *Range // out
 		dst = (*Range)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.atk_range_free((*C.AtkRange)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.atk_range_free((*C.AtkRange)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_sList = append(_sList, dst)
 	})
@@ -17165,11 +17157,10 @@ func NewRange(lowerLimit float64, upperLimit float64, description string) *Range
 	var __range *Range // out
 
 	__range = (*Range)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(__range)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.atk_range_free((*C.AtkRange)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.atk_range_free((*C.AtkRange)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return __range
@@ -17192,11 +17183,10 @@ func (src *Range) Copy() *Range {
 	var __range *Range // out
 
 	__range = (*Range)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(__range)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.atk_range_free((*C.AtkRange)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.atk_range_free((*C.AtkRange)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return __range
diff --git a/pkg/core/glib/glib.go b/pkg/core/glib/glib.go
index 8d70da50d..fa15f921d 100644
--- a/pkg/core/glib/glib.go
+++ b/pkg/core/glib/glib.go
@@ -1045,11 +1045,20 @@ func InitValue(t Type) *Value {
 	return v
 }
 
-// ValueFromNative returns a type-asserted pointer to the Value. It does not add
-// a finalizer into the Value. This function should only be used for
-// autogenerated bindings.
+// ValueFromNative returns a type-asserted pointer to the Value.
+// This should only be used by the code generator.
 func ValueFromNative(l unsafe.Pointer) *Value {
-	return &Value{&value{(*C.GValue)(l)}}
+	v := &Value{&value{(*C.GValue)(l)}}
+	return v
+}
+
+// ValueFromNativeOwned returns a type-asserted pointer to the Value, with a
+// finalizer set to call g_value_unset() on the underlying GValue. This should
+// only be used by the code generator.
+func ValueFromNativeOwned(l unsafe.Pointer) *Value {
+	v := ValueFromNative(l)
+	runtime.AddCleanup(v.value, func(v *C.GValue) { C.g_value_unset(v) }, v.gvalue)
+	return v
 }
 
 // NewValue converts a Go type to a comparable GValue. It will panic if the
diff --git a/pkg/gdk/v3/gdk.go b/pkg/gdk/v3/gdk.go
index 698bbc8d6..24b8ef232 100644
--- a/pkg/gdk/v3/gdk.go
+++ b/pkg/gdk/v3/gdk.go
@@ -5753,9 +5753,11 @@ func CairoCreate(window Windower) *cairo.Context {
 	var _context *cairo.Context // out
 
 	_context = cairo.WrapContext(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_context, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_context,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _context
 }
@@ -5946,9 +5948,11 @@ func CairoRegionCreateFromSurface(surface *cairo.Surface) *cairo.Region {
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 		_region = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_region, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_region,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _region
 }
@@ -6085,9 +6089,11 @@ func CairoSurfaceCreateFromPixbuf(pixbuf *gdkpixbuf.Pixbuf, scale int, forWindow
 	var _surface *cairo.Surface // out
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _surface
 }
@@ -7145,9 +7151,11 @@ func OffscreenWindowGetSurface(window Windower) *cairo.Surface {
 	if _cret != nil {
 		_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
 		C.cairo_surface_reference(_cret)
-		runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-			C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_surface,
+			func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _surface
@@ -8952,9 +8960,11 @@ func (cursor *Cursor) Surface() (xHot, yHot float64, surface *cairo.Surface) {
 	_yHot = float64(_arg2)
 	if _cret != nil {
 		_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-			C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_surface,
+			func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _xHot, _yHot, _surface
@@ -12273,9 +12283,11 @@ func (context *DrawingContext) CairoContext() *cairo.Context {
 
 	_ret = cairo.WrapContext(uintptr(unsafe.Pointer(_cret)))
 	C.cairo_reference(_cret)
-	runtime.SetFinalizer(_ret, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_ret,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _ret
 }
@@ -12301,9 +12313,11 @@ func (context *DrawingContext) Clip() *cairo.Region {
 			_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 			_region = (*cairo.Region)(unsafe.Pointer(_pp))
 		}
-		runtime.SetFinalizer(_region, func(v *cairo.Region) {
-			C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_region,
+			func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _region
@@ -12533,11 +12547,10 @@ func (frameClock *FrameClock) CurrentTimings() *FrameTimings {
 	if _cret != nil {
 		_frameTimings = (*FrameTimings)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gdk_frame_timings_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_frameTimings)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_frame_timings_unref((*C.GdkFrameTimings)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_frame_timings_unref((*C.GdkFrameTimings)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -12688,11 +12701,10 @@ func (frameClock *FrameClock) Timings(frameCounter int64) *FrameTimings {
 	if _cret != nil {
 		_frameTimings = (*FrameTimings)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gdk_frame_timings_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_frameTimings)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_frame_timings_unref((*C.GdkFrameTimings)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_frame_timings_unref((*C.GdkFrameTimings)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -13370,11 +13382,10 @@ func (keymap *Keymap) EntriesForKeycode(hardwareKeycode uint) ([]KeymapKey, []ui
 			_keys = make([]KeymapKey, _arg4)
 			for i := 0; i < int(_arg4); i++ {
 				_keys[i] = *(*KeymapKey)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-				runtime.SetFinalizer(
+				runtime.AddCleanup(
 					gextras.StructIntern(unsafe.Pointer(&_keys[i])),
-					func(intern *struct{ C unsafe.Pointer }) {
-						C.free(intern.C)
-					},
+					func(ptr unsafe.Pointer) { C.free(ptr) },
+					unsafe.Pointer((&src[i])),
 				)
 			}
 		}
@@ -13437,11 +13448,10 @@ func (keymap *Keymap) EntriesForKeyval(keyval uint) ([]KeymapKey, bool) {
 		_keys = make([]KeymapKey, _arg3)
 		for i := 0; i < int(_arg3); i++ {
 			_keys[i] = *(*KeymapKey)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(&_keys[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.free(intern.C)
-				},
+				func(ptr unsafe.Pointer) { C.free(ptr) },
+				unsafe.Pointer((&src[i])),
 			)
 		}
 	}
@@ -16605,9 +16615,11 @@ func (window *Window) CreateSimilarImageSurface(format cairo.Format, width, heig
 	var _surface *cairo.Surface // out
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _surface
 }
@@ -16657,9 +16669,11 @@ func (window *Window) CreateSimilarSurface(content cairo.Content, width, height
 	var _surface *cairo.Surface // out
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _surface
 }
@@ -16940,9 +16954,11 @@ func (window *Window) BackgroundPattern() *cairo.Pattern {
 			_pattern = (*cairo.Pattern)(unsafe.Pointer(_pp))
 		}
 		C.cairo_pattern_reference(_cret)
-		runtime.SetFinalizer(_pattern, func(v *cairo.Pattern) {
-			C.cairo_pattern_destroy((*C.cairo_pattern_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_pattern,
+			func(p unsafe.Pointer) { C.cairo_pattern_destroy((*C.cairo_pattern_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _pattern
@@ -17074,9 +17090,11 @@ func (window *Window) ClipRegion() *cairo.Region {
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 		_region = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_region, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_region,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _region
 }
@@ -18279,9 +18297,11 @@ func (window *Window) UpdateArea() *cairo.Region {
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 		_region = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_region, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_region,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _region
 }
@@ -18330,9 +18350,11 @@ func (window *Window) VisibleRegion() *cairo.Region {
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 		_region = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_region, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_region,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _region
 }
@@ -20450,9 +20472,11 @@ func (window *Window) createSurface(width, height int) *cairo.Surface {
 	var _surface *cairo.Surface // out
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _surface
 }
@@ -20777,11 +20801,10 @@ func (color *Color) Copy() *Color {
 	var _ret *Color // out
 
 	_ret = (*Color)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ret)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_color_free((*C.GdkColor)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_color_free((*C.GdkColor)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ret
@@ -21703,9 +21726,11 @@ func (e *EventExpose) Region() *cairo.Region {
 		_v = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
 	C.cairo_region_reference(*valptr)
-	runtime.SetFinalizer(_v, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_v,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(*valptr),
+	)
 	return _v
 }
 
@@ -24508,11 +24533,10 @@ func (rgba *RGBA) Copy() *RGBA {
 	var _rgbA *RGBA // out
 
 	_rgbA = (*RGBA)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_rgbA)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_rgba_free((*C.GdkRGBA)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_rgba_free((*C.GdkRGBA)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _rgbA
@@ -25127,11 +25151,12 @@ func CopyEventer(e Eventer) *Event {
 	original := (*C.GdkEvent)(e.underlyingEvent())
 	copied := C.gdk_event_copy(original)
 	dst := (*Event)(gextras.NewStructNative(unsafe.Pointer(copied)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(copied),
 	)
 	return dst
 }
@@ -25168,11 +25193,12 @@ func (e *Event) AsAny() *EventAny {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventAny
 	dst = (*EventAny)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25190,11 +25216,12 @@ func (e *Event) AsExpose() *EventExpose {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventExpose
 	dst = (*EventExpose)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25212,11 +25239,12 @@ func (e *Event) AsVisibility() *EventVisibility {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventVisibility
 	dst = (*EventVisibility)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25234,11 +25262,12 @@ func (e *Event) AsMotion() *EventMotion {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventMotion
 	dst = (*EventMotion)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25256,11 +25285,12 @@ func (e *Event) AsButton() *EventButton {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventButton
 	dst = (*EventButton)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25278,11 +25308,12 @@ func (e *Event) AsTouch() *EventTouch {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventTouch
 	dst = (*EventTouch)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25300,11 +25331,12 @@ func (e *Event) AsScroll() *EventScroll {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventScroll
 	dst = (*EventScroll)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25322,11 +25354,12 @@ func (e *Event) AsKey() *EventKey {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventKey
 	dst = (*EventKey)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25344,11 +25377,12 @@ func (e *Event) AsCrossing() *EventCrossing {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventCrossing
 	dst = (*EventCrossing)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25366,11 +25400,12 @@ func (e *Event) AsFocusChange() *EventFocus {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventFocus
 	dst = (*EventFocus)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25388,11 +25423,12 @@ func (e *Event) AsConfigure() *EventConfigure {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventConfigure
 	dst = (*EventConfigure)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25410,11 +25446,12 @@ func (e *Event) AsProperty() *EventProperty {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventProperty
 	dst = (*EventProperty)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25432,11 +25469,12 @@ func (e *Event) AsSelection() *EventSelection {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventSelection
 	dst = (*EventSelection)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25454,11 +25492,12 @@ func (e *Event) AsOwnerChange() *EventOwnerChange {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventOwnerChange
 	dst = (*EventOwnerChange)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25476,11 +25515,12 @@ func (e *Event) AsProximity() *EventProximity {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventProximity
 	dst = (*EventProximity)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25498,11 +25538,12 @@ func (e *Event) AsDND() *EventDND {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventDND
 	dst = (*EventDND)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25520,11 +25561,12 @@ func (e *Event) AsWindowState() *EventWindowState {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventWindowState
 	dst = (*EventWindowState)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25542,11 +25584,12 @@ func (e *Event) AsSetting() *EventSetting {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventSetting
 	dst = (*EventSetting)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25564,11 +25607,12 @@ func (e *Event) AsGrabBroken() *EventGrabBroken {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventGrabBroken
 	dst = (*EventGrabBroken)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25586,11 +25630,12 @@ func (e *Event) AsTouchpadSwipe() *EventTouchpadSwipe {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventTouchpadSwipe
 	dst = (*EventTouchpadSwipe)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25608,11 +25653,12 @@ func (e *Event) AsTouchpadPinch() *EventTouchpadPinch {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventTouchpadPinch
 	dst = (*EventTouchpadPinch)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25630,11 +25676,12 @@ func (e *Event) AsPadButton() *EventPadButton {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventPadButton
 	dst = (*EventPadButton)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25652,11 +25699,12 @@ func (e *Event) AsPadAxis() *EventPadAxis {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventPadAxis
 	dst = (*EventPadAxis)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
@@ -25674,11 +25722,12 @@ func (e *Event) AsPadGroupMode() *EventPadGroupMode {
 	cpy := (*C.GdkEvent)(C.gdk_event_copy(e.event.native))
 	var dst *EventPadGroupMode
 	dst = (*EventPadGroupMode)(gextras.NewStructNative(unsafe.Pointer(cpy)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(dst)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_event_free((*C.GdkEvent)(intern.C))
+		func(ptr unsafe.Pointer) {
+			C.gdk_event_free((*C.GdkEvent)(ptr))
 		},
+		unsafe.Pointer(cpy),
 	)
 	runtime.KeepAlive(e.event)
 	return dst
diff --git a/pkg/gdk/v4/gdk.go b/pkg/gdk/v4/gdk.go
index 46c5e73f8..40da726e4 100644
--- a/pkg/gdk/v4/gdk.go
+++ b/pkg/gdk/v4/gdk.go
@@ -4690,9 +4690,11 @@ func CairoRegionCreateFromSurface(surface *cairo.Surface) *cairo.Region {
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 		_region = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_region, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_region,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _region
 }
@@ -7458,9 +7460,11 @@ func (self *CairoContext) CairoCreate() *cairo.Context {
 
 	if _cret != nil {
 		_context = cairo.WrapContext(uintptr(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(_context, func(v *cairo.Context) {
-			C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_context,
+			func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _context
@@ -7571,11 +7575,10 @@ func (clipboard *Clipboard) Formats() *ContentFormats {
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gdk_content_formats_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -8706,11 +8709,10 @@ func (provider *ContentProvider) RefFormats() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -8738,11 +8740,10 @@ func (provider *ContentProvider) RefStorableFormats() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -8927,11 +8928,10 @@ func (provider *ContentProvider) refFormats() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -8962,11 +8962,10 @@ func (provider *ContentProvider) refStorableFormats() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -10733,11 +10732,10 @@ func (display *Display) DmabufFormats() *DmabufFormats {
 
 	_dmabufFormats = (*DmabufFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gdk_dmabuf_formats_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dmabufFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_dmabuf_formats_unref((*C.GdkDmabufFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_dmabuf_formats_unref((*C.GdkDmabufFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dmabufFormats
@@ -11090,11 +11088,10 @@ func (display *Display) MapKeycode(keycode uint) ([]KeymapKey, []uint, bool) {
 			_keys = make([]KeymapKey, _arg4)
 			for i := 0; i < int(_arg4); i++ {
 				_keys[i] = *(*KeymapKey)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-				runtime.SetFinalizer(
+				runtime.AddCleanup(
 					gextras.StructIntern(unsafe.Pointer(&_keys[i])),
-					func(intern *struct{ C unsafe.Pointer }) {
-						C.free(intern.C)
-					},
+					func(ptr unsafe.Pointer) { C.free(ptr) },
+					unsafe.Pointer((&src[i])),
 				)
 			}
 		}
@@ -11163,11 +11160,10 @@ func (display *Display) MapKeyval(keyval uint) ([]KeymapKey, bool) {
 		_keys = make([]KeymapKey, _arg3)
 		for i := 0; i < int(_arg3); i++ {
 			_keys[i] = *(*KeymapKey)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(&_keys[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.free(intern.C)
-				},
+				func(ptr unsafe.Pointer) { C.free(ptr) },
+				unsafe.Pointer((&src[i])),
 			)
 		}
 	}
@@ -12022,9 +12018,11 @@ func (self *DmabufTextureBuilder) UpdateRegion() *cairo.Region {
 			_region = (*cairo.Region)(unsafe.Pointer(_pp))
 		}
 		C.cairo_region_reference(_cret)
-		runtime.SetFinalizer(_region, func(v *cairo.Region) {
-			C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_region,
+			func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _region
@@ -12593,11 +12591,10 @@ func (drag *Drag) Formats() *ContentFormats {
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gdk_content_formats_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -12912,9 +12909,11 @@ func (context *DrawContext) FrameRegion() *cairo.Region {
 			_region = (*cairo.Region)(unsafe.Pointer(_pp))
 		}
 		C.cairo_region_reference(_cret)
-		runtime.SetFinalizer(_region, func(v *cairo.Region) {
-			C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_region,
+			func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _region
@@ -13207,11 +13206,10 @@ func (self *Drop) Formats() *ContentFormats {
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gdk_content_formats_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -14197,11 +14195,10 @@ func (frameClock *FrameClock) CurrentTimings() *FrameTimings {
 	if _cret != nil {
 		_frameTimings = (*FrameTimings)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gdk_frame_timings_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_frameTimings)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_frame_timings_unref((*C.GdkFrameTimings)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_frame_timings_unref((*C.GdkFrameTimings)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -14383,11 +14380,10 @@ func (frameClock *FrameClock) Timings(frameCounter int64) *FrameTimings {
 	if _cret != nil {
 		_frameTimings = (*FrameTimings)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gdk_frame_timings_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_frameTimings)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_frame_timings_unref((*C.GdkFrameTimings)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_frame_timings_unref((*C.GdkFrameTimings)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15330,9 +15326,11 @@ func (self *GLTextureBuilder) UpdateRegion() *cairo.Region {
 			_region = (*cairo.Region)(unsafe.Pointer(_pp))
 		}
 		C.cairo_region_reference(_cret)
-		runtime.SetFinalizer(_region, func(v *cairo.Region) {
-			C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_region,
+			func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _region
@@ -17185,9 +17183,11 @@ func (surface *Surface) CreateSimilarSurface(content cairo.Content, width, heigh
 	var _ret *cairo.Surface // out
 
 	_ret = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_ret, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_ret,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _ret
 }
@@ -18124,11 +18124,10 @@ func (texture *Texture) SaveToPNGBytes() *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -18193,11 +18192,10 @@ func (texture *Texture) SaveToTIFFBytes() *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -18520,11 +18518,10 @@ func NewContentFormats(mimeTypes []string) *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -18543,11 +18540,10 @@ func NewContentFormatsForGType(typ coreglib.Type) *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -18827,11 +18823,10 @@ func (first *ContentFormats) Union(second *ContentFormats) *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -18855,11 +18850,10 @@ func (formats *ContentFormats) UnionDeserializeGTypes() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -18883,11 +18877,10 @@ func (formats *ContentFormats) UnionDeserializeMIMETypes() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -18911,11 +18904,10 @@ func (formats *ContentFormats) UnionSerializeGTypes() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -18939,11 +18931,10 @@ func (formats *ContentFormats) UnionSerializeMIMETypes() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -18978,11 +18969,10 @@ func ContentFormatsParse(str string) *ContentFormats {
 
 	if _cret != nil {
 		_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -19016,11 +19006,10 @@ func NewContentFormatsBuilder() *ContentFormatsBuilder {
 	var _contentFormatsBuilder *ContentFormatsBuilder // out
 
 	_contentFormatsBuilder = (*ContentFormatsBuilder)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormatsBuilder)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_builder_unref((*C.GdkContentFormatsBuilder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_builder_unref((*C.GdkContentFormatsBuilder)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormatsBuilder
@@ -19103,11 +19092,10 @@ func (builder *ContentFormatsBuilder) ToFormats() *ContentFormats {
 	var _contentFormats *ContentFormats // out
 
 	_contentFormats = (*ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _contentFormats
@@ -19342,11 +19330,10 @@ func NewFileListFromArray(files []gio.Filer) *FileList {
 	var _fileList *FileList // out
 
 	_fileList = (*FileList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fileList
@@ -19371,11 +19358,10 @@ func NewFileListFromList(files []gio.Filer) *FileList {
 	var _fileList *FileList // out
 
 	_fileList = (*FileList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fileList
@@ -19780,11 +19766,10 @@ func NewPopupLayout(anchorRect *Rectangle, rectAnchor Gravity, surfaceAnchor Gra
 	var _popupLayout *PopupLayout // out
 
 	_popupLayout = (*PopupLayout)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_popupLayout)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_popup_layout_unref((*C.GdkPopupLayout)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_popup_layout_unref((*C.GdkPopupLayout)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _popupLayout
@@ -19807,11 +19792,10 @@ func (layout *PopupLayout) Copy() *PopupLayout {
 	var _popupLayout *PopupLayout // out
 
 	_popupLayout = (*PopupLayout)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_popupLayout)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_popup_layout_unref((*C.GdkPopupLayout)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_popup_layout_unref((*C.GdkPopupLayout)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _popupLayout
@@ -20241,11 +20225,10 @@ func (rgba *RGBA) Copy() *RGBA {
 	var _rgbA *RGBA // out
 
 	_rgbA = (*RGBA)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_rgbA)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_rgba_free((*C.GdkRGBA)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_rgba_free((*C.GdkRGBA)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _rgbA
@@ -20729,11 +20712,10 @@ func NewTextureDownloader(texture Texturer) *TextureDownloader {
 	var _textureDownloader *TextureDownloader // out
 
 	_textureDownloader = (*TextureDownloader)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_textureDownloader)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_texture_downloader_free((*C.GdkTextureDownloader)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_texture_downloader_free((*C.GdkTextureDownloader)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _textureDownloader
@@ -20758,11 +20740,10 @@ func (self *TextureDownloader) Copy() *TextureDownloader {
 	var _textureDownloader *TextureDownloader // out
 
 	_textureDownloader = (*TextureDownloader)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_textureDownloader)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_texture_downloader_free((*C.GdkTextureDownloader)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_texture_downloader_free((*C.GdkTextureDownloader)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _textureDownloader
@@ -20795,11 +20776,10 @@ func (self *TextureDownloader) DownloadBytes() (uint, *glib.Bytes) {
 
 	_outStride = uint(_arg1)
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _outStride, _bytes
@@ -20978,11 +20958,10 @@ func NewToplevelLayout() *ToplevelLayout {
 	var _toplevelLayout *ToplevelLayout // out
 
 	_toplevelLayout = (*ToplevelLayout)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_toplevelLayout)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_toplevel_layout_unref((*C.GdkToplevelLayout)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_toplevel_layout_unref((*C.GdkToplevelLayout)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _toplevelLayout
@@ -21005,11 +20984,10 @@ func (layout *ToplevelLayout) Copy() *ToplevelLayout {
 	var _toplevelLayout *ToplevelLayout // out
 
 	_toplevelLayout = (*ToplevelLayout)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_toplevelLayout)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gdk_toplevel_layout_unref((*C.GdkToplevelLayout)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gdk_toplevel_layout_unref((*C.GdkToplevelLayout)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _toplevelLayout
diff --git a/pkg/gdk/v4/gdk_export.go b/pkg/gdk/v4/gdk_export.go
index 25ae58ba2..398a694e9 100644
--- a/pkg/gdk/v4/gdk_export.go
+++ b/pkg/gdk/v4/gdk_export.go
@@ -821,9 +821,11 @@ func _gotk4_gdk4_Surface_ConnectRender(arg0 C.gpointer, arg1 *C.cairo_region_t,
 		_region = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
 	C.cairo_region_reference(arg1)
-	runtime.SetFinalizer(_region, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_region,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 
 	ok := f(_region)
 
diff --git a/pkg/gdkpixbuf/v2/gdkpixbuf.go b/pkg/gdkpixbuf/v2/gdkpixbuf.go
index 80f8ac39f..2350eb0c9 100644
--- a/pkg/gdkpixbuf/v2/gdkpixbuf.go
+++ b/pkg/gdkpixbuf/v2/gdkpixbuf.go
@@ -2013,11 +2013,10 @@ func (pixbuf *Pixbuf) ReadPixelBytes() *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -4304,11 +4303,10 @@ func (format *PixbufFormat) Copy() *PixbufFormat {
 
 	if _cret != nil {
 		_pixbufFormat = (*PixbufFormat)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_pixbufFormat)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_pixbuf_format_free((*C.GdkPixbufFormat)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_pixbuf_format_free((*C.GdkPixbufFormat)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
diff --git a/pkg/gdkx11/v3/gdkx11.go b/pkg/gdkx11/v3/gdkx11.go
index a2e8b36a0..b78b4a465 100644
--- a/pkg/gdkx11/v3/gdkx11.go
+++ b/pkg/gdkx11/v3/gdkx11.go
@@ -174,9 +174,11 @@ func X11GetParentRelativePattern() *cairo.Pattern {
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 		_pattern = (*cairo.Pattern)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_pattern, func(v *cairo.Pattern) {
-		C.cairo_pattern_destroy((*C.cairo_pattern_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_pattern,
+		func(p unsafe.Pointer) { C.cairo_pattern_destroy((*C.cairo_pattern_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _pattern
 }
diff --git a/pkg/gio/v2/gio.go b/pkg/gio/v2/gio.go
index 5ee2ab798..1cbce90f2 100644
--- a/pkg/gio/v2/gio.go
+++ b/pkg/gio/v2/gio.go
@@ -9383,11 +9383,10 @@ func DBusGValueToGVariant(gvalue *coreglib.Value, typ *glib.VariantType) *glib.V
 	var _variant *glib.Variant // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -9853,11 +9852,10 @@ func NewPollableSource(pollableStream *coreglib.Object) *glib.Source {
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -9901,11 +9899,10 @@ func PollableSourceNewFull(ctx context.Context, pollableStream *coreglib.Object,
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -10236,11 +10233,10 @@ func ResourcesLookupData(path string, lookupFlags ResourceLookupFlags) (*glib.By
 	var _goerr error       // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -10597,11 +10593,10 @@ func (action *Action) State() *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10642,11 +10637,10 @@ func (action *Action) StateHint() *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10857,11 +10851,10 @@ func (action *Action) state() *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10905,11 +10898,10 @@ func (action *Action) stateHint() *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -11045,11 +11037,10 @@ func ActionParseDetailedName(detailedName string) (string, *glib.Variant, error)
 	}
 	if _arg3 != nil {
 		_targetValue = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_targetValue)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _cerr != nil {
@@ -11537,11 +11528,10 @@ func (actionGroup *ActionGroup) ActionState(actionName string) *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -11590,11 +11580,10 @@ func (actionGroup *ActionGroup) ActionStateHint(actionName string) *glib.Variant
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -11790,20 +11779,18 @@ func (actionGroup *ActionGroup) QueryAction(actionName string) (enabled bool, pa
 	}
 	if _arg5 != nil {
 		_stateHint = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_arg5)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_stateHint)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_arg5),
 		)
 	}
 	if _arg6 != nil {
 		_state = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_arg6)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_state)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_arg6),
 		)
 	}
 	if _cret != 0 {
@@ -12128,11 +12115,10 @@ func (actionGroup *ActionGroup) actionState(actionName string) *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -12184,11 +12170,10 @@ func (actionGroup *ActionGroup) actionStateHint(actionName string) *glib.Variant
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -12396,20 +12381,18 @@ func (actionGroup *ActionGroup) queryAction(actionName string) (enabled bool, pa
 	}
 	if _arg5 != nil {
 		_stateHint = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_arg5)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_stateHint)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_arg5),
 		)
 	}
 	if _arg6 != nil {
 		_state = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_arg6)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_state)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_arg6),
 		)
 	}
 	if _cret != 0 {
@@ -16048,11 +16031,10 @@ func (interface_ *DBusInterface) Info() *DBusInterfaceInfo {
 
 	_dBusInterfaceInfo = (*DBusInterfaceInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_dbus_interface_info_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dBusInterfaceInfo)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dBusInterfaceInfo
@@ -16128,11 +16110,10 @@ func (interface_ *DBusInterface) info() *DBusInterfaceInfo {
 
 	_dBusInterfaceInfo = (*DBusInterfaceInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_dbus_interface_info_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dBusInterfaceInfo)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dBusInterfaceInfo
@@ -17077,11 +17058,10 @@ func (datagramBased *DatagramBased) CreateSource(ctx context.Context, condition
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -17457,11 +17437,10 @@ func (datagramBased *DatagramBased) createSource(ctx context.Context, condition
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -23461,11 +23440,10 @@ func (file *File) LoadBytes(ctx context.Context) (string, *glib.Bytes, error) {
 		defer C.free(unsafe.Pointer(_arg2))
 	}
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -23555,11 +23533,10 @@ func (file *File) LoadBytesFinish(result AsyncResulter) (string, *glib.Bytes, er
 		defer C.free(unsafe.Pointer(_arg2))
 	}
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -25209,11 +25186,10 @@ func (file *File) QuerySettableAttributes(ctx context.Context) (*FileAttributeIn
 	var _goerr error                                  // out
 
 	_fileAttributeInfoList = (*FileAttributeInfoList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileAttributeInfoList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -25259,11 +25235,10 @@ func (file *File) QueryWritableNamespaces(ctx context.Context) (*FileAttributeIn
 	var _goerr error                                  // out
 
 	_fileAttributeInfoList = (*FileAttributeInfoList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileAttributeInfoList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -29788,11 +29763,10 @@ func (file *File) querySettableAttributes(ctx context.Context) (*FileAttributeIn
 	var _goerr error                                  // out
 
 	_fileAttributeInfoList = (*FileAttributeInfoList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileAttributeInfoList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -29841,11 +29815,10 @@ func (file *File) queryWritableNamespaces(ctx context.Context) (*FileAttributeIn
 	var _goerr error                                  // out
 
 	_fileAttributeInfoList = (*FileAttributeInfoList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileAttributeInfoList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -31714,11 +31687,10 @@ func (icon *Icon) Serialize() *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -31852,11 +31824,10 @@ func (icon *Icon) serialize() *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -35352,11 +35323,10 @@ func (stream *PollableInputStream) CreateSource(ctx context.Context) *glib.Sourc
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -35528,11 +35498,10 @@ func (stream *PollableInputStream) createSource(ctx context.Context) *glib.Sourc
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -35750,11 +35719,10 @@ func (stream *PollableOutputStream) CreateSource(ctx context.Context) *glib.Sour
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -36004,11 +35972,10 @@ func (stream *PollableOutputStream) createSource(ctx context.Context) *glib.Sour
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -43521,11 +43488,10 @@ func (cmdline *ApplicationCommandLine) OptionsDict() *glib.VariantDict {
 
 	_variantDict = (*glib.VariantDict)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_dict_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantDict)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_dict_unref((*C.GVariantDict)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_dict_unref((*C.GVariantDict)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantDict
@@ -43559,11 +43525,10 @@ func (cmdline *ApplicationCommandLine) PlatformData() *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -44783,11 +44748,10 @@ func (icon *BytesIcon) Bytes() *glib.Bytes {
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_bytes_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -45163,11 +45127,10 @@ func (cancellable *Cancellable) NewSource() *glib.Source {
 	var _source *glib.Source // out
 
 	_source = (*glib.Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -46489,11 +46452,10 @@ func (connection *DBusConnection) CallFinish(res AsyncResulter) (*glib.Variant,
 	var _goerr error           // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -46608,11 +46570,10 @@ func (connection *DBusConnection) CallSync(ctx context.Context, busName, objectP
 	var _goerr error           // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -48307,11 +48268,10 @@ func (interface_ *DBusInterfaceSkeleton) Info() *DBusInterfaceInfo {
 
 	_dBusInterfaceInfo = (*DBusInterfaceInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_dbus_interface_info_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dBusInterfaceInfo)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dBusInterfaceInfo
@@ -48359,11 +48319,10 @@ func (interface_ *DBusInterfaceSkeleton) Properties() *glib.Variant {
 	var _variant *glib.Variant // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -48540,11 +48499,10 @@ func (interface_ *DBusInterfaceSkeleton) info() *DBusInterfaceInfo {
 
 	_dBusInterfaceInfo = (*DBusInterfaceInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_dbus_interface_info_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dBusInterfaceInfo)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dBusInterfaceInfo
@@ -48571,11 +48529,10 @@ func (interface_ *DBusInterfaceSkeleton) properties() *glib.Variant {
 	var _variant *glib.Variant // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -48944,11 +48901,10 @@ func (message *DBusMessage) Body() *glib.Variant {
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_variant_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -49077,11 +49033,10 @@ func (message *DBusMessage) Header(headerField DBusMessageHeaderField) *glib.Var
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_variant_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -49966,11 +49921,10 @@ func (invocation *DBusMethodInvocation) MethodInfo() *DBusMethodInfo {
 	if _cret != nil {
 		_dBusMethodInfo = (*DBusMethodInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_dbus_method_info_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dBusMethodInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_dbus_method_info_unref((*C.GDBusMethodInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_dbus_method_info_unref((*C.GDBusMethodInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -50039,11 +49993,10 @@ func (invocation *DBusMethodInvocation) Parameters() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -50078,11 +50031,10 @@ func (invocation *DBusMethodInvocation) PropertyInfo() *DBusPropertyInfo {
 	if _cret != nil {
 		_dBusPropertyInfo = (*DBusPropertyInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_dbus_property_info_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dBusPropertyInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_dbus_property_info_unref((*C.GDBusPropertyInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_dbus_property_info_unref((*C.GDBusPropertyInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -51671,11 +51623,10 @@ func (proxy *DBusProxy) CallFinish(res AsyncResulter) (*glib.Variant, error) {
 	var _goerr error           // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -51766,11 +51717,10 @@ func (proxy *DBusProxy) CallSync(ctx context.Context, methodName string, paramet
 	var _goerr error           // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -51812,11 +51762,10 @@ func (proxy *DBusProxy) CachedProperty(propertyName string) *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -51950,11 +51899,10 @@ func (proxy *DBusProxy) InterfaceInfo() *DBusInterfaceInfo {
 	if _cret != nil {
 		_dBusInterfaceInfo = (*DBusInterfaceInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_dbus_interface_info_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dBusInterfaceInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -56387,11 +56335,10 @@ func (info *FileInfo) AccessDateTime() *glib.DateTime {
 
 	if _cret != nil {
 		_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -56926,11 +56873,10 @@ func (info *FileInfo) CreationDateTime() *glib.DateTime {
 
 	if _cret != nil {
 		_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -56957,11 +56903,10 @@ func (info *FileInfo) DeletionDate() *glib.DateTime {
 
 	if _cret != nil {
 		_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -57201,11 +57146,10 @@ func (info *FileInfo) ModificationDateTime() *glib.DateTime {
 
 	if _cret != nil {
 		_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -62359,11 +62303,10 @@ func (stream *InputStream) ReadBytes(ctx context.Context, count uint) (*glib.Byt
 	var _goerr error       // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -62453,11 +62396,10 @@ func (stream *InputStream) ReadBytesFinish(result AsyncResulter) (*glib.Bytes, e
 	var _goerr error       // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -63684,11 +63626,10 @@ func (ostream *MemoryOutputStream) StealAsBytes() *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -64306,11 +64247,10 @@ func (iter *MenuAttributeIter) GetNext() (string, *glib.Variant, bool) {
 	}
 	if _arg2 != nil {
 		_value = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_value)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_arg2),
 		)
 	}
 	if _cret != 0 {
@@ -64339,11 +64279,10 @@ func (iter *MenuAttributeIter) Value() *glib.Variant {
 	var _variant *glib.Variant // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -64420,11 +64359,10 @@ func (iter *MenuAttributeIter) next() (string, *glib.Variant, bool) {
 	}
 	if _arg2 != nil {
 		_value = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_value)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_arg2),
 		)
 	}
 	if _cret != 0 {
@@ -64687,11 +64625,10 @@ func (menuItem *MenuItem) AttributeValue(attribute string, expectedType *glib.Va
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -65702,11 +65639,10 @@ func (model *MenuModel) ItemAttributeValue(itemIndex int, attribute string, expe
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -65994,11 +65930,10 @@ func (model *MenuModel) itemAttributeValue(itemIndex int, attribute string, expe
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -66041,11 +65976,10 @@ func (model *MenuModel) itemAttributes(itemIndex int) map[string]*glib.Variant {
 		kdst = C.GoString((*C.gchar)(unsafe.Pointer(ksrc)))
 		vdst = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(vsrc)))
 		C.g_variant_ref(vsrc)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(vdst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(vsrc),
 		)
 		_attributes[kdst] = vdst
 	})
@@ -72139,11 +72073,10 @@ func (resolver *Resolver) LookupRecords(ctx context.Context, rrname string, reco
 		src := (*C.GVariant)(v)
 		var dst *glib.Variant // out
 		dst = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -72233,11 +72166,10 @@ func (resolver *Resolver) LookupRecordsFinish(result AsyncResulter) ([]*glib.Var
 		src := (*C.GVariant)(v)
 		var dst *glib.Variant // out
 		dst = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -72316,11 +72248,10 @@ func (resolver *Resolver) LookupService(ctx context.Context, service, protocol,
 		src := (*C.GSrvTarget)(v)
 		var dst *SrvTarget // out
 		dst = (*SrvTarget)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_srv_target_free((*C.GSrvTarget)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_srv_target_free((*C.GSrvTarget)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -72414,11 +72345,10 @@ func (resolver *Resolver) LookupServiceFinish(result AsyncResulter) ([]*SrvTarge
 		src := (*C.GSrvTarget)(v)
 		var dst *SrvTarget // out
 		dst = (*SrvTarget)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_srv_target_free((*C.GSrvTarget)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_srv_target_free((*C.GSrvTarget)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -72966,11 +72896,10 @@ func (resolver *Resolver) lookupRecords(ctx context.Context, rrname string, reco
 		src := (*C.GVariant)(v)
 		var dst *glib.Variant // out
 		dst = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -73066,11 +72995,10 @@ func (resolver *Resolver) lookupRecordsFinish(result AsyncResulter) ([]*glib.Var
 		src := (*C.GVariant)(v)
 		var dst *glib.Variant // out
 		dst = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -73155,11 +73083,10 @@ func (resolver *Resolver) lookupServiceFinish(result AsyncResulter) ([]*SrvTarge
 		src := (*C.GSrvTarget)(v)
 		var dst *SrvTarget // out
 		dst = (*SrvTarget)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_srv_target_free((*C.GSrvTarget)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_srv_target_free((*C.GSrvTarget)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -73979,11 +73906,10 @@ func (settings *Settings) DefaultValue(key string) *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -74279,11 +74205,10 @@ func (settings *Settings) Range(key string) *glib.Variant {
 	var _variant *glib.Variant // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -74481,11 +74406,10 @@ func (settings *Settings) UserValue(key string) *glib.Variant {
 
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -74520,11 +74444,10 @@ func (settings *Settings) Value(key string) *glib.Variant {
 	var _variant *glib.Variant // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -78070,11 +77993,10 @@ func (socket *Socket) ReceiveBytes(ctx context.Context, size uint, timeoutUs int
 	var _goerr error       // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -78154,11 +78076,10 @@ func (socket *Socket) ReceiveBytesFrom(ctx context.Context, size uint, timeoutUs
 		}
 	}
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -83383,11 +83304,10 @@ func (task *Task) Context() *glib.MainContext {
 
 	_mainContext = (*glib.MainContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_main_context_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mainContext)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_main_context_unref((*C.GMainContext)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_main_context_unref((*C.GMainContext)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _mainContext
@@ -85394,11 +85314,10 @@ func (cert *TLSCertificate) NotValidAfter() *glib.DateTime {
 
 	if _cret != nil {
 		_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -85425,11 +85344,10 @@ func (cert *TLSCertificate) NotValidBefore() *glib.DateTime {
 
 	if _cret != nil {
 		_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -92198,11 +92116,10 @@ func (d *DBusAnnotationInfo) Annotations() []*DBusAnnotationInfo {
 		for i := range src {
 			_v[i] = (*DBusAnnotationInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_annotation_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92321,11 +92238,10 @@ func (d *DBusArgInfo) Annotations() []*DBusAnnotationInfo {
 		for i := range src {
 			_v[i] = (*DBusAnnotationInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_annotation_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92434,11 +92350,10 @@ func (d *DBusInterfaceInfo) Methods() []*DBusMethodInfo {
 		for i := range src {
 			_v[i] = (*DBusMethodInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_method_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_method_info_unref((*C.GDBusMethodInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_method_info_unref((*C.GDBusMethodInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92462,11 +92377,10 @@ func (d *DBusInterfaceInfo) Signals() []*DBusSignalInfo {
 		for i := range src {
 			_v[i] = (*DBusSignalInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_signal_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_signal_info_unref((*C.GDBusSignalInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_signal_info_unref((*C.GDBusSignalInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92490,11 +92404,10 @@ func (d *DBusInterfaceInfo) Properties() []*DBusPropertyInfo {
 		for i := range src {
 			_v[i] = (*DBusPropertyInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_property_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_property_info_unref((*C.GDBusPropertyInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_property_info_unref((*C.GDBusPropertyInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92518,11 +92431,10 @@ func (d *DBusInterfaceInfo) Annotations() []*DBusAnnotationInfo {
 		for i := range src {
 			_v[i] = (*DBusAnnotationInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_annotation_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92596,11 +92508,10 @@ func (info *DBusInterfaceInfo) LookupMethod(name string) *DBusMethodInfo {
 	if _cret != nil {
 		_dBusMethodInfo = (*DBusMethodInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_dbus_method_info_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dBusMethodInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_dbus_method_info_unref((*C.GDBusMethodInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_dbus_method_info_unref((*C.GDBusMethodInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -92638,11 +92549,10 @@ func (info *DBusInterfaceInfo) LookupProperty(name string) *DBusPropertyInfo {
 	if _cret != nil {
 		_dBusPropertyInfo = (*DBusPropertyInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_dbus_property_info_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dBusPropertyInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_dbus_property_info_unref((*C.GDBusPropertyInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_dbus_property_info_unref((*C.GDBusPropertyInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -92680,11 +92590,10 @@ func (info *DBusInterfaceInfo) LookupSignal(name string) *DBusSignalInfo {
 	if _cret != nil {
 		_dBusSignalInfo = (*DBusSignalInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_dbus_signal_info_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dBusSignalInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_dbus_signal_info_unref((*C.GDBusSignalInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_dbus_signal_info_unref((*C.GDBusSignalInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -92801,11 +92710,10 @@ func (d *DBusMethodInfo) InArgs() []*DBusArgInfo {
 		for i := range src {
 			_v[i] = (*DBusArgInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_arg_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_arg_info_unref((*C.GDBusArgInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_arg_info_unref((*C.GDBusArgInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92829,11 +92737,10 @@ func (d *DBusMethodInfo) OutArgs() []*DBusArgInfo {
 		for i := range src {
 			_v[i] = (*DBusArgInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_arg_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_arg_info_unref((*C.GDBusArgInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_arg_info_unref((*C.GDBusArgInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92857,11 +92764,10 @@ func (d *DBusMethodInfo) Annotations() []*DBusAnnotationInfo {
 		for i := range src {
 			_v[i] = (*DBusAnnotationInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_annotation_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92907,11 +92813,10 @@ func NewDBusNodeInfoForXML(xmlData string) (*DBusNodeInfo, error) {
 	var _goerr error                // out
 
 	_dBusNodeInfo = (*DBusNodeInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dBusNodeInfo)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_dbus_node_info_unref((*C.GDBusNodeInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_dbus_node_info_unref((*C.GDBusNodeInfo)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -92954,11 +92859,10 @@ func (d *DBusNodeInfo) Interfaces() []*DBusInterfaceInfo {
 		for i := range src {
 			_v[i] = (*DBusInterfaceInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_interface_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -92982,11 +92886,10 @@ func (d *DBusNodeInfo) Nodes() []*DBusNodeInfo {
 		for i := range src {
 			_v[i] = (*DBusNodeInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_node_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_node_info_unref((*C.GDBusNodeInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_node_info_unref((*C.GDBusNodeInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -93010,11 +92913,10 @@ func (d *DBusNodeInfo) Annotations() []*DBusAnnotationInfo {
 		for i := range src {
 			_v[i] = (*DBusAnnotationInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_annotation_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -93057,11 +92959,10 @@ func (info *DBusNodeInfo) LookupInterface(name string) *DBusInterfaceInfo {
 	if _cret != nil {
 		_dBusInterfaceInfo = (*DBusInterfaceInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_dbus_interface_info_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dBusInterfaceInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_dbus_interface_info_unref((*C.GDBusInterfaceInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -93206,11 +93107,10 @@ func (d *DBusPropertyInfo) Annotations() []*DBusAnnotationInfo {
 		for i := range src {
 			_v[i] = (*DBusAnnotationInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_annotation_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -93285,11 +93185,10 @@ func (d *DBusSignalInfo) Args() []*DBusArgInfo {
 		for i := range src {
 			_v[i] = (*DBusArgInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_arg_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_arg_info_unref((*C.GDBusArgInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_arg_info_unref((*C.GDBusArgInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -93313,11 +93212,10 @@ func (d *DBusSignalInfo) Annotations() []*DBusAnnotationInfo {
 		for i := range src {
 			_v[i] = (*DBusAnnotationInfo)(gextras.NewStructNative(unsafe.Pointer(src[i])))
 			C.g_dbus_annotation_info_ref(src[i])
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(_v[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.g_dbus_annotation_info_unref((*C.GDBusAnnotationInfo)(ptr)) },
+				unsafe.Pointer(src[i]),
 			)
 		}
 	}
@@ -93551,11 +93449,10 @@ func NewFileAttributeInfoList() *FileAttributeInfoList {
 	var _fileAttributeInfoList *FileAttributeInfoList // out
 
 	_fileAttributeInfoList = (*FileAttributeInfoList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileAttributeInfoList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fileAttributeInfoList
@@ -93626,11 +93523,10 @@ func (list *FileAttributeInfoList) Dup() *FileAttributeInfoList {
 	var _fileAttributeInfoList *FileAttributeInfoList // out
 
 	_fileAttributeInfoList = (*FileAttributeInfoList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileAttributeInfoList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fileAttributeInfoList
@@ -93696,11 +93592,10 @@ func NewFileAttributeMatcher(attributes string) *FileAttributeMatcher {
 	var _fileAttributeMatcher *FileAttributeMatcher // out
 
 	_fileAttributeMatcher = (*FileAttributeMatcher)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fileAttributeMatcher)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_file_attribute_matcher_unref((*C.GFileAttributeMatcher)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_file_attribute_matcher_unref((*C.GFileAttributeMatcher)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fileAttributeMatcher
@@ -93868,11 +93763,10 @@ func (matcher *FileAttributeMatcher) Subtract(subtract *FileAttributeMatcher) *F
 
 	if _cret != nil {
 		_fileAttributeMatcher = (*FileAttributeMatcher)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_fileAttributeMatcher)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_file_attribute_matcher_unref((*C.GFileAttributeMatcher)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_file_attribute_matcher_unref((*C.GFileAttributeMatcher)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -94801,11 +94695,10 @@ func NewResourceFromData(data *glib.Bytes) (*Resource, error) {
 	var _goerr error        // out
 
 	_resource = (*Resource)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_resource)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_resource_unref((*C.GResource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_resource_unref((*C.GResource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -94962,11 +94855,10 @@ func (resource *Resource) LookupData(path string, lookupFlags ResourceLookupFlag
 	var _goerr error       // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -95065,11 +94957,10 @@ func ResourceLoad(filename string) (*Resource, error) {
 	var _goerr error        // out
 
 	_resource = (*Resource)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_resource)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_resource_unref((*C.GResource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_resource_unref((*C.GResource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -95261,11 +95152,10 @@ func (schema *SettingsSchema) Key(name string) *SettingsSchemaKey {
 	var _settingsSchemaKey *SettingsSchemaKey // out
 
 	_settingsSchemaKey = (*SettingsSchemaKey)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_settingsSchemaKey)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_settings_schema_key_unref((*C.GSettingsSchemaKey)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_settings_schema_key_unref((*C.GSettingsSchemaKey)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _settingsSchemaKey
@@ -95447,11 +95337,10 @@ func (key *SettingsSchemaKey) DefaultValue() *glib.Variant {
 	var _variant *glib.Variant // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -95562,11 +95451,10 @@ func (key *SettingsSchemaKey) Range() *glib.Variant {
 	var _variant *glib.Variant // out
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -95703,11 +95591,10 @@ func NewSettingsSchemaSourceFromDirectory(directory string, parent *SettingsSche
 	var _goerr error                                // out
 
 	_settingsSchemaSource = (*SettingsSchemaSource)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_settingsSchemaSource)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_settings_schema_source_unref((*C.GSettingsSchemaSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_settings_schema_source_unref((*C.GSettingsSchemaSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -95829,11 +95716,10 @@ func (source *SettingsSchemaSource) Lookup(schemaId string, recursive bool) *Set
 
 	if _cret != nil {
 		_settingsSchema = (*SettingsSchema)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_settingsSchema)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_settings_schema_unref((*C.GSettingsSchema)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_settings_schema_unref((*C.GSettingsSchema)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -95866,11 +95752,10 @@ func SettingsSchemaSourceGetDefault() *SettingsSchemaSource {
 	if _cret != nil {
 		_settingsSchemaSource = (*SettingsSchemaSource)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_settings_schema_source_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_settingsSchemaSource)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_settings_schema_source_unref((*C.GSettingsSchemaSource)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_settings_schema_source_unref((*C.GSettingsSchemaSource)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -96067,11 +95952,10 @@ func NewSrvTarget(hostname string, port uint16, priority uint16, weight uint16)
 	var _srvTarget *SrvTarget // out
 
 	_srvTarget = (*SrvTarget)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_srvTarget)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_srv_target_free((*C.GSrvTarget)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_srv_target_free((*C.GSrvTarget)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _srvTarget
@@ -96094,11 +95978,10 @@ func (target *SrvTarget) Copy() *SrvTarget {
 	var _srvTarget *SrvTarget // out
 
 	_srvTarget = (*SrvTarget)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_srvTarget)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_srv_target_free((*C.GSrvTarget)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_srv_target_free((*C.GSrvTarget)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _srvTarget
@@ -96243,11 +96126,10 @@ func (staticResource *StaticResource) Resource() *Resource {
 
 	_resource = (*Resource)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_resource_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_resource)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_resource_unref((*C.GResource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_resource_unref((*C.GResource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _resource
diff --git a/pkg/gio/v2/gio_export.go b/pkg/gio/v2/gio_export.go
index 16c5bedf7..b7d42b0c7 100644
--- a/pkg/gio/v2/gio_export.go
+++ b/pkg/gio/v2/gio_export.go
@@ -218,11 +218,10 @@ func _gotk4_gio2_DBusInterfaceMethodCallFunc(arg1 *C.GDBusConnection, arg2 *C.gc
 	_methodName = C.GoString((*C.gchar)(unsafe.Pointer(arg5)))
 	_parameters = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg6)))
 	C.g_variant_ref(arg6)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_parameters)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg6),
 	)
 	_invocation = wrapDBusMethodInvocation(coreglib.AssumeOwnership(unsafe.Pointer(arg7)))
 
@@ -254,11 +253,10 @@ func _gotk4_gio2_DBusInterfaceSetPropertyFunc(arg1 *C.GDBusConnection, arg2 *C.g
 	_propertyName = C.GoString((*C.gchar)(unsafe.Pointer(arg5)))
 	_value = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg6)))
 	C.g_variant_ref(arg6)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_value)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg6),
 	)
 
 	err, ok := fn(_connection, _sender, _objectPath, _interfaceName, _propertyName, _value)
@@ -336,11 +334,10 @@ func _gotk4_gio2_DBusSignalCallback(arg1 *C.GDBusConnection, arg2 *C.gchar, arg3
 	_signalName = C.GoString((*C.gchar)(unsafe.Pointer(arg5)))
 	_parameters = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg6)))
 	C.g_variant_ref(arg6)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_parameters)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg6),
 	)
 
 	fn(_connection, _senderName, _objectPath, _interfaceName, _signalName, _parameters)
@@ -479,11 +476,10 @@ func _gotk4_gio2_SettingsBindGetMapping(arg1 *C.GValue, arg2 *C.GVariant, arg3 C
 	_value = coreglib.ValueFromNative(unsafe.Pointer(arg1))
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 	C.g_variant_ref(arg2)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg2),
 	)
 
 	ok := fn(_value, _variant)
@@ -538,11 +534,10 @@ func _gotk4_gio2_SettingsGetMapping(arg1 *C.GVariant, arg2 *C.gpointer, arg3 C.g
 
 	_value = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.g_variant_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_value)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 
 	result, ok := fn(_value)
@@ -668,11 +663,10 @@ func _gotk4_gio2_ActionGroup_ConnectActionStateChanged(arg0 C.gpointer, arg1 *C.
 	_actionName = C.GoString((*C.gchar)(unsafe.Pointer(arg1)))
 	_value = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 	C.g_variant_ref(arg2)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_value)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg2),
 	)
 
 	f(_actionName, _value)
@@ -1373,11 +1367,10 @@ func _gotk4_gio2_AppLaunchContextClass_launch_started(arg0 *C.GAppLaunchContext,
 	}
 	_platformData = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 	C.g_variant_ref(arg2)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_platformData)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg2),
 	)
 
 	overrides.LaunchStarted(_info, _platformData)
@@ -1413,11 +1406,10 @@ func _gotk4_gio2_AppLaunchContextClass_launched(arg0 *C.GAppLaunchContext, arg1
 	}
 	_platformData = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 	C.g_variant_ref(arg2)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_platformData)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg2),
 	)
 
 	overrides.Launched(_info, _platformData)
@@ -1479,11 +1471,10 @@ func _gotk4_gio2_AppLaunchContext_ConnectLaunchStarted(arg0 C.gpointer, arg1 *C.
 	if arg2 != nil {
 		_platformData = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 		C.g_variant_ref(arg2)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_platformData)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(arg2),
 		)
 	}
 
@@ -1525,11 +1516,10 @@ func _gotk4_gio2_AppLaunchContext_ConnectLaunched(arg0 C.gpointer, arg1 *C.GAppI
 	}
 	_platformData = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 	C.g_variant_ref(arg2)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_platformData)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg2),
 	)
 
 	f(_info, _platformData)
@@ -1558,11 +1548,10 @@ func _gotk4_gio2_ApplicationClass_add_platform_data(arg0 *C.GApplication, arg1 *
 
 	_builder = (*glib.VariantBuilder)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.g_variant_builder_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_builder)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_builder_unref((*C.GVariantBuilder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_builder_unref((*C.GVariantBuilder)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 
 	overrides.AddPlatformData(_builder)
@@ -1580,11 +1569,10 @@ func _gotk4_gio2_ApplicationClass_after_emit(arg0 *C.GApplication, arg1 *C.GVari
 
 	_platformData = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.g_variant_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_platformData)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 
 	overrides.AfterEmit(_platformData)
@@ -1602,11 +1590,10 @@ func _gotk4_gio2_ApplicationClass_before_emit(arg0 *C.GApplication, arg1 *C.GVar
 
 	_platformData = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.g_variant_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_platformData)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 
 	overrides.BeforeEmit(_platformData)
@@ -1687,11 +1674,10 @@ func _gotk4_gio2_ApplicationClass_handle_local_options(arg0 *C.GApplication, arg
 
 	_options = (*glib.VariantDict)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.g_variant_dict_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_options)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_dict_unref((*C.GVariantDict)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_dict_unref((*C.GVariantDict)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 
 	gint := overrides.HandleLocalOptions(_options)
@@ -1864,11 +1850,10 @@ func _gotk4_gio2_Application_ConnectHandleLocalOptions(arg0 C.gpointer, arg1 *C.
 
 	_options = (*glib.VariantDict)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.g_variant_dict_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_options)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_dict_unref((*C.GVariantDict)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_dict_unref((*C.GVariantDict)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 
 	gint := f(_options)
@@ -2373,11 +2358,10 @@ func _gotk4_gio2_DBusObjectManagerClientClass_interface_proxy_signal(arg0 *C.GDB
 	_signalName = C.GoString((*C.gchar)(unsafe.Pointer(arg4)))
 	_parameters = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg5)))
 	C.g_variant_ref(arg5)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_parameters)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg5),
 	)
 
 	overrides.InterfaceProxySignal(_objectProxy, _interfaceProxy, _senderName, _signalName, _parameters)
@@ -2405,11 +2389,10 @@ func _gotk4_gio2_DBusObjectManagerClient_ConnectInterfaceProxyPropertiesChanged(
 	_interfaceProxy = wrapDBusProxy(coreglib.Take(unsafe.Pointer(arg2)))
 	_changedProperties = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg3)))
 	C.g_variant_ref(arg3)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_changedProperties)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg3),
 	)
 	{
 		var i int
@@ -2453,11 +2436,10 @@ func _gotk4_gio2_DBusObjectManagerClient_ConnectInterfaceProxySignal(arg0 C.gpoi
 	_signalName = C.GoString((*C.gchar)(unsafe.Pointer(arg4)))
 	_parameters = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg5)))
 	C.g_variant_ref(arg5)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_parameters)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg5),
 	)
 
 	f(_objectProxy, _interfaceProxy, _senderName, _signalName, _parameters)
@@ -2566,11 +2548,10 @@ func _gotk4_gio2_DBusProxyClass_g_signal(arg0 *C.GDBusProxy, arg1 *C.gchar, arg2
 	_signalName = C.GoString((*C.gchar)(unsafe.Pointer(arg2)))
 	_parameters = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg3)))
 	C.g_variant_ref(arg3)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_parameters)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg3),
 	)
 
 	overrides.GSignal(_senderName, _signalName, _parameters)
@@ -2594,11 +2575,10 @@ func _gotk4_gio2_DBusProxy_ConnectGPropertiesChanged(arg0 C.gpointer, arg1 *C.GV
 
 	_changedProperties = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.g_variant_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_changedProperties)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 	{
 		var i int
@@ -2640,11 +2620,10 @@ func _gotk4_gio2_DBusProxy_ConnectGSignal(arg0 C.gpointer, arg1 *C.gchar, arg2 *
 	_signalName = C.GoString((*C.gchar)(unsafe.Pointer(arg2)))
 	_parameters = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg3)))
 	C.g_variant_ref(arg3)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_parameters)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(arg3),
 	)
 
 	f(_senderName, _signalName, _parameters)
@@ -5123,7 +5102,6 @@ func _gotk4_gio2_ResolverClass_lookup_service_finish(arg0 *C.GResolver, arg1 *C.
 		src := list[i]
 		var dst *C.GSrvTarget // out
 		dst = (*C.GSrvTarget)(gextras.StructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(src)), nil)
 		cret = C.g_list_prepend(cret, C.gpointer(unsafe.Pointer(dst)))
 	}
 	if _goerr != nil && _cerr != nil {
@@ -5353,11 +5331,10 @@ func _gotk4_gio2_SimpleAction_ConnectActivate(arg0 C.gpointer, arg1 *C.GVariant,
 	if arg1 != nil {
 		_parameter = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 		C.g_variant_ref(arg1)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_parameter)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(arg1),
 		)
 	}
 
@@ -5382,11 +5359,10 @@ func _gotk4_gio2_SimpleAction_ConnectChangeState(arg0 C.gpointer, arg1 *C.GVaria
 	if arg1 != nil {
 		_value = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 		C.g_variant_ref(arg1)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_value)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(arg1),
 		)
 	}
 
@@ -6733,11 +6709,10 @@ func _gotk4_gio2_VfsClass_add_writable_namespaces(arg0 *C.GVfs, arg1 *C.GFileAtt
 
 	_list = (*FileAttributeInfoList)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.g_file_attribute_info_list_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_list)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_file_attribute_info_list_unref((*C.GFileAttributeInfoList)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 
 	overrides.AddWritableNamespaces(_list)
diff --git a/pkg/glib/v2/glib.go b/pkg/glib/v2/glib.go
index 79f75489a..ca3e1072f 100644
--- a/pkg/glib/v2/glib.go
+++ b/pkg/glib/v2/glib.go
@@ -8210,11 +8210,10 @@ func NewIdleSource() *Source {
 	var _source *Source // out
 
 	_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -8457,11 +8456,10 @@ func IOCreateWatch(channel *IOChannel, condition IOCondition) *Source {
 	var _source *Source // out
 
 	_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -9384,11 +9382,10 @@ func MainCurrentSource() *Source {
 	if _cret != nil {
 		_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_source_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_source)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_source_unref((*C.GSource)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10791,11 +10788,10 @@ func NewTimeoutSource(interval uint) *Source {
 	var _source *Source // out
 
 	_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -10831,11 +10827,10 @@ func TimeoutSourceNewSeconds(interval uint) *Source {
 	var _source *Source // out
 
 	_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -13352,11 +13347,10 @@ func NewBookmarkFile() *BookmarkFile {
 	var _bookmarkFile *BookmarkFile // out
 
 	_bookmarkFile = (*BookmarkFile)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bookmarkFile)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bookmark_file_free((*C.GBookmarkFile)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bookmark_file_free((*C.GBookmarkFile)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bookmarkFile
@@ -13455,11 +13449,10 @@ func (bookmark *BookmarkFile) Copy() *BookmarkFile {
 	var _bookmarkFile *BookmarkFile // out
 
 	_bookmarkFile = (*BookmarkFile)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bookmarkFile)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bookmark_file_free((*C.GBookmarkFile)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bookmark_file_free((*C.GBookmarkFile)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bookmarkFile
@@ -13496,11 +13489,10 @@ func (bookmark *BookmarkFile) AddedDateTime(uri string) (*DateTime, error) {
 
 	_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_date_time_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dateTime)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_date_time_unref((*C.GDateTime)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -13567,11 +13559,10 @@ func (bookmark *BookmarkFile) ApplicationInfo(uri string, name string) (string,
 	if _arg5 != nil {
 		_stamp = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_arg5)))
 		C.g_date_time_ref(_arg5)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_stamp)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_arg5),
 		)
 	}
 	if _cerr != nil {
@@ -13868,11 +13859,10 @@ func (bookmark *BookmarkFile) ModifiedDateTime(uri string) (*DateTime, error) {
 
 	_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_date_time_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dateTime)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_date_time_unref((*C.GDateTime)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -14009,11 +13999,10 @@ func (bookmark *BookmarkFile) VisitedDateTime(uri string) (*DateTime, error) {
 
 	_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_date_time_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dateTime)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_date_time_unref((*C.GDateTime)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -14857,11 +14846,10 @@ func NewBytes(data []byte) *Bytes {
 	var _bytes *Bytes // out
 
 	_bytes = (*Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -15106,11 +15094,10 @@ func (bytes *Bytes) NewFromBytes(offset uint, length uint) *Bytes {
 	var _ret *Bytes // out
 
 	_ret = (*Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ret)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ret
@@ -15162,11 +15149,10 @@ func NewChecksum(checksumType ChecksumType) *Checksum {
 
 	if _cret != nil {
 		_checksum = (*Checksum)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_checksum)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_checksum_free((*C.GChecksum)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_checksum_free((*C.GChecksum)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15193,11 +15179,10 @@ func (checksum *Checksum) Copy() *Checksum {
 	var _ret *Checksum // out
 
 	_ret = (*Checksum)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ret)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_checksum_free((*C.GChecksum)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_checksum_free((*C.GChecksum)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ret
@@ -15408,11 +15393,10 @@ func NewDateTime(tz *TimeZone, year int, month int, day int, hour int, minute in
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15439,11 +15423,10 @@ func NewDateTimeFromISO8601(text string, defaultTz *TimeZone) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15464,11 +15447,10 @@ func NewDateTimeFromTimevalLocal(tv *TimeVal) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15489,11 +15471,10 @@ func NewDateTimeFromTimevalUTC(tv *TimeVal) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15514,11 +15495,10 @@ func NewDateTimeFromUnixLocal(t int64) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15539,11 +15519,10 @@ func NewDateTimeFromUnixLocalUsec(usecs int64) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15564,11 +15543,10 @@ func NewDateTimeFromUnixUTC(t int64) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15589,11 +15567,10 @@ func NewDateTimeFromUnixUTCUsec(usecs int64) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15629,11 +15606,10 @@ func NewDateTimeLocal(year int, month int, day int, hour int, minute int, second
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15654,11 +15630,10 @@ func NewDateTimeNow(tz *TimeZone) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15675,11 +15650,10 @@ func NewDateTimeNowLocal() *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15696,11 +15670,10 @@ func NewDateTimeNowUTC() *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15736,11 +15709,10 @@ func NewDateTimeUTC(year int, month int, day int, hour int, minute int, seconds
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15773,11 +15745,10 @@ func (datetime *DateTime) Add(timespan TimeSpan) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15811,11 +15782,10 @@ func (datetime *DateTime) AddDays(days int) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15869,11 +15839,10 @@ func (datetime *DateTime) AddFull(years int, months int, days int, hours int, mi
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15907,11 +15876,10 @@ func (datetime *DateTime) AddHours(hours int) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15945,11 +15913,10 @@ func (datetime *DateTime) AddMinutes(minutes int) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15988,11 +15955,10 @@ func (datetime *DateTime) AddMonths(months int) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16026,11 +15992,10 @@ func (datetime *DateTime) AddSeconds(seconds float64) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16064,11 +16029,10 @@ func (datetime *DateTime) AddWeeks(weeks int) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16105,11 +16069,10 @@ func (datetime *DateTime) AddYears(years int) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16655,11 +16618,10 @@ func (datetime *DateTime) Timezone() *TimeZone {
 
 	_timeZone = (*TimeZone)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_time_zone_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_timeZone)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_time_zone_unref((*C.GTimeZone)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_time_zone_unref((*C.GTimeZone)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _timeZone
@@ -16922,11 +16884,10 @@ func (datetime *DateTime) ToLocal() *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -17007,11 +16968,10 @@ func (datetime *DateTime) ToTimezone(tz *TimeZone) *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -17090,11 +17050,10 @@ func (datetime *DateTime) ToUTC() *DateTime {
 
 	if _cret != nil {
 		_dateTime = (*DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_dateTime)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_date_time_unref((*C.GDateTime)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -17171,11 +17130,10 @@ func NewDirOpen(path string, flags uint) (*Dir, error) {
 	var _goerr error // out
 
 	_dir = (*Dir)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dir)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_dir_unref((*C.GDir)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_dir_unref((*C.GDir)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -18268,11 +18226,10 @@ func NewHMAC(digestType ChecksumType, key []byte) *HMAC {
 
 	if _cret != nil {
 		_hmac = (*HMAC)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_hmac)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_hmac_unref((*C.GHmac)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_hmac_unref((*C.GHmac)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -18298,11 +18255,10 @@ func (hmac *HMAC) Copy() *HMAC {
 	var _ret *HMAC // out
 
 	_ret = (*HMAC)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ret)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_hmac_unref((*C.GHmac)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_hmac_unref((*C.GHmac)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ret
@@ -18427,11 +18383,10 @@ func NewIOChannelFile(filename string, mode string) (*IOChannel, error) {
 	var _goerr error          // out
 
 	_ioChannel = (*IOChannel)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ioChannel)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_io_channel_unref((*C.GIOChannel)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_io_channel_unref((*C.GIOChannel)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -18453,11 +18408,10 @@ func NewIOChannelUnix(fd int) *IOChannel {
 	var _ioChannel *IOChannel // out
 
 	_ioChannel = (*IOChannel)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ioChannel)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_io_channel_unref((*C.GIOChannel)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_io_channel_unref((*C.GIOChannel)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ioChannel
@@ -19461,11 +19415,10 @@ func NewKeyFile() *KeyFile {
 	var _keyFile *KeyFile // out
 
 	_keyFile = (*KeyFile)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_keyFile)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_key_file_unref((*C.GKeyFile)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_key_file_unref((*C.GKeyFile)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _keyFile
@@ -21302,11 +21255,10 @@ func NewMainContext() *MainContext {
 	var _mainContext *MainContext // out
 
 	_mainContext = (*MainContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mainContext)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_main_context_unref((*C.GMainContext)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_main_context_unref((*C.GMainContext)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _mainContext
@@ -21325,11 +21277,10 @@ func NewMainContextWithFlags(flags MainContextFlags) *MainContext {
 	var _mainContext *MainContext // out
 
 	_mainContext = (*MainContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mainContext)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_main_context_unref((*C.GMainContext)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_main_context_unref((*C.GMainContext)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _mainContext
@@ -21421,11 +21372,10 @@ func (context *MainContext) FindSourceByFuncsUserData(funcs *SourceFuncs, userDa
 
 	_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_source_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -21468,11 +21418,10 @@ func (context *MainContext) FindSourceByID(sourceId uint) *Source {
 
 	_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_source_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -21507,11 +21456,10 @@ func (context *MainContext) FindSourceByUserData(userData unsafe.Pointer) *Sourc
 
 	_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_source_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -21799,11 +21747,10 @@ func MainContextDefault() *MainContext {
 
 	_mainContext = (*MainContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_main_context_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mainContext)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_main_context_unref((*C.GMainContext)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_main_context_unref((*C.GMainContext)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _mainContext
@@ -21834,11 +21781,10 @@ func MainContextGetThreadDefault() *MainContext {
 	if _cret != nil {
 		_mainContext = (*MainContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_main_context_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_mainContext)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_main_context_unref((*C.GMainContext)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_main_context_unref((*C.GMainContext)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -21864,11 +21810,10 @@ func MainContextRefThreadDefault() *MainContext {
 	var _mainContext *MainContext // out
 
 	_mainContext = (*MainContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mainContext)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_main_context_unref((*C.GMainContext)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_main_context_unref((*C.GMainContext)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _mainContext
@@ -21912,11 +21857,10 @@ func NewMainLoop(context *MainContext, isRunning bool) *MainLoop {
 	var _mainLoop *MainLoop // out
 
 	_mainLoop = (*MainLoop)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mainLoop)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_main_loop_unref((*C.GMainLoop)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_main_loop_unref((*C.GMainLoop)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _mainLoop
@@ -21940,11 +21884,10 @@ func (loop *MainLoop) Context() *MainContext {
 
 	_mainContext = (*MainContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_main_context_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mainContext)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_main_context_unref((*C.GMainContext)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_main_context_unref((*C.GMainContext)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _mainContext
@@ -22039,11 +21982,10 @@ func NewMappedFile(filename string, writable bool) (*MappedFile, error) {
 	var _goerr error            // out
 
 	_mappedFile = (*MappedFile)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mappedFile)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_mapped_file_unref((*C.GMappedFile)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_mapped_file_unref((*C.GMappedFile)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -22072,11 +22014,10 @@ func NewMappedFileFromFd(fd int, writable bool) (*MappedFile, error) {
 	var _goerr error            // out
 
 	_mappedFile = (*MappedFile)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_mappedFile)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_mapped_file_unref((*C.GMappedFile)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_mapped_file_unref((*C.GMappedFile)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -22104,11 +22045,10 @@ func (file *MappedFile) Bytes() *Bytes {
 	var _bytes *Bytes // out
 
 	_bytes = (*Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -22826,11 +22766,10 @@ func (matchInfo *MatchInfo) Regex() *Regex {
 
 	_regex = (*Regex)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_regex_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_regex)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_regex_unref((*C.GRegex)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_regex_unref((*C.GRegex)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _regex
@@ -23508,7 +23447,6 @@ func (buf *PathBuf) FreeToPath() string {
 	var _cret *C.char     // in
 
 	_arg0 = (*C.GPathBuf)(gextras.StructNative(unsafe.Pointer(buf)))
-	runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(buf)), nil)
 
 	_cret = C.g_path_buf_free_to_path(_arg0)
 	runtime.KeepAlive(buf)
@@ -23879,11 +23817,10 @@ func NewPatternSpec(pattern string) *PatternSpec {
 	var _patternSpec *PatternSpec // out
 
 	_patternSpec = (*PatternSpec)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_patternSpec)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_pattern_spec_free((*C.GPatternSpec)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_pattern_spec_free((*C.GPatternSpec)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _patternSpec
@@ -23906,11 +23843,10 @@ func (pspec *PatternSpec) Copy() *PatternSpec {
 	var _patternSpec *PatternSpec // out
 
 	_patternSpec = (*PatternSpec)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_patternSpec)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_pattern_spec_free((*C.GPatternSpec)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_pattern_spec_free((*C.GPatternSpec)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _patternSpec
@@ -24552,11 +24488,10 @@ func NewRand() *Rand {
 	var _rand *Rand // out
 
 	_rand = (*Rand)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_rand)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_rand_free((*C.GRand)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_rand_free((*C.GRand)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _rand
@@ -24575,11 +24510,10 @@ func NewRandWithSeed(seed uint32) *Rand {
 	var _rand *Rand // out
 
 	_rand = (*Rand)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_rand)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_rand_free((*C.GRand)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_rand_free((*C.GRand)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _rand
@@ -24601,11 +24535,10 @@ func NewRandWithSeedArray(seed *uint32, seedLength uint) *Rand {
 	var _rand *Rand // out
 
 	_rand = (*Rand)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_rand)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_rand_free((*C.GRand)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_rand_free((*C.GRand)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _rand
@@ -24630,11 +24563,10 @@ func (rand_ *Rand) Copy() *Rand {
 	var _rand *Rand // out
 
 	_rand = (*Rand)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_rand)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_rand_free((*C.GRand)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_rand_free((*C.GRand)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _rand
@@ -24880,11 +24812,10 @@ func NewRegex(pattern string, compileOptions RegexCompileFlags, matchOptions Reg
 
 	if _cret != nil {
 		_regex = (*Regex)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_regex)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_regex_unref((*C.GRegex)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_regex_unref((*C.GRegex)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 	if _cerr != nil {
@@ -25150,11 +25081,10 @@ func (regex *Regex) Match(str string, matchOptions RegexMatchFlags) (*MatchInfo,
 
 	if _arg3 != nil {
 		_matchInfo = (*MatchInfo)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_matchInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_match_info_unref((*C.GMatchInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_match_info_unref((*C.GMatchInfo)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _cret != 0 {
@@ -25210,11 +25140,10 @@ func (regex *Regex) MatchAll(str string, matchOptions RegexMatchFlags) (*MatchIn
 
 	if _arg3 != nil {
 		_matchInfo = (*MatchInfo)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_matchInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_match_info_unref((*C.GMatchInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_match_info_unref((*C.GMatchInfo)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _cret != 0 {
@@ -26066,11 +25995,10 @@ func NewSource(sourceFuncs *SourceFuncs, structSize uint) *Source {
 	var _source *Source // out
 
 	_source = (*Source)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_source)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_source_unref((*C.GSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_source_unref((*C.GSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _source
@@ -26215,11 +26143,10 @@ func (source *Source) Context() *MainContext {
 	if _cret != nil {
 		_mainContext = (*MainContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_main_context_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_mainContext)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_main_context_unref((*C.GMainContext)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_main_context_unref((*C.GMainContext)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -27054,11 +26981,10 @@ func NewTimeZone(identifier string) *TimeZone {
 	var _timeZone *TimeZone // out
 
 	_timeZone = (*TimeZone)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_timeZone)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_time_zone_unref((*C.GTimeZone)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_time_zone_unref((*C.GTimeZone)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _timeZone
@@ -27081,11 +27007,10 @@ func NewTimeZoneIdentifier(identifier string) *TimeZone {
 
 	if _cret != nil {
 		_timeZone = (*TimeZone)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_timeZone)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_time_zone_unref((*C.GTimeZone)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_time_zone_unref((*C.GTimeZone)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -27101,11 +27026,10 @@ func NewTimeZoneLocal() *TimeZone {
 	var _timeZone *TimeZone // out
 
 	_timeZone = (*TimeZone)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_timeZone)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_time_zone_unref((*C.GTimeZone)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_time_zone_unref((*C.GTimeZone)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _timeZone
@@ -27124,11 +27048,10 @@ func NewTimeZoneOffset(seconds int32) *TimeZone {
 	var _timeZone *TimeZone // out
 
 	_timeZone = (*TimeZone)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_timeZone)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_time_zone_unref((*C.GTimeZone)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_time_zone_unref((*C.GTimeZone)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _timeZone
@@ -27143,11 +27066,10 @@ func NewTimeZoneUTC() *TimeZone {
 	var _timeZone *TimeZone // out
 
 	_timeZone = (*TimeZone)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_timeZone)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_time_zone_unref((*C.GTimeZone)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_time_zone_unref((*C.GTimeZone)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _timeZone
@@ -28175,11 +28097,10 @@ func (baseUri *URI) ParseRelative(uriRef string, flags URIFlags) (*URI, error) {
 	var _goerr error // out
 
 	_uri = (*URI)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_uri)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -28316,11 +28237,10 @@ func URIBuild(flags URIFlags, scheme, userinfo, host string, port int, path, que
 	var _uri *URI // out
 
 	_uri = (*URI)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_uri)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _uri
@@ -28410,11 +28330,10 @@ func URIBuildWithUser(flags URIFlags, scheme, user, password, authParams, host s
 	var _uri *URI // out
 
 	_uri = (*URI)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_uri)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _uri
@@ -28810,11 +28729,10 @@ func URIParse(uriString string, flags URIFlags) (*URI, error) {
 	var _goerr error // out
 
 	_uri = (*URI)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_uri)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -29318,11 +29236,10 @@ func URIUnescapeBytes(escapedString, illegalCharacters string) (*Bytes, error) {
 	var _goerr error  // out
 
 	_bytes = (*Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -29822,11 +29739,10 @@ func NewVariantArray(childType *VariantType, children []*Variant) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -29848,11 +29764,10 @@ func NewVariantBoolean(value bool) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -29872,11 +29787,10 @@ func NewVariantByte(value byte) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -29898,11 +29812,10 @@ func NewVariantBytestring(str []byte) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -29932,11 +29845,10 @@ func NewVariantBytestringArray(strv []string) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -29959,11 +29871,10 @@ func NewVariantDictEntry(key *Variant, value *Variant) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -29983,11 +29894,10 @@ func NewVariantDouble(value float64) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30016,11 +29926,10 @@ func NewVariantFixedArray(elementType *VariantType, elements unsafe.Pointer, nEl
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30048,11 +29957,10 @@ func NewVariantFromBytes(typ *VariantType, bytes *Bytes, trusted bool) *Variant
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30072,11 +29980,10 @@ func NewVariantHandle(value int32) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30096,11 +30003,10 @@ func NewVariantInt16(value int16) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30120,11 +30026,10 @@ func NewVariantInt32(value int32) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30144,11 +30049,10 @@ func NewVariantInt64(value int64) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30175,11 +30079,10 @@ func NewVariantMaybe(childType *VariantType, child *Variant) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30200,11 +30103,10 @@ func NewVariantObjectPath(objectPath string) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30234,11 +30136,10 @@ func NewVariantObjv(strv []string) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30259,11 +30160,10 @@ func NewVariantSignature(signature string) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30284,11 +30184,10 @@ func NewVariantString(str string) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30318,11 +30217,10 @@ func NewVariantStrv(strv []string) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30351,11 +30249,10 @@ func NewVariantTuple(children []*Variant) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30375,11 +30272,10 @@ func NewVariantUint16(value uint16) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30399,11 +30295,10 @@ func NewVariantUint32(value uint32) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30423,11 +30318,10 @@ func NewVariantUint64(value uint64) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30447,11 +30341,10 @@ func NewVariantVariant(value *Variant) *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -30490,11 +30383,10 @@ func (value *Variant) Byteswap() *Variant {
 
 	if _cret != nil {
 		_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -31003,11 +30895,10 @@ func (value *Variant) ChildValue(index_ uint) *Variant {
 
 	if _cret != nil {
 		_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -31075,11 +30966,10 @@ func (value *Variant) DataAsBytes() *Bytes {
 	var _bytes *Bytes // out
 
 	_bytes = (*Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -31228,11 +31118,10 @@ func (value *Variant) Maybe() *Variant {
 
 	if _cret != nil {
 		_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -31280,11 +31169,10 @@ func (value *Variant) NormalForm() *Variant {
 
 	if _cret != nil {
 		_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -31570,11 +31458,10 @@ func (value *Variant) Variant() *Variant {
 
 	if _cret != nil {
 		_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -31780,11 +31667,10 @@ func (dictionary *Variant) LookupValue(key string, expectedType *VariantType) *V
 
 	if _cret != nil {
 		_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -31893,11 +31779,10 @@ func (value *Variant) RefSink() *Variant {
 
 	if _cret != nil {
 		_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -32120,11 +32005,10 @@ func NewVariantBuilder(typ *VariantType) *VariantBuilder {
 	var _variantBuilder *VariantBuilder // out
 
 	_variantBuilder = (*VariantBuilder)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantBuilder)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_builder_unref((*C.GVariantBuilder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_builder_unref((*C.GVariantBuilder)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantBuilder
@@ -32202,11 +32086,10 @@ func (builder *VariantBuilder) End() *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -32351,11 +32234,10 @@ func NewVariantDict(fromAsv *Variant) *VariantDict {
 	var _variantDict *VariantDict // out
 
 	_variantDict = (*VariantDict)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantDict)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_dict_unref((*C.GVariantDict)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_dict_unref((*C.GVariantDict)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantDict
@@ -32437,11 +32319,10 @@ func (dict *VariantDict) End() *Variant {
 
 	_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -32512,11 +32393,10 @@ func (dict *VariantDict) LookupValue(key string, expectedType *VariantType) *Var
 
 	if _cret != nil {
 		_variant = (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -32750,11 +32630,10 @@ func NewVariantType(typeString string) *VariantType {
 	var _variantType *VariantType // out
 
 	_variantType = (*VariantType)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantType)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_type_free((*C.GVariantType)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_type_free((*C.GVariantType)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantType
@@ -32773,11 +32652,10 @@ func NewVariantTypeArray(element *VariantType) *VariantType {
 	var _variantType *VariantType // out
 
 	_variantType = (*VariantType)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantType)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_type_free((*C.GVariantType)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_type_free((*C.GVariantType)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantType
@@ -32799,11 +32677,10 @@ func NewVariantTypeDictEntry(key *VariantType, value *VariantType) *VariantType
 	var _variantType *VariantType // out
 
 	_variantType = (*VariantType)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantType)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_type_free((*C.GVariantType)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_type_free((*C.GVariantType)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantType
@@ -32822,11 +32699,10 @@ func NewVariantTypeMaybe(element *VariantType) *VariantType {
 	var _variantType *VariantType // out
 
 	_variantType = (*VariantType)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantType)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_type_free((*C.GVariantType)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_type_free((*C.GVariantType)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantType
@@ -32854,11 +32730,10 @@ func NewVariantTypeTuple(items []*VariantType) *VariantType {
 	var _variantType *VariantType // out
 
 	_variantType = (*VariantType)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantType)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_type_free((*C.GVariantType)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_type_free((*C.GVariantType)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantType
@@ -32884,11 +32759,10 @@ func (typ *VariantType) Copy() *VariantType {
 	var _variantType *VariantType // out
 
 	_variantType = (*VariantType)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variantType)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_type_free((*C.GVariantType)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_type_free((*C.GVariantType)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variantType
@@ -33591,11 +33465,10 @@ func NewBytesWithGo(data []byte) *Bytes {
 	)
 
 	_bytes := (*Bytes)(gextras.NewStructNative(unsafe.Pointer(v)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(v),
 	)
 
 	return _bytes
@@ -33631,11 +33504,10 @@ func marshalVariant(p uintptr) (interface{}, error) {
 	}
 
 	_variant := (*Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	return _variant, nil
 }
@@ -33655,11 +33527,10 @@ func (value *Variant) ForEach(f func(*Variant) (stop bool)) {
 		}
 
 		variant := (*Variant)(gextras.NewStructNative(unsafe.Pointer(item)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(item),
 		)
 
 		return variant
diff --git a/pkg/graphene/graphene.go b/pkg/graphene/graphene.go
index fe1a11203..df550696c 100644
--- a/pkg/graphene/graphene.go
+++ b/pkg/graphene/graphene.go
@@ -332,11 +332,10 @@ func NewBoxAlloc() *Box {
 	var _box *Box // out
 
 	_box = (*Box)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_box)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_box_free((*C.graphene_box_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_box_free((*C.graphene_box_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _box
@@ -1112,11 +1111,10 @@ func NewEulerAlloc() *Euler {
 	var _euler *Euler // out
 
 	_euler = (*Euler)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_euler)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_euler_free((*C.graphene_euler_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_euler_free((*C.graphene_euler_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _euler
@@ -1718,11 +1716,10 @@ func NewFrustumAlloc() *Frustum {
 	var _frustum *Frustum // out
 
 	_frustum = (*Frustum)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_frustum)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_frustum_free((*C.graphene_frustum_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_frustum_free((*C.graphene_frustum_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _frustum
@@ -2012,11 +2009,10 @@ func NewMatrixAlloc() *Matrix {
 	var _matrix *Matrix // out
 
 	_matrix = (*Matrix)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_matrix)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_matrix_free((*C.graphene_matrix_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_matrix_free((*C.graphene_matrix_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _matrix
@@ -3985,11 +3981,10 @@ func NewPlaneAlloc() *Plane {
 	var _plane *Plane // out
 
 	_plane = (*Plane)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_plane)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_plane_free((*C.graphene_plane_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_plane_free((*C.graphene_plane_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _plane
@@ -4376,11 +4371,10 @@ func NewPointAlloc() *Point {
 	var _point *Point // out
 
 	_point = (*Point)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_point)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_point_free((*C.graphene_point_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_point_free((*C.graphene_point_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _point
@@ -4708,11 +4702,10 @@ func NewPoint3DAlloc() *Point3D {
 	var _point3D *Point3D // out
 
 	_point3D = (*Point3D)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_point3D)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_point3d_free((*C.graphene_point3d_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_point3d_free((*C.graphene_point3d_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _point3D
@@ -5224,11 +5217,10 @@ func NewQuadAlloc() *Quad {
 	var _quad *Quad // out
 
 	_quad = (*Quad)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_quad)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_quad_free((*C.graphene_quad_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_quad_free((*C.graphene_quad_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _quad
@@ -5446,11 +5438,10 @@ func NewQuaternionAlloc() *Quaternion {
 	var _quaternion *Quaternion // out
 
 	_quaternion = (*Quaternion)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_quaternion)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_quaternion_free((*C.graphene_quaternion_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_quaternion_free((*C.graphene_quaternion_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _quaternion
@@ -6128,11 +6119,10 @@ func NewRayAlloc() *Ray {
 	var _ray *Ray // out
 
 	_ray = (*Ray)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ray)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_ray_free((*C.graphene_ray_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_ray_free((*C.graphene_ray_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ray
@@ -7559,11 +7549,10 @@ func RectAlloc() *Rect {
 	var _rect *Rect // out
 
 	_rect = (*Rect)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_rect)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_rect_free((*C.graphene_rect_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_rect_free((*C.graphene_rect_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _rect
@@ -7633,11 +7622,10 @@ func NewSizeAlloc() *Size {
 	var _size *Size // out
 
 	_size = (*Size)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_size)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_size_free((*C.graphene_size_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_size_free((*C.graphene_size_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _size
@@ -7867,11 +7855,10 @@ func NewSphereAlloc() *Sphere {
 	var _sphere *Sphere // out
 
 	_sphere = (*Sphere)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_sphere)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_sphere_free((*C.graphene_sphere_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_sphere_free((*C.graphene_sphere_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _sphere
@@ -8235,11 +8222,10 @@ func NewTriangleAlloc() *Triangle {
 	var _triangle *Triangle // out
 
 	_triangle = (*Triangle)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_triangle)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_triangle_free((*C.graphene_triangle_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_triangle_free((*C.graphene_triangle_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _triangle
@@ -8739,11 +8725,10 @@ func NewVec2Alloc() *Vec2 {
 	var _vec2 *Vec2 // out
 
 	_vec2 = (*Vec2)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_vec2)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_vec2_free((*C.graphene_vec2_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_vec2_free((*C.graphene_vec2_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _vec2
@@ -9394,11 +9379,10 @@ func NewVec3Alloc() *Vec3 {
 	var _vec3 *Vec3 // out
 
 	_vec3 = (*Vec3)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_vec3)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_vec3_free((*C.graphene_vec3_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_vec3_free((*C.graphene_vec3_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _vec3
@@ -10239,11 +10223,10 @@ func NewVec4Alloc() *Vec4 {
 	var _vec4 *Vec4 // out
 
 	_vec4 = (*Vec4)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_vec4)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.graphene_vec4_free((*C.graphene_vec4_t)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.graphene_vec4_free((*C.graphene_vec4_t)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _vec4
diff --git a/pkg/gsk/v4/gsk.go b/pkg/gsk/v4/gsk.go
index 89e5229f6..513e7164b 100644
--- a/pkg/gsk/v4/gsk.go
+++ b/pkg/gsk/v4/gsk.go
@@ -1546,9 +1546,11 @@ func (node *CairoNode) DrawContext() *cairo.Context {
 	var _context *cairo.Context // out
 
 	_context = cairo.WrapContext(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_context, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_context,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _context
 }
@@ -1571,9 +1573,11 @@ func (node *CairoNode) Surface() *cairo.Surface {
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
 	C.cairo_surface_reference(_cret)
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _surface
 }
@@ -2668,11 +2672,10 @@ func (node *FillNode) Path() *Path {
 
 	_path = (*Path)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gsk_path_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_path)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_path_unref((*C.GskPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_path_unref((*C.GskPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _path
@@ -3268,11 +3271,10 @@ func (shader *GLShader) Source() *glib.Bytes {
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_bytes_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -3470,11 +3472,10 @@ func (node *GLShaderNode) Args() *glib.Bytes {
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_bytes_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -4800,11 +4801,10 @@ func (node *RenderNode) Serialize() *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -5857,11 +5857,10 @@ func (node *StrokeNode) Path() *Path {
 
 	_path = (*Path)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gsk_path_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_path)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_path_unref((*C.GskPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_path_unref((*C.GskPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _path
@@ -6483,11 +6482,10 @@ func (node *TransformNode) Transform() *Transform {
 
 	_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gsk_transform_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_transform)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_transform_unref((*C.GskTransform)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _transform
@@ -7109,11 +7107,10 @@ func PathParse(str string) *Path {
 
 	if _cret != nil {
 		_path = (*Path)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_path_unref((*C.GskPath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_path_unref((*C.GskPath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -7181,11 +7178,10 @@ func NewPathBuilder() *PathBuilder {
 	var _pathBuilder *PathBuilder // out
 
 	_pathBuilder = (*PathBuilder)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_pathBuilder)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_path_builder_unref((*C.GskPathBuilder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_path_builder_unref((*C.GskPathBuilder)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _pathBuilder
@@ -8000,11 +7996,10 @@ func (self *PathBuilder) ToPath() *Path {
 	var _path *Path // out
 
 	_path = (*Path)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_path)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_path_unref((*C.GskPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_path_unref((*C.GskPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _path
@@ -8048,11 +8043,10 @@ func NewPathMeasure(path *Path) *PathMeasure {
 	var _pathMeasure *PathMeasure // out
 
 	_pathMeasure = (*PathMeasure)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_pathMeasure)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_path_measure_unref((*C.GskPathMeasure)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_path_measure_unref((*C.GskPathMeasure)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _pathMeasure
@@ -8074,11 +8068,10 @@ func NewPathMeasureWithTolerance(path *Path, tolerance float32) *PathMeasure {
 	var _pathMeasure *PathMeasure // out
 
 	_pathMeasure = (*PathMeasure)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_pathMeasure)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_path_measure_unref((*C.GskPathMeasure)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_path_measure_unref((*C.GskPathMeasure)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _pathMeasure
@@ -8125,11 +8118,10 @@ func (self *PathMeasure) Path() *Path {
 
 	_path = (*Path)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gsk_path_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_path)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_path_unref((*C.GskPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_path_unref((*C.GskPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _path
@@ -8262,11 +8254,10 @@ func (point *PathPoint) Copy() *PathPoint {
 	var _pathPoint *PathPoint // out
 
 	_pathPoint = (*PathPoint)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_pathPoint)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_path_point_free((*C.GskPathPoint)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_path_point_free((*C.GskPathPoint)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _pathPoint
@@ -8910,11 +8901,10 @@ func NewShaderArgsBuilder(shader *GLShader, initialValues *glib.Bytes) *ShaderAr
 	var _shaderArgsBuilder *ShaderArgsBuilder // out
 
 	_shaderArgsBuilder = (*ShaderArgsBuilder)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_shaderArgsBuilder)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_shader_args_builder_unref((*C.GskShaderArgsBuilder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_shader_args_builder_unref((*C.GskShaderArgsBuilder)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _shaderArgsBuilder
@@ -9109,11 +9099,10 @@ func (builder *ShaderArgsBuilder) ToArgs() *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -9212,11 +9201,10 @@ func NewStroke(lineWidth float32) *Stroke {
 	var _stroke *Stroke // out
 
 	_stroke = (*Stroke)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_stroke)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_stroke_free((*C.GskStroke)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_stroke_free((*C.GskStroke)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _stroke
@@ -9239,11 +9227,10 @@ func (other *Stroke) Copy() *Stroke {
 	var _stroke *Stroke // out
 
 	_stroke = (*Stroke)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_stroke)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_stroke_free((*C.GskStroke)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_stroke_free((*C.GskStroke)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _stroke
@@ -9603,11 +9590,10 @@ func NewTransform() *Transform {
 	var _transform *Transform // out
 
 	_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_transform)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_transform_unref((*C.GskTransform)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _transform
@@ -9695,11 +9681,10 @@ func (self *Transform) Invert() *Transform {
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -9732,11 +9717,10 @@ func (next *Transform) Matrix(matrix *graphene.Matrix) *Transform {
 	var _transform *Transform // out
 
 	_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_transform)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_transform_unref((*C.GskTransform)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _transform
@@ -9773,11 +9757,10 @@ func (next *Transform) Perspective(depth float32) *Transform {
 	var _transform *Transform // out
 
 	_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_transform)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_transform_unref((*C.GskTransform)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _transform
@@ -9811,11 +9794,10 @@ func (next *Transform) Rotate(angle float32) *Transform {
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -9855,11 +9837,10 @@ func (next *Transform) Rotate3D(angle float32, axis *graphene.Vec3) *Transform {
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -9899,11 +9880,10 @@ func (next *Transform) Scale(factorX float32, factorY float32) *Transform {
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -9945,11 +9925,10 @@ func (next *Transform) Scale3D(factorX float32, factorY float32, factorZ float32
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -9987,11 +9966,10 @@ func (next *Transform) Skew(skewX float32, skewY float32) *Transform {
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10272,11 +10250,10 @@ func (next *Transform) Transform(other *Transform) *Transform {
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10368,11 +10345,10 @@ func (next *Transform) Translate(point *graphene.Point) *Transform {
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10406,11 +10382,10 @@ func (next *Transform) Translate3D(point *graphene.Point3D) *Transform {
 
 	if _cret != nil {
 		_transform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10449,11 +10424,10 @@ func TransformParse(str string) (*Transform, bool) {
 	var _ok bool                 // out
 
 	_outTransform = (*Transform)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_outTransform)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gsk_transform_unref((*C.GskTransform)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+		unsafe.Pointer(_arg2),
 	)
 	if _cret != 0 {
 		_ok = true
diff --git a/pkg/gtk/v3/gtk.go b/pkg/gtk/v3/gtk.go
index 67483e111..ea557d210 100644
--- a/pkg/gtk/v3/gtk.go
+++ b/pkg/gtk/v3/gtk.go
@@ -12624,11 +12624,10 @@ func GetOptionGroup(openDefaultDisplay bool) *glib.OptionGroup {
 	var _optionGroup *glib.OptionGroup // out
 
 	_optionGroup = (*glib.OptionGroup)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_optionGroup)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_option_group_unref((*C.GOptionGroup)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_option_group_unref((*C.GOptionGroup)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _optionGroup
@@ -15826,11 +15825,10 @@ func TargetTableNewFromList(list *TargetList) []TargetEntry {
 		_targetEntrys = make([]TargetEntry, _arg2)
 		for i := 0; i < int(_arg2); i++ {
 			_targetEntrys[i] = *(*TargetEntry)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(&_targetEntrys[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.gtk_target_entry_free((*C.GtkTargetEntry)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.gtk_target_entry_free((*C.GtkTargetEntry)(ptr)) },
+				unsafe.Pointer((&src[i])),
 			)
 		}
 	}
@@ -16371,11 +16369,10 @@ func TreeGetRowDragData(selectionData *SelectionData) (*TreeModel, *TreePath, bo
 	}
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _cret != 0 {
@@ -16589,11 +16586,10 @@ func (actionable *Actionable) ActionTargetValue() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -16741,11 +16737,10 @@ func (actionable *Actionable) actionTargetValue() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -22746,11 +22741,10 @@ func (fontchooser *FontChooser) FontDesc() *pango.FontDescription {
 
 	if _cret != nil {
 		_fontDescription = (*pango.FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -23922,11 +23916,10 @@ func (chooser *RecentChooser) CurrentItem() *RecentInfo {
 	var _recentInfo *RecentInfo // out
 
 	_recentInfo = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_recentInfo)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _recentInfo
@@ -24002,11 +23995,10 @@ func (chooser *RecentChooser) Items() []*RecentInfo {
 		src := (*C.GtkRecentInfo)(v)
 		var dst *RecentInfo // out
 		dst = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -24658,11 +24650,10 @@ func (chooser *RecentChooser) items() []*RecentInfo {
 		src := (*C.GtkRecentInfo)(v)
 		var dst *RecentInfo // out
 		dst = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -26829,11 +26820,10 @@ func (treeModel *TreeModel) Path(iter *TreeIter) *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -27494,11 +27484,10 @@ func (treeModel *TreeModel) path(iter *TreeIter) *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -47006,11 +46995,10 @@ func (cellView *CellView) DisplayedRow() *TreePath {
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -49536,11 +49524,10 @@ func ColorSelectionPaletteFromString(str string) ([]gdk.Color, bool) {
 		_colors = make([]gdk.Color, _arg3)
 		for i := 0; i < int(_arg3); i++ {
 			_colors[i] = *(*gdk.Color)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(&_colors[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.gdk_color_free((*C.GdkColor)(intern.C))
-				},
+				func(ptr unsafe.Pointer) { C.gdk_color_free((*C.GdkColor)(ptr)) },
+				unsafe.Pointer((&src[i])),
 			)
 		}
 	}
@@ -51995,11 +51982,10 @@ func (container *Container) PathForChild(child Widgetter) *WidgetPath {
 	var _widgetPath *WidgetPath // out
 
 	_widgetPath = (*WidgetPath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_widgetPath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_widget_path_unref((*C.GtkWidgetPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_widget_path_unref((*C.GtkWidgetPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _widgetPath
@@ -52457,11 +52443,10 @@ func (container *Container) pathForChild(child Widgetter) *WidgetPath {
 	var _widgetPath *WidgetPath // out
 
 	_widgetPath = (*WidgetPath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_widgetPath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_widget_path_unref((*C.GtkWidgetPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_widget_path_unref((*C.GtkWidgetPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _widgetPath
@@ -54291,11 +54276,10 @@ func (entry *Entry) Attributes() *pango.AttrList {
 	if _cret != nil {
 		_attrList = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_attr_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -60834,11 +60818,10 @@ func (filter *FileFilter) ToGVariant() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -66250,11 +66233,10 @@ func (gesture *GestureSingle) CurrentSequence() *gdk.EventSequence {
 
 	if _cret != nil {
 		_eventSequence = (*gdk.EventSequence)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_eventSequence)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.free(intern.C)
-			},
+			func(ptr unsafe.Pointer) { C.free(ptr) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -69465,11 +69447,10 @@ func (context *IMContext) PreeditString() (string, *pango.AttrList, int) {
 	_str = C.GoString((*C.gchar)(unsafe.Pointer(_arg1)))
 	defer C.free(unsafe.Pointer(_arg1))
 	_attrs = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attrs)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+		unsafe.Pointer(_arg2),
 	)
 	_cursorPos = int(_arg3)
 
@@ -69794,11 +69775,10 @@ func (context *IMContext) preeditString() (string, *pango.AttrList, int) {
 	_str = C.GoString((*C.gchar)(unsafe.Pointer(_arg1)))
 	defer C.free(unsafe.Pointer(_arg1))
 	_attrs = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attrs)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+		unsafe.Pointer(_arg2),
 	)
 	_cursorPos = int(_arg3)
 
@@ -70481,11 +70461,10 @@ func (factory *IconFactory) Lookup(stockId string) *IconSet {
 
 	_iconSet = (*IconSet)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_icon_set_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_iconSet)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_icon_set_unref((*C.GtkIconSet)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_icon_set_unref((*C.GtkIconSet)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _iconSet
@@ -70534,11 +70513,10 @@ func IconFactoryLookupDefault(stockId string) *IconSet {
 
 	_iconSet = (*IconSet)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_icon_set_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_iconSet)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_icon_set_unref((*C.GtkIconSet)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_icon_set_unref((*C.GtkIconSet)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _iconSet
@@ -70623,11 +70601,10 @@ func (iconInfo *IconInfo) AttachPoints() ([]gdk.Point, bool) {
 			_points = make([]gdk.Point, _arg2)
 			for i := 0; i < int(_arg2); i++ {
 				_points[i] = *(*gdk.Point)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-				runtime.SetFinalizer(
+				runtime.AddCleanup(
 					gextras.StructIntern(unsafe.Pointer(&_points[i])),
-					func(intern *struct{ C unsafe.Pointer }) {
-						C.free(intern.C)
-					},
+					func(ptr unsafe.Pointer) { C.free(ptr) },
+					unsafe.Pointer((&src[i])),
 				)
 			}
 		}
@@ -71001,9 +70978,11 @@ func (iconInfo *IconInfo) LoadSurface(forWindow gdk.Windower) (*cairo.Surface, e
 	var _goerr error            // out
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
 	}
@@ -72177,9 +72156,11 @@ func (iconTheme *IconTheme) LoadSurface(iconName string, size, scale int, forWin
 
 	if _cret != nil {
 		_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-			C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_surface,
+			func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -72975,9 +72956,11 @@ func (iconView *IconView) CreateDragIcon(path *TreePath) *cairo.Surface {
 	var _surface *cairo.Surface // out
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _surface
 }
@@ -73185,11 +73168,10 @@ func (iconView *IconView) Cursor() (*TreePath, CellRendererer, bool) {
 
 	if _arg1 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	if _arg2 != nil {
@@ -73250,11 +73232,10 @@ func (iconView *IconView) DestItemAtPos(dragX, dragY int) (*TreePath, IconViewDr
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	_pos = IconViewDropPosition(_arg4)
@@ -73288,11 +73269,10 @@ func (iconView *IconView) DragDestItem() (*TreePath, IconViewDropPosition) {
 
 	if _arg1 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	_pos = IconViewDropPosition(_arg2)
@@ -73341,11 +73321,10 @@ func (iconView *IconView) ItemAtPos(x, y int) (*TreePath, CellRendererer, bool)
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _arg4 != nil {
@@ -73593,11 +73572,10 @@ func (iconView *IconView) PathAtPos(x, y int) *TreePath {
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -73698,11 +73676,10 @@ func (iconView *IconView) SelectedItems() []*TreePath {
 		src := (*C.GtkTreePath)(v)
 		var dst *TreePath // out
 		dst = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -73823,20 +73800,18 @@ func (iconView *IconView) VisibleRange() (startPath, endPath *TreePath, ok bool)
 
 	if _arg1 != nil {
 		_startPath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_startPath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	if _arg2 != nil {
 		_endPath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_endPath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg2),
 		)
 	}
 	if _cret != 0 {
@@ -75237,11 +75212,10 @@ func (image *Image) IconSet() (*IconSet, int) {
 	if _arg1 != nil {
 		_iconSet = (*IconSet)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
 		C.gtk_icon_set_ref(_arg1)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_iconSet)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_icon_set_unref((*C.GtkIconSet)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_icon_set_unref((*C.GtkIconSet)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	_size = int(_arg2)
@@ -77038,11 +77012,10 @@ func (label *Label) Attributes() *pango.AttrList {
 	if _cret != nil {
 		_attrList = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_attr_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -88933,9 +88906,11 @@ func (offscreen *OffscreenWindow) Surface() *cairo.Surface {
 	if _cret != nil {
 		_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
 		C.cairo_surface_reference(_cret)
-		runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-			C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-		})
+		runtime.AddCleanup(
+			_surface,
+			func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+			unsafe.Pointer(_cret),
+		)
 	}
 
 	return _surface
@@ -90108,11 +90083,10 @@ func (setup *PageSetup) ToGVariant() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -92938,9 +92912,11 @@ func (context *PrintContext) CairoContext() *cairo.Context {
 
 	_ret = cairo.WrapContext(uintptr(unsafe.Pointer(_cret)))
 	C.cairo_reference(_cret)
-	runtime.SetFinalizer(_ret, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_ret,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _ret
 }
@@ -95152,11 +95128,10 @@ func (settings *PrintSettings) PageRanges() []PageRange {
 		_pageRanges = make([]PageRange, _arg1)
 		for i := 0; i < int(_arg1); i++ {
 			_pageRanges[i] = *(*PageRange)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(&_pageRanges[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.free(intern.C)
-				},
+				func(ptr unsafe.Pointer) { C.free(ptr) },
+				unsafe.Pointer((&src[i])),
 			)
 		}
 	}
@@ -95232,11 +95207,10 @@ func (settings *PrintSettings) PaperSize() *PaperSize {
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -96212,11 +96186,10 @@ func (settings *PrintSettings) ToGVariant() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -100693,11 +100666,10 @@ func (manager *RecentManager) Items() []*RecentInfo {
 		src := (*C.GtkRecentInfo)(v)
 		var dst *RecentInfo // out
 		dst = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -100769,11 +100741,10 @@ func (manager *RecentManager) LookupItem(uri string) (*RecentInfo, error) {
 
 	if _cret != nil {
 		_recentInfo = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_recentInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 	if _cerr != nil {
@@ -110177,11 +110148,10 @@ func (style *Style) LookupIconSet(stockId string) *IconSet {
 
 	_iconSet = (*IconSet)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_icon_set_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_iconSet)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_icon_set_unref((*C.GtkIconSet)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_icon_set_unref((*C.GtkIconSet)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _iconSet
@@ -112073,11 +112043,10 @@ func (context *StyleContext) Path() *WidgetPath {
 
 	_widgetPath = (*WidgetPath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_widget_path_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_widgetPath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_widget_path_unref((*C.GtkWidgetPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_widget_path_unref((*C.GtkWidgetPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _widgetPath
@@ -112122,10 +112091,7 @@ func (context *StyleContext) Property(property string, state StateFlags) coregli
 
 	var _value coreglib.Value // out
 
-	_value = *coreglib.ValueFromNative(unsafe.Pointer((&_arg3)))
-	runtime.SetFinalizer(_value, func(v *coreglib.Value) {
-		C.g_value_unset((*C.GValue)(unsafe.Pointer(v.Native())))
-	})
+	_value = *coreglib.ValueFromNativeOwned(unsafe.Pointer((&_arg3)))
 
 	return _value
 }
@@ -112215,11 +112181,10 @@ func (context *StyleContext) Section(property string) *CSSSection {
 	if _cret != nil {
 		_cssSection = (*CSSSection)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gtk_css_section_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_cssSection)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_css_section_unref((*C.GtkCssSection)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_css_section_unref((*C.GtkCssSection)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -112491,11 +112456,10 @@ func (context *StyleContext) LookupIconSet(stockId string) *IconSet {
 	if _cret != nil {
 		_iconSet = (*IconSet)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gtk_icon_set_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_iconSet)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_icon_set_unref((*C.GtkIconSet)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_icon_set_unref((*C.GtkIconSet)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -113195,10 +113159,7 @@ func (props *StyleProperties) Property(property string, state StateFlags) (coreg
 	var _value coreglib.Value // out
 	var _ok bool              // out
 
-	_value = *coreglib.ValueFromNative(unsafe.Pointer((&_arg3)))
-	runtime.SetFinalizer(_value, func(v *coreglib.Value) {
-		C.g_value_unset((*C.GValue)(unsafe.Pointer(v.Native())))
-	})
+	_value = *coreglib.ValueFromNativeOwned(unsafe.Pointer((&_arg3)))
 	if _cret != 0 {
 		_ok = true
 	}
@@ -113234,11 +113195,10 @@ func (props *StyleProperties) LookupColor(name string) *SymbolicColor {
 
 	_symbolicColor = (*SymbolicColor)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_symbolic_color_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_symbolicColor)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _symbolicColor
@@ -115246,11 +115206,10 @@ func (buffer *TextBuffer) CopyTargetList() *TargetList {
 
 	_targetList = (*TargetList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_target_list_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_targetList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_target_list_unref((*C.GtkTargetList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_target_list_unref((*C.GtkTargetList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _targetList
@@ -115625,11 +115584,10 @@ func (buffer *TextBuffer) PasteTargetList() *TargetList {
 
 	_targetList = (*TargetList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_target_list_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_targetList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_target_list_unref((*C.GtkTargetList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_target_list_unref((*C.GtkTargetList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _targetList
@@ -118617,11 +118575,10 @@ func (textView *TextView) DefaultAttributes() *TextAttributes {
 	var _textAttributes *TextAttributes // out
 
 	_textAttributes = (*TextAttributes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_textAttributes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_text_attributes_unref((*C.GtkTextAttributes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_text_attributes_unref((*C.GtkTextAttributes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _textAttributes
@@ -119127,11 +119084,10 @@ func (textView *TextView) Tabs() *pango.TabArray {
 
 	if _cret != nil {
 		_tabArray = (*pango.TabArray)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_tabArray)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_tab_array_free((*C.PangoTabArray)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_tab_array_free((*C.PangoTabArray)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -121007,11 +120963,10 @@ func (engine *ThemingEngine) Path() *WidgetPath {
 
 	_widgetPath = (*WidgetPath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_widget_path_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_widgetPath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_widget_path_unref((*C.GtkWidgetPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_widget_path_unref((*C.GtkWidgetPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _widgetPath
@@ -121049,10 +121004,7 @@ func (engine *ThemingEngine) Property(property string, state StateFlags) coregli
 
 	var _value coreglib.Value // out
 
-	_value = *coreglib.ValueFromNative(unsafe.Pointer((&_arg3)))
-	runtime.SetFinalizer(_value, func(v *coreglib.Value) {
-		C.g_value_unset((*C.GValue)(unsafe.Pointer(v.Native())))
-	})
+	_value = *coreglib.ValueFromNativeOwned(unsafe.Pointer((&_arg3)))
 
 	return _value
 }
@@ -126497,11 +126449,10 @@ func (filter *TreeModelFilter) ConvertChildPathToPath(childPath *TreePath) *Tree
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -126566,11 +126517,10 @@ func (filter *TreeModelFilter) ConvertPathToChildPath(filterPath *TreePath) *Tre
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -127003,11 +126953,10 @@ func (treeModelSort *TreeModelSort) ConvertChildPathToPath(childPath *TreePath)
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -127072,11 +127021,10 @@ func (treeModelSort *TreeModelSort) ConvertPathToChildPath(sortedPath *TreePath)
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -127354,11 +127302,10 @@ func (selection *TreeSelection) SelectedRows() (*TreeModel, []*TreePath) {
 		src := (*C.GtkTreePath)(v)
 		var dst *TreePath // out
 		dst = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -129048,9 +128995,11 @@ func (treeView *TreeView) CreateRowDragIcon(path *TreePath) *cairo.Surface {
 	var _surface *cairo.Surface // out
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _surface
 }
@@ -129425,11 +129374,10 @@ func (treeView *TreeView) Cursor() (*TreePath, *TreeViewColumn) {
 
 	if _arg1 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	if _arg2 != nil {
@@ -129479,11 +129427,10 @@ func (treeView *TreeView) DestRowAtPos(dragX, dragY int) (*TreePath, TreeViewDro
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	_pos = TreeViewDropPosition(_arg4)
@@ -129516,11 +129463,10 @@ func (treeView *TreeView) DragDestRow() (*TreePath, TreeViewDropPosition) {
 
 	if _arg1 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	_pos = TreeViewDropPosition(_arg2)
@@ -129885,11 +129831,10 @@ func (treeView *TreeView) PathAtPos(x, y int) (path *TreePath, column *TreeViewC
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _arg4 != nil {
@@ -130139,20 +130084,18 @@ func (treeView *TreeView) VisibleRange() (startPath, endPath *TreePath, ok bool)
 
 	if _arg1 != nil {
 		_startPath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_startPath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	if _arg2 != nil {
 		_endPath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_endPath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg2),
 		)
 	}
 	if _cret != 0 {
@@ -130331,11 +130274,10 @@ func (treeView *TreeView) IsBlankAtPos(x, y int) (path *TreePath, column *TreeVi
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _arg4 != nil {
@@ -137775,11 +137717,10 @@ func (widget *Widget) DragDestGetTargetList() *TargetList {
 	if _cret != nil {
 		_targetList = (*TargetList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gtk_target_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_targetList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_target_list_unref((*C.GtkTargetList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_target_list_unref((*C.GtkTargetList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -138043,11 +137984,10 @@ func (widget *Widget) DragSourceGetTargetList() *TargetList {
 	if _cret != nil {
 		_targetList = (*TargetList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gtk_target_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_targetList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_target_list_unref((*C.GtkTargetList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_target_list_unref((*C.GtkTargetList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -139640,11 +139580,10 @@ func (widget *Widget) GetPath() *WidgetPath {
 
 	_widgetPath = (*WidgetPath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_widget_path_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_widgetPath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_widget_path_unref((*C.GtkWidgetPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_widget_path_unref((*C.GtkWidgetPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _widgetPath
@@ -142115,9 +142054,11 @@ func (widget *Widget) RegionIntersect(region *cairo.Region) *cairo.Region {
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 		_ret = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_ret, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_ret,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _ret
 }
@@ -151074,11 +151015,10 @@ func NewBorder() *Border {
 	var _border *Border // out
 
 	_border = (*Border)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_border)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_border_free((*C.GtkBorder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_border_free((*C.GtkBorder)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _border
@@ -151157,11 +151097,10 @@ func (border_ *Border) Copy() *Border {
 	var _border *Border // out
 
 	_border = (*Border)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_border)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_border_free((*C.GtkBorder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_border_free((*C.GtkBorder)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _border
@@ -151968,11 +151907,10 @@ func (section *CSSSection) Parent() *CSSSection {
 	if _cret != nil {
 		_cssSection = (*CSSSection)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gtk_css_section_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_cssSection)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_css_section_unref((*C.GtkCssSection)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_css_section_unref((*C.GtkCssSection)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -152678,11 +152616,10 @@ func NewGradientLinear(x0 float64, y0 float64, x1 float64, y1 float64) *Gradient
 	var _gradient *Gradient // out
 
 	_gradient = (*Gradient)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_gradient)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_gradient_unref((*C.GtkGradient)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_gradient_unref((*C.GtkGradient)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _gradient
@@ -152716,11 +152653,10 @@ func NewGradientRadial(x0 float64, y0 float64, radius0 float64, x1 float64, y1 f
 	var _gradient *Gradient // out
 
 	_gradient = (*Gradient)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_gradient)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_gradient_unref((*C.GtkGradient)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_gradient_unref((*C.GtkGradient)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _gradient
@@ -152784,9 +152720,11 @@ func (gradient *Gradient) Resolve(props *StyleProperties) (*cairo.Pattern, bool)
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_arg2)}
 		_resolvedGradient = (*cairo.Pattern)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_resolvedGradient, func(v *cairo.Pattern) {
-		C.cairo_pattern_destroy((*C.cairo_pattern_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_resolvedGradient,
+		func(p unsafe.Pointer) { C.cairo_pattern_destroy((*C.cairo_pattern_t)(p)) },
+		unsafe.Pointer(_arg2),
+	)
 	if _cret != 0 {
 		_ok = true
 	}
@@ -152812,9 +152750,11 @@ func (gradient *Gradient) ResolveForContext(context *StyleContext) *cairo.Patter
 		_pp := &struct{ p unsafe.Pointer }{unsafe.Pointer(_cret)}
 		_pattern = (*cairo.Pattern)(unsafe.Pointer(_pp))
 	}
-	runtime.SetFinalizer(_pattern, func(v *cairo.Pattern) {
-		C.cairo_pattern_destroy((*C.cairo_pattern_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_pattern,
+		func(p unsafe.Pointer) { C.cairo_pattern_destroy((*C.cairo_pattern_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _pattern
 }
@@ -153147,11 +153087,10 @@ func NewIconSet() *IconSet {
 	var _iconSet *IconSet // out
 
 	_iconSet = (*IconSet)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_iconSet)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_icon_set_unref((*C.GtkIconSet)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_icon_set_unref((*C.GtkIconSet)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _iconSet
@@ -153170,11 +153109,10 @@ func NewIconSetFromPixbuf(pixbuf *gdkpixbuf.Pixbuf) *IconSet {
 	var _iconSet *IconSet // out
 
 	_iconSet = (*IconSet)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_iconSet)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_icon_set_unref((*C.GtkIconSet)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_icon_set_unref((*C.GtkIconSet)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _iconSet
@@ -153240,11 +153178,10 @@ func (iconSet *IconSet) Copy() *IconSet {
 	var _iconSet *IconSet // out
 
 	_iconSet = (*IconSet)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_iconSet)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_icon_set_unref((*C.GtkIconSet)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_icon_set_unref((*C.GtkIconSet)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _iconSet
@@ -153452,9 +153389,11 @@ func (iconSet *IconSet) RenderIconSurface(context *StyleContext, size int, scale
 	var _surface *cairo.Surface // out
 
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _surface
 }
@@ -153483,11 +153422,10 @@ func NewIconSource() *IconSource {
 	var _iconSource *IconSource // out
 
 	_iconSource = (*IconSource)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_iconSource)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_icon_source_free((*C.GtkIconSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_icon_source_free((*C.GtkIconSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _iconSource
@@ -153512,11 +153450,10 @@ func (source *IconSource) Copy() *IconSource {
 	var _iconSource *IconSource // out
 
 	_iconSource = (*IconSource)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_iconSource)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_icon_source_free((*C.GtkIconSource)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_icon_source_free((*C.GtkIconSource)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _iconSource
@@ -154922,11 +154859,10 @@ func NewPaperSize(name string) *PaperSize {
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -154959,11 +154895,10 @@ func NewPaperSizeCustom(name string, displayName string, width float64, height f
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -154982,11 +154917,10 @@ func NewPaperSizeFromGVariant(variant *glib.Variant) *PaperSize {
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -155012,11 +154946,10 @@ func NewPaperSizeFromIPP(ippName string, width float64, height float64) *PaperSi
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -155043,11 +154976,10 @@ func NewPaperSizeFromKeyFile(keyFile *glib.KeyFile, groupName string) (*PaperSiz
 	var _goerr error          // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -155080,11 +155012,10 @@ func NewPaperSizeFromPPD(ppdName string, ppdDisplayName string, width float64, h
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -155107,11 +155038,10 @@ func (other *PaperSize) Copy() *PaperSize {
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -155467,11 +155397,10 @@ func (paperSize *PaperSize) ToGVariant() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -155546,11 +155475,10 @@ func PaperSizeGetPaperSizes(includeCustom bool) []*PaperSize {
 		src := (*C.GtkPaperSize)(v)
 		var dst *PaperSize // out
 		dst = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -156912,11 +156840,10 @@ func NewRequisition() *Requisition {
 	var _requisition *Requisition // out
 
 	_requisition = (*Requisition)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_requisition)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_requisition_free((*C.GtkRequisition)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_requisition_free((*C.GtkRequisition)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _requisition
@@ -156967,11 +156894,10 @@ func (requisition *Requisition) Copy() *Requisition {
 	var _ret *Requisition // out
 
 	_ret = (*Requisition)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ret)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_requisition_free((*C.GtkRequisition)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_requisition_free((*C.GtkRequisition)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ret
@@ -157201,11 +157127,10 @@ func (data *SelectionData) Copy() *SelectionData {
 	var _selectionData *SelectionData // out
 
 	_selectionData = (*SelectionData)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_selectionData)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_selection_data_free((*C.GtkSelectionData)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_selection_data_free((*C.GtkSelectionData)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _selectionData
@@ -158145,11 +158070,10 @@ func NewSymbolicColorAlpha(color *SymbolicColor, factor float64) *SymbolicColor
 	var _symbolicColor *SymbolicColor // out
 
 	_symbolicColor = (*SymbolicColor)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_symbolicColor)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _symbolicColor
@@ -158168,11 +158092,10 @@ func NewSymbolicColorLiteral(color *gdk.RGBA) *SymbolicColor {
 	var _symbolicColor *SymbolicColor // out
 
 	_symbolicColor = (*SymbolicColor)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_symbolicColor)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _symbolicColor
@@ -158197,11 +158120,10 @@ func NewSymbolicColorMix(color1 *SymbolicColor, color2 *SymbolicColor, factor fl
 	var _symbolicColor *SymbolicColor // out
 
 	_symbolicColor = (*SymbolicColor)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_symbolicColor)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _symbolicColor
@@ -158221,11 +158143,10 @@ func NewSymbolicColorName(name string) *SymbolicColor {
 	var _symbolicColor *SymbolicColor // out
 
 	_symbolicColor = (*SymbolicColor)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_symbolicColor)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _symbolicColor
@@ -158247,11 +158168,10 @@ func NewSymbolicColorShade(color *SymbolicColor, factor float64) *SymbolicColor
 	var _symbolicColor *SymbolicColor // out
 
 	_symbolicColor = (*SymbolicColor)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_symbolicColor)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _symbolicColor
@@ -158274,11 +158194,10 @@ func NewSymbolicColorWin32(themeClass string, id int) *SymbolicColor {
 	var _symbolicColor *SymbolicColor // out
 
 	_symbolicColor = (*SymbolicColor)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_symbolicColor)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_symbolic_color_unref((*C.GtkSymbolicColor)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _symbolicColor
@@ -158562,11 +158481,10 @@ func NewTargetEntry(target string, flags uint, info uint) *TargetEntry {
 	var _targetEntry *TargetEntry // out
 
 	_targetEntry = (*TargetEntry)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_targetEntry)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_target_entry_free((*C.GtkTargetEntry)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_target_entry_free((*C.GtkTargetEntry)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _targetEntry
@@ -158630,11 +158548,10 @@ func (data *TargetEntry) Copy() *TargetEntry {
 	var _targetEntry *TargetEntry // out
 
 	_targetEntry = (*TargetEntry)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_targetEntry)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_target_entry_free((*C.GtkTargetEntry)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_target_entry_free((*C.GtkTargetEntry)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _targetEntry
@@ -158680,11 +158597,10 @@ func NewTargetList(targets []TargetEntry) *TargetList {
 	var _targetList *TargetList // out
 
 	_targetList = (*TargetList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_targetList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_target_list_unref((*C.GtkTargetList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_target_list_unref((*C.GtkTargetList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _targetList
@@ -158912,11 +158828,10 @@ func NewTextAttributes() *TextAttributes {
 	var _textAttributes *TextAttributes // out
 
 	_textAttributes = (*TextAttributes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_textAttributes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_text_attributes_unref((*C.GtkTextAttributes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_text_attributes_unref((*C.GtkTextAttributes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _textAttributes
@@ -159107,11 +159022,10 @@ func (src *TextAttributes) Copy() *TextAttributes {
 	var _textAttributes *TextAttributes // out
 
 	_textAttributes = (*TextAttributes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_textAttributes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_text_attributes_unref((*C.GtkTextAttributes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_text_attributes_unref((*C.GtkTextAttributes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _textAttributes
@@ -159941,11 +159855,10 @@ func (iter *TextIter) Copy() *TextIter {
 	var _textIter *TextIter // out
 
 	_textIter = (*TextIter)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_textIter)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_text_iter_free((*C.GtkTextIter)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_text_iter_free((*C.GtkTextIter)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _textIter
@@ -160821,11 +160734,10 @@ func (iter *TextIter) Attributes() (*TextAttributes, bool) {
 
 	_values = (*TextAttributes)(gextras.NewStructNative(unsafe.Pointer((&_arg1))))
 	C.gtk_text_attributes_ref((&_arg1))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_values)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_text_attributes_unref((*C.GtkTextAttributes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_text_attributes_unref((*C.GtkTextAttributes)(ptr)) },
+		unsafe.Pointer((&_arg1)),
 	)
 	if _cret != 0 {
 		_ok = true
@@ -160966,11 +160878,10 @@ func (iter *TextIter) Language() *pango.Language {
 	var _language *pango.Language // out
 
 	_language = (*pango.Language)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_language)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _language
@@ -162302,11 +162213,10 @@ func (iter *TreeIter) Copy() *TreeIter {
 	var _treeIter *TreeIter // out
 
 	_treeIter = (*TreeIter)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treeIter)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_iter_free((*C.GtkTreeIter)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_iter_free((*C.GtkTreeIter)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treeIter
@@ -162366,11 +162276,10 @@ func NewTreePath() *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -162385,11 +162294,10 @@ func NewTreePathFirst() *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -162417,11 +162325,10 @@ func NewTreePathFromIndices(indices []int) *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -162441,11 +162348,10 @@ func NewTreePathFromString(path string) *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -162518,11 +162424,10 @@ func (path *TreePath) Copy() *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -162786,11 +162691,10 @@ func NewTreeRowReference(model TreeModeller, path *TreePath) *TreeRowReference {
 	var _treeRowReference *TreeRowReference // out
 
 	_treeRowReference = (*TreeRowReference)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treeRowReference)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treeRowReference
@@ -162815,11 +162719,10 @@ func NewTreeRowReferenceProxy(proxy *coreglib.Object, model TreeModeller, path *
 	var _treeRowReference *TreeRowReference // out
 
 	_treeRowReference = (*TreeRowReference)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treeRowReference)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treeRowReference
@@ -162842,11 +162745,10 @@ func (reference *TreeRowReference) Copy() *TreeRowReference {
 	var _treeRowReference *TreeRowReference // out
 
 	_treeRowReference = (*TreeRowReference)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treeRowReference)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treeRowReference
@@ -162892,11 +162794,10 @@ func (reference *TreeRowReference) Path() *TreePath {
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -163478,11 +163379,10 @@ func NewWidgetPath() *WidgetPath {
 	var _widgetPath *WidgetPath // out
 
 	_widgetPath = (*WidgetPath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_widgetPath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_widget_path_unref((*C.GtkWidgetPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_widget_path_unref((*C.GtkWidgetPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _widgetPath
@@ -163604,11 +163504,10 @@ func (path *WidgetPath) Copy() *WidgetPath {
 	var _widgetPath *WidgetPath // out
 
 	_widgetPath = (*WidgetPath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_widgetPath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_widget_path_unref((*C.GtkWidgetPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_widget_path_unref((*C.GtkWidgetPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _widgetPath
@@ -163939,11 +163838,10 @@ func (path *WidgetPath) IterGetSiblings(pos int) *WidgetPath {
 
 	_widgetPath = (*WidgetPath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_widget_path_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_widgetPath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_widget_path_unref((*C.GtkWidgetPath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_widget_path_unref((*C.GtkWidgetPath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _widgetPath
diff --git a/pkg/gtk/v3/gtk_export.go b/pkg/gtk/v3/gtk_export.go
index faa7dfa47..a9869a52e 100644
--- a/pkg/gtk/v3/gtk_export.go
+++ b/pkg/gtk/v3/gtk_export.go
@@ -854,19 +854,17 @@ func _gotk4_gtk3_RecentSortFunc(arg1 *C.GtkRecentInfo, arg2 *C.GtkRecentInfo, ar
 
 	_a = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.gtk_recent_info_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_a)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 	_b = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 	C.gtk_recent_info_ref(arg2)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_b)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+		unsafe.Pointer(arg2),
 	)
 
 	gint := fn(_a, _b)
@@ -3840,9 +3838,11 @@ func _gotk4_gtk3_CellAreaClass_render(arg0 *C.GtkCellArea, arg1 *C.GtkCellAreaCo
 	}
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg3)))
 	C.cairo_reference(arg3)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg3),
+	)
 	_backgroundArea = (*gdk.Rectangle)(gextras.NewStructNative(unsafe.Pointer(arg4)))
 	_cellArea = (*gdk.Rectangle)(gextras.NewStructNative(unsafe.Pointer(arg5)))
 	_flags = CellRendererState(arg6)
@@ -4485,9 +4485,11 @@ func _gotk4_gtk3_CellRendererClass_render(arg0 *C.GtkCellRenderer, arg1 *C.cairo
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	{
 		objptr := unsafe.Pointer(arg2)
 		if objptr == nil {
@@ -4811,9 +4813,11 @@ func _gotk4_gtk3_CheckButtonClass_draw_indicator(arg0 *C.GtkCheckButton, arg1 *C
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 
 	overrides.DrawIndicator(_cr)
 }
@@ -4830,9 +4834,11 @@ func _gotk4_gtk3_CheckMenuItemClass_draw_indicator(arg0 *C.GtkCheckMenuItem, arg
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 
 	overrides.DrawIndicator(_cr)
 }
@@ -5403,11 +5409,10 @@ func _gotk4_gtk3_CssProviderClass_parsing_error(arg0 *C.GtkCssProvider, arg1 *C.
 
 	_section = (*CSSSection)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.gtk_css_section_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_section)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_css_section_unref((*C.GtkCssSection)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_css_section_unref((*C.GtkCssSection)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 	_err = gerror.Take(unsafe.Pointer(arg2))
 
@@ -5432,11 +5437,10 @@ func _gotk4_gtk3_CssProvider_ConnectParsingError(arg0 C.gpointer, arg1 *C.GtkCss
 
 	_section = (*CSSSection)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.gtk_css_section_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_section)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_css_section_unref((*C.GtkCssSection)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_css_section_unref((*C.GtkCssSection)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 	_err = gerror.Take(unsafe.Pointer(arg2))
 
@@ -13399,9 +13403,11 @@ func _gotk4_gtk3_StyleClass_draw_arrow(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2 C
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -13454,9 +13460,11 @@ func _gotk4_gtk3_StyleClass_draw_box(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2 C.G
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -13508,9 +13516,11 @@ func _gotk4_gtk3_StyleClass_draw_box_gap(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -13562,9 +13572,11 @@ func _gotk4_gtk3_StyleClass_draw_check(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2 C
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -13613,9 +13625,11 @@ func _gotk4_gtk3_StyleClass_draw_diamond(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -13662,9 +13676,11 @@ func _gotk4_gtk3_StyleClass_draw_expander(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	{
 		objptr := unsafe.Pointer(arg3)
@@ -13712,9 +13728,11 @@ func _gotk4_gtk3_StyleClass_draw_extension(arg0 *C.GtkStyle, arg1 *C.cairo_t, ar
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -13764,9 +13782,11 @@ func _gotk4_gtk3_StyleClass_draw_flat_box(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -13814,9 +13834,11 @@ func _gotk4_gtk3_StyleClass_draw_focus(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2 C
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	{
 		objptr := unsafe.Pointer(arg3)
@@ -13865,9 +13887,11 @@ func _gotk4_gtk3_StyleClass_draw_handle(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -13915,9 +13939,11 @@ func _gotk4_gtk3_StyleClass_draw_hline(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2 C
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	{
 		objptr := unsafe.Pointer(arg3)
@@ -13963,9 +13989,11 @@ func _gotk4_gtk3_StyleClass_draw_layout(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	if arg3 != 0 {
 		_useText = true
@@ -14020,9 +14048,11 @@ func _gotk4_gtk3_StyleClass_draw_option(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -14071,9 +14101,11 @@ func _gotk4_gtk3_StyleClass_draw_resize_grip(arg0 *C.GtkStyle, arg1 *C.cairo_t,
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	{
 		objptr := unsafe.Pointer(arg3)
@@ -14122,9 +14154,11 @@ func _gotk4_gtk3_StyleClass_draw_shadow(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -14176,9 +14210,11 @@ func _gotk4_gtk3_StyleClass_draw_shadow_gap(arg0 *C.GtkStyle, arg1 *C.cairo_t, a
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -14231,9 +14267,11 @@ func _gotk4_gtk3_StyleClass_draw_slider(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -14283,9 +14321,11 @@ func _gotk4_gtk3_StyleClass_draw_spinner(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	{
 		objptr := unsafe.Pointer(arg3)
@@ -14334,9 +14374,11 @@ func _gotk4_gtk3_StyleClass_draw_tab(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2 C.G
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	_shadowType = ShadowType(arg3)
 	{
@@ -14383,9 +14425,11 @@ func _gotk4_gtk3_StyleClass_draw_vline(arg0 *C.GtkStyle, arg1 *C.cairo_t, arg2 C
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_stateType = StateType(arg2)
 	{
 		objptr := unsafe.Pointer(arg3)
@@ -15399,9 +15443,11 @@ func _gotk4_gtk3_TextViewClass_draw_layer(arg0 *C.GtkTextView, arg1 C.GtkTextVie
 	_layer = TextViewLayer(arg1)
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg2)))
 	C.cairo_reference(arg2)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg2),
+	)
 
 	overrides.DrawLayer(_layer, _cr)
 }
@@ -15892,9 +15938,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_activity(arg0 *C.GtkThemingEngine, ar
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -15919,9 +15967,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_arrow(arg0 *C.GtkThemingEngine, arg1
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_angle = float64(arg2)
 	_x = float64(arg3)
 	_y = float64(arg4)
@@ -15946,9 +15996,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_background(arg0 *C.GtkThemingEngine,
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -15973,9 +16025,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_check(arg0 *C.GtkThemingEngine, arg1
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -16000,9 +16054,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_expander(arg0 *C.GtkThemingEngine, ar
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -16028,9 +16084,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_extension(arg0 *C.GtkThemingEngine, a
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -16056,9 +16114,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_focus(arg0 *C.GtkThemingEngine, arg1
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -16083,9 +16143,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_frame(arg0 *C.GtkThemingEngine, arg1
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -16113,9 +16175,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_frame_gap(arg0 *C.GtkThemingEngine, a
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -16143,9 +16207,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_handle(arg0 *C.GtkThemingEngine, arg1
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -16169,9 +16235,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_icon(arg0 *C.GtkThemingEngine, arg1 *
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	{
 		obj := coreglib.Take(unsafe.Pointer(arg2))
 		_pixbuf = &gdkpixbuf.Pixbuf{
@@ -16204,14 +16272,18 @@ func _gotk4_gtk3_ThemingEngineClass_render_icon_surface(arg0 *C.GtkThemingEngine
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_surface = cairo.WrapSurface(uintptr(unsafe.Pointer(arg2)))
 	C.cairo_surface_reference(arg2)
-	runtime.SetFinalizer(_surface, func(v *cairo.Surface) {
-		C.cairo_surface_destroy((*C.cairo_surface_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_surface,
+		func(p unsafe.Pointer) { C.cairo_surface_destroy((*C.cairo_surface_t)(p)) },
+		unsafe.Pointer(arg2),
+	)
 	_x = float64(arg3)
 	_y = float64(arg4)
 
@@ -16233,9 +16305,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_layout(arg0 *C.GtkThemingEngine, arg1
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	{
@@ -16264,9 +16338,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_line(arg0 *C.GtkThemingEngine, arg1 *
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x0 = float64(arg2)
 	_y0 = float64(arg3)
 	_x1 = float64(arg4)
@@ -16291,9 +16367,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_option(arg0 *C.GtkThemingEngine, arg1
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -16319,9 +16397,11 @@ func _gotk4_gtk3_ThemingEngineClass_render_slider(arg0 *C.GtkThemingEngine, arg1
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_x = float64(arg2)
 	_y = float64(arg3)
 	_width = float64(arg4)
@@ -18345,9 +18425,11 @@ func _gotk4_gtk3_WidgetClass_draw(arg0 *C.GtkWidget, arg1 *C.cairo_t) (cret C.gb
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 
 	ok := overrides.Draw(_cr)
 
@@ -19061,9 +19143,11 @@ func _gotk4_gtk3_WidgetClass_queue_draw_region(arg0 *C.GtkWidget, arg1 *C.cairo_
 		_region = (*cairo.Region)(unsafe.Pointer(_pp))
 	}
 	C.cairo_region_reference(arg1)
-	runtime.SetFinalizer(_region, func(v *cairo.Region) {
-		C.cairo_region_destroy((*C.cairo_region_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_region,
+		func(p unsafe.Pointer) { C.cairo_region_destroy((*C.cairo_region_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 
 	overrides.QueueDrawRegion(_region)
 }
@@ -20029,9 +20113,11 @@ func _gotk4_gtk3_Widget_ConnectDraw(arg0 C.gpointer, arg1 *C.cairo_t, arg2 C.gui
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 
 	ok := f(_cr)
 
diff --git a/pkg/gtk/v4/gtk.go b/pkg/gtk/v4/gtk.go
index 68322968d..c8ffc21e1 100644
--- a/pkg/gtk/v4/gtk.go
+++ b/pkg/gtk/v4/gtk.go
@@ -10957,11 +10957,10 @@ func TreeGetRowDragData(value *coreglib.Value) (*TreeModel, *TreePath, bool) {
 	}
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _cret != 0 {
@@ -12232,11 +12231,10 @@ func (self *AccessibleText) contents(start, end uint) *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -12285,11 +12283,10 @@ func (self *AccessibleText) contentsAt(offset uint, granularity AccessibleTextGr
 	_start = uint(_arg3)
 	_end = uint(_arg4)
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _start, _end, _bytes
@@ -12525,11 +12522,10 @@ func (actionable *Actionable) ActionTargetValue() *glib.Variant {
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_variant_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -12672,11 +12668,10 @@ func (actionable *Actionable) actionTargetValue() *glib.Variant {
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_variant_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16740,11 +16735,10 @@ func (fontchooser *FontChooser) FontDesc() *pango.FontDescription {
 
 	if _cret != nil {
 		_fontDescription = (*pango.FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -18779,11 +18773,10 @@ func (model *SelectionModel) Selection() *Bitset {
 	var _bitset *Bitset // out
 
 	_bitset = (*Bitset)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bitset)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_bitset_unref((*C.GtkBitset)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_bitset_unref((*C.GtkBitset)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bitset
@@ -18822,11 +18815,10 @@ func (model *SelectionModel) SelectionInRange(position, nItems uint) *Bitset {
 	var _bitset *Bitset // out
 
 	_bitset = (*Bitset)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bitset)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_bitset_unref((*C.GtkBitset)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_bitset_unref((*C.GtkBitset)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bitset
@@ -19178,11 +19170,10 @@ func (model *SelectionModel) selectionInRange(position, nItems uint) *Bitset {
 	var _bitset *Bitset // out
 
 	_bitset = (*Bitset)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bitset)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_bitset_unref((*C.GtkBitset)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_bitset_unref((*C.GtkBitset)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bitset
@@ -20836,11 +20827,10 @@ func (treeModel *TreeModel) Path(iter *TreeIter) *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -21558,11 +21548,10 @@ func (treeModel *TreeModel) path(iter *TreeIter) *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -30676,11 +30665,10 @@ func (self *BuilderListItemFactory) Bytes() *glib.Bytes {
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_bytes_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -31483,11 +31471,10 @@ func (self *Calendar) Date() *glib.DateTime {
 	var _dateTime *glib.DateTime // out
 
 	_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dateTime)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_date_time_unref((*C.GDateTime)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dateTime
@@ -38130,11 +38117,10 @@ func (cellView *CellView) DisplayedRow() *TreePath {
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -40177,11 +40163,10 @@ func (self *ColorDialog) ChooseRGBAFinish(result gio.AsyncResulter) (*gdk.RGBA,
 
 	if _cret != nil {
 		_rgbA = (*gdk.RGBA)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_rgbA)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_rgba_free((*C.GdkRGBA)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_rgba_free((*C.GdkRGBA)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 	if _cerr != nil {
@@ -48692,11 +48677,10 @@ func (self *DropTarget) Formats() *gdk.ContentFormats {
 	if _cret != nil {
 		_contentFormats = (*gdk.ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gdk_content_formats_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -49044,11 +49028,10 @@ func (self *DropTargetAsync) Formats() *gdk.ContentFormats {
 
 	if _cret != nil {
 		_contentFormats = (*gdk.ContentFormats)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_contentFormats)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gdk_content_formats_unref((*C.GdkContentFormats)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gdk_content_formats_unref((*C.GdkContentFormats)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -49730,11 +49713,10 @@ func (entry *Entry) Attributes() *pango.AttrList {
 	if _cret != nil {
 		_attrList = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_attr_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -54297,11 +54279,10 @@ func (self *Expression) Bind(target *coreglib.Object, property string, this_ *co
 
 	_expressionWatch = (*ExpressionWatch)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_expression_watch_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_expressionWatch)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_expression_watch_unref((*C.GtkExpressionWatch)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_expression_watch_unref((*C.GtkExpressionWatch)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _expressionWatch
@@ -54445,11 +54426,10 @@ func (self *Expression) Watch(this_ *coreglib.Object, notify ExpressionNotify) *
 
 	_expressionWatch = (*ExpressionWatch)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.gtk_expression_watch_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_expressionWatch)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_expression_watch_unref((*C.GtkExpressionWatch)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_expression_watch_unref((*C.GtkExpressionWatch)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _expressionWatch
@@ -56436,11 +56416,10 @@ func (filter *FileFilter) ToGVariant() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -57511,11 +57490,10 @@ func (fixed *Fixed) ChildTransform(widget Widgetter) *gsk.Transform {
 	if _cret != nil {
 		_transform = (*gsk.Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gsk_transform_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -57773,11 +57751,10 @@ func (child *FixedLayoutChild) Transform() *gsk.Transform {
 	if _cret != nil {
 		_transform = (*gsk.Transform)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gsk_transform_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_transform)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gsk_transform_unref((*C.GskTransform)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gsk_transform_unref((*C.GskTransform)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -60028,20 +60005,18 @@ func (self *FontDialog) ChooseFontAndFeaturesFinish(result gio.AsyncResulter) (*
 	var _goerr error                     // out
 
 	_fontDesc = (*pango.FontDescription)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDesc)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_arg2),
 	)
 	_fontFeatures = C.GoString((*C.gchar)(unsafe.Pointer(_arg3)))
 	defer C.free(unsafe.Pointer(_arg3))
 	_language = (*pango.Language)(gextras.NewStructNative(unsafe.Pointer(_arg4)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_language)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_arg4),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -60078,11 +60053,10 @@ func (self *FontDialog) ChooseFontFinish(result gio.AsyncResulter) (*pango.FontD
 
 	if _cret != nil {
 		_fontDescription = (*pango.FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 	if _cerr != nil {
@@ -60171,11 +60145,10 @@ func (self *FontDialog) Language() *pango.Language {
 
 	if _cret != nil {
 		_language = (*pango.Language)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_language)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.free(intern.C)
-			},
+			func(ptr unsafe.Pointer) { C.free(ptr) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -60535,11 +60508,10 @@ func (self *FontDialogButton) Language() *pango.Language {
 
 	if _cret != nil {
 		_language = (*pango.Language)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_language)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.free(intern.C)
-			},
+			func(ptr unsafe.Pointer) { C.free(ptr) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -63236,11 +63208,10 @@ func (gesture *GestureSingle) CurrentSequence() *gdk.EventSequence {
 
 	if _cret != nil {
 		_eventSequence = (*gdk.EventSequence)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_eventSequence)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.free(intern.C)
-			},
+			func(ptr unsafe.Pointer) { C.free(ptr) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -63502,11 +63473,10 @@ func (gesture *GestureStylus) Backlog() ([]gdk.TimeCoord, bool) {
 		_backlog = make([]gdk.TimeCoord, _arg2)
 		for i := 0; i < int(_arg2); i++ {
 			_backlog[i] = *(*gdk.TimeCoord)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(&_backlog[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.free(intern.C)
-				},
+				func(ptr unsafe.Pointer) { C.free(ptr) },
+				unsafe.Pointer((&src[i])),
 			)
 		}
 	}
@@ -66712,11 +66682,10 @@ func (context *IMContext) PreeditString() (string, *pango.AttrList, int) {
 	_str = C.GoString((*C.gchar)(unsafe.Pointer(_arg1)))
 	defer C.free(unsafe.Pointer(_arg1))
 	_attrs = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attrs)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+		unsafe.Pointer(_arg2),
 	)
 	_cursorPos = int(_arg3)
 
@@ -67188,11 +67157,10 @@ func (context *IMContext) preeditString() (string, *pango.AttrList, int) {
 	_str = C.GoString((*C.gchar)(unsafe.Pointer(_arg1)))
 	defer C.free(unsafe.Pointer(_arg1))
 	_attrs = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attrs)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+		unsafe.Pointer(_arg2),
 	)
 	_cursorPos = int(_arg3)
 
@@ -69057,11 +69025,10 @@ func (iconView *IconView) Cursor() (*TreePath, CellRendererer, bool) {
 
 	if _arg1 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	if _arg2 != nil {
@@ -69124,11 +69091,10 @@ func (iconView *IconView) DestItemAtPos(dragX, dragY int) (*TreePath, IconViewDr
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	_pos = IconViewDropPosition(_arg4)
@@ -69163,11 +69129,10 @@ func (iconView *IconView) DragDestItem() (*TreePath, IconViewDropPosition) {
 
 	if _arg1 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	_pos = IconViewDropPosition(_arg2)
@@ -69213,11 +69178,10 @@ func (iconView *IconView) ItemAtPos(x, y int) (*TreePath, CellRendererer, bool)
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _arg4 != nil {
@@ -69479,11 +69443,10 @@ func (iconView *IconView) PathAtPos(x, y int) *TreePath {
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -69599,11 +69562,10 @@ func (iconView *IconView) SelectedItems() []*TreePath {
 		src := (*C.GtkTreePath)(v)
 		var dst *TreePath // out
 		dst = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -69763,11 +69725,10 @@ func (iconView *IconView) TooltipContext(x, y int, keyboardTip bool) (*TreeModel
 	}
 	if _arg5 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg5)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg5),
 		)
 	}
 	_iter = (*TreeIter)(gextras.NewStructNative(unsafe.Pointer((&_arg6))))
@@ -69807,20 +69768,18 @@ func (iconView *IconView) VisibleRange() (startPath, endPath *TreePath, ok bool)
 
 	if _arg1 != nil {
 		_startPath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_startPath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	if _arg2 != nil {
 		_endPath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_endPath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg2),
 		)
 	}
 	if _cret != 0 {
@@ -71765,11 +71724,10 @@ func (self *Inscription) Attributes() *pango.AttrList {
 	if _cret != nil {
 		_attrList = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_attr_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -72645,11 +72603,10 @@ func (self *Label) Attributes() *pango.AttrList {
 	if _cret != nil {
 		_attrList = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_attr_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -73092,11 +73049,10 @@ func (self *Label) Tabs() *pango.TabArray {
 
 	if _cret != nil {
 		_tabArray = (*pango.TabArray)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_tabArray)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_tab_array_free((*C.PangoTabArray)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_tab_array_free((*C.PangoTabArray)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -85995,11 +85951,10 @@ func (setup *PageSetup) ToGVariant() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -88977,9 +88932,11 @@ func (context *PrintContext) CairoContext() *cairo.Context {
 
 	_ret = cairo.WrapContext(uintptr(unsafe.Pointer(_cret)))
 	C.cairo_reference(_cret)
-	runtime.SetFinalizer(_ret, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_ret,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _ret
 }
@@ -89727,11 +89684,10 @@ func (self *PrintDialog) SetupFinish(result gio.AsyncResulter) (*PrintSetup, err
 
 	if _cret != nil {
 		_printSetup = (*PrintSetup)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_printSetup)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_print_setup_unref((*C.GtkPrintSetup)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_print_setup_unref((*C.GtkPrintSetup)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 	if _cerr != nil {
@@ -91789,11 +91745,10 @@ func (settings *PrintSettings) PageRanges() []PageRange {
 		_pageRanges = make([]PageRange, _arg1)
 		for i := 0; i < int(_arg1); i++ {
 			_pageRanges[i] = *(*PageRange)(gextras.NewStructNative(unsafe.Pointer((&src[i]))))
-			runtime.SetFinalizer(
+			runtime.AddCleanup(
 				gextras.StructIntern(unsafe.Pointer(&_pageRanges[i])),
-				func(intern *struct{ C unsafe.Pointer }) {
-					C.free(intern.C)
-				},
+				func(ptr unsafe.Pointer) { C.free(ptr) },
+				unsafe.Pointer((&src[i])),
 			)
 		}
 	}
@@ -91870,11 +91825,10 @@ func (settings *PrintSettings) PaperSize() *PaperSize {
 
 	if _cret != nil {
 		_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_paperSize)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -92858,11 +92812,10 @@ func (settings *PrintSettings) ToGVariant() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -94435,11 +94388,10 @@ func (manager *RecentManager) Items() []*RecentInfo {
 		src := (*C.GtkRecentInfo)(v)
 		var dst *RecentInfo // out
 		dst = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -94511,11 +94463,10 @@ func (manager *RecentManager) LookupItem(uri string) (*RecentInfo, error) {
 
 	if _cret != nil {
 		_recentInfo = (*RecentInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_recentInfo)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_recent_info_unref((*C.GtkRecentInfo)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_recent_info_unref((*C.GtkRecentInfo)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 	if _cerr != nil {
@@ -98252,11 +98203,10 @@ func (self *Shortcut) Arguments() *glib.Variant {
 	if _cret != nil {
 		_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.g_variant_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_variant)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -100667,9 +100617,11 @@ func (snapshot *Snapshot) AppendCairo(bounds *graphene.Rect) *cairo.Context {
 	var _context *cairo.Context // out
 
 	_context = cairo.WrapContext(uintptr(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(_context, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_context,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(_cret),
+	)
 
 	return _context
 }
@@ -107216,11 +107168,10 @@ func (self *Text) Attributes() *pango.AttrList {
 	if _cret != nil {
 		_attrList = (*pango.AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_attr_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -112945,11 +112896,10 @@ func (textView *TextView) Tabs() *pango.TabArray {
 
 	if _cret != nil {
 		_tabArray = (*pango.TabArray)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_tabArray)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_tab_array_free((*C.PangoTabArray)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_tab_array_free((*C.PangoTabArray)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -115998,11 +115948,10 @@ func (filter *TreeModelFilter) ConvertChildPathToPath(childPath *TreePath) *Tree
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -116071,11 +116020,10 @@ func (filter *TreeModelFilter) ConvertPathToChildPath(filterPath *TreePath) *Tre
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -116529,11 +116477,10 @@ func (treeModelSort *TreeModelSort) ConvertChildPathToPath(childPath *TreePath)
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -116602,11 +116549,10 @@ func (treeModelSort *TreeModelSort) ConvertPathToChildPath(sortedPath *TreePath)
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -116859,11 +116805,10 @@ func (selection *TreeSelection) SelectedRows() (*TreeModel, []*TreePath) {
 		src := (*C.GtkTreePath)(v)
 		var dst *TreePath // out
 		dst = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -119063,11 +119008,10 @@ func (treeView *TreeView) Cursor() (*TreePath, *TreeViewColumn) {
 
 	if _arg1 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	if _arg2 != nil {
@@ -119118,11 +119062,10 @@ func (treeView *TreeView) DestRowAtPos(dragX, dragY int) (*TreePath, TreeViewDro
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	_pos = TreeViewDropPosition(_arg4)
@@ -119156,11 +119099,10 @@ func (treeView *TreeView) DragDestRow() (*TreePath, TreeViewDropPosition) {
 
 	if _arg1 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	_pos = TreeViewDropPosition(_arg2)
@@ -119531,11 +119473,10 @@ func (treeView *TreeView) PathAtPos(x, y int) (path *TreePath, column *TreeViewC
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _arg4 != nil {
@@ -119785,11 +119726,10 @@ func (treeView *TreeView) TooltipContext(x, y int, keyboardTip bool) (*TreeModel
 	}
 	if _arg5 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg5)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg5),
 		)
 	}
 	_iter = (*TreeIter)(gextras.NewStructNative(unsafe.Pointer((&_arg6))))
@@ -119829,20 +119769,18 @@ func (treeView *TreeView) VisibleRange() (startPath, endPath *TreePath, ok bool)
 
 	if _arg1 != nil {
 		_startPath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg1)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_startPath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg1),
 		)
 	}
 	if _arg2 != nil {
 		_endPath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_endPath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg2),
 		)
 	}
 	if _cret != 0 {
@@ -120029,11 +119967,10 @@ func (treeView *TreeView) IsBlankAtPos(x, y int) (path *TreePath, column *TreeVi
 
 	if _arg3 != nil {
 		_path = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_arg3)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_path)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_arg3),
 		)
 	}
 	if _arg4 != nil {
@@ -132519,11 +132456,10 @@ func NewAccessibleListFromArray(accessibles []Accessibler) *AccessibleList {
 	var _accessibleList *AccessibleList // out
 
 	_accessibleList = (*AccessibleList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_accessibleList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _accessibleList
@@ -132548,11 +132484,10 @@ func NewAccessibleListFromList(list []Accessibler) *AccessibleList {
 	var _accessibleList *AccessibleList // out
 
 	_accessibleList = (*AccessibleList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_accessibleList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _accessibleList
@@ -132792,11 +132727,10 @@ func NewBitsetEmpty() *Bitset {
 	var _bitset *Bitset // out
 
 	_bitset = (*Bitset)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bitset)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_bitset_unref((*C.GtkBitset)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_bitset_unref((*C.GtkBitset)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bitset
@@ -132818,11 +132752,10 @@ func NewBitsetRange(start uint, nItems uint) *Bitset {
 	var _bitset *Bitset // out
 
 	_bitset = (*Bitset)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bitset)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_bitset_unref((*C.GtkBitset)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_bitset_unref((*C.GtkBitset)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bitset
@@ -132980,11 +132913,10 @@ func (self *Bitset) Copy() *Bitset {
 	var _bitset *Bitset // out
 
 	_bitset = (*Bitset)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bitset)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_bitset_unref((*C.GtkBitset)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_bitset_unref((*C.GtkBitset)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bitset
@@ -133762,11 +133694,10 @@ func NewBorder() *Border {
 	var _border *Border // out
 
 	_border = (*Border)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_border)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_border_free((*C.GtkBorder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_border_free((*C.GtkBorder)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _border
@@ -133845,11 +133776,10 @@ func (border_ *Border) Copy() *Border {
 	var _border *Border // out
 
 	_border = (*Border)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_border)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_border_free((*C.GtkBorder)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_border_free((*C.GtkBorder)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _border
@@ -134324,11 +134254,10 @@ func NewCSSSection(file gio.Filer, start *CSSLocation, end *CSSLocation) *CSSSec
 	var _cssSection *CSSSection // out
 
 	_cssSection = (*CSSSection)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_cssSection)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_css_section_unref((*C.GtkCssSection)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_css_section_unref((*C.GtkCssSection)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _cssSection
@@ -134411,11 +134340,10 @@ func (section *CSSSection) Parent() *CSSSection {
 	if _cret != nil {
 		_cssSection = (*CSSSection)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.gtk_css_section_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_cssSection)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_css_section_unref((*C.GtkCssSection)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_css_section_unref((*C.GtkCssSection)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -135458,11 +135386,10 @@ func NewPaperSize(name string) *PaperSize {
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -135495,11 +135422,10 @@ func NewPaperSizeCustom(name string, displayName string, width float64, height f
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -135518,11 +135444,10 @@ func NewPaperSizeFromGVariant(variant *glib.Variant) *PaperSize {
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -135548,11 +135473,10 @@ func NewPaperSizeFromIPP(ippName string, width float64, height float64) *PaperSi
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -135579,11 +135503,10 @@ func NewPaperSizeFromKeyFile(keyFile *glib.KeyFile, groupName string) (*PaperSiz
 	var _goerr error          // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 	if _cerr != nil {
 		_goerr = gerror.Take(unsafe.Pointer(_cerr))
@@ -135616,11 +135539,10 @@ func NewPaperSizeFromPPD(ppdName string, ppdDisplayName string, width float64, h
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -135643,11 +135565,10 @@ func (other *PaperSize) Copy() *PaperSize {
 	var _paperSize *PaperSize // out
 
 	_paperSize = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_paperSize)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _paperSize
@@ -136003,11 +135924,10 @@ func (paperSize *PaperSize) ToGVariant() *glib.Variant {
 
 	_variant = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_variant_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_variant)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_variant_unref((*C.GVariant)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _variant
@@ -136082,11 +136002,10 @@ func PaperSizeGetPaperSizes(includeCustom bool) []*PaperSize {
 		src := (*C.GtkPaperSize)(v)
 		var dst *PaperSize // out
 		dst = (*PaperSize)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_paper_size_free((*C.GtkPaperSize)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_paper_size_free((*C.GtkPaperSize)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -136479,11 +136398,10 @@ func (info *RecentInfo) Added() *glib.DateTime {
 
 	_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_date_time_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dateTime)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_date_time_unref((*C.GDateTime)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dateTime
@@ -136556,11 +136474,10 @@ func (info *RecentInfo) ApplicationInfo(appName string) (string, uint, *glib.Dat
 	_count = uint(_arg3)
 	_stamp = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_arg4)))
 	C.g_date_time_ref(_arg4)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_stamp)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_date_time_unref((*C.GDateTime)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+		unsafe.Pointer(_arg4),
 	)
 	if _cret != 0 {
 		_ok = true
@@ -136749,11 +136666,10 @@ func (info *RecentInfo) Modified() *glib.DateTime {
 
 	_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_date_time_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dateTime)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_date_time_unref((*C.GDateTime)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dateTime
@@ -136879,11 +136795,10 @@ func (info *RecentInfo) Visited() *glib.DateTime {
 
 	_dateTime = (*glib.DateTime)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_date_time_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_dateTime)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_date_time_unref((*C.GDateTime)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_date_time_unref((*C.GDateTime)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _dateTime
@@ -137122,11 +137037,10 @@ func NewRequisition() *Requisition {
 	var _requisition *Requisition // out
 
 	_requisition = (*Requisition)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_requisition)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_requisition_free((*C.GtkRequisition)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_requisition_free((*C.GtkRequisition)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _requisition
@@ -137177,11 +137091,10 @@ func (requisition *Requisition) Copy() *Requisition {
 	var _ret *Requisition // out
 
 	_ret = (*Requisition)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_ret)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_requisition_free((*C.GtkRequisition)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_requisition_free((*C.GtkRequisition)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _ret
@@ -137251,11 +137164,10 @@ func NewScrollInfo() *ScrollInfo {
 	var _scrollInfo *ScrollInfo // out
 
 	_scrollInfo = (*ScrollInfo)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_scrollInfo)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_scroll_info_unref((*C.GtkScrollInfo)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_scroll_info_unref((*C.GtkScrollInfo)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _scrollInfo
@@ -138334,11 +138246,10 @@ func (iter *TextIter) Copy() *TextIter {
 	var _textIter *TextIter // out
 
 	_textIter = (*TextIter)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_textIter)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_text_iter_free((*C.GtkTextIter)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_text_iter_free((*C.GtkTextIter)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _textIter
@@ -139367,11 +139278,10 @@ func (iter *TextIter) Language() *pango.Language {
 	var _language *pango.Language // out
 
 	_language = (*pango.Language)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_language)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _language
@@ -140470,11 +140380,10 @@ func (iter *TreeIter) Copy() *TreeIter {
 	var _treeIter *TreeIter // out
 
 	_treeIter = (*TreeIter)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treeIter)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_iter_free((*C.GtkTreeIter)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_iter_free((*C.GtkTreeIter)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treeIter
@@ -140575,11 +140484,10 @@ func NewTreePath() *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -140594,11 +140502,10 @@ func NewTreePathFirst() *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -140626,11 +140533,10 @@ func NewTreePathFromIndices(indices []int) *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -140651,11 +140557,10 @@ func NewTreePathFromString(path string) *TreePath {
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -140735,11 +140640,10 @@ func (path *TreePath) Copy() *TreePath {
 	var _treePath *TreePath // out
 
 	_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treePath)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treePath
@@ -141031,11 +140935,10 @@ func NewTreeRowReference(model TreeModeller, path *TreePath) *TreeRowReference {
 
 	if _cret != nil {
 		_treeRowReference = (*TreeRowReference)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treeRowReference)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -141062,11 +140965,10 @@ func NewTreeRowReferenceProxy(proxy *coreglib.Object, model TreeModeller, path *
 
 	if _cret != nil {
 		_treeRowReference = (*TreeRowReference)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treeRowReference)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -141092,11 +140994,10 @@ func (reference *TreeRowReference) Copy() *TreeRowReference {
 	var _treeRowReference *TreeRowReference // out
 
 	_treeRowReference = (*TreeRowReference)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_treeRowReference)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_tree_row_reference_free((*C.GtkTreeRowReference)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _treeRowReference
@@ -141146,11 +141047,10 @@ func (reference *TreeRowReference) Path() *TreePath {
 
 	if _cret != nil {
 		_treePath = (*TreePath)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_treePath)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.gtk_tree_path_free((*C.GtkTreePath)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.gtk_tree_path_free((*C.GtkTreePath)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
diff --git a/pkg/gtk/v4/gtk_export.go b/pkg/gtk/v4/gtk_export.go
index 38f386a1b..f7371a1e2 100644
--- a/pkg/gtk/v4/gtk_export.go
+++ b/pkg/gtk/v4/gtk_export.go
@@ -251,9 +251,11 @@ func _gotk4_gtk4_DrawingAreaDrawFunc(arg1 *C.GtkDrawingArea, arg2 *C.cairo_t, ar
 	_drawingArea = wrapDrawingArea(coreglib.Take(unsafe.Pointer(arg1)))
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg2)))
 	C.cairo_reference(arg2)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg2),
+	)
 	_width = int(arg3)
 	_height = int(arg4)
 
@@ -741,11 +743,10 @@ func _gotk4_gtk4_ShortcutFunc(arg1 *C.GtkWidget, arg2 *C.GVariant, arg3 C.gpoint
 	if arg2 != nil {
 		_args = (*glib.Variant)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 		C.g_variant_ref(arg2)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_args)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.g_variant_unref((*C.GVariant)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.g_variant_unref((*C.GVariant)(ptr)) },
+			unsafe.Pointer(arg2),
 		)
 	}
 
@@ -3920,11 +3921,10 @@ func _gotk4_gtk4_CssProvider_ConnectParsingError(arg0 C.gpointer, arg1 *C.GtkCss
 
 	_section = (*CSSSection)(gextras.NewStructNative(unsafe.Pointer(arg1)))
 	C.gtk_css_section_ref(arg1)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_section)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.gtk_css_section_unref((*C.GtkCssSection)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.gtk_css_section_unref((*C.GtkCssSection)(ptr)) },
+		unsafe.Pointer(arg1),
 	)
 	_err = gerror.Take(unsafe.Pointer(arg2))
 
diff --git a/pkg/pango/pango.go b/pkg/pango/pango.go
index 8c27a8c3b..4d2181c57 100644
--- a/pkg/pango/pango.go
+++ b/pkg/pango/pango.go
@@ -1936,11 +1936,10 @@ func ScriptGetSampleLanguage(script Script) *Language {
 
 	if _cret != nil {
 		_language = (*Language)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_language)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.free(intern.C)
-			},
+			func(ptr unsafe.Pointer) { C.free(ptr) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -2655,11 +2654,10 @@ func NewAttrAllowBreaks(allowBreaks bool) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -2687,11 +2685,10 @@ func NewAttrBackgroundAlpha(alpha uint16) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -2727,11 +2724,10 @@ func NewAttrBackground(red, green, blue uint16) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -2768,11 +2764,10 @@ func NewAttrBaselineShift(shift int) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -2850,11 +2845,10 @@ func NewAttrFallback(enableFallback bool) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -2883,11 +2877,10 @@ func NewAttrFamily(family string) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -2919,11 +2912,10 @@ func NewAttrFontScale(scale FontScale) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -2951,11 +2943,10 @@ func NewAttrForegroundAlpha(alpha uint16) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -2991,11 +2982,10 @@ func NewAttrForeground(red, green, blue uint16) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3023,11 +3013,10 @@ func NewAttrGravityHint(hint GravityHint) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3055,11 +3044,10 @@ func NewAttrGravity(gravity Gravity) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3092,11 +3080,10 @@ func NewAttrInsertHyphens(insertHyphens bool) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3125,11 +3112,10 @@ func NewAttrLetterSpacing(letterSpacing int) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3155,11 +3141,10 @@ func NewAttrLineHeight(factor float64) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3186,11 +3171,10 @@ func AttrLineHeightNewAbsolute(height int) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3229,11 +3213,10 @@ func NewAttrOverlineColor(red, green, blue uint16) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3261,11 +3244,10 @@ func NewAttrOverline(overline Overline) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3294,11 +3276,10 @@ func NewAttrRise(rise int) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3329,11 +3310,10 @@ func NewAttrScale(scaleFactor float64) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3356,11 +3336,10 @@ func NewAttrSentence() *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3389,11 +3368,10 @@ func NewAttrShow(flags ShowFlags) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3421,11 +3399,10 @@ func NewAttrStretch(stretch Stretch) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3464,11 +3441,10 @@ func NewAttrStrikethroughColor(red, green, blue uint16) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3498,11 +3474,10 @@ func NewAttrStrikethrough(strikethrough bool) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3530,11 +3505,10 @@ func NewAttrStyle(style Style) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3563,11 +3537,10 @@ func NewAttrTextTransform(transform TextTransform) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3606,11 +3579,10 @@ func NewAttrUnderlineColor(red, green, blue uint16) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3638,11 +3610,10 @@ func NewAttrUnderline(underline Underline) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3670,11 +3641,10 @@ func NewAttrVariant(variant Variant) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3702,11 +3672,10 @@ func NewAttrWeight(weight Weight) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -3729,11 +3698,10 @@ func NewAttrWord() *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -4111,11 +4079,10 @@ func Itemize(context *Context, text string, startIndex, length int, attrs *AttrL
 		src := (*C.PangoItem)(v)
 		var dst *Item // out
 		dst = (*Item)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_item_free((*C.PangoItem)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_item_free((*C.PangoItem)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -4182,11 +4149,10 @@ func ItemizeWithBaseDir(context *Context, baseDir Direction, text string, startI
 		src := (*C.PangoItem)(v)
 		var dst *Item // out
 		dst = (*Item)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_item_free((*C.PangoItem)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_item_free((*C.PangoItem)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -4270,11 +4236,10 @@ func MarkupParserFinish(context *glib.MarkupParseContext) (*AttrList, string, ui
 
 	if _arg2 != nil {
 		_attrList = (*AttrList)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_arg2),
 		)
 	}
 	if _arg3 != nil {
@@ -4333,11 +4298,10 @@ func NewMarkupParser(accelMarker uint32) *glib.MarkupParseContext {
 
 	_markupParseContext = (*glib.MarkupParseContext)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 	C.g_markup_parse_context_ref(_cret)
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_markupParseContext)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_markup_parse_context_unref((*C.GMarkupParseContext)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_markup_parse_context_unref((*C.GMarkupParseContext)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _markupParseContext
@@ -4460,11 +4424,10 @@ func ParseMarkup(markupText string, accelMarker uint32) (*AttrList, string, uint
 
 	if _arg4 != nil {
 		_attrList = (*AttrList)(gextras.NewStructNative(unsafe.Pointer(_arg4)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_arg4),
 		)
 	}
 	if _arg5 != nil {
@@ -4684,11 +4647,10 @@ func ReorderItems(items []*Item) []*Item {
 		src := (*C.PangoItem)(v)
 		var dst *Item // out
 		dst = (*Item)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_item_free((*C.PangoItem)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_item_free((*C.PangoItem)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_list = append(_list, dst)
 	})
@@ -5532,11 +5494,10 @@ func (context *Context) Metrics(desc *FontDescription, language *Language) *Font
 	var _fontMetrics *FontMetrics // out
 
 	_fontMetrics = (*FontMetrics)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontMetrics)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_metrics_unref((*C.PangoFontMetrics)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_metrics_unref((*C.PangoFontMetrics)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontMetrics
@@ -6306,11 +6267,10 @@ func (font *Font) Describe() *FontDescription {
 	var _fontDescription *FontDescription // out
 
 	_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontDescription
@@ -6336,11 +6296,10 @@ func (font *Font) DescribeWithAbsoluteSize() *FontDescription {
 	var _fontDescription *FontDescription // out
 
 	_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontDescription
@@ -6583,11 +6542,10 @@ func (font *Font) Metrics(language *Language) *FontMetrics {
 	var _fontMetrics *FontMetrics // out
 
 	_fontMetrics = (*FontMetrics)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontMetrics)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_metrics_unref((*C.PangoFontMetrics)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_metrics_unref((*C.PangoFontMetrics)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontMetrics
@@ -6648,11 +6606,10 @@ func (font *Font) Serialize() *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -6681,11 +6638,10 @@ func (font *Font) describe() *FontDescription {
 	var _fontDescription *FontDescription // out
 
 	_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontDescription
@@ -6706,11 +6662,10 @@ func (font *Font) describeAbsolute() *FontDescription {
 	var _fontDescription *FontDescription // out
 
 	_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontDescription
@@ -6886,11 +6841,10 @@ func (font *Font) metrics(language *Language) *FontMetrics {
 	var _fontMetrics *FontMetrics // out
 
 	_fontMetrics = (*FontMetrics)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontMetrics)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_metrics_unref((*C.PangoFontMetrics)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_metrics_unref((*C.PangoFontMetrics)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontMetrics
@@ -7115,11 +7069,10 @@ func (face *FontFace) Describe() *FontDescription {
 	var _fontDescription *FontDescription // out
 
 	_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontDescription
@@ -7275,11 +7228,10 @@ func (face *FontFace) describe() *FontDescription {
 	var _fontDescription *FontDescription // out
 
 	_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontDescription
@@ -8962,11 +8914,10 @@ func (fontset *Fontset) Metrics() *FontMetrics {
 	var _fontMetrics *FontMetrics // out
 
 	_fontMetrics = (*FontMetrics)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontMetrics)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_metrics_unref((*C.PangoFontMetrics)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_metrics_unref((*C.PangoFontMetrics)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontMetrics
@@ -9062,11 +9013,10 @@ func (fontset *Fontset) language() *Language {
 	var _language *Language // out
 
 	_language = (*Language)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_language)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.free(intern.C)
-		},
+		func(ptr unsafe.Pointer) { C.free(ptr) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _language
@@ -9092,11 +9042,10 @@ func (fontset *Fontset) metrics() *FontMetrics {
 	var _fontMetrics *FontMetrics // out
 
 	_fontMetrics = (*FontMetrics)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontMetrics)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_metrics_unref((*C.PangoFontMetrics)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_metrics_unref((*C.PangoFontMetrics)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontMetrics
@@ -9349,11 +9298,10 @@ func (layout *Layout) Attributes() *AttrList {
 	if _cret != nil {
 		_attrList = (*AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_attr_list_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -9724,11 +9672,10 @@ func (layout *Layout) Iter() *LayoutIter {
 	var _layoutIter *LayoutIter // out
 
 	_layoutIter = (*LayoutIter)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_layoutIter)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_layout_iter_free((*C.PangoLayoutIter)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_layout_iter_free((*C.PangoLayoutIter)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _layoutIter
@@ -9814,11 +9761,10 @@ func (layout *Layout) Line(line int) *LayoutLine {
 	if _cret != nil {
 		_layoutLine = (*LayoutLine)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_layout_line_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_layoutLine)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_layout_line_unref((*C.PangoLayoutLine)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_layout_line_unref((*C.PangoLayoutLine)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -9879,11 +9825,10 @@ func (layout *Layout) LineReadonly(line int) *LayoutLine {
 	if _cret != nil {
 		_layoutLine = (*LayoutLine)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_layout_line_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_layoutLine)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_layout_line_unref((*C.PangoLayoutLine)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_layout_line_unref((*C.PangoLayoutLine)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -9936,11 +9881,10 @@ func (layout *Layout) Lines() []*LayoutLine {
 		var dst *LayoutLine // out
 		dst = (*LayoutLine)(gextras.NewStructNative(unsafe.Pointer(src)))
 		C.pango_layout_line_ref(src)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_layout_line_unref((*C.PangoLayoutLine)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_layout_line_unref((*C.PangoLayoutLine)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_sList = append(_sList, dst)
 	})
@@ -9976,11 +9920,10 @@ func (layout *Layout) LinesReadonly() []*LayoutLine {
 		var dst *LayoutLine // out
 		dst = (*LayoutLine)(gextras.NewStructNative(unsafe.Pointer(src)))
 		C.pango_layout_line_ref(src)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_layout_line_unref((*C.PangoLayoutLine)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_layout_line_unref((*C.PangoLayoutLine)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_sList = append(_sList, dst)
 	})
@@ -10246,11 +10189,10 @@ func (layout *Layout) Tabs() *TabArray {
 
 	if _cret != nil {
 		_tabArray = (*TabArray)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_tabArray)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_tab_array_free((*C.PangoTabArray)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_tab_array_free((*C.PangoTabArray)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -10585,11 +10527,10 @@ func (layout *Layout) Serialize(flags LayoutSerializeFlags) *glib.Bytes {
 	var _bytes *glib.Bytes // out
 
 	_bytes = (*glib.Bytes)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_bytes)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.g_bytes_unref((*C.GBytes)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.g_bytes_unref((*C.GBytes)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _bytes
@@ -11941,11 +11882,10 @@ func (renderer *Renderer) LayoutLine() *LayoutLine {
 	if _cret != nil {
 		_layoutLine = (*LayoutLine)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_layout_line_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_layoutLine)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_layout_line_unref((*C.PangoLayoutLine)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_layout_line_unref((*C.PangoLayoutLine)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -12687,11 +12627,10 @@ func NewAttrFontDesc(desc *FontDescription) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -12754,11 +12693,10 @@ func NewAttrFontFeatures(features string) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -12839,11 +12777,10 @@ func (iterator *AttrIterator) Copy() *AttrIterator {
 	var _attrIterator *AttrIterator // out
 
 	_attrIterator = (*AttrIterator)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attrIterator)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attr_iterator_destroy((*C.PangoAttrIterator)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attr_iterator_destroy((*C.PangoAttrIterator)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attrIterator
@@ -12917,11 +12854,10 @@ func (iterator *AttrIterator) Attrs() []*Attribute {
 		src := (*C.PangoAttribute)(v)
 		var dst *Attribute // out
 		dst = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_sList = append(_sList, dst)
 	})
@@ -12966,11 +12902,10 @@ func (iterator *AttrIterator) Font(desc *FontDescription) (*Language, []*Attribu
 
 	if _arg2 != nil {
 		_language = (*Language)(gextras.NewStructNative(unsafe.Pointer(_arg2)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_language)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.free(intern.C)
-			},
+			func(ptr unsafe.Pointer) { C.free(ptr) },
+			unsafe.Pointer(_arg2),
 		)
 	}
 	if _arg3 != nil {
@@ -13089,11 +13024,10 @@ func NewAttrLanguage(language *Language) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -13135,11 +13069,10 @@ func NewAttrList() *AttrList {
 	var _attrList *AttrList // out
 
 	_attrList = (*AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attrList)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attrList
@@ -13164,7 +13097,6 @@ func (list *AttrList) Change(attr *Attribute) {
 
 	_arg0 = (*C.PangoAttrList)(gextras.StructNative(unsafe.Pointer(list)))
 	_arg1 = (*C.PangoAttribute)(gextras.StructNative(unsafe.Pointer(attr)))
-	runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(attr)), nil)
 
 	C.pango_attr_list_change(_arg0, _arg1)
 	runtime.KeepAlive(list)
@@ -13193,11 +13125,10 @@ func (list *AttrList) Copy() *AttrList {
 
 	if _cret != nil {
 		_attrList = (*AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -13268,11 +13199,10 @@ func (list *AttrList) Filter(fn AttrFilterFunc) *AttrList {
 
 	if _cret != nil {
 		_attrList = (*AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -13301,11 +13231,10 @@ func (list *AttrList) Attributes() []*Attribute {
 		src := (*C.PangoAttribute)(v)
 		var dst *Attribute // out
 		dst = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_sList = append(_sList, dst)
 	})
@@ -13333,11 +13262,10 @@ func (list *AttrList) Iterator() *AttrIterator {
 	var _attrIterator *AttrIterator // out
 
 	_attrIterator = (*AttrIterator)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attrIterator)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attr_iterator_destroy((*C.PangoAttrIterator)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attr_iterator_destroy((*C.PangoAttrIterator)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attrIterator
@@ -13356,7 +13284,6 @@ func (list *AttrList) Insert(attr *Attribute) {
 
 	_arg0 = (*C.PangoAttrList)(gextras.StructNative(unsafe.Pointer(list)))
 	_arg1 = (*C.PangoAttribute)(gextras.StructNative(unsafe.Pointer(attr)))
-	runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(attr)), nil)
 
 	C.pango_attr_list_insert(_arg0, _arg1)
 	runtime.KeepAlive(list)
@@ -13376,7 +13303,6 @@ func (list *AttrList) InsertBefore(attr *Attribute) {
 
 	_arg0 = (*C.PangoAttrList)(gextras.StructNative(unsafe.Pointer(list)))
 	_arg1 = (*C.PangoAttribute)(gextras.StructNative(unsafe.Pointer(attr)))
-	runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(attr)), nil)
 
 	C.pango_attr_list_insert_before(_arg0, _arg1)
 	runtime.KeepAlive(list)
@@ -13549,11 +13475,10 @@ func AttrListFromString(text string) *AttrList {
 
 	if _cret != nil {
 		_attrList = (*AttrList)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_attrList)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_attr_list_unref((*C.PangoAttrList)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_attr_list_unref((*C.PangoAttrList)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -13603,11 +13528,10 @@ func NewAttrShape(inkRect, logicalRect *Rectangle) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -13672,11 +13596,10 @@ func NewAttrSize(size int) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -13704,11 +13627,10 @@ func NewAttrSizeAbsolute(size int) *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -14057,11 +13979,10 @@ func (attr *Attribute) Copy() *Attribute {
 	var _attribute *Attribute // out
 
 	_attribute = (*Attribute)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_attribute)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_attribute_destroy((*C.PangoAttribute)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_attribute_destroy((*C.PangoAttribute)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _attribute
@@ -14235,11 +14156,10 @@ func (src *Color) Copy() *Color {
 
 	if _cret != nil {
 		_color = (*Color)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_color)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_color_free((*C.PangoColor)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_color_free((*C.PangoColor)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -14401,11 +14321,10 @@ func NewFontDescription() *FontDescription {
 	var _fontDescription *FontDescription // out
 
 	_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontDescription
@@ -14479,11 +14398,10 @@ func (desc *FontDescription) Copy() *FontDescription {
 
 	if _cret != nil {
 		_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -14518,11 +14436,10 @@ func (desc *FontDescription) CopyStatic() *FontDescription {
 
 	if _cret != nil {
 		_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15307,11 +15224,10 @@ func FontDescriptionFromString(str string) *FontDescription {
 	var _fontDescription *FontDescription // out
 
 	_fontDescription = (*FontDescription)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_fontDescription)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_font_description_free((*C.PangoFontDescription)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_font_description_free((*C.PangoFontDescription)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _fontDescription
@@ -15844,11 +15760,10 @@ func (glyphItem *GlyphItem) ApplyAttrs(text string, list *AttrList) []*GlyphItem
 		src := (*C.PangoGlyphItem)(v)
 		var dst *GlyphItem // out
 		dst = (*GlyphItem)(gextras.NewStructNative(unsafe.Pointer(src)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(dst)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_glyph_item_free((*C.PangoGlyphItem)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_glyph_item_free((*C.PangoGlyphItem)(ptr)) },
+			unsafe.Pointer(src),
 		)
 		_sList = append(_sList, dst)
 	})
@@ -15876,11 +15791,10 @@ func (orig *GlyphItem) Copy() *GlyphItem {
 
 	if _cret != nil {
 		_glyphItem = (*GlyphItem)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_glyphItem)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_glyph_item_free((*C.PangoGlyphItem)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_glyph_item_free((*C.PangoGlyphItem)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -15928,11 +15842,10 @@ func (orig *GlyphItem) Split(text string, splitIndex int) *GlyphItem {
 
 	if _cret != nil {
 		_glyphItem = (*GlyphItem)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_glyphItem)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_glyph_item_free((*C.PangoGlyphItem)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_glyph_item_free((*C.PangoGlyphItem)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16097,11 +16010,10 @@ func (orig *GlyphItemIter) Copy() *GlyphItemIter {
 
 	if _cret != nil {
 		_glyphItemIter = (*GlyphItemIter)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_glyphItemIter)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_glyph_item_iter_free((*C.PangoGlyphItemIter)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_glyph_item_iter_free((*C.PangoGlyphItemIter)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16265,11 +16177,10 @@ func NewGlyphString() *GlyphString {
 	var _glyphString *GlyphString // out
 
 	_glyphString = (*GlyphString)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_glyphString)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_glyph_string_free((*C.PangoGlyphString)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_glyph_string_free((*C.PangoGlyphString)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _glyphString
@@ -16295,11 +16206,10 @@ func (str *GlyphString) Copy() *GlyphString {
 
 	if _cret != nil {
 		_glyphString = (*GlyphString)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_glyphString)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_glyph_string_free((*C.PangoGlyphString)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_glyph_string_free((*C.PangoGlyphString)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16648,11 +16558,10 @@ func NewItem() *Item {
 	var _item *Item // out
 
 	_item = (*Item)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_item)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_item_free((*C.PangoItem)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_item_free((*C.PangoItem)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _item
@@ -16754,11 +16663,10 @@ func (item *Item) Copy() *Item {
 
 	if _cret != nil {
 		_ret = (*Item)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_ret)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_item_free((*C.PangoItem)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_item_free((*C.PangoItem)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -16804,11 +16712,10 @@ func (orig *Item) Split(splitIndex int, splitOffset int) *Item {
 	var _item *Item // out
 
 	_item = (*Item)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_item)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_item_free((*C.PangoItem)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_item_free((*C.PangoItem)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _item
@@ -17214,11 +17121,10 @@ func (iter *LayoutIter) Copy() *LayoutIter {
 
 	if _cret != nil {
 		_layoutIter = (*LayoutIter)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_layoutIter)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_layout_iter_free((*C.PangoLayoutIter)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_layout_iter_free((*C.PangoLayoutIter)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -17399,11 +17305,10 @@ func (iter *LayoutIter) Line() *LayoutLine {
 	if _cret != nil {
 		_layoutLine = (*LayoutLine)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_layout_line_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_layoutLine)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_layout_line_unref((*C.PangoLayoutLine)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_layout_line_unref((*C.PangoLayoutLine)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -17462,11 +17367,10 @@ func (iter *LayoutIter) LineReadonly() *LayoutLine {
 	if _cret != nil {
 		_layoutLine = (*LayoutLine)(gextras.NewStructNative(unsafe.Pointer(_cret)))
 		C.pango_layout_line_ref(_cret)
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_layoutLine)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_layout_line_unref((*C.PangoLayoutLine)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_layout_line_unref((*C.PangoLayoutLine)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -18260,11 +18164,10 @@ func (matrix *Matrix) Copy() *Matrix {
 
 	if _cret != nil {
 		_ret = (*Matrix)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_ret)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_matrix_free((*C.PangoMatrix)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_matrix_free((*C.PangoMatrix)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
@@ -18591,11 +18494,10 @@ func NewScriptIter(text string) *ScriptIter {
 	var _scriptIter *ScriptIter // out
 
 	_scriptIter = (*ScriptIter)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_scriptIter)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_script_iter_free((*C.PangoScriptIter)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_script_iter_free((*C.PangoScriptIter)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _scriptIter
@@ -18707,11 +18609,10 @@ func NewTabArray(initialSize int, positionsInPixels bool) *TabArray {
 	var _tabArray *TabArray // out
 
 	_tabArray = (*TabArray)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_tabArray)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_tab_array_free((*C.PangoTabArray)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_tab_array_free((*C.PangoTabArray)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _tabArray
@@ -18735,11 +18636,10 @@ func (src *TabArray) Copy() *TabArray {
 	var _tabArray *TabArray // out
 
 	_tabArray = (*TabArray)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-	runtime.SetFinalizer(
+	runtime.AddCleanup(
 		gextras.StructIntern(unsafe.Pointer(_tabArray)),
-		func(intern *struct{ C unsafe.Pointer }) {
-			C.pango_tab_array_free((*C.PangoTabArray)(intern.C))
-		},
+		func(ptr unsafe.Pointer) { C.pango_tab_array_free((*C.PangoTabArray)(ptr)) },
+		unsafe.Pointer(_cret),
 	)
 
 	return _tabArray
@@ -19007,11 +18907,10 @@ func TabArrayFromString(text string) *TabArray {
 
 	if _cret != nil {
 		_tabArray = (*TabArray)(gextras.NewStructNative(unsafe.Pointer(_cret)))
-		runtime.SetFinalizer(
+		runtime.AddCleanup(
 			gextras.StructIntern(unsafe.Pointer(_tabArray)),
-			func(intern *struct{ C unsafe.Pointer }) {
-				C.pango_tab_array_free((*C.PangoTabArray)(intern.C))
-			},
+			func(ptr unsafe.Pointer) { C.pango_tab_array_free((*C.PangoTabArray)(ptr)) },
+			unsafe.Pointer(_cret),
 		)
 	}
 
diff --git a/pkg/pango/pango_export.go b/pkg/pango/pango_export.go
index e090e7e17..c61c45a85 100644
--- a/pkg/pango/pango_export.go
+++ b/pkg/pango/pango_export.go
@@ -3,7 +3,6 @@
 package pango
 
 import (
-	"runtime"
 	"unsafe"
 
 	"github.com/diamondburned/gotk4/pkg/core/gbox"
@@ -134,7 +133,6 @@ func _gotk4_pango1_FontClass_describe(arg0 *C.PangoFont) (cret *C.PangoFontDescr
 	var _ *FontDescription
 
 	cret = (*C.PangoFontDescription)(gextras.StructNative(unsafe.Pointer(fontDescription)))
-	runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(fontDescription)), nil)
 
 	return cret
 }
@@ -152,7 +150,6 @@ func _gotk4_pango1_FontClass_describe_absolute(arg0 *C.PangoFont) (cret *C.Pango
 	var _ *FontDescription
 
 	cret = (*C.PangoFontDescription)(gextras.StructNative(unsafe.Pointer(fontDescription)))
-	runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(fontDescription)), nil)
 
 	return cret
 }
@@ -263,7 +260,6 @@ func _gotk4_pango1_FontFaceClass_describe(arg0 *C.PangoFontFace) (cret *C.PangoF
 	var _ *FontDescription
 
 	cret = (*C.PangoFontDescription)(gextras.StructNative(unsafe.Pointer(fontDescription)))
-	runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(fontDescription)), nil)
 
 	return cret
 }
@@ -609,7 +605,6 @@ func _gotk4_pango1_FontsetClass_get_language(arg0 *C.PangoFontset) (cret *C.Pang
 	var _ *Language
 
 	cret = (*C.PangoLanguage)(gextras.StructNative(unsafe.Pointer(language)))
-	runtime.SetFinalizer(gextras.StructIntern(unsafe.Pointer(language)), nil)
 
 	return cret
 }
diff --git a/pkg/pangocairo/pangocairo_export.go b/pkg/pangocairo/pangocairo_export.go
index e8d177ed6..00063da20 100644
--- a/pkg/pangocairo/pangocairo_export.go
+++ b/pkg/pangocairo/pangocairo_export.go
@@ -33,9 +33,11 @@ func _gotk4_pangocairo1_ShapeRendererFunc(arg1 *C.cairo_t, arg2 *C.PangoAttrShap
 
 	_cr = cairo.WrapContext(uintptr(unsafe.Pointer(arg1)))
 	C.cairo_reference(arg1)
-	runtime.SetFinalizer(_cr, func(v *cairo.Context) {
-		C.cairo_destroy((*C.cairo_t)(unsafe.Pointer(v.Native())))
-	})
+	runtime.AddCleanup(
+		_cr,
+		func(p unsafe.Pointer) { C.cairo_destroy((*C.cairo_t)(p)) },
+		unsafe.Pointer(arg1),
+	)
 	_attr = (*pango.AttrShape)(gextras.NewStructNative(unsafe.Pointer(arg2)))
 	if arg3 != 0 {
 		_doPath = true