diff --git a/gir b/gir
index ea993ed556..8b9d0bb32e 160000
--- a/gir
+++ b/gir
@@ -1 +1 @@
-Subproject commit ea993ed556a1743d16734963df923965e471db5a
+Subproject commit 8b9d0bb32ed3b76ff9931ee283c07d32af955b60
diff --git a/src/assistant.rs b/src/assistant.rs
index 0485113665..49034f03d6 100644
--- a/src/assistant.rs
+++ b/src/assistant.rs
@@ -21,12 +21,10 @@ impl<O: IsA<Assistant>> AssistantExtManual for O {
 }
 
 unsafe extern "C" fn forward_page_trampoline(current_page: i32, f: glib_ffi::gpointer) -> i32 {
-    callback_guard!();
     let f: &&(Fn(i32) -> i32 + 'static) = transmute(f);
     f(current_page)
 }
 
 unsafe extern "C" fn destroy_closure(ptr: glib_ffi::gpointer) {
-    callback_guard!();
     Box_::<Box_<Fn(i32) -> i32 + 'static>>::from_raw(ptr as *mut _);
 }
diff --git a/src/auto/about_dialog.rs b/src/auto/about_dialog.rs
index 91e154a63b..a96555925e 100644
--- a/src/auto/about_dialog.rs
+++ b/src/auto/about_dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -481,112 +481,96 @@ impl<O: IsA<AboutDialog> + IsA<glib::object::Object>> AboutDialogExt for O {
 
 unsafe extern "C" fn activate_link_trampoline<P>(this: *mut ffi::GtkAboutDialog, uri: *mut libc::c_char, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) -> Inhibit + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(uri)).to_glib()
 }
 
 unsafe extern "C" fn notify_artists_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_authors_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_comments_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_copyright_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_documenters_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_license_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_license_type_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_logo_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_logo_icon_name_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_program_name_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_translator_credits_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_version_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_website_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_website_label_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_license_trampoline<P>(this: *mut ffi::GtkAboutDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AboutDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AboutDialog::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/accel_group.rs b/src/auto/accel_group.rs
index 94f953ae6a..2e1b5cfcfe 100644
--- a/src/auto/accel_group.rs
+++ b/src/auto/accel_group.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
@@ -158,21 +158,18 @@ impl<O: IsA<AccelGroup> + IsA<glib::object::Object>> AccelGroupExt for O {
 
 unsafe extern "C" fn accel_activate_trampoline<P>(this: *mut ffi::GtkAccelGroup, acceleratable: *mut gobject_ffi::GObject, keyval: libc::c_uint, modifier: gdk_ffi::GdkModifierType, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<AccelGroup> {
-    callback_guard!();
     let f: &&(Fn(&P, &glib::Object, u32, gdk::ModifierType) -> bool + 'static) = transmute(f);
     f(&AccelGroup::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(acceleratable), keyval, from_glib(modifier)).to_glib()
 }
 
 unsafe extern "C" fn notify_is_locked_trampoline<P>(this: *mut ffi::GtkAccelGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AccelGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AccelGroup::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_modifier_mask_trampoline<P>(this: *mut ffi::GtkAccelGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AccelGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AccelGroup::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/action_bar.rs b/src/auto/action_bar.rs
index 0faf28beca..42ff758b13 100644
--- a/src/auto/action_bar.rs
+++ b/src/auto/action_bar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
diff --git a/src/auto/actionable.rs b/src/auto/actionable.rs
index 8e01743056..b4dba5fa0b 100644
--- a/src/auto/actionable.rs
+++ b/src/auto/actionable.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -90,7 +90,6 @@ impl<O: IsA<Actionable> + IsA<glib::object::Object>> ActionableExt for O {
 
 unsafe extern "C" fn notify_action_name_trampoline<P>(this: *mut ffi::GtkActionable, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Actionable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Actionable::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/adjustment.rs b/src/auto/adjustment.rs
index ca7e402350..bda8932c30 100644
--- a/src/auto/adjustment.rs
+++ b/src/auto/adjustment.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
@@ -257,56 +257,48 @@ impl<O: IsA<Adjustment> + IsA<glib::object::Object>> AdjustmentExt for O {
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GtkAdjustment, f: glib_ffi::gpointer)
 where P: IsA<Adjustment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Adjustment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn value_changed_trampoline<P>(this: *mut ffi::GtkAdjustment, f: glib_ffi::gpointer)
 where P: IsA<Adjustment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Adjustment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_lower_trampoline<P>(this: *mut ffi::GtkAdjustment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Adjustment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Adjustment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_page_increment_trampoline<P>(this: *mut ffi::GtkAdjustment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Adjustment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Adjustment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_page_size_trampoline<P>(this: *mut ffi::GtkAdjustment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Adjustment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Adjustment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_step_increment_trampoline<P>(this: *mut ffi::GtkAdjustment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Adjustment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Adjustment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_upper_trampoline<P>(this: *mut ffi::GtkAdjustment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Adjustment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Adjustment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_value_trampoline<P>(this: *mut ffi::GtkAdjustment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Adjustment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Adjustment::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/alignment.rs b/src/auto/alignment.rs
index 5a4a751c4b..1feb1b5421 100644
--- a/src/auto/alignment.rs
+++ b/src/auto/alignment.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -326,56 +326,48 @@ impl<O: IsA<Alignment> + IsA<glib::object::Object>> AlignmentExt for O {
 
 unsafe extern "C" fn notify_bottom_padding_trampoline<P>(this: *mut ffi::GtkAlignment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Alignment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Alignment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_left_padding_trampoline<P>(this: *mut ffi::GtkAlignment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Alignment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Alignment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_right_padding_trampoline<P>(this: *mut ffi::GtkAlignment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Alignment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Alignment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_top_padding_trampoline<P>(this: *mut ffi::GtkAlignment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Alignment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Alignment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_xalign_trampoline<P>(this: *mut ffi::GtkAlignment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Alignment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Alignment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_xscale_trampoline<P>(this: *mut ffi::GtkAlignment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Alignment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Alignment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_yalign_trampoline<P>(this: *mut ffi::GtkAlignment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Alignment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Alignment::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_yscale_trampoline<P>(this: *mut ffi::GtkAlignment, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Alignment> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Alignment::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/app_chooser_button.rs b/src/auto/app_chooser_button.rs
index 0325b0ce95..4edc522817 100644
--- a/src/auto/app_chooser_button.rs
+++ b/src/auto/app_chooser_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AppChooser;
@@ -161,28 +161,24 @@ impl<O: IsA<AppChooserButton> + IsA<glib::object::Object>> AppChooserButtonExt f
 
 unsafe extern "C" fn custom_item_activated_trampoline<P>(this: *mut ffi::GtkAppChooserButton, item_name: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<AppChooserButton> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&AppChooserButton::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(item_name))
 }
 
 unsafe extern "C" fn notify_heading_trampoline<P>(this: *mut ffi::GtkAppChooserButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_default_item_trampoline<P>(this: *mut ffi::GtkAppChooserButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_dialog_item_trampoline<P>(this: *mut ffi::GtkAppChooserButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/app_chooser_dialog.rs b/src/auto/app_chooser_dialog.rs
index a01ae640da..f871ca1224 100644
--- a/src/auto/app_chooser_dialog.rs
+++ b/src/auto/app_chooser_dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AppChooser;
@@ -115,14 +115,12 @@ impl<O: IsA<AppChooserDialog> + IsA<glib::object::Object>> AppChooserDialogExt f
 
 unsafe extern "C" fn notify_gfile_trampoline<P>(this: *mut ffi::GtkAppChooserDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_heading_trampoline<P>(this: *mut ffi::GtkAppChooserDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserDialog::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/app_chooser_widget.rs b/src/auto/app_chooser_widget.rs
index f0ceb1d33b..d6808dea2a 100644
--- a/src/auto/app_chooser_widget.rs
+++ b/src/auto/app_chooser_widget.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AppChooser;
@@ -234,63 +234,54 @@ impl<O: IsA<AppChooserWidget> + IsA<glib::object::Object>> AppChooserWidgetExt f
 
 unsafe extern "C" fn application_activated_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, application: *mut gio_ffi::GAppInfo, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gio::AppInfo) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(application))
 }
 
 unsafe extern "C" fn application_selected_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, application: *mut gio_ffi::GAppInfo, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gio::AppInfo) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(application))
 }
 
 unsafe extern "C" fn populate_popup_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, menu: *mut ffi::GtkMenu, application: *mut gio_ffi::GAppInfo, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P, &Menu, &gio::AppInfo) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(menu), &from_glib_borrow(application))
 }
 
 unsafe extern "C" fn notify_default_text_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_all_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_default_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_fallback_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_other_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_recommended_trampoline<P>(this: *mut ffi::GtkAppChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AppChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AppChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/application.rs b/src/auto/application.rs
index c88653d5fb..c0934fee2c 100644
--- a/src/auto/application.rs
+++ b/src/auto/application.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ApplicationInhibitFlags;
@@ -318,42 +318,36 @@ impl<O: IsA<Application> + IsA<glib::object::Object>> GtkApplicationExt for O {
 
 unsafe extern "C" fn window_added_trampoline<P>(this: *mut ffi::GtkApplication, window: *mut ffi::GtkWindow, f: glib_ffi::gpointer)
 where P: IsA<Application> {
-    callback_guard!();
     let f: &&(Fn(&P, &Window) + 'static) = transmute(f);
     f(&Application::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(window))
 }
 
 unsafe extern "C" fn window_removed_trampoline<P>(this: *mut ffi::GtkApplication, window: *mut ffi::GtkWindow, f: glib_ffi::gpointer)
 where P: IsA<Application> {
-    callback_guard!();
     let f: &&(Fn(&P, &Window) + 'static) = transmute(f);
     f(&Application::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(window))
 }
 
 unsafe extern "C" fn notify_active_window_trampoline<P>(this: *mut ffi::GtkApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Application> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Application::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_app_menu_trampoline<P>(this: *mut ffi::GtkApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Application> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Application::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_menubar_trampoline<P>(this: *mut ffi::GtkApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Application> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Application::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_register_session_trampoline<P>(this: *mut ffi::GtkApplication, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Application> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Application::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/application_window.rs b/src/auto/application_window.rs
index 116eb9362a..be1f8b9a99 100644
--- a/src/auto/application_window.rs
+++ b/src/auto/application_window.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Application;
@@ -115,7 +115,6 @@ impl<O: IsA<ApplicationWindow> + IsA<glib::object::Object>> ApplicationWindowExt
 
 unsafe extern "C" fn notify_show_menubar_trampoline<P>(this: *mut ffi::GtkApplicationWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ApplicationWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ApplicationWindow::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/arrow.rs b/src/auto/arrow.rs
index e09b3f18f6..068ad78879 100644
--- a/src/auto/arrow.rs
+++ b/src/auto/arrow.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ArrowType;
@@ -112,14 +112,12 @@ impl<O: IsA<Arrow> + IsA<glib::object::Object>> ArrowExt for O {
 
 unsafe extern "C" fn notify_arrow_type_trampoline<P>(this: *mut ffi::GtkArrow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Arrow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Arrow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_shadow_type_trampoline<P>(this: *mut ffi::GtkArrow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Arrow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Arrow::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/aspect_frame.rs b/src/auto/aspect_frame.rs
index 3637a4a6ed..52212c289b 100644
--- a/src/auto/aspect_frame.rs
+++ b/src/auto/aspect_frame.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -168,28 +168,24 @@ impl<O: IsA<AspectFrame> + IsA<glib::object::Object>> AspectFrameExt for O {
 
 unsafe extern "C" fn notify_obey_child_trampoline<P>(this: *mut ffi::GtkAspectFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AspectFrame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AspectFrame::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ratio_trampoline<P>(this: *mut ffi::GtkAspectFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AspectFrame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AspectFrame::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_xalign_trampoline<P>(this: *mut ffi::GtkAspectFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AspectFrame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AspectFrame::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_yalign_trampoline<P>(this: *mut ffi::GtkAspectFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<AspectFrame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AspectFrame::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/assistant.rs b/src/auto/assistant.rs
index 8d2109526f..56d9c5380c 100644
--- a/src/auto/assistant.rs
+++ b/src/auto/assistant.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AssistantPageType;
@@ -392,35 +392,30 @@ impl<O: IsA<Assistant> + IsA<Container> + IsA<glib::object::Object> + glib::obje
 
 unsafe extern "C" fn apply_trampoline<P>(this: *mut ffi::GtkAssistant, f: glib_ffi::gpointer)
 where P: IsA<Assistant> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Assistant::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn cancel_trampoline<P>(this: *mut ffi::GtkAssistant, f: glib_ffi::gpointer)
 where P: IsA<Assistant> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Assistant::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn close_trampoline<P>(this: *mut ffi::GtkAssistant, f: glib_ffi::gpointer)
 where P: IsA<Assistant> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Assistant::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn escape_trampoline<P>(this: *mut ffi::GtkAssistant, f: glib_ffi::gpointer)
 where P: IsA<Assistant> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Assistant::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn prepare_trampoline<P>(this: *mut ffi::GtkAssistant, page: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Assistant> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget) + 'static) = transmute(f);
     f(&Assistant::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(page))
 }
@@ -428,7 +423,6 @@ where P: IsA<Assistant> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_use_header_bar_trampoline<P>(this: *mut ffi::GtkAssistant, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Assistant> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Assistant::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/bin.rs b/src/auto/bin.rs
index 801c4f7cf7..c629ddb000 100644
--- a/src/auto/bin.rs
+++ b/src/auto/bin.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/box_.rs b/src/auto/box_.rs
index 37cb8dc188..be00264fd1 100644
--- a/src/auto/box_.rs
+++ b/src/auto/box_.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_10", feature = "dox"))]
@@ -307,21 +307,18 @@ impl<O: IsA<Box> + IsA<Container> + IsA<glib::object::Object>> BoxExt for O {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn notify_baseline_position_trampoline<P>(this: *mut ffi::GtkBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Box> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Box::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_homogeneous_trampoline<P>(this: *mut ffi::GtkBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Box> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Box::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_spacing_trampoline<P>(this: *mut ffi::GtkBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Box> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Box::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/buildable.rs b/src/auto/buildable.rs
index 42556c99cb..228a8927f9 100644
--- a/src/auto/buildable.rs
+++ b/src/auto/buildable.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Builder;
diff --git a/src/auto/builder.rs b/src/auto/builder.rs
index e2c6fce727..60025c5757 100644
--- a/src/auto/builder.rs
+++ b/src/auto/builder.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_10", feature = "dox"))]
@@ -246,7 +246,6 @@ impl<O: IsA<Builder> + IsA<glib::object::Object>> BuilderExt for O {
 
 unsafe extern "C" fn notify_translation_domain_trampoline<P>(this: *mut ffi::GtkBuilder, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Builder> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Builder::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/button.rs b/src/auto/button.rs
index 5c37955d09..1cb7ef9c63 100644
--- a/src/auto/button.rs
+++ b/src/auto/button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -433,14 +433,12 @@ impl<O: IsA<Button> + IsA<glib::object::Object> + glib::object::ObjectExt> Butto
 
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkButton, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn clicked_trampoline<P>(this: *mut ffi::GtkButton, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
@@ -448,63 +446,54 @@ where P: IsA<Button> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_always_show_image_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_image_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_image_position_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_relief_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_stock_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_underline_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_xalign_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_yalign_trampoline<P>(this: *mut ffi::GtkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Button> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Button::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/button_box.rs b/src/auto/button_box.rs
index 64223a09b8..d9798d4b27 100644
--- a/src/auto/button_box.rs
+++ b/src/auto/button_box.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
@@ -124,7 +124,6 @@ impl<O: IsA<ButtonBox> + IsA<glib::object::Object>> ButtonBoxExt for O {
 
 unsafe extern "C" fn notify_layout_style_trampoline<P>(this: *mut ffi::GtkButtonBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ButtonBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ButtonBox::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/calendar.rs b/src/auto/calendar.rs
index 496718c045..0352a273a1 100644
--- a/src/auto/calendar.rs
+++ b/src/auto/calendar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -478,119 +478,102 @@ impl<O: IsA<Calendar> + IsA<glib::object::Object>> CalendarExt for O {
 
 unsafe extern "C" fn day_selected_trampoline<P>(this: *mut ffi::GtkCalendar, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn day_selected_double_click_trampoline<P>(this: *mut ffi::GtkCalendar, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn month_changed_trampoline<P>(this: *mut ffi::GtkCalendar, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn next_month_trampoline<P>(this: *mut ffi::GtkCalendar, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn next_year_trampoline<P>(this: *mut ffi::GtkCalendar, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn prev_month_trampoline<P>(this: *mut ffi::GtkCalendar, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn prev_year_trampoline<P>(this: *mut ffi::GtkCalendar, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_day_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_detail_height_rows_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_detail_width_chars_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_month_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_no_month_change_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_day_names_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_details_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_heading_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_week_numbers_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_year_trampoline<P>(this: *mut ffi::GtkCalendar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Calendar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Calendar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_area.rs b/src/auto/cell_area.rs
index 77523a2381..9f1c7f461d 100644
--- a/src/auto/cell_area.rs
+++ b/src/auto/cell_area.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -462,7 +462,6 @@ impl<O: IsA<CellArea> + IsA<glib::object::Object>> CellAreaExt for O {
 
 unsafe extern "C" fn add_editable_trampoline<P>(this: *mut ffi::GtkCellArea, renderer: *mut ffi::GtkCellRenderer, editable: *mut ffi::GtkCellEditable, cell_area: *mut gdk_ffi::GdkRectangle, path: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<CellArea> {
-    callback_guard!();
     let f: &&(Fn(&P, &CellRenderer, &CellEditable, &gdk::Rectangle, TreePath) + 'static) = transmute(f);
     let path = from_glib_full(ffi::gtk_tree_path_new_from_string(path));
     f(&CellArea::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(renderer), &from_glib_borrow(editable), &from_glib_borrow(cell_area), path)
@@ -470,14 +469,12 @@ where P: IsA<CellArea> {
 
 unsafe extern "C" fn apply_attributes_trampoline<P>(this: *mut ffi::GtkCellArea, model: *mut ffi::GtkTreeModel, iter: *mut ffi::GtkTreeIter, is_expander: glib_ffi::gboolean, is_expanded: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<CellArea> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreeModel, &TreeIter, bool, bool) + 'static) = transmute(f);
     f(&CellArea::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(model), &from_glib_borrow(iter), from_glib(is_expander), from_glib(is_expanded))
 }
 
 unsafe extern "C" fn focus_changed_trampoline<P>(this: *mut ffi::GtkCellArea, renderer: *mut ffi::GtkCellRenderer, path: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<CellArea> {
-    callback_guard!();
     let f: &&(Fn(&P, &CellRenderer, TreePath) + 'static) = transmute(f);
     let path = from_glib_full(ffi::gtk_tree_path_new_from_string(path));
     f(&CellArea::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(renderer), path)
@@ -485,28 +482,24 @@ where P: IsA<CellArea> {
 
 unsafe extern "C" fn remove_editable_trampoline<P>(this: *mut ffi::GtkCellArea, renderer: *mut ffi::GtkCellRenderer, editable: *mut ffi::GtkCellEditable, f: glib_ffi::gpointer)
 where P: IsA<CellArea> {
-    callback_guard!();
     let f: &&(Fn(&P, &CellRenderer, &CellEditable) + 'static) = transmute(f);
     f(&CellArea::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(renderer), &from_glib_borrow(editable))
 }
 
 unsafe extern "C" fn notify_edit_widget_trampoline<P>(this: *mut ffi::GtkCellArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellArea::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_edited_cell_trampoline<P>(this: *mut ffi::GtkCellArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellArea::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_focus_cell_trampoline<P>(this: *mut ffi::GtkCellArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellArea::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_area_box.rs b/src/auto/cell_area_box.rs
index b9d3cfa236..7698221ca3 100644
--- a/src/auto/cell_area_box.rs
+++ b/src/auto/cell_area_box.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -92,7 +92,6 @@ impl<O: IsA<CellAreaBox> + IsA<glib::object::Object>> CellAreaBoxExt for O {
 
 unsafe extern "C" fn notify_spacing_trampoline<P>(this: *mut ffi::GtkCellAreaBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellAreaBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellAreaBox::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_area_context.rs b/src/auto/cell_area_context.rs
index 06755f561f..60ad5da788 100644
--- a/src/auto/cell_area_context.rs
+++ b/src/auto/cell_area_context.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellArea;
@@ -218,35 +218,30 @@ impl<O: IsA<CellAreaContext> + IsA<glib::object::Object>> CellAreaContextExt for
 
 unsafe extern "C" fn notify_area_trampoline<P>(this: *mut ffi::GtkCellAreaContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellAreaContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellAreaContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_minimum_height_trampoline<P>(this: *mut ffi::GtkCellAreaContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellAreaContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellAreaContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_minimum_width_trampoline<P>(this: *mut ffi::GtkCellAreaContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellAreaContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellAreaContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_natural_height_trampoline<P>(this: *mut ffi::GtkCellAreaContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellAreaContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellAreaContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_natural_width_trampoline<P>(this: *mut ffi::GtkCellAreaContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellAreaContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellAreaContext::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_editable.rs b/src/auto/cell_editable.rs
index 755f0fd432..f40a384ffb 100644
--- a/src/auto/cell_editable.rs
+++ b/src/auto/cell_editable.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -108,21 +108,18 @@ impl<O: IsA<CellEditable> + IsA<glib::object::Object>> CellEditableExt for O {
 
 unsafe extern "C" fn editing_done_trampoline<P>(this: *mut ffi::GtkCellEditable, f: glib_ffi::gpointer)
 where P: IsA<CellEditable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellEditable::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn remove_widget_trampoline<P>(this: *mut ffi::GtkCellEditable, f: glib_ffi::gpointer)
 where P: IsA<CellEditable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellEditable::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_editing_canceled_trampoline<P>(this: *mut ffi::GtkCellEditable, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellEditable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellEditable::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_layout.rs b/src/auto/cell_layout.rs
index aa9ffca35e..3b52dc485e 100644
--- a/src/auto/cell_layout.rs
+++ b/src/auto/cell_layout.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellArea;
diff --git a/src/auto/cell_renderer.rs b/src/auto/cell_renderer.rs
index f5a2f8e2d9..fd278df001 100644
--- a/src/auto/cell_renderer.rs
+++ b/src/auto/cell_renderer.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellEditable;
@@ -642,14 +642,12 @@ impl<O: IsA<CellRenderer> + IsA<glib::object::Object>> CellRendererExt for O {
 
 unsafe extern "C" fn editing_canceled_trampoline<P>(this: *mut ffi::GtkCellRenderer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn editing_started_trampoline<P>(this: *mut ffi::GtkCellRenderer, editable: *mut ffi::GtkCellEditable, path: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P, &CellEditable, TreePath) + 'static) = transmute(f);
     let path = from_glib_full(ffi::gtk_tree_path_new_from_string(path));
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(editable), path)
@@ -657,105 +655,90 @@ where P: IsA<CellRenderer> {
 
 unsafe extern "C" fn notify_cell_background_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cell_background_rgba_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cell_background_set_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_editing_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_height_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_is_expanded_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_is_expander_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mode_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_sensitive_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_xalign_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_xpad_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_yalign_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ypad_trampoline<P>(this: *mut ffi::GtkCellRenderer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRenderer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRenderer::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_renderer_accel.rs b/src/auto/cell_renderer_accel.rs
index 66012a83fb..6feaa64aa6 100644
--- a/src/auto/cell_renderer_accel.rs
+++ b/src/auto/cell_renderer_accel.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellRenderer;
@@ -186,7 +186,6 @@ impl<O: IsA<CellRendererAccel> + IsA<glib::object::Object>> CellRendererAccelExt
 
 unsafe extern "C" fn accel_cleared_trampoline<P>(this: *mut ffi::GtkCellRendererAccel, path_string: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<CellRendererAccel> {
-    callback_guard!();
     let f: &&(Fn(&P, TreePath) + 'static) = transmute(f);
     let path = from_glib_full(ffi::gtk_tree_path_new_from_string(path_string));
     f(&CellRendererAccel::from_glib_borrow(this).downcast_unchecked(), path)
@@ -194,7 +193,6 @@ where P: IsA<CellRendererAccel> {
 
 unsafe extern "C" fn accel_edited_trampoline<P>(this: *mut ffi::GtkCellRendererAccel, path_string: *mut libc::c_char, accel_key: libc::c_uint, accel_mods: gdk_ffi::GdkModifierType, hardware_keycode: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<CellRendererAccel> {
-    callback_guard!();
     let f: &&(Fn(&P, TreePath, u32, gdk::ModifierType, u32) + 'static) = transmute(f);
     let path = from_glib_full(ffi::gtk_tree_path_new_from_string(path_string));
     f(&CellRendererAccel::from_glib_borrow(this).downcast_unchecked(), path, accel_key, from_glib(accel_mods), hardware_keycode)
@@ -202,28 +200,24 @@ where P: IsA<CellRendererAccel> {
 
 unsafe extern "C" fn notify_accel_key_trampoline<P>(this: *mut ffi::GtkCellRendererAccel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererAccel> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererAccel::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_accel_mode_trampoline<P>(this: *mut ffi::GtkCellRendererAccel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererAccel> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererAccel::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_accel_mods_trampoline<P>(this: *mut ffi::GtkCellRendererAccel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererAccel> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererAccel::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_keycode_trampoline<P>(this: *mut ffi::GtkCellRendererAccel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererAccel> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererAccel::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_renderer_combo.rs b/src/auto/cell_renderer_combo.rs
index cf9e96971d..e8bceba8ca 100644
--- a/src/auto/cell_renderer_combo.rs
+++ b/src/auto/cell_renderer_combo.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellRenderer;
@@ -147,7 +147,6 @@ impl<O: IsA<CellRendererCombo> + IsA<glib::object::Object>> CellRendererComboExt
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GtkCellRendererCombo, path_string: *mut libc::c_char, new_iter: *mut ffi::GtkTreeIter, f: glib_ffi::gpointer)
 where P: IsA<CellRendererCombo> {
-    callback_guard!();
     let f: &&(Fn(&P, TreePath, &TreeIter) + 'static) = transmute(f);
     let path = from_glib_full(ffi::gtk_tree_path_new_from_string(path_string));
     f(&CellRendererCombo::from_glib_borrow(this).downcast_unchecked(), path, &from_glib_borrow(new_iter))
@@ -155,21 +154,18 @@ where P: IsA<CellRendererCombo> {
 
 unsafe extern "C" fn notify_has_entry_trampoline<P>(this: *mut ffi::GtkCellRendererCombo, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererCombo> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererCombo::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_model_trampoline<P>(this: *mut ffi::GtkCellRendererCombo, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererCombo> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererCombo::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_column_trampoline<P>(this: *mut ffi::GtkCellRendererCombo, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererCombo> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererCombo::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_renderer_pixbuf.rs b/src/auto/cell_renderer_pixbuf.rs
index 379d834980..e698af659e 100644
--- a/src/auto/cell_renderer_pixbuf.rs
+++ b/src/auto/cell_renderer_pixbuf.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellRenderer;
@@ -308,63 +308,54 @@ impl<O: IsA<CellRendererPixbuf> + IsA<glib::object::Object>> CellRendererPixbufE
 
 unsafe extern "C" fn notify_follow_state_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gicon_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_name_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixbuf_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixbuf_expander_closed_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixbuf_expander_open_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stock_detail_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stock_id_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stock_size_trampoline<P>(this: *mut ffi::GtkCellRendererPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererPixbuf> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererPixbuf::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_renderer_progress.rs b/src/auto/cell_renderer_progress.rs
index 83745e4950..a9b5352491 100644
--- a/src/auto/cell_renderer_progress.rs
+++ b/src/auto/cell_renderer_progress.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellRenderer;
@@ -217,42 +217,36 @@ impl<O: IsA<CellRendererProgress> + IsA<glib::object::Object>> CellRendererProgr
 
 unsafe extern "C" fn notify_inverted_trampoline<P>(this: *mut ffi::GtkCellRendererProgress, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererProgress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererProgress::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pulse_trampoline<P>(this: *mut ffi::GtkCellRendererProgress, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererProgress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererProgress::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_trampoline<P>(this: *mut ffi::GtkCellRendererProgress, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererProgress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererProgress::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_xalign_trampoline<P>(this: *mut ffi::GtkCellRendererProgress, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererProgress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererProgress::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_yalign_trampoline<P>(this: *mut ffi::GtkCellRendererProgress, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererProgress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererProgress::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_value_trampoline<P>(this: *mut ffi::GtkCellRendererProgress, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererProgress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererProgress::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_renderer_spin.rs b/src/auto/cell_renderer_spin.rs
index b7a9b840f6..496b320e05 100644
--- a/src/auto/cell_renderer_spin.rs
+++ b/src/auto/cell_renderer_spin.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -134,21 +134,18 @@ impl<O: IsA<CellRendererSpin> + IsA<glib::object::Object>> CellRendererSpinExt f
 
 unsafe extern "C" fn notify_adjustment_trampoline<P>(this: *mut ffi::GtkCellRendererSpin, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererSpin> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererSpin::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_climb_rate_trampoline<P>(this: *mut ffi::GtkCellRendererSpin, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererSpin> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererSpin::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_digits_trampoline<P>(this: *mut ffi::GtkCellRendererSpin, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererSpin> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererSpin::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_renderer_spinner.rs b/src/auto/cell_renderer_spinner.rs
index d5a32ce0fb..3c972146e0 100644
--- a/src/auto/cell_renderer_spinner.rs
+++ b/src/auto/cell_renderer_spinner.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellRenderer;
@@ -133,21 +133,18 @@ impl<O: IsA<CellRendererSpinner> + IsA<glib::object::Object>> CellRendererSpinne
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkCellRendererSpinner, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererSpinner> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererSpinner::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pulse_trampoline<P>(this: *mut ffi::GtkCellRendererSpinner, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererSpinner> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererSpinner::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_trampoline<P>(this: *mut ffi::GtkCellRendererSpinner, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererSpinner> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererSpinner::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_renderer_text.rs b/src/auto/cell_renderer_text.rs
index 89dd533c77..ca930141ec 100644
--- a/src/auto/cell_renderer_text.rs
+++ b/src/auto/cell_renderer_text.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellRenderer;
@@ -1272,7 +1272,6 @@ impl<O: IsA<CellRendererText> + IsA<glib::object::Object>> CellRendererTextExt f
 
 unsafe extern "C" fn edited_trampoline<P>(this: *mut ffi::GtkCellRendererText, path: *mut libc::c_char, new_text: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P, TreePath, &str) + 'static) = transmute(f);
     let path = from_glib_full(ffi::gtk_tree_path_new_from_string(path));
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked(), path, &String::from_glib_none(new_text))
@@ -1280,308 +1279,264 @@ where P: IsA<CellRendererText> {
 
 unsafe extern "C" fn notify_align_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_alignment_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_rgba_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_editable_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_editable_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ellipsize_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ellipsize_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_family_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_family_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_font_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_foreground_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_foreground_rgba_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_foreground_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_language_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_language_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_markup_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_max_width_chars_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_placeholder_text_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rise_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rise_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_scale_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_scale_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_single_paragraph_mode_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_points_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stretch_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stretch_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_strikethrough_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_strikethrough_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_style_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_style_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_underline_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_underline_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_variant_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_variant_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_weight_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_weight_set_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_chars_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_mode_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_width_trampoline<P>(this: *mut ffi::GtkCellRendererText, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererText> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererText::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_renderer_toggle.rs b/src/auto/cell_renderer_toggle.rs
index 93539cea32..01f05fe76f 100644
--- a/src/auto/cell_renderer_toggle.rs
+++ b/src/auto/cell_renderer_toggle.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CellRenderer;
@@ -194,7 +194,6 @@ impl<O: IsA<CellRendererToggle> + IsA<glib::object::Object>> CellRendererToggleE
 
 unsafe extern "C" fn toggled_trampoline<P>(this: *mut ffi::GtkCellRendererToggle, path: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<CellRendererToggle> {
-    callback_guard!();
     let f: &&(Fn(&P, TreePath) + 'static) = transmute(f);
     let path = from_glib_full(ffi::gtk_tree_path_new_from_string(path));
     f(&CellRendererToggle::from_glib_borrow(this).downcast_unchecked(), path)
@@ -202,35 +201,30 @@ where P: IsA<CellRendererToggle> {
 
 unsafe extern "C" fn notify_activatable_trampoline<P>(this: *mut ffi::GtkCellRendererToggle, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererToggle> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererToggle::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkCellRendererToggle, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererToggle> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererToggle::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_inconsistent_trampoline<P>(this: *mut ffi::GtkCellRendererToggle, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererToggle> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererToggle::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_indicator_size_trampoline<P>(this: *mut ffi::GtkCellRendererToggle, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererToggle> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererToggle::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_radio_trampoline<P>(this: *mut ffi::GtkCellRendererToggle, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellRendererToggle> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellRendererToggle::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/cell_view.rs b/src/auto/cell_view.rs
index 4294de13bf..75bd2f85e7 100644
--- a/src/auto/cell_view.rs
+++ b/src/auto/cell_view.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -295,56 +295,48 @@ impl<O: IsA<CellView> + IsA<glib::object::Object>> CellViewExt for O {
 
 unsafe extern "C" fn notify_background_trampoline<P>(this: *mut ffi::GtkCellView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_rgba_trampoline<P>(this: *mut ffi::GtkCellView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_set_trampoline<P>(this: *mut ffi::GtkCellView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cell_area_trampoline<P>(this: *mut ffi::GtkCellView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cell_area_context_trampoline<P>(this: *mut ffi::GtkCellView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_draw_sensitive_trampoline<P>(this: *mut ffi::GtkCellView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_fit_model_trampoline<P>(this: *mut ffi::GtkCellView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_model_trampoline<P>(this: *mut ffi::GtkCellView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CellView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CellView::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/check_button.rs b/src/auto/check_button.rs
index e141200653..9c6bf561ad 100644
--- a/src/auto/check_button.rs
+++ b/src/auto/check_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
diff --git a/src/auto/check_menu_item.rs b/src/auto/check_menu_item.rs
index 4f0b229141..7a2ce61154 100644
--- a/src/auto/check_menu_item.rs
+++ b/src/auto/check_menu_item.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -161,28 +161,24 @@ impl<O: IsA<CheckMenuItem> + IsA<glib::object::Object>> CheckMenuItemExt for O {
 
 unsafe extern "C" fn toggled_trampoline<P>(this: *mut ffi::GtkCheckMenuItem, f: glib_ffi::gpointer)
 where P: IsA<CheckMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CheckMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkCheckMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CheckMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CheckMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_draw_as_radio_trampoline<P>(this: *mut ffi::GtkCheckMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CheckMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CheckMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_inconsistent_trampoline<P>(this: *mut ffi::GtkCheckMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<CheckMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CheckMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/clipboard.rs b/src/auto/clipboard.rs
index d262fab923..0c5fc1c84a 100644
--- a/src/auto/clipboard.rs
+++ b/src/auto/clipboard.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use SelectionData;
diff --git a/src/auto/color_button.rs b/src/auto/color_button.rs
index 04899cd2be..990645c803 100644
--- a/src/auto/color_button.rs
+++ b/src/auto/color_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -186,21 +186,18 @@ impl<O: IsA<ColorButton> + IsA<glib::object::Object>> ColorButtonExt for O {
 
 unsafe extern "C" fn color_set_trampoline<P>(this: *mut ffi::GtkColorButton, f: glib_ffi::gpointer)
 where P: IsA<ColorButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_alpha_trampoline<P>(this: *mut ffi::GtkColorButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rgba_trampoline<P>(this: *mut ffi::GtkColorButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -208,21 +205,18 @@ where P: IsA<ColorButton> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_show_editor_trampoline<P>(this: *mut ffi::GtkColorButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::GtkColorButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_alpha_trampoline<P>(this: *mut ffi::GtkColorButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/color_chooser.rs b/src/auto/color_chooser.rs
index afc37cc74a..1758db154f 100644
--- a/src/auto/color_chooser.rs
+++ b/src/auto/color_chooser.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
@@ -96,21 +96,18 @@ impl<O: IsA<ColorChooser> + IsA<glib::object::Object>> ColorChooserExt for O {
 
 unsafe extern "C" fn color_activated_trampoline<P>(this: *mut ffi::GtkColorChooser, color: *mut gdk_ffi::GdkRGBA, f: glib_ffi::gpointer)
 where P: IsA<ColorChooser> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::RGBA) + 'static) = transmute(f);
     f(&ColorChooser::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(color))
 }
 
 unsafe extern "C" fn notify_rgba_trampoline<P>(this: *mut ffi::GtkColorChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_alpha_trampoline<P>(this: *mut ffi::GtkColorChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorChooser::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/color_chooser_dialog.rs b/src/auto/color_chooser_dialog.rs
index 843d516348..a044ae9d9c 100644
--- a/src/auto/color_chooser_dialog.rs
+++ b/src/auto/color_chooser_dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -80,7 +80,6 @@ impl<O: IsA<ColorChooserDialog> + IsA<glib::object::Object>> ColorChooserDialogE
 
 unsafe extern "C" fn notify_show_editor_trampoline<P>(this: *mut ffi::GtkColorChooserDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorChooserDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorChooserDialog::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/color_chooser_widget.rs b/src/auto/color_chooser_widget.rs
index c69b39ff3b..7fe35d880a 100644
--- a/src/auto/color_chooser_widget.rs
+++ b/src/auto/color_chooser_widget.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
@@ -81,7 +81,6 @@ impl<O: IsA<ColorChooserWidget> + IsA<glib::object::Object>> ColorChooserWidgetE
 
 unsafe extern "C" fn notify_show_editor_trampoline<P>(this: *mut ffi::GtkColorChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/combo_box.rs b/src/auto/combo_box.rs
index c9c7b8fb3b..862396cbae 100644
--- a/src/auto/combo_box.rs
+++ b/src/auto/combo_box.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -675,147 +675,126 @@ impl<O: IsA<ComboBox> + IsA<glib::object::Object> + glib::object::ObjectExt> Com
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GtkComboBox, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn format_entry_text_trampoline<P>(this: *mut ffi::GtkComboBox, path: *mut libc::c_char, f: glib_ffi::gpointer) -> *mut libc::c_char
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) -> String + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(path)).to_glib_full()
 }
 
 unsafe extern "C" fn move_active_trampoline<P>(this: *mut ffi::GtkComboBox, scroll_type: ffi::GtkScrollType, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P, ScrollType) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked(), from_glib(scroll_type))
 }
 
 unsafe extern "C" fn popdown_trampoline<P>(this: *mut ffi::GtkComboBox, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn popup_trampoline<P>(this: *mut ffi::GtkComboBox, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_active_id_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_add_tearoffs_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_button_sensitivity_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cell_area_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_column_span_column_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_entry_text_column_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_entry_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_frame_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_id_column_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_model_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_popup_fixed_width_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_popup_shown_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_row_span_column_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tearoff_title_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_width_trampoline<P>(this: *mut ffi::GtkComboBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ComboBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ComboBox::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/combo_box_text.rs b/src/auto/combo_box_text.rs
index 0361d612eb..cfe6d77782 100644
--- a/src/auto/combo_box_text.rs
+++ b/src/auto/combo_box_text.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
diff --git a/src/auto/container.rs b/src/auto/container.rs
index 17b716bf61..a35597bf0f 100644
--- a/src/auto/container.rs
+++ b/src/auto/container.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -350,49 +350,42 @@ impl<O: IsA<Container> + IsA<glib::object::Object>> ContainerExt for O {
 
 unsafe extern "C" fn add_trampoline<P>(this: *mut ffi::GtkContainer, object: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Container> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget) + 'static) = transmute(f);
     f(&Container::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn check_resize_trampoline<P>(this: *mut ffi::GtkContainer, f: glib_ffi::gpointer)
 where P: IsA<Container> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Container::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn remove_trampoline<P>(this: *mut ffi::GtkContainer, object: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Container> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget) + 'static) = transmute(f);
     f(&Container::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn set_focus_child_trampoline<P>(this: *mut ffi::GtkContainer, object: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Container> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget) + 'static) = transmute(f);
     f(&Container::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn notify_border_width_trampoline<P>(this: *mut ffi::GtkContainer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Container> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Container::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_child_trampoline<P>(this: *mut ffi::GtkContainer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Container> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Container::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_resize_mode_trampoline<P>(this: *mut ffi::GtkContainer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Container> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Container::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/css_provider.rs b/src/auto/css_provider.rs
index 316b0c7495..9b5f03fc47 100644
--- a/src/auto/css_provider.rs
+++ b/src/auto/css_provider.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CssSection;
@@ -132,7 +132,6 @@ impl<O: IsA<CssProvider> + IsA<glib::object::Object>> CssProviderExt for O {
 
 unsafe extern "C" fn parsing_error_trampoline<P>(this: *mut ffi::GtkCssProvider, section: *mut ffi::GtkCssSection, error: *mut glib_ffi::GError, f: glib_ffi::gpointer)
 where P: IsA<CssProvider> {
-    callback_guard!();
     let f: &&(Fn(&P, &CssSection, &Error) + 'static) = transmute(f);
     f(&CssProvider::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(section), &from_glib_borrow(error))
 }
diff --git a/src/auto/css_section.rs b/src/auto/css_section.rs
index 65905853fa..f50f6c085c 100644
--- a/src/auto/css_section.rs
+++ b/src/auto/css_section.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CssSectionType;
diff --git a/src/auto/dialog.rs b/src/auto/dialog.rs
index 27946c4eff..99a2121817 100644
--- a/src/auto/dialog.rs
+++ b/src/auto/dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -224,14 +224,12 @@ impl<O: IsA<Dialog> + IsA<glib::object::Object> + glib::object::ObjectExt> Dialo
 
 unsafe extern "C" fn close_trampoline<P>(this: *mut ffi::GtkDialog, f: glib_ffi::gpointer)
 where P: IsA<Dialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Dialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn response_trampoline<P>(this: *mut ffi::GtkDialog, response_id: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<Dialog> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + 'static) = transmute(f);
     f(&Dialog::from_glib_borrow(this).downcast_unchecked(), response_id)
 }
@@ -239,7 +237,6 @@ where P: IsA<Dialog> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_use_header_bar_trampoline<P>(this: *mut ffi::GtkDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Dialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Dialog::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/drawing_area.rs b/src/auto/drawing_area.rs
index d1b0f30923..f07244c31d 100644
--- a/src/auto/drawing_area.rs
+++ b/src/auto/drawing_area.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/editable.rs b/src/auto/editable.rs
index fd641f5bc8..c7e589f163 100644
--- a/src/auto/editable.rs
+++ b/src/auto/editable.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
diff --git a/src/auto/entry.rs b/src/auto/entry.rs
index eabbf02514..c31325462c 100644
--- a/src/auto/entry.rs
+++ b/src/auto/entry.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -1877,98 +1877,84 @@ impl<O: IsA<Entry> + IsA<glib::object::Object> + glib::object::ObjectExt> EntryE
 
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkEntry, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn backspace_trampoline<P>(this: *mut ffi::GtkEntry, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn copy_clipboard_trampoline<P>(this: *mut ffi::GtkEntry, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn cut_clipboard_trampoline<P>(this: *mut ffi::GtkEntry, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn delete_from_cursor_trampoline<P>(this: *mut ffi::GtkEntry, type_: ffi::GtkDeleteType, count: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P, DeleteType, i32) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked(), from_glib(type_), count)
 }
 
 unsafe extern "C" fn icon_press_trampoline<P>(this: *mut ffi::GtkEntry, icon_pos: ffi::GtkEntryIconPosition, event: *mut gdk_ffi::GdkEventButton, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P, EntryIconPosition, &gdk::EventButton) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked(), from_glib(icon_pos), &from_glib_borrow(event))
 }
 
 unsafe extern "C" fn icon_release_trampoline<P>(this: *mut ffi::GtkEntry, icon_pos: ffi::GtkEntryIconPosition, event: *mut gdk_ffi::GdkEventButton, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P, EntryIconPosition, &gdk::EventButton) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked(), from_glib(icon_pos), &from_glib_borrow(event))
 }
 
 unsafe extern "C" fn insert_at_cursor_trampoline<P>(this: *mut ffi::GtkEntry, string: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(string))
 }
 
 unsafe extern "C" fn move_cursor_trampoline<P>(this: *mut ffi::GtkEntry, step: ffi::GtkMovementStep, count: libc::c_int, extend_selection: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P, MovementStep, i32, bool) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked(), from_glib(step), count, from_glib(extend_selection))
 }
 
 unsafe extern "C" fn paste_clipboard_trampoline<P>(this: *mut ffi::GtkEntry, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn populate_popup_trampoline<P>(this: *mut ffi::GtkEntry, widget: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(widget))
 }
 
 unsafe extern "C" fn preedit_changed_trampoline<P>(this: *mut ffi::GtkEntry, preedit: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(preedit))
 }
 
 unsafe extern "C" fn toggle_overwrite_trampoline<P>(this: *mut ffi::GtkEntry, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_activates_default_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1976,56 +1962,48 @@ where P: IsA<Entry> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_attributes_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_buffer_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_caps_lock_warning_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_completion_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cursor_position_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_editable_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_frame_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_im_module_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2033,7 +2011,6 @@ where P: IsA<Entry> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_input_hints_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2041,28 +2018,24 @@ where P: IsA<Entry> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_input_purpose_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_invisible_char_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_invisible_char_set_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_max_length_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2070,21 +2043,18 @@ where P: IsA<Entry> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_max_width_chars_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_overwrite_mode_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_placeholder_text_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2092,217 +2062,186 @@ where P: IsA<Entry> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_populate_all_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_activatable_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_gicon_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_name_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_pixbuf_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_sensitive_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_stock_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_storage_type_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_tooltip_markup_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_primary_icon_tooltip_text_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_progress_fraction_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_progress_pulse_step_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_scroll_offset_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_activatable_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_gicon_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_name_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_pixbuf_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_sensitive_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_stock_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_storage_type_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_tooltip_markup_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_icon_tooltip_text_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_selection_bound_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_shadow_type_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_emoji_icon_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_length_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_truncate_multiline_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visibility_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_chars_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_xalign_trampoline<P>(this: *mut ffi::GtkEntry, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Entry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Entry::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/entry_completion.rs b/src/auto/entry_completion.rs
index 8db551219a..c59bd88df8 100644
--- a/src/auto/entry_completion.rs
+++ b/src/auto/entry_completion.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -414,28 +414,24 @@ impl<O: IsA<EntryCompletion> + IsA<glib::object::Object>> EntryCompletionExt for
 
 unsafe extern "C" fn action_activated_trampoline<P>(this: *mut ffi::GtkEntryCompletion, index: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked(), index)
 }
 
 unsafe extern "C" fn cursor_on_match_trampoline<P>(this: *mut ffi::GtkEntryCompletion, model: *mut ffi::GtkTreeModel, iter: *mut ffi::GtkTreeIter, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreeModel, &TreeIter) -> Inhibit + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(model), &from_glib_borrow(iter)).to_glib()
 }
 
 unsafe extern "C" fn insert_prefix_trampoline<P>(this: *mut ffi::GtkEntryCompletion, prefix: *mut libc::c_char, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) -> Inhibit + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(prefix)).to_glib()
 }
 
 unsafe extern "C" fn match_selected_trampoline<P>(this: *mut ffi::GtkEntryCompletion, model: *mut ffi::GtkTreeModel, iter: *mut ffi::GtkTreeIter, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreeModel, &TreeIter) -> Inhibit + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(model), &from_glib_borrow(iter)).to_glib()
 }
@@ -443,70 +439,60 @@ where P: IsA<EntryCompletion> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn no_matches_trampoline<P>(this: *mut ffi::GtkEntryCompletion, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cell_area_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_inline_completion_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_inline_selection_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_minimum_key_length_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_model_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_popup_completion_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_popup_set_width_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_popup_single_match_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_column_trampoline<P>(this: *mut ffi::GtkEntryCompletion, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EntryCompletion> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EntryCompletion::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/enums.rs b/src/auto/enums.rs
index cf39503318..4cfb93a71e 100644
--- a/src/auto/enums.rs
+++ b/src/auto/enums.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
diff --git a/src/auto/event_box.rs b/src/auto/event_box.rs
index 2c9444950f..0b0bb84cf1 100644
--- a/src/auto/event_box.rs
+++ b/src/auto/event_box.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -101,14 +101,12 @@ impl<O: IsA<EventBox> + IsA<glib::object::Object>> EventBoxExt for O {
 
 unsafe extern "C" fn notify_above_child_trampoline<P>(this: *mut ffi::GtkEventBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EventBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EventBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_window_trampoline<P>(this: *mut ffi::GtkEventBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EventBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EventBox::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/event_controller.rs b/src/auto/event_controller.rs
index b74aaaad48..08d09becf0 100644
--- a/src/auto/event_controller.rs
+++ b/src/auto/event_controller.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_14", feature = "dox"))]
@@ -116,7 +116,6 @@ impl<O: IsA<EventController> + IsA<glib::object::Object>> EventControllerExt for
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_propagation_phase_trampoline<P>(this: *mut ffi::GtkEventController, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EventController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EventController::from_glib_borrow(this).downcast_unchecked())
 }
@@ -124,7 +123,6 @@ where P: IsA<EventController> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_widget_trampoline<P>(this: *mut ffi::GtkEventController, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EventController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EventController::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/expander.rs b/src/auto/expander.rs
index e5560dc758..c63e24059b 100644
--- a/src/auto/expander.rs
+++ b/src/auto/expander.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -283,63 +283,54 @@ impl<O: IsA<Expander> + IsA<glib::object::Object> + glib::object::ObjectExt> Exp
 
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkExpander, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_expanded_trampoline<P>(this: *mut ffi::GtkExpander, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_trampoline<P>(this: *mut ffi::GtkExpander, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_fill_trampoline<P>(this: *mut ffi::GtkExpander, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_widget_trampoline<P>(this: *mut ffi::GtkExpander, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_resize_toplevel_trampoline<P>(this: *mut ffi::GtkExpander, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_spacing_trampoline<P>(this: *mut ffi::GtkExpander, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_markup_trampoline<P>(this: *mut ffi::GtkExpander, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_underline_trampoline<P>(this: *mut ffi::GtkExpander, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Expander> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Expander::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/file_chooser.rs b/src/auto/file_chooser.rs
index 190b46640d..7d6ab7852a 100644
--- a/src/auto/file_chooser.rs
+++ b/src/auto/file_chooser.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
@@ -715,112 +715,96 @@ impl<O: IsA<FileChooser> + IsA<glib::object::Object>> FileChooserExt for O {
 
 unsafe extern "C" fn confirm_overwrite_trampoline<P>(this: *mut ffi::GtkFileChooser, f: glib_ffi::gpointer) -> ffi::GtkFileChooserConfirmation
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) -> FileChooserConfirmation + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn current_folder_changed_trampoline<P>(this: *mut ffi::GtkFileChooser, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn file_activated_trampoline<P>(this: *mut ffi::GtkFileChooser, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn selection_changed_trampoline<P>(this: *mut ffi::GtkFileChooser, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn update_preview_trampoline<P>(this: *mut ffi::GtkFileChooser, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_action_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_create_folders_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_do_overwrite_confirmation_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_extra_widget_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_filter_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_local_only_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_preview_widget_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_preview_widget_active_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_select_multiple_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_hidden_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_preview_label_trampoline<P>(this: *mut ffi::GtkFileChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooser::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/file_chooser_button.rs b/src/auto/file_chooser_button.rs
index 54b0c02c63..e81a327814 100644
--- a/src/auto/file_chooser_button.rs
+++ b/src/auto/file_chooser_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
@@ -148,28 +148,24 @@ impl<O: IsA<FileChooserButton> + IsA<glib::object::Object>> FileChooserButtonExt
 
 unsafe extern "C" fn file_set_trampoline<P>(this: *mut ffi::GtkFileChooserButton, f: glib_ffi::gpointer)
 where P: IsA<FileChooserButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_dialog_trampoline<P>(this: *mut ffi::GtkFileChooserButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::GtkFileChooserButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_chars_trampoline<P>(this: *mut ffi::GtkFileChooserButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/file_chooser_dialog.rs b/src/auto/file_chooser_dialog.rs
index 33e4902ba2..ed492d1348 100644
--- a/src/auto/file_chooser_dialog.rs
+++ b/src/auto/file_chooser_dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
diff --git a/src/auto/file_chooser_native.rs b/src/auto/file_chooser_native.rs
index 34c5febc32..446e5e31b6 100644
--- a/src/auto/file_chooser_native.rs
+++ b/src/auto/file_chooser_native.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use FileChooser;
@@ -156,14 +156,12 @@ impl<O: IsA<FileChooserNative> + IsA<glib::object::Object>> FileChooserNativeExt
 
 unsafe extern "C" fn notify_accept_label_trampoline<P>(this: *mut ffi::GtkFileChooserNative, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserNative> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserNative::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cancel_label_trampoline<P>(this: *mut ffi::GtkFileChooserNative, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserNative> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserNative::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/file_chooser_widget.rs b/src/auto/file_chooser_widget.rs
index b7510d1528..bdeb36fedd 100644
--- a/src/auto/file_chooser_widget.rs
+++ b/src/auto/file_chooser_widget.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
@@ -289,98 +289,84 @@ impl<O: IsA<FileChooserWidget> + IsA<glib::object::Object> + glib::object::Objec
 
 unsafe extern "C" fn desktop_folder_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn down_folder_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn home_folder_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn location_popup_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, path: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(path))
 }
 
 unsafe extern "C" fn location_popup_on_paste_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn location_toggle_popup_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn places_shortcut_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn quick_bookmark_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, bookmark_index: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked(), bookmark_index)
 }
 
 unsafe extern "C" fn recent_shortcut_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn search_shortcut_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn show_hidden_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn up_folder_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_search_mode_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_subtitle_trampoline<P>(this: *mut ffi::GtkFileChooserWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserWidget::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/file_filter.rs b/src/auto/file_filter.rs
index cc0c6d8f3f..caf267e855 100644
--- a/src/auto/file_filter.rs
+++ b/src/auto/file_filter.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/fixed.rs b/src/auto/fixed.rs
index 77fa386a8b..4ba278dff4 100644
--- a/src/auto/fixed.rs
+++ b/src/auto/fixed.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/flags.rs b/src/auto/flags.rs
index c5aab127b8..a5c76b0f78 100644
--- a/src/auto/flags.rs
+++ b/src/auto/flags.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
diff --git a/src/auto/flow_box.rs b/src/auto/flow_box.rs
index b29137c359..4e0e632d55 100644
--- a/src/auto/flow_box.rs
+++ b/src/auto/flow_box.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_12", feature = "dox"))]
@@ -648,98 +648,84 @@ impl<O: IsA<FlowBox> + IsA<glib::object::Object> + glib::object::ObjectExt> Flow
 
 unsafe extern "C" fn activate_cursor_child_trampoline<P>(this: *mut ffi::GtkFlowBox, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn child_activated_trampoline<P>(this: *mut ffi::GtkFlowBox, child: *mut ffi::GtkFlowBoxChild, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P, &FlowBoxChild) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(child))
 }
 
 unsafe extern "C" fn move_cursor_trampoline<P>(this: *mut ffi::GtkFlowBox, step: ffi::GtkMovementStep, count: libc::c_int, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P, MovementStep, i32) -> bool + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked(), from_glib(step), count).to_glib()
 }
 
 unsafe extern "C" fn select_all_trampoline<P>(this: *mut ffi::GtkFlowBox, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn selected_children_changed_trampoline<P>(this: *mut ffi::GtkFlowBox, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn toggle_cursor_child_trampoline<P>(this: *mut ffi::GtkFlowBox, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn unselect_all_trampoline<P>(this: *mut ffi::GtkFlowBox, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_activate_on_single_click_trampoline<P>(this: *mut ffi::GtkFlowBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_column_spacing_trampoline<P>(this: *mut ffi::GtkFlowBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_homogeneous_trampoline<P>(this: *mut ffi::GtkFlowBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_max_children_per_line_trampoline<P>(this: *mut ffi::GtkFlowBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_min_children_per_line_trampoline<P>(this: *mut ffi::GtkFlowBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_row_spacing_trampoline<P>(this: *mut ffi::GtkFlowBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_selection_mode_trampoline<P>(this: *mut ffi::GtkFlowBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FlowBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBox::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/flow_box_child.rs b/src/auto/flow_box_child.rs
index c4e5e939a0..61997deabf 100644
--- a/src/auto/flow_box_child.rs
+++ b/src/auto/flow_box_child.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -97,7 +97,6 @@ impl<O: IsA<FlowBoxChild> + IsA<glib::object::Object> + glib::object::ObjectExt>
 
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkFlowBoxChild, f: glib_ffi::gpointer)
 where P: IsA<FlowBoxChild> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FlowBoxChild::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/font_button.rs b/src/auto/font_button.rs
index ddb4b1fcbd..20b96d2e38 100644
--- a/src/auto/font_button.rs
+++ b/src/auto/font_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -225,49 +225,42 @@ impl<O: IsA<FontButton> + IsA<glib::object::Object>> FontButtonExt for O {
 
 unsafe extern "C" fn font_set_trampoline<P>(this: *mut ffi::GtkFontButton, f: glib_ffi::gpointer)
 where P: IsA<FontButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_font_name_trampoline<P>(this: *mut ffi::GtkFontButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_size_trampoline<P>(this: *mut ffi::GtkFontButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_style_trampoline<P>(this: *mut ffi::GtkFontButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::GtkFontButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_font_trampoline<P>(this: *mut ffi::GtkFontButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_size_trampoline<P>(this: *mut ffi::GtkFontButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/font_chooser.rs b/src/auto/font_chooser.rs
index 7b6baac459..91f020147b 100644
--- a/src/auto/font_chooser.rs
+++ b/src/auto/font_chooser.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
@@ -198,35 +198,30 @@ impl<O: IsA<FontChooser> + IsA<glib::object::Object>> FontChooserExt for O {
 
 unsafe extern "C" fn font_activated_trampoline<P>(this: *mut ffi::GtkFontChooser, fontname: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<FontChooser> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&FontChooser::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(fontname))
 }
 
 unsafe extern "C" fn notify_font_trampoline<P>(this: *mut ffi::GtkFontChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_font_desc_trampoline<P>(this: *mut ffi::GtkFontChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_preview_text_trampoline<P>(this: *mut ffi::GtkFontChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_preview_entry_trampoline<P>(this: *mut ffi::GtkFontChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FontChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FontChooser::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/font_chooser_dialog.rs b/src/auto/font_chooser_dialog.rs
index 322503e8a8..ac1a10cffa 100644
--- a/src/auto/font_chooser_dialog.rs
+++ b/src/auto/font_chooser_dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
diff --git a/src/auto/font_chooser_widget.rs b/src/auto/font_chooser_widget.rs
index bbe5dab408..48695ce40c 100644
--- a/src/auto/font_chooser_widget.rs
+++ b/src/auto/font_chooser_widget.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
diff --git a/src/auto/frame.rs b/src/auto/frame.rs
index ec66a30196..30b38d4257 100644
--- a/src/auto/frame.rs
+++ b/src/auto/frame.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -205,35 +205,30 @@ impl<O: IsA<Frame> + IsA<glib::object::Object>> FrameExt for O {
 
 unsafe extern "C" fn notify_label_trampoline<P>(this: *mut ffi::GtkFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Frame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Frame::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_widget_trampoline<P>(this: *mut ffi::GtkFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Frame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Frame::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_xalign_trampoline<P>(this: *mut ffi::GtkFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Frame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Frame::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_yalign_trampoline<P>(this: *mut ffi::GtkFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Frame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Frame::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_shadow_type_trampoline<P>(this: *mut ffi::GtkFrame, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Frame> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Frame::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/functions.rs b/src/auto/functions.rs
index ffd4cc6671..260e105828 100644
--- a/src/auto/functions.rs
+++ b/src/auto/functions.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AccelGroup;
diff --git a/src/auto/gesture.rs b/src/auto/gesture.rs
index 7d43f8a5e2..3e7c6115e9 100644
--- a/src/auto/gesture.rs
+++ b/src/auto/gesture.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -304,7 +304,6 @@ impl<O: IsA<Gesture> + IsA<glib::object::Object>> GestureExt for O {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_n_points_trampoline<P>(this: *mut ffi::GtkGesture, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Gesture> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Gesture::from_glib_borrow(this).downcast_unchecked())
 }
@@ -312,7 +311,6 @@ where P: IsA<Gesture> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_window_trampoline<P>(this: *mut ffi::GtkGesture, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Gesture> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Gesture::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/gesture_drag.rs b/src/auto/gesture_drag.rs
index a44f0c3b51..3db45f2509 100644
--- a/src/auto/gesture_drag.rs
+++ b/src/auto/gesture_drag.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -114,7 +114,6 @@ impl<O: IsA<GestureDrag> + IsA<glib::object::Object>> GestureDragExt for O {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn drag_begin_trampoline<P>(this: *mut ffi::GtkGestureDrag, start_x: libc::c_double, start_y: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureDrag> {
-    callback_guard!();
     let f: &&(Fn(&P, f64, f64) + 'static) = transmute(f);
     f(&GestureDrag::from_glib_borrow(this).downcast_unchecked(), start_x, start_y)
 }
@@ -122,7 +121,6 @@ where P: IsA<GestureDrag> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn drag_end_trampoline<P>(this: *mut ffi::GtkGestureDrag, offset_x: libc::c_double, offset_y: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureDrag> {
-    callback_guard!();
     let f: &&(Fn(&P, f64, f64) + 'static) = transmute(f);
     f(&GestureDrag::from_glib_borrow(this).downcast_unchecked(), offset_x, offset_y)
 }
@@ -130,7 +128,6 @@ where P: IsA<GestureDrag> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn drag_update_trampoline<P>(this: *mut ffi::GtkGestureDrag, offset_x: libc::c_double, offset_y: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureDrag> {
-    callback_guard!();
     let f: &&(Fn(&P, f64, f64) + 'static) = transmute(f);
     f(&GestureDrag::from_glib_borrow(this).downcast_unchecked(), offset_x, offset_y)
 }
diff --git a/src/auto/gesture_long_press.rs b/src/auto/gesture_long_press.rs
index fc709af10e..54c0af2b76 100644
--- a/src/auto/gesture_long_press.rs
+++ b/src/auto/gesture_long_press.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -102,7 +102,6 @@ impl<O: IsA<GestureLongPress> + IsA<glib::object::Object>> GestureLongPressExt f
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn cancelled_trampoline<P>(this: *mut ffi::GtkGestureLongPress, f: glib_ffi::gpointer)
 where P: IsA<GestureLongPress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GestureLongPress::from_glib_borrow(this).downcast_unchecked())
 }
@@ -110,14 +109,12 @@ where P: IsA<GestureLongPress> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn pressed_trampoline<P>(this: *mut ffi::GtkGestureLongPress, x: libc::c_double, y: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureLongPress> {
-    callback_guard!();
     let f: &&(Fn(&P, f64, f64) + 'static) = transmute(f);
     f(&GestureLongPress::from_glib_borrow(this).downcast_unchecked(), x, y)
 }
 
 unsafe extern "C" fn notify_delay_factor_trampoline<P>(this: *mut ffi::GtkGestureLongPress, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GestureLongPress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GestureLongPress::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/gesture_multi_press.rs b/src/auto/gesture_multi_press.rs
index e08bbead60..ee6a59c21c 100644
--- a/src/auto/gesture_multi_press.rs
+++ b/src/auto/gesture_multi_press.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -114,7 +114,6 @@ impl<O: IsA<GestureMultiPress> + IsA<glib::object::Object>> GestureMultiPressExt
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn pressed_trampoline<P>(this: *mut ffi::GtkGestureMultiPress, n_press: libc::c_int, x: libc::c_double, y: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureMultiPress> {
-    callback_guard!();
     let f: &&(Fn(&P, i32, f64, f64) + 'static) = transmute(f);
     f(&GestureMultiPress::from_glib_borrow(this).downcast_unchecked(), n_press, x, y)
 }
@@ -122,7 +121,6 @@ where P: IsA<GestureMultiPress> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn released_trampoline<P>(this: *mut ffi::GtkGestureMultiPress, n_press: libc::c_int, x: libc::c_double, y: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureMultiPress> {
-    callback_guard!();
     let f: &&(Fn(&P, i32, f64, f64) + 'static) = transmute(f);
     f(&GestureMultiPress::from_glib_borrow(this).downcast_unchecked(), n_press, x, y)
 }
@@ -130,7 +128,6 @@ where P: IsA<GestureMultiPress> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn stopped_trampoline<P>(this: *mut ffi::GtkGestureMultiPress, f: glib_ffi::gpointer)
 where P: IsA<GestureMultiPress> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GestureMultiPress::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/gesture_pan.rs b/src/auto/gesture_pan.rs
index 74c93814cb..415ef62fa5 100644
--- a/src/auto/gesture_pan.rs
+++ b/src/auto/gesture_pan.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -101,7 +101,6 @@ impl<O: IsA<GesturePan> + IsA<glib::object::Object>> GesturePanExt for O {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn pan_trampoline<P>(this: *mut ffi::GtkGesturePan, direction: ffi::GtkPanDirection, offset: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GesturePan> {
-    callback_guard!();
     let f: &&(Fn(&P, PanDirection, f64) + 'static) = transmute(f);
     f(&GesturePan::from_glib_borrow(this).downcast_unchecked(), from_glib(direction), offset)
 }
@@ -109,7 +108,6 @@ where P: IsA<GesturePan> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_orientation_trampoline<P>(this: *mut ffi::GtkGesturePan, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GesturePan> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GesturePan::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/gesture_rotate.rs b/src/auto/gesture_rotate.rs
index b4639c9496..361b653b16 100644
--- a/src/auto/gesture_rotate.rs
+++ b/src/auto/gesture_rotate.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -73,7 +73,6 @@ impl<O: IsA<GestureRotate> + IsA<glib::object::Object>> GestureRotateExt for O {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn angle_changed_trampoline<P>(this: *mut ffi::GtkGestureRotate, angle: libc::c_double, angle_delta: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureRotate> {
-    callback_guard!();
     let f: &&(Fn(&P, f64, f64) + 'static) = transmute(f);
     f(&GestureRotate::from_glib_borrow(this).downcast_unchecked(), angle, angle_delta)
 }
diff --git a/src/auto/gesture_single.rs b/src/auto/gesture_single.rs
index 028ee6f6e7..9819d57cb3 100644
--- a/src/auto/gesture_single.rs
+++ b/src/auto/gesture_single.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -152,7 +152,6 @@ impl<O: IsA<GestureSingle> + IsA<glib::object::Object>> GestureSingleExt for O {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_button_trampoline<P>(this: *mut ffi::GtkGestureSingle, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GestureSingle> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GestureSingle::from_glib_borrow(this).downcast_unchecked())
 }
@@ -160,7 +159,6 @@ where P: IsA<GestureSingle> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_exclusive_trampoline<P>(this: *mut ffi::GtkGestureSingle, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GestureSingle> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GestureSingle::from_glib_borrow(this).downcast_unchecked())
 }
@@ -168,7 +166,6 @@ where P: IsA<GestureSingle> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_touch_only_trampoline<P>(this: *mut ffi::GtkGestureSingle, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GestureSingle> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GestureSingle::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/gesture_swipe.rs b/src/auto/gesture_swipe.rs
index c05a76e544..f3d73e27a4 100644
--- a/src/auto/gesture_swipe.rs
+++ b/src/auto/gesture_swipe.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -77,7 +77,6 @@ impl<O: IsA<GestureSwipe> + IsA<glib::object::Object>> GestureSwipeExt for O {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn swipe_trampoline<P>(this: *mut ffi::GtkGestureSwipe, velocity_x: libc::c_double, velocity_y: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureSwipe> {
-    callback_guard!();
     let f: &&(Fn(&P, f64, f64) + 'static) = transmute(f);
     f(&GestureSwipe::from_glib_borrow(this).downcast_unchecked(), velocity_x, velocity_y)
 }
diff --git a/src/auto/gesture_zoom.rs b/src/auto/gesture_zoom.rs
index dd112163c3..fa23fb65c7 100644
--- a/src/auto/gesture_zoom.rs
+++ b/src/auto/gesture_zoom.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -73,7 +73,6 @@ impl<O: IsA<GestureZoom> + IsA<glib::object::Object>> GestureZoomExt for O {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn scale_changed_trampoline<P>(this: *mut ffi::GtkGestureZoom, scale: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<GestureZoom> {
-    callback_guard!();
     let f: &&(Fn(&P, f64) + 'static) = transmute(f);
     f(&GestureZoom::from_glib_borrow(this).downcast_unchecked(), scale)
 }
diff --git a/src/auto/gl_area.rs b/src/auto/gl_area.rs
index 34f463d2e5..5eb45a7060 100644
--- a/src/auto/gl_area.rs
+++ b/src/auto/gl_area.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -357,7 +357,6 @@ impl<O: IsA<GLArea> + IsA<glib::object::Object>> GLAreaExt for O {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn create_context_trampoline<P>(this: *mut ffi::GtkGLArea, f: glib_ffi::gpointer) -> *mut gdk_ffi::GdkGLContext
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P) -> gdk::GLContext + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked()).to_glib_full()
 }
@@ -365,7 +364,6 @@ where P: IsA<GLArea> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn render_trampoline<P>(this: *mut ffi::GtkGLArea, context: *mut gdk_ffi::GdkGLContext, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::GLContext) -> Inhibit + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context)).to_glib()
 }
@@ -373,7 +371,6 @@ where P: IsA<GLArea> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn resize_trampoline<P>(this: *mut ffi::GtkGLArea, width: libc::c_int, height: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P, i32, i32) + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked(), width, height)
 }
@@ -381,7 +378,6 @@ where P: IsA<GLArea> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_auto_render_trampoline<P>(this: *mut ffi::GtkGLArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked())
 }
@@ -389,7 +385,6 @@ where P: IsA<GLArea> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_context_trampoline<P>(this: *mut ffi::GtkGLArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked())
 }
@@ -397,7 +392,6 @@ where P: IsA<GLArea> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_has_alpha_trampoline<P>(this: *mut ffi::GtkGLArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked())
 }
@@ -405,7 +399,6 @@ where P: IsA<GLArea> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_has_depth_buffer_trampoline<P>(this: *mut ffi::GtkGLArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked())
 }
@@ -413,7 +406,6 @@ where P: IsA<GLArea> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_has_stencil_buffer_trampoline<P>(this: *mut ffi::GtkGLArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked())
 }
@@ -421,7 +413,6 @@ where P: IsA<GLArea> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_use_es_trampoline<P>(this: *mut ffi::GtkGLArea, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<GLArea> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&GLArea::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/grid.rs b/src/auto/grid.rs
index 1af3ba212c..0d3f44098c 100644
--- a/src/auto/grid.rs
+++ b/src/auto/grid.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_10", feature = "dox"))]
@@ -368,35 +368,30 @@ impl<O: IsA<Grid> + IsA<Container> + IsA<glib::object::Object>> GridExt for O {
 
 unsafe extern "C" fn notify_baseline_row_trampoline<P>(this: *mut ffi::GtkGrid, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Grid> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Grid::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_column_homogeneous_trampoline<P>(this: *mut ffi::GtkGrid, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Grid> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Grid::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_column_spacing_trampoline<P>(this: *mut ffi::GtkGrid, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Grid> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Grid::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_row_homogeneous_trampoline<P>(this: *mut ffi::GtkGrid, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Grid> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Grid::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_row_spacing_trampoline<P>(this: *mut ffi::GtkGrid, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Grid> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Grid::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/header_bar.rs b/src/auto/header_bar.rs
index e809121130..06287777a6 100644
--- a/src/auto/header_bar.rs
+++ b/src/auto/header_bar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -435,7 +435,6 @@ impl<O: IsA<HeaderBar> + IsA<Container> + IsA<glib::object::Object>> HeaderBarEx
 
 unsafe extern "C" fn notify_custom_title_trampoline<P>(this: *mut ffi::GtkHeaderBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HeaderBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HeaderBar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -443,7 +442,6 @@ where P: IsA<HeaderBar> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_decoration_layout_trampoline<P>(this: *mut ffi::GtkHeaderBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HeaderBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HeaderBar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -451,7 +449,6 @@ where P: IsA<HeaderBar> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_decoration_layout_set_trampoline<P>(this: *mut ffi::GtkHeaderBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HeaderBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HeaderBar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -459,35 +456,30 @@ where P: IsA<HeaderBar> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_has_subtitle_trampoline<P>(this: *mut ffi::GtkHeaderBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HeaderBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HeaderBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_close_button_trampoline<P>(this: *mut ffi::GtkHeaderBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HeaderBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HeaderBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_spacing_trampoline<P>(this: *mut ffi::GtkHeaderBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HeaderBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HeaderBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_subtitle_trampoline<P>(this: *mut ffi::GtkHeaderBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HeaderBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HeaderBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::GtkHeaderBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HeaderBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HeaderBar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/i_m_context.rs b/src/auto/i_m_context.rs
index 8f4a701c02..86f1927e14 100644
--- a/src/auto/i_m_context.rs
+++ b/src/auto/i_m_context.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_6", feature = "dox"))]
@@ -267,42 +267,36 @@ impl<O: IsA<IMContext> + IsA<glib::object::Object>> IMContextExt for O {
 
 unsafe extern "C" fn commit_trampoline<P>(this: *mut ffi::GtkIMContext, str: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<IMContext> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&IMContext::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(str))
 }
 
 unsafe extern "C" fn delete_surrounding_trampoline<P>(this: *mut ffi::GtkIMContext, offset: libc::c_int, n_chars: libc::c_int, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<IMContext> {
-    callback_guard!();
     let f: &&(Fn(&P, i32, i32) -> bool + 'static) = transmute(f);
     f(&IMContext::from_glib_borrow(this).downcast_unchecked(), offset, n_chars).to_glib()
 }
 
 unsafe extern "C" fn preedit_changed_trampoline<P>(this: *mut ffi::GtkIMContext, f: glib_ffi::gpointer)
 where P: IsA<IMContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IMContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn preedit_end_trampoline<P>(this: *mut ffi::GtkIMContext, f: glib_ffi::gpointer)
 where P: IsA<IMContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IMContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn preedit_start_trampoline<P>(this: *mut ffi::GtkIMContext, f: glib_ffi::gpointer)
 where P: IsA<IMContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IMContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn retrieve_surrounding_trampoline<P>(this: *mut ffi::GtkIMContext, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<IMContext> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&IMContext::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
@@ -310,7 +304,6 @@ where P: IsA<IMContext> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_input_hints_trampoline<P>(this: *mut ffi::GtkIMContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IMContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IMContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -318,7 +311,6 @@ where P: IsA<IMContext> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_input_purpose_trampoline<P>(this: *mut ffi::GtkIMContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IMContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IMContext::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/i_m_multicontext.rs b/src/auto/i_m_multicontext.rs
index 8f365c5935..ca07b0b4a9 100644
--- a/src/auto/i_m_multicontext.rs
+++ b/src/auto/i_m_multicontext.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use IMContext;
diff --git a/src/auto/icon_factory.rs b/src/auto/icon_factory.rs
index 6f8c0c8409..9ad6fbbd85 100644
--- a/src/auto/icon_factory.rs
+++ b/src/auto/icon_factory.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/icon_info.rs b/src/auto/icon_info.rs
index 079f8f52f7..f677a336ce 100644
--- a/src/auto/icon_info.rs
+++ b/src/auto/icon_info.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
@@ -159,7 +159,6 @@ impl<O: IsA<IconInfo>> IconInfoExt for O {
         let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
         unsafe extern "C" fn load_icon_async_trampoline<Q: FnOnce(Result<(), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
         {
-            callback_guard!();
             let mut error = ptr::null_mut();
             let _ = ffi::gtk_icon_info_load_icon_finish(_source_object as *mut _, res, &mut error);
             let result = if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) };
@@ -211,7 +210,6 @@ impl<O: IsA<IconInfo>> IconInfoExt for O {
         let user_data: Box<Box<T>> = Box::new(Box::new(callback));
         unsafe extern "C" fn load_symbolic_async_trampoline<T: FnOnce(Result<bool, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
         {
-            callback_guard!();
             let mut error = ptr::null_mut();
             let mut was_symbolic = mem::uninitialized();
             let _ = ffi::gtk_icon_info_load_symbolic_finish(_source_object as *mut _, res, &mut was_symbolic, &mut error);
@@ -241,7 +239,6 @@ impl<O: IsA<IconInfo>> IconInfoExt for O {
         let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
         unsafe extern "C" fn load_symbolic_for_context_async_trampoline<Q: FnOnce(Result<bool, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
         {
-            callback_guard!();
             let mut error = ptr::null_mut();
             let mut was_symbolic = mem::uninitialized();
             let _ = ffi::gtk_icon_info_load_symbolic_for_context_finish(_source_object as *mut _, res, &mut was_symbolic, &mut error);
diff --git a/src/auto/icon_set.rs b/src/auto/icon_set.rs
index be088bb6ac..6f062ace74 100644
--- a/src/auto/icon_set.rs
+++ b/src/auto/icon_set.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use IconSource;
diff --git a/src/auto/icon_source.rs b/src/auto/icon_source.rs
index 8d69b75bec..e480bc21a4 100644
--- a/src/auto/icon_source.rs
+++ b/src/auto/icon_source.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use StateType;
diff --git a/src/auto/icon_theme.rs b/src/auto/icon_theme.rs
index 413e54cc88..033426a8c4 100644
--- a/src/auto/icon_theme.rs
+++ b/src/auto/icon_theme.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
@@ -244,7 +244,6 @@ impl<O: IsA<IconTheme> + IsA<glib::object::Object>> IconThemeExt for O {
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GtkIconTheme, f: glib_ffi::gpointer)
 where P: IsA<IconTheme> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconTheme::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/icon_view.rs b/src/auto/icon_view.rs
index bbe734b9c4..d942ab0c2c 100644
--- a/src/auto/icon_view.rs
+++ b/src/auto/icon_view.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -889,56 +889,48 @@ impl<O: IsA<IconView> + IsA<glib::object::Object> + glib::object::ObjectExt> Ico
 
 unsafe extern "C" fn activate_cursor_item_trampoline<P>(this: *mut ffi::GtkIconView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn item_activated_trampoline<P>(this: *mut ffi::GtkIconView, path: *mut ffi::GtkTreePath, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreePath) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(path))
 }
 
 unsafe extern "C" fn move_cursor_trampoline<P>(this: *mut ffi::GtkIconView, step: ffi::GtkMovementStep, count: libc::c_int, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P, MovementStep, i32) -> bool + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked(), from_glib(step), count).to_glib()
 }
 
 unsafe extern "C" fn select_all_trampoline<P>(this: *mut ffi::GtkIconView, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn select_cursor_item_trampoline<P>(this: *mut ffi::GtkIconView, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn selection_changed_trampoline<P>(this: *mut ffi::GtkIconView, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn toggle_cursor_item_trampoline<P>(this: *mut ffi::GtkIconView, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn unselect_all_trampoline<P>(this: *mut ffi::GtkIconView, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -946,119 +938,102 @@ where P: IsA<IconView> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_activate_on_single_click_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cell_area_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_column_spacing_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_columns_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_item_orientation_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_item_padding_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_item_width_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_margin_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_markup_column_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_model_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixbuf_column_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_reorderable_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_row_spacing_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_selection_mode_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_spacing_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_column_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_column_trampoline<P>(this: *mut ffi::GtkIconView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<IconView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&IconView::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/image.rs b/src/auto/image.rs
index f8de0763a9..b41e3f6231 100644
--- a/src/auto/image.rs
+++ b/src/auto/image.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -543,49 +543,42 @@ impl<O: IsA<Image> + IsA<glib::object::Object>> ImageExt for O {
 
 unsafe extern "C" fn notify_file_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gicon_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_name_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_size_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixbuf_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixbuf_animation_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixel_size_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
@@ -593,28 +586,24 @@ where P: IsA<Image> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_resource_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stock_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_storage_type_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_fallback_trampoline<P>(this: *mut ffi::GtkImage, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Image> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Image::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/image_menu_item.rs b/src/auto/image_menu_item.rs
index b3cfed623f..40139e48ba 100644
--- a/src/auto/image_menu_item.rs
+++ b/src/auto/image_menu_item.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AccelGroup;
@@ -189,28 +189,24 @@ impl<O: IsA<ImageMenuItem> + IsA<glib::object::Object>> ImageMenuItemExt for O {
 
 unsafe extern "C" fn notify_accel_group_trampoline<P>(this: *mut ffi::GtkImageMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ImageMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ImageMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_always_show_image_trampoline<P>(this: *mut ffi::GtkImageMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ImageMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ImageMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_image_trampoline<P>(this: *mut ffi::GtkImageMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ImageMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ImageMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_stock_trampoline<P>(this: *mut ffi::GtkImageMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ImageMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ImageMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/info_bar.rs b/src/auto/info_bar.rs
index 23eca486d4..a964e9dd82 100644
--- a/src/auto/info_bar.rs
+++ b/src/auto/info_bar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
@@ -203,21 +203,18 @@ impl<O: IsA<InfoBar> + IsA<glib::object::Object> + glib::object::ObjectExt> Info
 
 unsafe extern "C" fn close_trampoline<P>(this: *mut ffi::GtkInfoBar, f: glib_ffi::gpointer)
 where P: IsA<InfoBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&InfoBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn response_trampoline<P>(this: *mut ffi::GtkInfoBar, response_id: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<InfoBar> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + 'static) = transmute(f);
     f(&InfoBar::from_glib_borrow(this).downcast_unchecked(), response_id)
 }
 
 unsafe extern "C" fn notify_message_type_trampoline<P>(this: *mut ffi::GtkInfoBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<InfoBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&InfoBar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -225,7 +222,6 @@ where P: IsA<InfoBar> {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn notify_show_close_button_trampoline<P>(this: *mut ffi::GtkInfoBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<InfoBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&InfoBar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/invisible.rs b/src/auto/invisible.rs
index fcbe377806..31c50b9e5d 100644
--- a/src/auto/invisible.rs
+++ b/src/auto/invisible.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -73,7 +73,6 @@ impl<O: IsA<Invisible> + IsA<glib::object::Object>> InvisibleExt for O {
 
 unsafe extern "C" fn notify_screen_trampoline<P>(this: *mut ffi::GtkInvisible, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Invisible> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Invisible::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/label.rs b/src/auto/label.rs
index 7a14e9bf8a..b1d4cbcd3d 100644
--- a/src/auto/label.rs
+++ b/src/auto/label.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -817,77 +817,66 @@ impl<O: IsA<Label> + IsA<glib::object::Object> + glib::object::ObjectExt> LabelE
 
 unsafe extern "C" fn activate_current_link_trampoline<P>(this: *mut ffi::GtkLabel, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn activate_link_trampoline<P>(this: *mut ffi::GtkLabel, uri: *mut libc::c_char, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) -> Inhibit + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(uri)).to_glib()
 }
 
 unsafe extern "C" fn copy_clipboard_trampoline<P>(this: *mut ffi::GtkLabel, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn move_cursor_trampoline<P>(this: *mut ffi::GtkLabel, step: ffi::GtkMovementStep, count: libc::c_int, extend_selection: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P, MovementStep, i32, bool) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked(), from_glib(step), count, from_glib(extend_selection))
 }
 
 unsafe extern "C" fn populate_popup_trampoline<P>(this: *mut ffi::GtkLabel, menu: *mut ffi::GtkMenu, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P, &Menu) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(menu))
 }
 
 unsafe extern "C" fn notify_angle_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_attributes_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cursor_position_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ellipsize_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_justify_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
@@ -895,98 +884,84 @@ where P: IsA<Label> {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn notify_lines_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_max_width_chars_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mnemonic_keyval_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mnemonic_widget_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pattern_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_selectable_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_selection_bound_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_single_line_mode_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_track_visited_links_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_markup_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_underline_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_chars_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_mode_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
@@ -994,7 +969,6 @@ where P: IsA<Label> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_xalign_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1002,7 +976,6 @@ where P: IsA<Label> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_yalign_trampoline<P>(this: *mut ffi::GtkLabel, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Label> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Label::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/layout.rs b/src/auto/layout.rs
index 855138d8af..681c0deed5 100644
--- a/src/auto/layout.rs
+++ b/src/auto/layout.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -186,14 +186,12 @@ impl<O: IsA<Layout> + IsA<Container> + IsA<glib::object::Object>> LayoutExt for
 
 unsafe extern "C" fn notify_height_trampoline<P>(this: *mut ffi::GtkLayout, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Layout> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Layout::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_trampoline<P>(this: *mut ffi::GtkLayout, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Layout> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Layout::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/level_bar.rs b/src/auto/level_bar.rs
index 45e98963cd..2e14d770d0 100644
--- a/src/auto/level_bar.rs
+++ b/src/auto/level_bar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -275,7 +275,6 @@ impl<O: IsA<LevelBar> + IsA<glib::object::Object>> LevelBarExt for O {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn offset_changed_trampoline<P>(this: *mut ffi::GtkLevelBar, name: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<LevelBar> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&LevelBar::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(name))
 }
@@ -283,7 +282,6 @@ where P: IsA<LevelBar> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_inverted_trampoline<P>(this: *mut ffi::GtkLevelBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LevelBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LevelBar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -291,7 +289,6 @@ where P: IsA<LevelBar> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_max_value_trampoline<P>(this: *mut ffi::GtkLevelBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LevelBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LevelBar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -299,7 +296,6 @@ where P: IsA<LevelBar> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_min_value_trampoline<P>(this: *mut ffi::GtkLevelBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LevelBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LevelBar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -307,7 +303,6 @@ where P: IsA<LevelBar> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_mode_trampoline<P>(this: *mut ffi::GtkLevelBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LevelBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LevelBar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -315,7 +310,6 @@ where P: IsA<LevelBar> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_value_trampoline<P>(this: *mut ffi::GtkLevelBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LevelBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LevelBar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/link_button.rs b/src/auto/link_button.rs
index 9c56bde4a4..154fb13196 100644
--- a/src/auto/link_button.rs
+++ b/src/auto/link_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -117,21 +117,18 @@ impl<O: IsA<LinkButton> + IsA<glib::object::Object>> LinkButtonExt for O {
 
 unsafe extern "C" fn activate_link_trampoline<P>(this: *mut ffi::GtkLinkButton, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<LinkButton> {
-    callback_guard!();
     let f: &&(Fn(&P) -> Inhibit + 'static) = transmute(f);
     f(&LinkButton::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn notify_uri_trampoline<P>(this: *mut ffi::GtkLinkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LinkButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LinkButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visited_trampoline<P>(this: *mut ffi::GtkLinkButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LinkButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LinkButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/list_box.rs b/src/auto/list_box.rs
index 4a61cf46d9..39ffb5f7f8 100644
--- a/src/auto/list_box.rs
+++ b/src/auto/list_box.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_10", feature = "dox"))]
@@ -505,14 +505,12 @@ impl<O: IsA<ListBox> + IsA<glib::object::Object> + glib::object::ObjectExt> List
 
 unsafe extern "C" fn activate_cursor_row_trampoline<P>(this: *mut ffi::GtkListBox, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn move_cursor_trampoline<P>(this: *mut ffi::GtkListBox, object: ffi::GtkMovementStep, p0: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P, MovementStep, i32) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked(), from_glib(object), p0)
 }
@@ -520,7 +518,6 @@ where P: IsA<ListBox> {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn row_activated_trampoline<P>(this: *mut ffi::GtkListBox, row: *mut ffi::GtkListBoxRow, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P, &ListBoxRow) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(row))
 }
@@ -528,7 +525,6 @@ where P: IsA<ListBox> {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn row_selected_trampoline<P>(this: *mut ffi::GtkListBox, row: *mut ffi::GtkListBoxRow, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P, &Option<ListBoxRow>) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(row))
 }
@@ -536,7 +532,6 @@ where P: IsA<ListBox> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn select_all_trampoline<P>(this: *mut ffi::GtkListBox, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked())
 }
@@ -544,14 +539,12 @@ where P: IsA<ListBox> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn selected_rows_changed_trampoline<P>(this: *mut ffi::GtkListBox, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn toggle_cursor_row_trampoline<P>(this: *mut ffi::GtkListBox, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked())
 }
@@ -559,21 +552,18 @@ where P: IsA<ListBox> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn unselect_all_trampoline<P>(this: *mut ffi::GtkListBox, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_activate_on_single_click_trampoline<P>(this: *mut ffi::GtkListBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_selection_mode_trampoline<P>(this: *mut ffi::GtkListBox, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ListBox> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBox::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/list_box_row.rs b/src/auto/list_box_row.rs
index ab2ba56a6c..983b62c070 100644
--- a/src/auto/list_box_row.rs
+++ b/src/auto/list_box_row.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -183,7 +183,6 @@ impl<O: IsA<ListBoxRow> + IsA<glib::object::Object> + glib::object::ObjectExt> L
 
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkListBoxRow, f: glib_ffi::gpointer)
 where P: IsA<ListBoxRow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBoxRow::from_glib_borrow(this).downcast_unchecked())
 }
@@ -191,7 +190,6 @@ where P: IsA<ListBoxRow> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_activatable_trampoline<P>(this: *mut ffi::GtkListBoxRow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ListBoxRow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBoxRow::from_glib_borrow(this).downcast_unchecked())
 }
@@ -199,7 +197,6 @@ where P: IsA<ListBoxRow> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_selectable_trampoline<P>(this: *mut ffi::GtkListBoxRow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ListBoxRow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ListBoxRow::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/list_store.rs b/src/auto/list_store.rs
index 01ee2284ec..5b4b27809a 100644
--- a/src/auto/list_store.rs
+++ b/src/auto/list_store.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/lock_button.rs b/src/auto/lock_button.rs
index 8cba49c703..336ce96bcc 100644
--- a/src/auto/lock_button.rs
+++ b/src/auto/lock_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -218,42 +218,36 @@ impl<O: IsA<LockButton> + IsA<glib::object::Object>> LockButtonExt for O {
 
 unsafe extern "C" fn notify_permission_trampoline<P>(this: *mut ffi::GtkLockButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LockButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LockButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_lock_trampoline<P>(this: *mut ffi::GtkLockButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LockButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LockButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_unlock_trampoline<P>(this: *mut ffi::GtkLockButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LockButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LockButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_lock_trampoline<P>(this: *mut ffi::GtkLockButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LockButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LockButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_not_authorized_trampoline<P>(this: *mut ffi::GtkLockButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LockButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LockButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_unlock_trampoline<P>(this: *mut ffi::GtkLockButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<LockButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&LockButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/menu.rs b/src/auto/menu.rs
index 14cd1193f3..39a5f38d5a 100644
--- a/src/auto/menu.rs
+++ b/src/auto/menu.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AccelGroup;
@@ -657,28 +657,24 @@ impl<O: IsA<Menu> + IsA<Container> + IsA<glib::object::Object> + glib::object::O
 
 unsafe extern "C" fn move_scroll_trampoline<P>(this: *mut ffi::GtkMenu, scroll_type: ffi::GtkScrollType, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P, ScrollType) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked(), from_glib(scroll_type))
 }
 
 unsafe extern "C" fn notify_accel_group_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_accel_path_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
@@ -686,14 +682,12 @@ where P: IsA<Menu> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_anchor_hints_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_attach_widget_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
@@ -701,14 +695,12 @@ where P: IsA<Menu> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_menu_type_hint_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_monitor_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
@@ -716,7 +708,6 @@ where P: IsA<Menu> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_rect_anchor_dx_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
@@ -724,28 +715,24 @@ where P: IsA<Menu> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_rect_anchor_dy_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_reserve_toggle_size_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tearoff_state_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tearoff_title_trampoline<P>(this: *mut ffi::GtkMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Menu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Menu::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/menu_bar.rs b/src/auto/menu_bar.rs
index 7bfda7f5a8..5708b9b459 100644
--- a/src/auto/menu_bar.rs
+++ b/src/auto/menu_bar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -110,14 +110,12 @@ impl<O: IsA<MenuBar> + IsA<glib::object::Object>> MenuBarExt for O {
 
 unsafe extern "C" fn notify_child_pack_direction_trampoline<P>(this: *mut ffi::GtkMenuBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pack_direction_trampoline<P>(this: *mut ffi::GtkMenuBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuBar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/menu_button.rs b/src/auto/menu_button.rs
index 3d357b9202..816e93ba46 100644
--- a/src/auto/menu_button.rs
+++ b/src/auto/menu_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -267,7 +267,6 @@ impl<O: IsA<MenuButton> + IsA<glib::object::Object>> MenuButtonExt for O {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_align_widget_trampoline<P>(this: *mut ffi::GtkMenuButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -275,7 +274,6 @@ where P: IsA<MenuButton> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_direction_trampoline<P>(this: *mut ffi::GtkMenuButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -283,7 +281,6 @@ where P: IsA<MenuButton> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_menu_model_trampoline<P>(this: *mut ffi::GtkMenuButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -291,7 +288,6 @@ where P: IsA<MenuButton> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_popover_trampoline<P>(this: *mut ffi::GtkMenuButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -299,7 +295,6 @@ where P: IsA<MenuButton> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_popup_trampoline<P>(this: *mut ffi::GtkMenuButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -307,7 +302,6 @@ where P: IsA<MenuButton> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_use_popover_trampoline<P>(this: *mut ffi::GtkMenuButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/menu_item.rs b/src/auto/menu_item.rs
index e81e44a6f3..b9bb8630ba 100644
--- a/src/auto/menu_item.rs
+++ b/src/auto/menu_item.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -314,70 +314,60 @@ impl<O: IsA<MenuItem> + IsA<glib::object::Object> + glib::object::ObjectExt> Men
 
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkMenuItem, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn activate_item_trampoline<P>(this: *mut ffi::GtkMenuItem, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn deselect_trampoline<P>(this: *mut ffi::GtkMenuItem, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn select_trampoline<P>(this: *mut ffi::GtkMenuItem, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn toggle_size_allocate_trampoline<P>(this: *mut ffi::GtkMenuItem, object: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked(), object)
 }
 
 unsafe extern "C" fn notify_accel_path_trampoline<P>(this: *mut ffi::GtkMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_trampoline<P>(this: *mut ffi::GtkMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_right_justified_trampoline<P>(this: *mut ffi::GtkMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_submenu_trampoline<P>(this: *mut ffi::GtkMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_underline_trampoline<P>(this: *mut ffi::GtkMenuItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuItem::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/menu_shell.rs b/src/auto/menu_shell.rs
index 7856534a15..eca8fd0c33 100644
--- a/src/auto/menu_shell.rs
+++ b/src/auto/menu_shell.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -272,63 +272,54 @@ impl<O: IsA<MenuShell> + IsA<glib::object::Object> + glib::object::ObjectExt> Me
 
 unsafe extern "C" fn activate_current_trampoline<P>(this: *mut ffi::GtkMenuShell, force_hide: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked(), from_glib(force_hide))
 }
 
 unsafe extern "C" fn cancel_trampoline<P>(this: *mut ffi::GtkMenuShell, f: glib_ffi::gpointer)
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn cycle_focus_trampoline<P>(this: *mut ffi::GtkMenuShell, direction: ffi::GtkDirectionType, f: glib_ffi::gpointer)
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P, DirectionType) + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked(), from_glib(direction))
 }
 
 unsafe extern "C" fn deactivate_trampoline<P>(this: *mut ffi::GtkMenuShell, f: glib_ffi::gpointer)
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn insert_trampoline<P>(this: *mut ffi::GtkMenuShell, child: *mut ffi::GtkWidget, position: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget, i32) + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(child), position)
 }
 
 unsafe extern "C" fn move_current_trampoline<P>(this: *mut ffi::GtkMenuShell, direction: ffi::GtkMenuDirectionType, f: glib_ffi::gpointer)
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P, MenuDirectionType) + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked(), from_glib(direction))
 }
 
 unsafe extern "C" fn move_selected_trampoline<P>(this: *mut ffi::GtkMenuShell, distance: libc::c_int, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) -> Inhibit + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked(), distance).to_glib()
 }
 
 unsafe extern "C" fn selection_done_trampoline<P>(this: *mut ffi::GtkMenuShell, f: glib_ffi::gpointer)
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_take_focus_trampoline<P>(this: *mut ffi::GtkMenuShell, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuShell> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuShell::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/menu_tool_button.rs b/src/auto/menu_tool_button.rs
index ca2fd54cba..c8e79ef5c8 100644
--- a/src/auto/menu_tool_button.rs
+++ b/src/auto/menu_tool_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -110,14 +110,12 @@ impl<O: IsA<MenuToolButton> + IsA<glib::object::Object>> MenuToolButtonExt for O
 
 unsafe extern "C" fn show_menu_trampoline<P>(this: *mut ffi::GtkMenuToolButton, f: glib_ffi::gpointer)
 where P: IsA<MenuToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuToolButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_menu_trampoline<P>(this: *mut ffi::GtkMenuToolButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MenuToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MenuToolButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/message_dialog.rs b/src/auto/message_dialog.rs
index 5324dfb59f..9382fc69fe 100644
--- a/src/auto/message_dialog.rs
+++ b/src/auto/message_dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -266,56 +266,48 @@ impl<O: IsA<MessageDialog> + IsA<glib::object::Object>> MessageDialogExt for O {
 
 unsafe extern "C" fn notify_buttons_trampoline<P>(this: *mut ffi::GtkMessageDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MessageDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MessageDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_image_trampoline<P>(this: *mut ffi::GtkMessageDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MessageDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MessageDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_message_area_trampoline<P>(this: *mut ffi::GtkMessageDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MessageDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MessageDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_message_type_trampoline<P>(this: *mut ffi::GtkMessageDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MessageDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MessageDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_text_trampoline<P>(this: *mut ffi::GtkMessageDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MessageDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MessageDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_secondary_use_markup_trampoline<P>(this: *mut ffi::GtkMessageDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MessageDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MessageDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_trampoline<P>(this: *mut ffi::GtkMessageDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MessageDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MessageDialog::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_markup_trampoline<P>(this: *mut ffi::GtkMessageDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MessageDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MessageDialog::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/misc.rs b/src/auto/misc.rs
index af3277bcac..a3b440a5d3 100644
--- a/src/auto/misc.rs
+++ b/src/auto/misc.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -200,28 +200,24 @@ impl<O: IsA<Misc> + IsA<glib::object::Object>> MiscExt for O {
 
 unsafe extern "C" fn notify_xalign_trampoline<P>(this: *mut ffi::GtkMisc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Misc> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Misc::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_xpad_trampoline<P>(this: *mut ffi::GtkMisc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Misc> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Misc::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_yalign_trampoline<P>(this: *mut ffi::GtkMisc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Misc> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Misc::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ypad_trampoline<P>(this: *mut ffi::GtkMisc, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Misc> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Misc::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/mod.rs b/src/auto/mod.rs
index 59de25c2e5..f7387cc861 100644
--- a/src/auto/mod.rs
+++ b/src/auto/mod.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 mod about_dialog;
diff --git a/src/auto/model_button.rs b/src/auto/model_button.rs
index 3d35d21d9f..2190b2ed7d 100644
--- a/src/auto/model_button.rs
+++ b/src/auto/model_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -338,7 +338,6 @@ impl<O: IsA<ModelButton> + IsA<glib::object::Object>> ModelButtonExt for O {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkModelButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ModelButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ModelButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -346,7 +345,6 @@ where P: IsA<ModelButton> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_centered_trampoline<P>(this: *mut ffi::GtkModelButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ModelButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ModelButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -354,7 +352,6 @@ where P: IsA<ModelButton> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_icon_trampoline<P>(this: *mut ffi::GtkModelButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ModelButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ModelButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -362,7 +359,6 @@ where P: IsA<ModelButton> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_iconic_trampoline<P>(this: *mut ffi::GtkModelButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ModelButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ModelButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -370,7 +366,6 @@ where P: IsA<ModelButton> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_inverted_trampoline<P>(this: *mut ffi::GtkModelButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ModelButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ModelButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -378,7 +373,6 @@ where P: IsA<ModelButton> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_menu_name_trampoline<P>(this: *mut ffi::GtkModelButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ModelButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ModelButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -386,7 +380,6 @@ where P: IsA<ModelButton> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_role_trampoline<P>(this: *mut ffi::GtkModelButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ModelButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ModelButton::from_glib_borrow(this).downcast_unchecked())
 }
@@ -394,7 +387,6 @@ where P: IsA<ModelButton> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_text_trampoline<P>(this: *mut ffi::GtkModelButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ModelButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ModelButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/mount_operation.rs b/src/auto/mount_operation.rs
index 48a7a4091c..7806ff866a 100644
--- a/src/auto/mount_operation.rs
+++ b/src/auto/mount_operation.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Window;
@@ -131,21 +131,18 @@ impl<O: IsA<MountOperation> + IsA<glib::object::Object>> MountOperationExt for O
 
 unsafe extern "C" fn notify_is_showing_trampoline<P>(this: *mut ffi::GtkMountOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MountOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MountOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_parent_trampoline<P>(this: *mut ffi::GtkMountOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MountOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MountOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_screen_trampoline<P>(this: *mut ffi::GtkMountOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<MountOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&MountOperation::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/native_dialog.rs b/src/auto/native_dialog.rs
index a75053f78f..cc2d6c65ad 100644
--- a/src/auto/native_dialog.rs
+++ b/src/auto/native_dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 #[cfg(any(feature = "v3_20", feature = "dox"))]
@@ -224,7 +224,6 @@ impl<O: IsA<NativeDialog> + IsA<glib::object::Object>> NativeDialogExt for O {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn response_trampoline<P>(this: *mut ffi::GtkNativeDialog, response_id: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<NativeDialog> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) + 'static) = transmute(f);
     f(&NativeDialog::from_glib_borrow(this).downcast_unchecked(), response_id)
 }
@@ -232,7 +231,6 @@ where P: IsA<NativeDialog> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_modal_trampoline<P>(this: *mut ffi::GtkNativeDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NativeDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NativeDialog::from_glib_borrow(this).downcast_unchecked())
 }
@@ -240,7 +238,6 @@ where P: IsA<NativeDialog> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::GtkNativeDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NativeDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NativeDialog::from_glib_borrow(this).downcast_unchecked())
 }
@@ -248,7 +245,6 @@ where P: IsA<NativeDialog> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_transient_for_trampoline<P>(this: *mut ffi::GtkNativeDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NativeDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NativeDialog::from_glib_borrow(this).downcast_unchecked())
 }
@@ -256,7 +252,6 @@ where P: IsA<NativeDialog> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_visible_trampoline<P>(this: *mut ffi::GtkNativeDialog, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NativeDialog> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NativeDialog::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/notebook.rs b/src/auto/notebook.rs
index afb16b4ef0..307cf4585c 100644
--- a/src/auto/notebook.rs
+++ b/src/auto/notebook.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -691,119 +691,102 @@ impl<O: IsA<Notebook> + IsA<Container> + IsA<glib::object::Object> + glib::objec
 
 unsafe extern "C" fn change_current_page_trampoline<P>(this: *mut ffi::GtkNotebook, object: libc::c_int, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) -> bool + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), object).to_glib()
 }
 
 unsafe extern "C" fn create_window_trampoline<P>(this: *mut ffi::GtkNotebook, page: *mut ffi::GtkWidget, x: libc::c_int, y: libc::c_int, f: glib_ffi::gpointer) -> *mut ffi::GtkNotebook
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget, i32, i32) -> Notebook + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(page), x, y)/*Not checked*/.to_glib_none().0
 }
 
 unsafe extern "C" fn focus_tab_trampoline<P>(this: *mut ffi::GtkNotebook, object: ffi::GtkNotebookTab, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, NotebookTab) -> bool + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), from_glib(object)).to_glib()
 }
 
 unsafe extern "C" fn move_focus_out_trampoline<P>(this: *mut ffi::GtkNotebook, object: ffi::GtkDirectionType, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, DirectionType) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), from_glib(object))
 }
 
 unsafe extern "C" fn page_added_trampoline<P>(this: *mut ffi::GtkNotebook, child: *mut ffi::GtkWidget, page_num: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget, u32) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(child), page_num)
 }
 
 unsafe extern "C" fn page_removed_trampoline<P>(this: *mut ffi::GtkNotebook, child: *mut ffi::GtkWidget, page_num: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget, u32) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(child), page_num)
 }
 
 unsafe extern "C" fn page_reordered_trampoline<P>(this: *mut ffi::GtkNotebook, child: *mut ffi::GtkWidget, page_num: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget, u32) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(child), page_num)
 }
 
 unsafe extern "C" fn reorder_tab_trampoline<P>(this: *mut ffi::GtkNotebook, object: ffi::GtkDirectionType, p0: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, DirectionType, bool) -> bool + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), from_glib(object), from_glib(p0)).to_glib()
 }
 
 unsafe extern "C" fn select_page_trampoline<P>(this: *mut ffi::GtkNotebook, object: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) -> bool + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), from_glib(object)).to_glib()
 }
 
 unsafe extern "C" fn switch_page_trampoline<P>(this: *mut ffi::GtkNotebook, page: *mut ffi::GtkWidget, page_num: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget, u32) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(page), page_num)
 }
 
 unsafe extern "C" fn notify_enable_popup_trampoline<P>(this: *mut ffi::GtkNotebook, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_group_name_trampoline<P>(this: *mut ffi::GtkNotebook, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_page_trampoline<P>(this: *mut ffi::GtkNotebook, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_scrollable_trampoline<P>(this: *mut ffi::GtkNotebook, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_border_trampoline<P>(this: *mut ffi::GtkNotebook, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_tabs_trampoline<P>(this: *mut ffi::GtkNotebook, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tab_pos_trampoline<P>(this: *mut ffi::GtkNotebook, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notebook> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notebook::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/offscreen_window.rs b/src/auto/offscreen_window.rs
index fd86dda5f9..a02d3c885c 100644
--- a/src/auto/offscreen_window.rs
+++ b/src/auto/offscreen_window.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
diff --git a/src/auto/orientable.rs b/src/auto/orientable.rs
index db5095920f..d9f1772251 100644
--- a/src/auto/orientable.rs
+++ b/src/auto/orientable.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Orientation;
@@ -57,7 +57,6 @@ impl<O: IsA<Orientable> + IsA<glib::object::Object>> OrientableExt for O {
 
 unsafe extern "C" fn notify_orientation_trampoline<P>(this: *mut ffi::GtkOrientable, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Orientable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Orientable::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/overlay.rs b/src/auto/overlay.rs
index 40ca7415bf..9b8252cab6 100644
--- a/src/auto/overlay.rs
+++ b/src/auto/overlay.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
diff --git a/src/auto/pad_controller.rs b/src/auto/pad_controller.rs
index 900b8cfffd..910b76c8e5 100644
--- a/src/auto/pad_controller.rs
+++ b/src/auto/pad_controller.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use EventController;
@@ -109,14 +109,12 @@ impl<O: IsA<PadController> + IsA<glib::object::Object>> PadControllerExt for O {
 
 unsafe extern "C" fn notify_action_group_trampoline<P>(this: *mut ffi::GtkPadController, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PadController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PadController::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pad_trampoline<P>(this: *mut ffi::GtkPadController, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PadController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PadController::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/page_setup.rs b/src/auto/page_setup.rs
index cdc7fef82b..5929f53364 100644
--- a/src/auto/page_setup.rs
+++ b/src/auto/page_setup.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
diff --git a/src/auto/paned.rs b/src/auto/paned.rs
index 47c74d83f8..f3474e2a8b 100644
--- a/src/auto/paned.rs
+++ b/src/auto/paned.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -368,70 +368,60 @@ impl<O: IsA<Paned> + IsA<Container> + IsA<glib::object::Object> + glib::object::
 
 unsafe extern "C" fn accept_position_trampoline<P>(this: *mut ffi::GtkPaned, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn cancel_position_trampoline<P>(this: *mut ffi::GtkPaned, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn cycle_child_focus_trampoline<P>(this: *mut ffi::GtkPaned, reversed: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) -> bool + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked(), from_glib(reversed)).to_glib()
 }
 
 unsafe extern "C" fn cycle_handle_focus_trampoline<P>(this: *mut ffi::GtkPaned, reversed: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) -> bool + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked(), from_glib(reversed)).to_glib()
 }
 
 unsafe extern "C" fn move_handle_trampoline<P>(this: *mut ffi::GtkPaned, scroll_type: ffi::GtkScrollType, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P, ScrollType) -> bool + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked(), from_glib(scroll_type)).to_glib()
 }
 
 unsafe extern "C" fn toggle_handle_focus_trampoline<P>(this: *mut ffi::GtkPaned, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn notify_max_position_trampoline<P>(this: *mut ffi::GtkPaned, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_min_position_trampoline<P>(this: *mut ffi::GtkPaned, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_position_trampoline<P>(this: *mut ffi::GtkPaned, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_position_set_trampoline<P>(this: *mut ffi::GtkPaned, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked())
 }
@@ -439,7 +429,6 @@ where P: IsA<Paned> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_wide_handle_trampoline<P>(this: *mut ffi::GtkPaned, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Paned> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Paned::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/paper_size.rs b/src/auto/paper_size.rs
index bc88134b18..55abb46d1e 100644
--- a/src/auto/paper_size.rs
+++ b/src/auto/paper_size.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (0f1d1c1) from gir-files (77d1f70)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
diff --git a/src/auto/places_sidebar.rs b/src/auto/places_sidebar.rs
index a19c4878d1..0eabfea3ad 100644
--- a/src/auto/places_sidebar.rs
+++ b/src/auto/places_sidebar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -731,7 +731,6 @@ impl<O: IsA<PlacesSidebar> + IsA<glib::object::Object>> PlacesSidebarExt for O {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn drag_action_ask_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, actions: libc::c_int, f: glib_ffi::gpointer) -> libc::c_int
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) -> i32 + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked(), actions)
 }
@@ -739,7 +738,6 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn mount_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, mount_operation: *mut gio_ffi::GMountOperation, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P, &gio::MountOperation) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(mount_operation))
 }
@@ -747,14 +745,12 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn open_location_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, location: *mut gio_ffi::GFile, open_flags: ffi::GtkPlacesOpenFlags, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P, &gio::File, PlacesOpenFlags) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(location), from_glib(open_flags))
 }
 
 unsafe extern "C" fn show_connect_to_server_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -762,7 +758,6 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn show_enter_location_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -770,7 +765,6 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn show_error_message_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, primary: *mut libc::c_char, secondary: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P, &str, &str) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(primary), &String::from_glib_none(secondary))
 }
@@ -778,7 +772,6 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_18", feature = "dox"))]
 unsafe extern "C" fn show_other_locations_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -786,7 +779,6 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn show_other_locations_with_flags_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, open_flags: ffi::GtkPlacesOpenFlags, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P, PlacesOpenFlags) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked(), from_glib(open_flags))
 }
@@ -794,7 +786,6 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_22_26", feature = "dox"))]
 unsafe extern "C" fn show_starred_location_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, object: ffi::GtkPlacesOpenFlags, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P, PlacesOpenFlags) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked(), from_glib(object))
 }
@@ -802,28 +793,24 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn unmount_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, mount_operation: *mut gio_ffi::GMountOperation, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P, &gio::MountOperation) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(mount_operation))
 }
 
 unsafe extern "C" fn notify_local_only_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_location_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_open_flags_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -831,42 +818,36 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_18", feature = "dox"))]
 unsafe extern "C" fn notify_populate_all_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_connect_to_server_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_desktop_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_enter_location_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_other_locations_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_recent_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
@@ -874,14 +855,12 @@ where P: IsA<PlacesSidebar> {
 #[cfg(any(feature = "v3_22_26", feature = "dox"))]
 unsafe extern "C" fn notify_show_starred_location_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_trash_trampoline<P>(this: *mut ffi::GtkPlacesSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PlacesSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PlacesSidebar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/plug.rs b/src/auto/plug.rs
index 55717445ea..186c2a2130 100644
--- a/src/auto/plug.rs
+++ b/src/auto/plug.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -123,21 +123,18 @@ impl<O: IsA<Plug> + IsA<glib::object::Object>> PlugExt for O {
 
 unsafe extern "C" fn embedded_trampoline<P>(this: *mut ffi::GtkPlug, f: glib_ffi::gpointer)
 where P: IsA<Plug> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Plug::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_embedded_trampoline<P>(this: *mut ffi::GtkPlug, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Plug> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Plug::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_socket_window_trampoline<P>(this: *mut ffi::GtkPlug, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Plug> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Plug::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/popover.rs b/src/auto/popover.rs
index 9bb1107366..3022d07276 100644
--- a/src/auto/popover.rs
+++ b/src/auto/popover.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -329,7 +329,6 @@ impl<O: IsA<Popover> + IsA<glib::object::Object>> PopoverExt for O {
 
 unsafe extern "C" fn closed_trampoline<P>(this: *mut ffi::GtkPopover, f: glib_ffi::gpointer)
 where P: IsA<Popover> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Popover::from_glib_borrow(this).downcast_unchecked())
 }
@@ -337,7 +336,6 @@ where P: IsA<Popover> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_constrain_to_trampoline<P>(this: *mut ffi::GtkPopover, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Popover> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Popover::from_glib_borrow(this).downcast_unchecked())
 }
@@ -345,7 +343,6 @@ where P: IsA<Popover> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_modal_trampoline<P>(this: *mut ffi::GtkPopover, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Popover> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Popover::from_glib_borrow(this).downcast_unchecked())
 }
@@ -353,7 +350,6 @@ where P: IsA<Popover> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_pointing_to_trampoline<P>(this: *mut ffi::GtkPopover, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Popover> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Popover::from_glib_borrow(this).downcast_unchecked())
 }
@@ -361,7 +357,6 @@ where P: IsA<Popover> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_position_trampoline<P>(this: *mut ffi::GtkPopover, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Popover> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Popover::from_glib_borrow(this).downcast_unchecked())
 }
@@ -369,7 +364,6 @@ where P: IsA<Popover> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_relative_to_trampoline<P>(this: *mut ffi::GtkPopover, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Popover> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Popover::from_glib_borrow(this).downcast_unchecked())
 }
@@ -377,7 +371,6 @@ where P: IsA<Popover> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_transitions_enabled_trampoline<P>(this: *mut ffi::GtkPopover, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Popover> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Popover::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/popover_menu.rs b/src/auto/popover_menu.rs
index 2dd51d204f..d6df947835 100644
--- a/src/auto/popover_menu.rs
+++ b/src/auto/popover_menu.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -129,7 +129,6 @@ impl<O: IsA<PopoverMenu> + IsA<Container> + IsA<glib::object::Object>> PopoverMe
 
 unsafe extern "C" fn notify_visible_submenu_trampoline<P>(this: *mut ffi::GtkPopoverMenu, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PopoverMenu> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PopoverMenu::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/print_context.rs b/src/auto/print_context.rs
index 894dde16ca..202f998a76 100644
--- a/src/auto/print_context.rs
+++ b/src/auto/print_context.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use PageSetup;
diff --git a/src/auto/print_operation.rs b/src/auto/print_operation.rs
index dd79b31796..a13fbe4a7b 100644
--- a/src/auto/print_operation.rs
+++ b/src/auto/print_operation.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
@@ -694,203 +694,174 @@ impl<O: IsA<PrintOperation> + IsA<glib::object::Object>> PrintOperationExt for O
 
 unsafe extern "C" fn begin_print_trampoline<P>(this: *mut ffi::GtkPrintOperation, context: *mut ffi::GtkPrintContext, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintContext) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context))
 }
 
 unsafe extern "C" fn create_custom_widget_trampoline<P>(this: *mut ffi::GtkPrintOperation, f: glib_ffi::gpointer) -> *mut gobject_ffi::GObject
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) -> glib::Object + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())/*Not checked*/.to_glib_none().0
 }
 
 unsafe extern "C" fn custom_widget_apply_trampoline<P>(this: *mut ffi::GtkPrintOperation, widget: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(widget))
 }
 
 unsafe extern "C" fn done_trampoline<P>(this: *mut ffi::GtkPrintOperation, result: ffi::GtkPrintOperationResult, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, PrintOperationResult) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), from_glib(result))
 }
 
 unsafe extern "C" fn draw_page_trampoline<P>(this: *mut ffi::GtkPrintOperation, context: *mut ffi::GtkPrintContext, page_nr: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintContext, i32) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), page_nr)
 }
 
 unsafe extern "C" fn end_print_trampoline<P>(this: *mut ffi::GtkPrintOperation, context: *mut ffi::GtkPrintContext, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintContext) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context))
 }
 
 unsafe extern "C" fn paginate_trampoline<P>(this: *mut ffi::GtkPrintOperation, context: *mut ffi::GtkPrintContext, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintContext) -> bool + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context)).to_glib()
 }
 
 unsafe extern "C" fn preview_trampoline<P>(this: *mut ffi::GtkPrintOperation, preview: *mut ffi::GtkPrintOperationPreview, context: *mut ffi::GtkPrintContext, parent: *mut ffi::GtkWindow, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintOperationPreview, &PrintContext, &Option<Window>) -> bool + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(preview), &from_glib_borrow(context), &from_glib_borrow(parent)).to_glib()
 }
 
 unsafe extern "C" fn request_page_setup_trampoline<P>(this: *mut ffi::GtkPrintOperation, context: *mut ffi::GtkPrintContext, page_nr: libc::c_int, setup: *mut ffi::GtkPageSetup, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintContext, i32, &PageSetup) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), page_nr, &from_glib_borrow(setup))
 }
 
 unsafe extern "C" fn status_changed_trampoline<P>(this: *mut ffi::GtkPrintOperation, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn update_custom_widget_trampoline<P>(this: *mut ffi::GtkPrintOperation, widget: *mut ffi::GtkWidget, setup: *mut ffi::GtkPageSetup, settings: *mut ffi::GtkPrintSettings, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget, &PageSetup, &PrintSettings) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(widget), &from_glib_borrow(setup), &from_glib_borrow(settings))
 }
 
 unsafe extern "C" fn notify_allow_async_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_current_page_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_custom_tab_label_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_default_page_setup_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_embed_page_setup_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_export_filename_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_selection_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_job_name_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_n_pages_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_n_pages_to_print_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_print_settings_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_progress_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_status_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_status_string_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_support_selection_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_track_print_status_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_unit_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_full_page_trampoline<P>(this: *mut ffi::GtkPrintOperation, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/print_operation_preview.rs b/src/auto/print_operation_preview.rs
index 0a8f26e72d..587b872ebb 100644
--- a/src/auto/print_operation_preview.rs
+++ b/src/auto/print_operation_preview.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use PageSetup;
@@ -76,14 +76,12 @@ impl<O: IsA<PrintOperationPreview> + IsA<glib::object::Object>> PrintOperationPr
 
 unsafe extern "C" fn got_page_size_trampoline<P>(this: *mut ffi::GtkPrintOperationPreview, context: *mut ffi::GtkPrintContext, page_setup: *mut ffi::GtkPageSetup, f: glib_ffi::gpointer)
 where P: IsA<PrintOperationPreview> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintContext, &PageSetup) + 'static) = transmute(f);
     f(&PrintOperationPreview::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), &from_glib_borrow(page_setup))
 }
 
 unsafe extern "C" fn ready_trampoline<P>(this: *mut ffi::GtkPrintOperationPreview, context: *mut ffi::GtkPrintContext, f: glib_ffi::gpointer)
 where P: IsA<PrintOperationPreview> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintContext) + 'static) = transmute(f);
     f(&PrintOperationPreview::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context))
 }
diff --git a/src/auto/print_settings.rs b/src/auto/print_settings.rs
index b8b874445c..6545260f4c 100644
--- a/src/auto/print_settings.rs
+++ b/src/auto/print_settings.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
diff --git a/src/auto/progress_bar.rs b/src/auto/progress_bar.rs
index d085fe6851..967afea28b 100644
--- a/src/auto/progress_bar.rs
+++ b/src/auto/progress_bar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -215,42 +215,36 @@ impl<O: IsA<ProgressBar> + IsA<glib::object::Object>> ProgressBarExt for O {
 
 unsafe extern "C" fn notify_ellipsize_trampoline<P>(this: *mut ffi::GtkProgressBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ProgressBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ProgressBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_fraction_trampoline<P>(this: *mut ffi::GtkProgressBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ProgressBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ProgressBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_inverted_trampoline<P>(this: *mut ffi::GtkProgressBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ProgressBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ProgressBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pulse_step_trampoline<P>(this: *mut ffi::GtkProgressBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ProgressBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ProgressBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_text_trampoline<P>(this: *mut ffi::GtkProgressBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ProgressBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ProgressBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_trampoline<P>(this: *mut ffi::GtkProgressBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ProgressBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ProgressBar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/radio_button.rs b/src/auto/radio_button.rs
index b97aeb6606..4527cc36f6 100644
--- a/src/auto/radio_button.rs
+++ b/src/auto/radio_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -89,7 +89,6 @@ impl<O: IsA<RadioButton> + IsA<glib::object::Object>> RadioButtonExt for O {
 
 unsafe extern "C" fn group_changed_trampoline<P>(this: *mut ffi::GtkRadioButton, f: glib_ffi::gpointer)
 where P: IsA<RadioButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RadioButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/radio_menu_item.rs b/src/auto/radio_menu_item.rs
index 45a8cd6b46..6715dac571 100644
--- a/src/auto/radio_menu_item.rs
+++ b/src/auto/radio_menu_item.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -94,7 +94,6 @@ impl<O: IsA<RadioMenuItem> + IsA<glib::object::Object>> RadioMenuItemExt for O {
 
 unsafe extern "C" fn group_changed_trampoline<P>(this: *mut ffi::GtkRadioMenuItem, f: glib_ffi::gpointer)
 where P: IsA<RadioMenuItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RadioMenuItem::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/radio_tool_button.rs b/src/auto/radio_tool_button.rs
index d12f66e33c..0f9aabdcbc 100644
--- a/src/auto/radio_tool_button.rs
+++ b/src/auto/radio_tool_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
diff --git a/src/auto/range.rs b/src/auto/range.rs
index 56c280a8a7..6430a0022c 100644
--- a/src/auto/range.rs
+++ b/src/auto/range.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -396,84 +396,72 @@ impl<O: IsA<Range> + IsA<glib::object::Object> + glib::object::ObjectExt> RangeE
 
 unsafe extern "C" fn adjust_bounds_trampoline<P>(this: *mut ffi::GtkRange, value: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P, f64) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked(), value)
 }
 
 unsafe extern "C" fn change_value_trampoline<P>(this: *mut ffi::GtkRange, scroll: ffi::GtkScrollType, value: libc::c_double, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P, ScrollType, f64) -> Inhibit + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked(), from_glib(scroll), value).to_glib()
 }
 
 unsafe extern "C" fn move_slider_trampoline<P>(this: *mut ffi::GtkRange, step: ffi::GtkScrollType, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P, ScrollType) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked(), from_glib(step))
 }
 
 unsafe extern "C" fn value_changed_trampoline<P>(this: *mut ffi::GtkRange, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_adjustment_trampoline<P>(this: *mut ffi::GtkRange, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_fill_level_trampoline<P>(this: *mut ffi::GtkRange, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_inverted_trampoline<P>(this: *mut ffi::GtkRange, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_lower_stepper_sensitivity_trampoline<P>(this: *mut ffi::GtkRange, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_restrict_to_fill_level_trampoline<P>(this: *mut ffi::GtkRange, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_round_digits_trampoline<P>(this: *mut ffi::GtkRange, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_fill_level_trampoline<P>(this: *mut ffi::GtkRange, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_upper_stepper_sensitivity_trampoline<P>(this: *mut ffi::GtkRange, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Range> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Range::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/recent_chooser.rs b/src/auto/recent_chooser.rs
index cc16e70902..6fcd002645 100644
--- a/src/auto/recent_chooser.rs
+++ b/src/auto/recent_chooser.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
@@ -408,84 +408,72 @@ impl<O: IsA<RecentChooser> + IsA<glib::object::Object>> RecentChooserExt for O {
 
 unsafe extern "C" fn item_activated_trampoline<P>(this: *mut ffi::GtkRecentChooser, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn selection_changed_trampoline<P>(this: *mut ffi::GtkRecentChooser, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_filter_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_limit_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_local_only_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_recent_manager_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_select_multiple_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_icons_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_not_found_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_private_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_tips_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_sort_type_trampoline<P>(this: *mut ffi::GtkRecentChooser, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentChooser> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentChooser::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/recent_chooser_dialog.rs b/src/auto/recent_chooser_dialog.rs
index ef179d1377..7e2f2cf85b 100644
--- a/src/auto/recent_chooser_dialog.rs
+++ b/src/auto/recent_chooser_dialog.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
diff --git a/src/auto/recent_chooser_widget.rs b/src/auto/recent_chooser_widget.rs
index d935c35ec0..3351ce1abc 100644
--- a/src/auto/recent_chooser_widget.rs
+++ b/src/auto/recent_chooser_widget.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
diff --git a/src/auto/recent_filter.rs b/src/auto/recent_filter.rs
index 9c291b409d..d0eca928c3 100644
--- a/src/auto/recent_filter.rs
+++ b/src/auto/recent_filter.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/recent_info.rs b/src/auto/recent_info.rs
index a044e58efc..1c3a6e1c38 100644
--- a/src/auto/recent_info.rs
+++ b/src/auto/recent_info.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
diff --git a/src/auto/recent_manager.rs b/src/auto/recent_manager.rs
index 45c1f800d6..7f88b5d6ea 100644
--- a/src/auto/recent_manager.rs
+++ b/src/auto/recent_manager.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Error;
@@ -181,21 +181,18 @@ impl<O: IsA<RecentManager> + IsA<glib::object::Object>> RecentManagerExt for O {
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GtkRecentManager, f: glib_ffi::gpointer)
 where P: IsA<RecentManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentManager::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_filename_trampoline<P>(this: *mut ffi::GtkRecentManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentManager::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_trampoline<P>(this: *mut ffi::GtkRecentManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<RecentManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&RecentManager::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/revealer.rs b/src/auto/revealer.rs
index c7ed05cdf6..90f92d7229 100644
--- a/src/auto/revealer.rs
+++ b/src/auto/revealer.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -228,28 +228,24 @@ impl<O: IsA<Revealer> + IsA<glib::object::Object>> RevealerExt for O {
 
 unsafe extern "C" fn notify_child_revealed_trampoline<P>(this: *mut ffi::GtkRevealer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Revealer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Revealer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_reveal_child_trampoline<P>(this: *mut ffi::GtkRevealer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Revealer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Revealer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_transition_duration_trampoline<P>(this: *mut ffi::GtkRevealer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Revealer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Revealer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_transition_type_trampoline<P>(this: *mut ffi::GtkRevealer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Revealer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Revealer::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/scale.rs b/src/auto/scale.rs
index 1e340b1a43..bfaf16380c 100644
--- a/src/auto/scale.rs
+++ b/src/auto/scale.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -208,35 +208,30 @@ impl<O: IsA<Scale> + IsA<glib::object::Object>> ScaleExt for O {
 
 unsafe extern "C" fn format_value_trampoline<P>(this: *mut ffi::GtkScale, value: libc::c_double, f: glib_ffi::gpointer) -> *mut libc::c_char
 where P: IsA<Scale> {
-    callback_guard!();
     let f: &&(Fn(&P, f64) -> String + 'static) = transmute(f);
     f(&Scale::from_glib_borrow(this).downcast_unchecked(), value).to_glib_full()
 }
 
 unsafe extern "C" fn notify_digits_trampoline<P>(this: *mut ffi::GtkScale, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Scale> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Scale::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_draw_value_trampoline<P>(this: *mut ffi::GtkScale, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Scale> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Scale::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_origin_trampoline<P>(this: *mut ffi::GtkScale, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Scale> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Scale::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_value_pos_trampoline<P>(this: *mut ffi::GtkScale, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Scale> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Scale::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/scale_button.rs b/src/auto/scale_button.rs
index e808ef91e4..05ec8a686e 100644
--- a/src/auto/scale_button.rs
+++ b/src/auto/scale_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -225,49 +225,42 @@ impl<O: IsA<ScaleButton> + IsA<glib::object::Object> + glib::object::ObjectExt>
 
 unsafe extern "C" fn popdown_trampoline<P>(this: *mut ffi::GtkScaleButton, f: glib_ffi::gpointer)
 where P: IsA<ScaleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScaleButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn popup_trampoline<P>(this: *mut ffi::GtkScaleButton, f: glib_ffi::gpointer)
 where P: IsA<ScaleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScaleButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn value_changed_trampoline<P>(this: *mut ffi::GtkScaleButton, value: libc::c_double, f: glib_ffi::gpointer)
 where P: IsA<ScaleButton> {
-    callback_guard!();
     let f: &&(Fn(&P, f64) + 'static) = transmute(f);
     f(&ScaleButton::from_glib_borrow(this).downcast_unchecked(), value)
 }
 
 unsafe extern "C" fn notify_adjustment_trampoline<P>(this: *mut ffi::GtkScaleButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScaleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScaleButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icons_trampoline<P>(this: *mut ffi::GtkScaleButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScaleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScaleButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_trampoline<P>(this: *mut ffi::GtkScaleButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScaleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScaleButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_value_trampoline<P>(this: *mut ffi::GtkScaleButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScaleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScaleButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/scrollable.rs b/src/auto/scrollable.rs
index 5e7fbc1b6e..3f0828d3f6 100644
--- a/src/auto/scrollable.rs
+++ b/src/auto/scrollable.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -154,28 +154,24 @@ impl<O: IsA<Scrollable> + IsA<glib::object::Object>> ScrollableExt for O {
 
 unsafe extern "C" fn notify_hadjustment_trampoline<P>(this: *mut ffi::GtkScrollable, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Scrollable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Scrollable::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_hscroll_policy_trampoline<P>(this: *mut ffi::GtkScrollable, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Scrollable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Scrollable::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_vadjustment_trampoline<P>(this: *mut ffi::GtkScrollable, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Scrollable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Scrollable::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_vscroll_policy_trampoline<P>(this: *mut ffi::GtkScrollable, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Scrollable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Scrollable::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/scrollbar.rs b/src/auto/scrollbar.rs
index 10c17fd852..645209886a 100644
--- a/src/auto/scrollbar.rs
+++ b/src/auto/scrollbar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
diff --git a/src/auto/scrolled_window.rs b/src/auto/scrolled_window.rs
index c35c087d49..6335fdffc5 100644
--- a/src/auto/scrolled_window.rs
+++ b/src/auto/scrolled_window.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -630,7 +630,6 @@ impl<O: IsA<ScrolledWindow> + IsA<glib::object::Object> + glib::object::ObjectEx
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn edge_overshot_trampoline<P>(this: *mut ffi::GtkScrolledWindow, pos: ffi::GtkPositionType, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P, PositionType) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked(), from_glib(pos))
 }
@@ -638,42 +637,36 @@ where P: IsA<ScrolledWindow> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn edge_reached_trampoline<P>(this: *mut ffi::GtkScrolledWindow, pos: ffi::GtkPositionType, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P, PositionType) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked(), from_glib(pos))
 }
 
 unsafe extern "C" fn move_focus_out_trampoline<P>(this: *mut ffi::GtkScrolledWindow, direction_type: ffi::GtkDirectionType, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P, DirectionType) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked(), from_glib(direction_type))
 }
 
 unsafe extern "C" fn scroll_child_trampoline<P>(this: *mut ffi::GtkScrolledWindow, scroll: ffi::GtkScrollType, horizontal: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P, ScrollType, bool) -> bool + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked(), from_glib(scroll), from_glib(horizontal)).to_glib()
 }
 
 unsafe extern "C" fn notify_hadjustment_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_hscrollbar_policy_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_kinetic_scrolling_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
@@ -681,7 +674,6 @@ where P: IsA<ScrolledWindow> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_max_content_height_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
@@ -689,21 +681,18 @@ where P: IsA<ScrolledWindow> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_max_content_width_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_min_content_height_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_min_content_width_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
@@ -711,7 +700,6 @@ where P: IsA<ScrolledWindow> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_overlay_scrolling_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
@@ -719,7 +707,6 @@ where P: IsA<ScrolledWindow> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_propagate_natural_height_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
@@ -727,42 +714,36 @@ where P: IsA<ScrolledWindow> {
 #[cfg(any(feature = "v3_22", feature = "dox"))]
 unsafe extern "C" fn notify_propagate_natural_width_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_shadow_type_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_vadjustment_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_vscrollbar_policy_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_window_placement_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_window_placement_set_trampoline<P>(this: *mut ffi::GtkScrolledWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ScrolledWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ScrolledWindow::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/search_bar.rs b/src/auto/search_bar.rs
index b5e5e8c8d2..ff93ef28df 100644
--- a/src/auto/search_bar.rs
+++ b/src/auto/search_bar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -173,14 +173,12 @@ impl<O: IsA<SearchBar> + IsA<glib::object::Object>> SearchBarExt for O {
 
 unsafe extern "C" fn notify_search_mode_enabled_trampoline<P>(this: *mut ffi::GtkSearchBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SearchBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SearchBar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_close_button_trampoline<P>(this: *mut ffi::GtkSearchBar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SearchBar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SearchBar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/search_entry.rs b/src/auto/search_entry.rs
index 4006ce5099..f83af1ffbc 100644
--- a/src/auto/search_entry.rs
+++ b/src/auto/search_entry.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -141,7 +141,6 @@ impl<O: IsA<SearchEntry> + IsA<glib::object::Object> + glib::object::ObjectExt>
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn next_match_trampoline<P>(this: *mut ffi::GtkSearchEntry, f: glib_ffi::gpointer)
 where P: IsA<SearchEntry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SearchEntry::from_glib_borrow(this).downcast_unchecked())
 }
@@ -149,7 +148,6 @@ where P: IsA<SearchEntry> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn previous_match_trampoline<P>(this: *mut ffi::GtkSearchEntry, f: glib_ffi::gpointer)
 where P: IsA<SearchEntry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SearchEntry::from_glib_borrow(this).downcast_unchecked())
 }
@@ -157,7 +155,6 @@ where P: IsA<SearchEntry> {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn search_changed_trampoline<P>(this: *mut ffi::GtkSearchEntry, f: glib_ffi::gpointer)
 where P: IsA<SearchEntry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SearchEntry::from_glib_borrow(this).downcast_unchecked())
 }
@@ -165,7 +162,6 @@ where P: IsA<SearchEntry> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn stop_search_trampoline<P>(this: *mut ffi::GtkSearchEntry, f: glib_ffi::gpointer)
 where P: IsA<SearchEntry> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SearchEntry::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/selection_data.rs b/src/auto/selection_data.rs
index c06251efb8..0a1ea1859f 100644
--- a/src/auto/selection_data.rs
+++ b/src/auto/selection_data.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use TextBuffer;
diff --git a/src/auto/separator.rs b/src/auto/separator.rs
index dc2d5ae376..cee8533ace 100644
--- a/src/auto/separator.rs
+++ b/src/auto/separator.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/separator_menu_item.rs b/src/auto/separator_menu_item.rs
index 902c9f0e93..df57c72e6f 100644
--- a/src/auto/separator_menu_item.rs
+++ b/src/auto/separator_menu_item.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
diff --git a/src/auto/separator_tool_item.rs b/src/auto/separator_tool_item.rs
index 4a7a6edd20..e8e4574a91 100644
--- a/src/auto/separator_tool_item.rs
+++ b/src/auto/separator_tool_item.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -76,7 +76,6 @@ impl<O: IsA<SeparatorToolItem> + IsA<glib::object::Object>> SeparatorToolItemExt
 
 unsafe extern "C" fn notify_draw_trampoline<P>(this: *mut ffi::GtkSeparatorToolItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SeparatorToolItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SeparatorToolItem::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/settings.rs b/src/auto/settings.rs
index 0b94e5e621..2ccbcb1bde 100644
--- a/src/auto/settings.rs
+++ b/src/auto/settings.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use CornerType;
@@ -2551,98 +2551,84 @@ impl<O: IsA<Settings> + IsA<glib::object::Object>> SettingsExt for O {
 
 unsafe extern "C" fn notify_color_hash_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_alternative_button_order_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_alternative_sort_arrows_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_application_prefer_dark_theme_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_auto_mnemonics_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_button_images_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_can_change_accels_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_color_palette_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_color_scheme_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_cursor_blink_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_cursor_blink_time_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_cursor_blink_timeout_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_cursor_theme_name_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_cursor_theme_size_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2650,7 +2636,6 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_decoration_layout_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2658,175 +2643,150 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_dialogs_use_header_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_dnd_drag_threshold_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_double_click_distance_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_double_click_time_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_enable_accels_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_enable_animations_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_enable_event_sounds_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_enable_input_feedback_sounds_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_enable_mnemonics_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_enable_primary_paste_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_enable_tooltips_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_entry_password_hint_timeout_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_entry_select_on_focus_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_error_bell_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_fallback_icon_theme_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_file_chooser_backend_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_font_name_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_fontconfig_timestamp_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_icon_sizes_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_icon_theme_name_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_im_module_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_im_preedit_style_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_im_status_style_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_key_theme_name_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_keynav_cursor_only_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2834,21 +2794,18 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_keynav_use_caret_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_keynav_wrap_around_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_label_select_on_focus_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2856,49 +2813,42 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_long_press_time_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_menu_bar_accel_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_menu_bar_popup_delay_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_menu_images_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_menu_popdown_delay_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_menu_popup_delay_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_modules_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2906,21 +2856,18 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_primary_button_warps_slider_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_print_backends_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_print_preview_command_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2928,105 +2875,90 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_recent_files_enabled_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_recent_files_limit_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_recent_files_max_age_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_scrolled_window_placement_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_shell_shows_app_menu_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_shell_shows_desktop_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_shell_shows_menubar_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_show_input_method_menu_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_show_unicode_menu_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_sound_theme_name_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_split_cursor_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_theme_name_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_timeout_expand_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_timeout_initial_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_timeout_repeat_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -3034,7 +2966,6 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_titlebar_double_click_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -3042,7 +2973,6 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_titlebar_middle_click_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
@@ -3050,84 +2980,72 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_gtk_titlebar_right_click_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_toolbar_icon_size_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_toolbar_style_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_tooltip_browse_mode_timeout_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_tooltip_browse_timeout_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_tooltip_timeout_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_visible_focus_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_xft_antialias_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_xft_dpi_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_xft_hinting_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_xft_hintstyle_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gtk_xft_rgba_trampoline<P>(this: *mut ffi::GtkSettings, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Settings> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Settings::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/shortcuts_window.rs b/src/auto/shortcuts_window.rs
index 121114d9bc..0f06c3682b 100644
--- a/src/auto/shortcuts_window.rs
+++ b/src/auto/shortcuts_window.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -125,28 +125,24 @@ impl<O: IsA<ShortcutsWindow> + IsA<glib::object::Object> + glib::object::ObjectE
 
 unsafe extern "C" fn close_trampoline<P>(this: *mut ffi::GtkShortcutsWindow, f: glib_ffi::gpointer)
 where P: IsA<ShortcutsWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ShortcutsWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn search_trampoline<P>(this: *mut ffi::GtkShortcutsWindow, f: glib_ffi::gpointer)
 where P: IsA<ShortcutsWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ShortcutsWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_section_name_trampoline<P>(this: *mut ffi::GtkShortcutsWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ShortcutsWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ShortcutsWindow::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_view_name_trampoline<P>(this: *mut ffi::GtkShortcutsWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ShortcutsWindow> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ShortcutsWindow::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/size_group.rs b/src/auto/size_group.rs
index e8d2908e7c..f679c05a15 100644
--- a/src/auto/size_group.rs
+++ b/src/auto/size_group.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -121,14 +121,12 @@ impl<O: IsA<SizeGroup> + IsA<glib::object::Object>> SizeGroupExt for O {
 
 unsafe extern "C" fn notify_ignore_hidden_trampoline<P>(this: *mut ffi::GtkSizeGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SizeGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SizeGroup::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mode_trampoline<P>(this: *mut ffi::GtkSizeGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SizeGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SizeGroup::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/socket.rs b/src/auto/socket.rs
index 30c7529f5e..d718eb9937 100644
--- a/src/auto/socket.rs
+++ b/src/auto/socket.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -94,14 +94,12 @@ impl<O: IsA<Socket> + IsA<glib::object::Object>> SocketExt for O {
 
 unsafe extern "C" fn plug_added_trampoline<P>(this: *mut ffi::GtkSocket, f: glib_ffi::gpointer)
 where P: IsA<Socket> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Socket::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn plug_removed_trampoline<P>(this: *mut ffi::GtkSocket, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Socket> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&Socket::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
diff --git a/src/auto/spin_button.rs b/src/auto/spin_button.rs
index 6ac9e618cb..8d1d47d866 100644
--- a/src/auto/spin_button.rs
+++ b/src/auto/spin_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -341,56 +341,48 @@ impl<O: IsA<SpinButton> + IsA<glib::object::Object>> SpinButtonExt for O {
 
 unsafe extern "C" fn notify_adjustment_trampoline<P>(this: *mut ffi::GtkSpinButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SpinButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SpinButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_climb_rate_trampoline<P>(this: *mut ffi::GtkSpinButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SpinButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SpinButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_digits_trampoline<P>(this: *mut ffi::GtkSpinButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SpinButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SpinButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_numeric_trampoline<P>(this: *mut ffi::GtkSpinButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SpinButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SpinButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_snap_to_ticks_trampoline<P>(this: *mut ffi::GtkSpinButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SpinButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SpinButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_update_policy_trampoline<P>(this: *mut ffi::GtkSpinButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SpinButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SpinButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_value_trampoline<P>(this: *mut ffi::GtkSpinButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SpinButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SpinButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_trampoline<P>(this: *mut ffi::GtkSpinButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<SpinButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&SpinButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/spinner.rs b/src/auto/spinner.rs
index 3821a8808a..1314af66f7 100644
--- a/src/auto/spinner.rs
+++ b/src/auto/spinner.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -93,7 +93,6 @@ impl<O: IsA<Spinner> + IsA<glib::object::Object>> SpinnerExt for O {
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkSpinner, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Spinner> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Spinner::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/stack.rs b/src/auto/stack.rs
index 868c4941c1..6cf5a5a217 100644
--- a/src/auto/stack.rs
+++ b/src/auto/stack.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -569,42 +569,36 @@ impl<O: IsA<Stack> + IsA<Container> + IsA<glib::object::Object>> StackExt for O
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_hhomogeneous_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_homogeneous_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_interpolate_size_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_transition_duration_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_transition_running_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_transition_type_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
@@ -612,21 +606,18 @@ where P: IsA<Stack> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_vhomogeneous_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_child_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_child_name_trampoline<P>(this: *mut ffi::GtkStack, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Stack> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Stack::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/stack_sidebar.rs b/src/auto/stack_sidebar.rs
index 3b59f9c3fa..1be422f69d 100644
--- a/src/auto/stack_sidebar.rs
+++ b/src/auto/stack_sidebar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -102,7 +102,6 @@ impl<O: IsA<StackSidebar> + IsA<glib::object::Object>> StackSidebarExt for O {
 
 unsafe extern "C" fn notify_stack_trampoline<P>(this: *mut ffi::GtkStackSidebar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StackSidebar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StackSidebar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/stack_switcher.rs b/src/auto/stack_switcher.rs
index d69c6f9236..a848472a72 100644
--- a/src/auto/stack_switcher.rs
+++ b/src/auto/stack_switcher.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
@@ -140,14 +140,12 @@ impl<O: IsA<StackSwitcher> + IsA<glib::object::Object>> StackSwitcherExt for O {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_icon_size_trampoline<P>(this: *mut ffi::GtkStackSwitcher, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StackSwitcher> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StackSwitcher::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stack_trampoline<P>(this: *mut ffi::GtkStackSwitcher, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StackSwitcher> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StackSwitcher::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/status_icon.rs b/src/auto/status_icon.rs
index 0846bdf6a6..7ca4744a97 100644
--- a/src/auto/status_icon.rs
+++ b/src/auto/status_icon.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ImageType;
@@ -654,154 +654,132 @@ impl<O: IsA<StatusIcon> + IsA<glib::object::Object> + glib::object::ObjectExt> S
 
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkStatusIcon, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn button_press_event_trampoline<P>(this: *mut ffi::GtkStatusIcon, event: *mut gdk_ffi::GdkEventButton, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventButton) -> bool + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn button_release_event_trampoline<P>(this: *mut ffi::GtkStatusIcon, event: *mut gdk_ffi::GdkEventButton, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventButton) -> bool + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn popup_menu_trampoline<P>(this: *mut ffi::GtkStatusIcon, button: libc::c_uint, activate_time: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P, u32, u32) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked(), button, activate_time)
 }
 
 unsafe extern "C" fn query_tooltip_trampoline<P>(this: *mut ffi::GtkStatusIcon, x: libc::c_int, y: libc::c_int, keyboard_mode: glib_ffi::gboolean, tooltip: *mut ffi::GtkTooltip, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P, i32, i32, bool, &Tooltip) -> bool + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked(), x, y, from_glib(keyboard_mode), &from_glib_borrow(tooltip)).to_glib()
 }
 
 unsafe extern "C" fn scroll_event_trampoline<P>(this: *mut ffi::GtkStatusIcon, event: *mut gdk_ffi::GdkEventScroll, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventScroll) -> bool + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn size_changed_trampoline<P>(this: *mut ffi::GtkStatusIcon, size: libc::c_int, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P, i32) -> bool + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked(), size).to_glib()
 }
 
 unsafe extern "C" fn notify_embedded_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_file_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gicon_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_tooltip_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_name_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_orientation_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixbuf_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_screen_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stock_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_storage_type_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_markup_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_text_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_trampoline<P>(this: *mut ffi::GtkStatusIcon, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StatusIcon> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StatusIcon::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/statusbar.rs b/src/auto/statusbar.rs
index 3186c2a2d1..11a9105989 100644
--- a/src/auto/statusbar.rs
+++ b/src/auto/statusbar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Box;
@@ -119,14 +119,12 @@ impl<O: IsA<Statusbar> + IsA<glib::object::Object>> StatusbarExt for O {
 
 unsafe extern "C" fn text_popped_trampoline<P>(this: *mut ffi::GtkStatusbar, context_id: libc::c_uint, text: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<Statusbar> {
-    callback_guard!();
     let f: &&(Fn(&P, u32, &str) + 'static) = transmute(f);
     f(&Statusbar::from_glib_borrow(this).downcast_unchecked(), context_id, &String::from_glib_none(text))
 }
 
 unsafe extern "C" fn text_pushed_trampoline<P>(this: *mut ffi::GtkStatusbar, context_id: libc::c_uint, text: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<Statusbar> {
-    callback_guard!();
     let f: &&(Fn(&P, u32, &str) + 'static) = transmute(f);
     f(&Statusbar::from_glib_borrow(this).downcast_unchecked(), context_id, &String::from_glib_none(text))
 }
diff --git a/src/auto/style_context.rs b/src/auto/style_context.rs
index e85dbb5336..b4b0934858 100644
--- a/src/auto/style_context.rs
+++ b/src/auto/style_context.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Border;
@@ -585,14 +585,12 @@ impl<O: IsA<StyleContext> + IsA<glib::object::Object>> StyleContextExt for O {
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GtkStyleContext, f: glib_ffi::gpointer)
 where P: IsA<StyleContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StyleContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_direction_trampoline<P>(this: *mut ffi::GtkStyleContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StyleContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StyleContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -600,21 +598,18 @@ where P: IsA<StyleContext> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_paint_clock_trampoline<P>(this: *mut ffi::GtkStyleContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StyleContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StyleContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_parent_trampoline<P>(this: *mut ffi::GtkStyleContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StyleContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StyleContext::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_screen_trampoline<P>(this: *mut ffi::GtkStyleContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<StyleContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&StyleContext::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/style_properties.rs b/src/auto/style_properties.rs
index 40b07f9a01..2b0be41852 100644
--- a/src/auto/style_properties.rs
+++ b/src/auto/style_properties.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use StateFlags;
diff --git a/src/auto/style_provider.rs b/src/auto/style_provider.rs
index 2aa154348b..1968fabd10 100644
--- a/src/auto/style_provider.rs
+++ b/src/auto/style_provider.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
diff --git a/src/auto/switch.rs b/src/auto/switch.rs
index 27a808d443..df09504fa3 100644
--- a/src/auto/switch.rs
+++ b/src/auto/switch.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -136,7 +136,6 @@ impl<O: IsA<Switch> + IsA<glib::object::Object> + glib::object::ObjectExt> Switc
 
 unsafe extern "C" fn activate_trampoline<P>(this: *mut ffi::GtkSwitch, f: glib_ffi::gpointer)
 where P: IsA<Switch> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Switch::from_glib_borrow(this).downcast_unchecked())
 }
@@ -144,14 +143,12 @@ where P: IsA<Switch> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn state_set_trampoline<P>(this: *mut ffi::GtkSwitch, state: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Switch> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) -> Inhibit + 'static) = transmute(f);
     f(&Switch::from_glib_borrow(this).downcast_unchecked(), from_glib(state)).to_glib()
 }
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkSwitch, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Switch> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Switch::from_glib_borrow(this).downcast_unchecked())
 }
@@ -159,7 +156,6 @@ where P: IsA<Switch> {
 #[cfg(any(feature = "v3_14", feature = "dox"))]
 unsafe extern "C" fn notify_state_trampoline<P>(this: *mut ffi::GtkSwitch, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Switch> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Switch::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/symbolic_color.rs b/src/auto/symbolic_color.rs
index fb7476b0d2..8ff410eb8d 100644
--- a/src/auto/symbolic_color.rs
+++ b/src/auto/symbolic_color.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use StyleProperties;
diff --git a/src/auto/target_list.rs b/src/auto/target_list.rs
index 9cdb61e03e..6a168aea9f 100644
--- a/src/auto/target_list.rs
+++ b/src/auto/target_list.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use TextBuffer;
diff --git a/src/auto/text_attributes.rs b/src/auto/text_attributes.rs
index a6ae6eda01..4aa36f2ceb 100644
--- a/src/auto/text_attributes.rs
+++ b/src/auto/text_attributes.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
diff --git a/src/auto/text_buffer.rs b/src/auto/text_buffer.rs
index b66a99bca9..16f5be65ed 100644
--- a/src/auto/text_buffer.rs
+++ b/src/auto/text_buffer.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Clipboard;
@@ -864,126 +864,108 @@ impl<O: IsA<TextBuffer> + IsA<glib::object::Object>> TextBufferExt for O {
 
 unsafe extern "C" fn apply_tag_trampoline<P>(this: *mut ffi::GtkTextBuffer, tag: *mut ffi::GtkTextTag, start: *mut ffi::GtkTextIter, end: *mut ffi::GtkTextIter, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextTag, &TextIter, &TextIter) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tag), &from_glib_borrow(start), &from_glib_borrow(end))
 }
 
 unsafe extern "C" fn begin_user_action_trampoline<P>(this: *mut ffi::GtkTextBuffer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GtkTextBuffer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn delete_range_trampoline<P>(this: *mut ffi::GtkTextBuffer, start: *mut ffi::GtkTextIter, end: *mut ffi::GtkTextIter, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextIter, &TextIter) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(start), &from_glib_borrow(end))
 }
 
 unsafe extern "C" fn end_user_action_trampoline<P>(this: *mut ffi::GtkTextBuffer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn insert_child_anchor_trampoline<P>(this: *mut ffi::GtkTextBuffer, location: *mut ffi::GtkTextIter, anchor: *mut ffi::GtkTextChildAnchor, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextIter, &TextChildAnchor) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(location), &from_glib_borrow(anchor))
 }
 
 unsafe extern "C" fn insert_pixbuf_trampoline<P>(this: *mut ffi::GtkTextBuffer, location: *mut ffi::GtkTextIter, pixbuf: *mut gdk_pixbuf_ffi::GdkPixbuf, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextIter, &gdk_pixbuf::Pixbuf) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(location), &from_glib_borrow(pixbuf))
 }
 
 unsafe extern "C" fn mark_deleted_trampoline<P>(this: *mut ffi::GtkTextBuffer, mark: *mut ffi::GtkTextMark, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextMark) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(mark))
 }
 
 unsafe extern "C" fn mark_set_trampoline<P>(this: *mut ffi::GtkTextBuffer, location: *mut ffi::GtkTextIter, mark: *mut ffi::GtkTextMark, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextIter, &TextMark) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(location), &from_glib_borrow(mark))
 }
 
 unsafe extern "C" fn modified_changed_trampoline<P>(this: *mut ffi::GtkTextBuffer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn paste_done_trampoline<P>(this: *mut ffi::GtkTextBuffer, clipboard: *mut ffi::GtkClipboard, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P, &Clipboard) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(clipboard))
 }
 
 unsafe extern "C" fn remove_tag_trampoline<P>(this: *mut ffi::GtkTextBuffer, tag: *mut ffi::GtkTextTag, start: *mut ffi::GtkTextIter, end: *mut ffi::GtkTextIter, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextTag, &TextIter, &TextIter) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tag), &from_glib_borrow(start), &from_glib_borrow(end))
 }
 
 unsafe extern "C" fn notify_copy_target_list_trampoline<P>(this: *mut ffi::GtkTextBuffer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cursor_position_trampoline<P>(this: *mut ffi::GtkTextBuffer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_selection_trampoline<P>(this: *mut ffi::GtkTextBuffer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_paste_target_list_trampoline<P>(this: *mut ffi::GtkTextBuffer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tag_table_trampoline<P>(this: *mut ffi::GtkTextBuffer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_trampoline<P>(this: *mut ffi::GtkTextBuffer, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextBuffer> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextBuffer::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/text_child_anchor.rs b/src/auto/text_child_anchor.rs
index df3296b399..54f114bd7c 100644
--- a/src/auto/text_child_anchor.rs
+++ b/src/auto/text_child_anchor.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Widget;
diff --git a/src/auto/text_iter.rs b/src/auto/text_iter.rs
index 886559c407..928c03d8f2 100644
--- a/src/auto/text_iter.rs
+++ b/src/auto/text_iter.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use TextBuffer;
diff --git a/src/auto/text_mark.rs b/src/auto/text_mark.rs
index 2e9e5d4fdf..048620ac32 100644
--- a/src/auto/text_mark.rs
+++ b/src/auto/text_mark.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use TextBuffer;
@@ -110,14 +110,12 @@ impl<O: IsA<TextMark> + IsA<glib::object::Object>> TextMarkExt for O {
 
 unsafe extern "C" fn notify_left_gravity_trampoline<P>(this: *mut ffi::GtkTextMark, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextMark> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextMark::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_name_trampoline<P>(this: *mut ffi::GtkTextMark, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextMark> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextMark::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/text_tag.rs b/src/auto/text_tag.rs
index 109811ea78..f669bb68cd 100644
--- a/src/auto/text_tag.rs
+++ b/src/auto/text_tag.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Justification;
@@ -2031,70 +2031,60 @@ impl<O: IsA<TextTag> + IsA<glib::object::Object>> TextTagExt for O {
 
 unsafe extern "C" fn event_trampoline<P>(this: *mut ffi::GtkTextTag, object: *mut gobject_ffi::GObject, event: *mut gdk_ffi::GdkEvent, iter: *mut ffi::GtkTextIter, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P, &glib::Object, &gdk::Event, &TextIter) -> Inhibit + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object), &from_glib_none(event), &from_glib_borrow(iter)).to_glib()
 }
 
 unsafe extern "C" fn notify_accumulative_margin_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_full_height_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_full_height_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_rgba_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_background_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_direction_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_editable_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_editable_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2102,35 +2092,30 @@ where P: IsA<TextTag> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_fallback_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_fallback_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_family_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_family_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_font_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2138,105 +2123,90 @@ where P: IsA<TextTag> {
 #[cfg(any(feature = "v3_18", feature = "dox"))]
 unsafe extern "C" fn notify_font_features_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_font_features_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_foreground_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_foreground_rgba_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_foreground_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_indent_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_indent_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_invisible_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_invisible_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_justification_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_justification_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_language_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_language_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_left_margin_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_left_margin_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2244,168 +2214,144 @@ where P: IsA<TextTag> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_letter_spacing_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_letter_spacing_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_name_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_paragraph_background_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_paragraph_background_rgba_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_paragraph_background_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_above_lines_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_above_lines_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_below_lines_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_below_lines_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_inside_wrap_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_inside_wrap_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_right_margin_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_right_margin_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rise_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rise_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_scale_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_scale_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_points_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_size_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stretch_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stretch_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_strikethrough_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2413,7 +2359,6 @@ where P: IsA<TextTag> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_strikethrough_rgba_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2421,42 +2366,36 @@ where P: IsA<TextTag> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_strikethrough_rgba_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_strikethrough_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_style_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_style_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tabs_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_underline_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2464,7 +2403,6 @@ where P: IsA<TextTag> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_underline_rgba_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
@@ -2472,56 +2410,48 @@ where P: IsA<TextTag> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn notify_underline_rgba_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_underline_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_variant_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_variant_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_weight_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_weight_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_mode_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_mode_set_trampoline<P>(this: *mut ffi::GtkTextTag, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextTag> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextTag::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/text_tag_table.rs b/src/auto/text_tag_table.rs
index aa098e99a7..f2557381e8 100644
--- a/src/auto/text_tag_table.rs
+++ b/src/auto/text_tag_table.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -115,21 +115,18 @@ impl<O: IsA<TextTagTable> + IsA<glib::object::Object>> TextTagTableExt for O {
 
 unsafe extern "C" fn tag_added_trampoline<P>(this: *mut ffi::GtkTextTagTable, tag: *mut ffi::GtkTextTag, f: glib_ffi::gpointer)
 where P: IsA<TextTagTable> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextTag) + 'static) = transmute(f);
     f(&TextTagTable::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tag))
 }
 
 unsafe extern "C" fn tag_changed_trampoline<P>(this: *mut ffi::GtkTextTagTable, tag: *mut ffi::GtkTextTag, size_changed: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<TextTagTable> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextTag, bool) + 'static) = transmute(f);
     f(&TextTagTable::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tag), from_glib(size_changed))
 }
 
 unsafe extern "C" fn tag_removed_trampoline<P>(this: *mut ffi::GtkTextTagTable, tag: *mut ffi::GtkTextTag, f: glib_ffi::gpointer)
 where P: IsA<TextTagTable> {
-    callback_guard!();
     let f: &&(Fn(&P, &TextTag) + 'static) = transmute(f);
     f(&TextTagTable::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(tag))
 }
diff --git a/src/auto/text_view.rs b/src/auto/text_view.rs
index 95360399b2..e0ff663273 100644
--- a/src/auto/text_view.rs
+++ b/src/auto/text_view.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -1210,28 +1210,24 @@ impl<O: IsA<TextView> + IsA<glib::object::Object> + glib::object::ObjectExt> Tex
 
 unsafe extern "C" fn backspace_trampoline<P>(this: *mut ffi::GtkTextView, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn copy_clipboard_trampoline<P>(this: *mut ffi::GtkTextView, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn cut_clipboard_trampoline<P>(this: *mut ffi::GtkTextView, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn delete_from_cursor_trampoline<P>(this: *mut ffi::GtkTextView, type_: ffi::GtkDeleteType, count: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P, DeleteType, i32) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked(), from_glib(type_), count)
 }
@@ -1239,14 +1235,12 @@ where P: IsA<TextView> {
 #[cfg(any(feature = "v3_16", feature = "dox"))]
 unsafe extern "C" fn extend_selection_trampoline<P>(this: *mut ffi::GtkTextView, granularity: ffi::GtkTextExtendSelection, location: *mut ffi::GtkTextIter, start: *mut ffi::GtkTextIter, end: *mut ffi::GtkTextIter, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P, TextExtendSelection, &TextIter, &TextIter, &TextIter) -> Inhibit + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked(), from_glib(granularity), &from_glib_borrow(location), &from_glib_borrow(start), &from_glib_borrow(end)).to_glib()
 }
 
 unsafe extern "C" fn insert_at_cursor_trampoline<P>(this: *mut ffi::GtkTextView, string: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(string))
 }
@@ -1254,77 +1248,66 @@ where P: IsA<TextView> {
 #[cfg(any(feature = "v3_22_26", feature = "dox"))]
 unsafe extern "C" fn insert_emoji_trampoline<P>(this: *mut ffi::GtkTextView, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn move_cursor_trampoline<P>(this: *mut ffi::GtkTextView, step: ffi::GtkMovementStep, count: libc::c_int, extend_selection: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P, MovementStep, i32, bool) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked(), from_glib(step), count, from_glib(extend_selection))
 }
 
 unsafe extern "C" fn move_viewport_trampoline<P>(this: *mut ffi::GtkTextView, step: ffi::GtkScrollStep, count: libc::c_int, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P, ScrollStep, i32) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked(), from_glib(step), count)
 }
 
 unsafe extern "C" fn paste_clipboard_trampoline<P>(this: *mut ffi::GtkTextView, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn populate_popup_trampoline<P>(this: *mut ffi::GtkTextView, popup: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(popup))
 }
 
 unsafe extern "C" fn preedit_changed_trampoline<P>(this: *mut ffi::GtkTextView, preedit: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(preedit))
 }
 
 unsafe extern "C" fn select_all_trampoline<P>(this: *mut ffi::GtkTextView, select: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked(), from_glib(select))
 }
 
 unsafe extern "C" fn set_anchor_trampoline<P>(this: *mut ffi::GtkTextView, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn toggle_cursor_visible_trampoline<P>(this: *mut ffi::GtkTextView, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn toggle_overwrite_trampoline<P>(this: *mut ffi::GtkTextView, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_accepts_tab_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1332,42 +1315,36 @@ where P: IsA<TextView> {
 #[cfg(any(feature = "v3_18", feature = "dox"))]
 unsafe extern "C" fn notify_bottom_margin_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_buffer_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cursor_visible_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_editable_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_im_module_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_indent_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1375,7 +1352,6 @@ where P: IsA<TextView> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_input_hints_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1383,56 +1359,48 @@ where P: IsA<TextView> {
 #[cfg(any(feature = "v3_6", feature = "dox"))]
 unsafe extern "C" fn notify_input_purpose_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_justification_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_left_margin_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_monospace_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_overwrite_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_above_lines_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_below_lines_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_pixels_inside_wrap_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1440,21 +1408,18 @@ where P: IsA<TextView> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_populate_all_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_right_margin_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tabs_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1462,14 +1427,12 @@ where P: IsA<TextView> {
 #[cfg(any(feature = "v3_18", feature = "dox"))]
 unsafe extern "C" fn notify_top_margin_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_wrap_mode_trampoline<P>(this: *mut ffi::GtkTextView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TextView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TextView::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/toggle_button.rs b/src/auto/toggle_button.rs
index 56a3aa29ea..52811542e9 100644
--- a/src/auto/toggle_button.rs
+++ b/src/auto/toggle_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -181,28 +181,24 @@ impl<O: IsA<ToggleButton> + IsA<glib::object::Object>> ToggleButtonExt for O {
 
 unsafe extern "C" fn toggled_trampoline<P>(this: *mut ffi::GtkToggleButton, f: glib_ffi::gpointer)
 where P: IsA<ToggleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToggleButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkToggleButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToggleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToggleButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_draw_indicator_trampoline<P>(this: *mut ffi::GtkToggleButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToggleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToggleButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_inconsistent_trampoline<P>(this: *mut ffi::GtkToggleButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToggleButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToggleButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/toggle_tool_button.rs b/src/auto/toggle_tool_button.rs
index a4231b349d..73a9cc1731 100644
--- a/src/auto/toggle_tool_button.rs
+++ b/src/auto/toggle_tool_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -96,14 +96,12 @@ impl<O: IsA<ToggleToolButton> + IsA<glib::object::Object>> ToggleToolButtonExt f
 
 unsafe extern "C" fn toggled_trampoline<P>(this: *mut ffi::GtkToggleToolButton, f: glib_ffi::gpointer)
 where P: IsA<ToggleToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToggleToolButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_active_trampoline<P>(this: *mut ffi::GtkToggleToolButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToggleToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToggleToolButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tool_button.rs b/src/auto/tool_button.rs
index 06145d660d..39bf9de0b5 100644
--- a/src/auto/tool_button.rs
+++ b/src/auto/tool_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -242,49 +242,42 @@ impl<O: IsA<ToolButton> + IsA<glib::object::Object> + glib::object::ObjectExt> T
 
 unsafe extern "C" fn clicked_trampoline<P>(this: *mut ffi::GtkToolButton, f: glib_ffi::gpointer)
 where P: IsA<ToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_name_trampoline<P>(this: *mut ffi::GtkToolButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_widget_trampoline<P>(this: *mut ffi::GtkToolButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_trampoline<P>(this: *mut ffi::GtkToolButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_widget_trampoline<P>(this: *mut ffi::GtkToolButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_stock_id_trampoline<P>(this: *mut ffi::GtkToolButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolButton::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_use_underline_trampoline<P>(this: *mut ffi::GtkToolButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tool_item.rs b/src/auto/tool_item.rs
index 3d732c999f..45c0fa698a 100644
--- a/src/auto/tool_item.rs
+++ b/src/auto/tool_item.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Bin;
@@ -307,35 +307,30 @@ impl<O: IsA<ToolItem> + IsA<glib::object::Object>> ToolItemExt for O {
 
 unsafe extern "C" fn create_menu_proxy_trampoline<P>(this: *mut ffi::GtkToolItem, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<ToolItem> {
-    callback_guard!();
     let f: &&(Fn(&P) -> Inhibit + 'static) = transmute(f);
     f(&ToolItem::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn toolbar_reconfigured_trampoline<P>(this: *mut ffi::GtkToolItem, f: glib_ffi::gpointer)
 where P: IsA<ToolItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_is_important_trampoline<P>(this: *mut ffi::GtkToolItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_horizontal_trampoline<P>(this: *mut ffi::GtkToolItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItem::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_vertical_trampoline<P>(this: *mut ffi::GtkToolItem, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolItem> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItem::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tool_item_group.rs b/src/auto/tool_item_group.rs
index 813b46a0dd..9e66e6fcdd 100644
--- a/src/auto/tool_item_group.rs
+++ b/src/auto/tool_item_group.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -298,35 +298,30 @@ impl<O: IsA<ToolItemGroup> + IsA<Container> + IsA<glib::object::Object>> ToolIte
 
 unsafe extern "C" fn notify_collapsed_trampoline<P>(this: *mut ffi::GtkToolItemGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolItemGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItemGroup::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ellipsize_trampoline<P>(this: *mut ffi::GtkToolItemGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolItemGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItemGroup::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_header_relief_trampoline<P>(this: *mut ffi::GtkToolItemGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolItemGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItemGroup::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_trampoline<P>(this: *mut ffi::GtkToolItemGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolItemGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItemGroup::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_label_widget_trampoline<P>(this: *mut ffi::GtkToolItemGroup, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolItemGroup> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolItemGroup::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tool_palette.rs b/src/auto/tool_palette.rs
index e5f9771470..9e6817f9b8 100644
--- a/src/auto/tool_palette.rs
+++ b/src/auto/tool_palette.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -276,21 +276,18 @@ impl<O: IsA<ToolPalette> + IsA<glib::object::Object>> ToolPaletteExt for O {
 
 unsafe extern "C" fn notify_icon_size_trampoline<P>(this: *mut ffi::GtkToolPalette, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolPalette> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolPalette::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_size_set_trampoline<P>(this: *mut ffi::GtkToolPalette, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolPalette> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolPalette::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_toolbar_style_trampoline<P>(this: *mut ffi::GtkToolPalette, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ToolPalette> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ToolPalette::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tool_shell.rs b/src/auto/tool_shell.rs
index 47ef7f641b..063aef2aba 100644
--- a/src/auto/tool_shell.rs
+++ b/src/auto/tool_shell.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/toolbar.rs b/src/auto/toolbar.rs
index 21ba42f302..82674e8681 100644
--- a/src/auto/toolbar.rs
+++ b/src/auto/toolbar.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -323,56 +323,48 @@ impl<O: IsA<Toolbar> + IsA<Container> + IsA<glib::object::Object> + glib::object
 
 unsafe extern "C" fn focus_home_or_end_trampoline<P>(this: *mut ffi::GtkToolbar, focus_home: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Toolbar> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) -> bool + 'static) = transmute(f);
     f(&Toolbar::from_glib_borrow(this).downcast_unchecked(), from_glib(focus_home)).to_glib()
 }
 
 unsafe extern "C" fn orientation_changed_trampoline<P>(this: *mut ffi::GtkToolbar, orientation: ffi::GtkOrientation, f: glib_ffi::gpointer)
 where P: IsA<Toolbar> {
-    callback_guard!();
     let f: &&(Fn(&P, Orientation) + 'static) = transmute(f);
     f(&Toolbar::from_glib_borrow(this).downcast_unchecked(), from_glib(orientation))
 }
 
 unsafe extern "C" fn popup_context_menu_trampoline<P>(this: *mut ffi::GtkToolbar, x: libc::c_int, y: libc::c_int, button: libc::c_int, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Toolbar> {
-    callback_guard!();
     let f: &&(Fn(&P, i32, i32, i32) -> Inhibit + 'static) = transmute(f);
     f(&Toolbar::from_glib_borrow(this).downcast_unchecked(), x, y, button).to_glib()
 }
 
 unsafe extern "C" fn style_changed_trampoline<P>(this: *mut ffi::GtkToolbar, style: ffi::GtkToolbarStyle, f: glib_ffi::gpointer)
 where P: IsA<Toolbar> {
-    callback_guard!();
     let f: &&(Fn(&P, ToolbarStyle) + 'static) = transmute(f);
     f(&Toolbar::from_glib_borrow(this).downcast_unchecked(), from_glib(style))
 }
 
 unsafe extern "C" fn notify_icon_size_trampoline<P>(this: *mut ffi::GtkToolbar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Toolbar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Toolbar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_size_set_trampoline<P>(this: *mut ffi::GtkToolbar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Toolbar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Toolbar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_arrow_trampoline<P>(this: *mut ffi::GtkToolbar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Toolbar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Toolbar::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_toolbar_style_trampoline<P>(this: *mut ffi::GtkToolbar, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Toolbar> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Toolbar::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tooltip.rs b/src/auto/tooltip.rs
index d20c6011ed..1f4510121e 100644
--- a/src/auto/tooltip.rs
+++ b/src/auto/tooltip.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Widget;
diff --git a/src/auto/tree_iter.rs b/src/auto/tree_iter.rs
index 9a1cc2e94e..24660edf05 100644
--- a/src/auto/tree_iter.rs
+++ b/src/auto/tree_iter.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
diff --git a/src/auto/tree_model.rs b/src/auto/tree_model.rs
index 0d5e3ef6bc..c6e7f778a7 100644
--- a/src/auto/tree_model.rs
+++ b/src/auto/tree_model.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use TreeIter;
@@ -294,28 +294,24 @@ impl<O: IsA<TreeModel> + IsA<glib::object::Object>> TreeModelExt for O {
 
 unsafe extern "C" fn row_changed_trampoline<P>(this: *mut ffi::GtkTreeModel, path: *mut ffi::GtkTreePath, iter: *mut ffi::GtkTreeIter, f: glib_ffi::gpointer)
 where P: IsA<TreeModel> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreePath, &TreeIter) + 'static) = transmute(f);
     f(&TreeModel::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(path), &from_glib_borrow(iter))
 }
 
 unsafe extern "C" fn row_deleted_trampoline<P>(this: *mut ffi::GtkTreeModel, path: *mut ffi::GtkTreePath, f: glib_ffi::gpointer)
 where P: IsA<TreeModel> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreePath) + 'static) = transmute(f);
     f(&TreeModel::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(path))
 }
 
 unsafe extern "C" fn row_has_child_toggled_trampoline<P>(this: *mut ffi::GtkTreeModel, path: *mut ffi::GtkTreePath, iter: *mut ffi::GtkTreeIter, f: glib_ffi::gpointer)
 where P: IsA<TreeModel> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreePath, &TreeIter) + 'static) = transmute(f);
     f(&TreeModel::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(path), &from_glib_borrow(iter))
 }
 
 unsafe extern "C" fn row_inserted_trampoline<P>(this: *mut ffi::GtkTreeModel, path: *mut ffi::GtkTreePath, iter: *mut ffi::GtkTreeIter, f: glib_ffi::gpointer)
 where P: IsA<TreeModel> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreePath, &TreeIter) + 'static) = transmute(f);
     f(&TreeModel::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(path), &from_glib_borrow(iter))
 }
diff --git a/src/auto/tree_model_filter.rs b/src/auto/tree_model_filter.rs
index 3436abe13f..7e5e88476e 100644
--- a/src/auto/tree_model_filter.rs
+++ b/src/auto/tree_model_filter.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use TreeIter;
@@ -135,7 +135,6 @@ impl<O: IsA<TreeModelFilter> + IsA<glib::object::Object>> TreeModelFilterExt for
 
 unsafe extern "C" fn notify_child_model_trampoline<P>(this: *mut ffi::GtkTreeModelFilter, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeModelFilter> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeModelFilter::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tree_path.rs b/src/auto/tree_path.rs
index 59b2ae6c2e..e3de8235bc 100644
--- a/src/auto/tree_path.rs
+++ b/src/auto/tree_path.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use ffi;
diff --git a/src/auto/tree_row_reference.rs b/src/auto/tree_row_reference.rs
index 4ce971ac7f..4f5f2526cb 100644
--- a/src/auto/tree_row_reference.rs
+++ b/src/auto/tree_row_reference.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use TreeModel;
diff --git a/src/auto/tree_selection.rs b/src/auto/tree_selection.rs
index 99c4e68fcd..d2072f0fd6 100644
--- a/src/auto/tree_selection.rs
+++ b/src/auto/tree_selection.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use SelectionMode;
@@ -212,14 +212,12 @@ impl<O: IsA<TreeSelection> + IsA<glib::object::Object>> TreeSelectionExt for O {
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::GtkTreeSelection, f: glib_ffi::gpointer)
 where P: IsA<TreeSelection> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeSelection::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mode_trampoline<P>(this: *mut ffi::GtkTreeSelection, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeSelection> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeSelection::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tree_sortable.rs b/src/auto/tree_sortable.rs
index 0e69d1c62c..709f2e9de5 100644
--- a/src/auto/tree_sortable.rs
+++ b/src/auto/tree_sortable.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use TreeModel;
@@ -69,7 +69,6 @@ impl<O: IsA<TreeSortable> + IsA<glib::object::Object>> TreeSortableExt for O {
 
 unsafe extern "C" fn sort_column_changed_trampoline<P>(this: *mut ffi::GtkTreeSortable, f: glib_ffi::gpointer)
 where P: IsA<TreeSortable> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeSortable::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tree_store.rs b/src/auto/tree_store.rs
index 91f5f7df3c..eb58713335 100644
--- a/src/auto/tree_store.rs
+++ b/src/auto/tree_store.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
diff --git a/src/auto/tree_view.rs b/src/auto/tree_view.rs
index e9f7f16102..dd2d9d3622 100644
--- a/src/auto/tree_view.rs
+++ b/src/auto/tree_view.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -1303,105 +1303,90 @@ impl<O: IsA<TreeView> + IsA<glib::object::Object> + glib::object::ObjectExt> Tre
 
 unsafe extern "C" fn columns_changed_trampoline<P>(this: *mut ffi::GtkTreeView, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn cursor_changed_trampoline<P>(this: *mut ffi::GtkTreeView, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn expand_collapse_cursor_row_trampoline<P>(this: *mut ffi::GtkTreeView, object: glib_ffi::gboolean, p0: glib_ffi::gboolean, p1: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P, bool, bool, bool) -> bool + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked(), from_glib(object), from_glib(p0), from_glib(p1)).to_glib()
 }
 
 unsafe extern "C" fn move_cursor_trampoline<P>(this: *mut ffi::GtkTreeView, step: ffi::GtkMovementStep, direction: libc::c_int, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P, MovementStep, i32) -> bool + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked(), from_glib(step), direction).to_glib()
 }
 
 unsafe extern "C" fn row_activated_trampoline<P>(this: *mut ffi::GtkTreeView, path: *mut ffi::GtkTreePath, column: *mut ffi::GtkTreeViewColumn, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreePath, &TreeViewColumn) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(path), &from_glib_borrow(column))
 }
 
 unsafe extern "C" fn row_collapsed_trampoline<P>(this: *mut ffi::GtkTreeView, iter: *mut ffi::GtkTreeIter, path: *mut ffi::GtkTreePath, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreeIter, &TreePath) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(iter), &from_glib_borrow(path))
 }
 
 unsafe extern "C" fn row_expanded_trampoline<P>(this: *mut ffi::GtkTreeView, iter: *mut ffi::GtkTreeIter, path: *mut ffi::GtkTreePath, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreeIter, &TreePath) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(iter), &from_glib_borrow(path))
 }
 
 unsafe extern "C" fn select_all_trampoline<P>(this: *mut ffi::GtkTreeView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn select_cursor_parent_trampoline<P>(this: *mut ffi::GtkTreeView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn select_cursor_row_trampoline<P>(this: *mut ffi::GtkTreeView, object: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) -> bool + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked(), from_glib(object)).to_glib()
 }
 
 unsafe extern "C" fn start_interactive_search_trampoline<P>(this: *mut ffi::GtkTreeView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn test_collapse_row_trampoline<P>(this: *mut ffi::GtkTreeView, iter: *mut ffi::GtkTreeIter, path: *mut ffi::GtkTreePath, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreeIter, &TreePath) -> Inhibit + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(iter), &from_glib_borrow(path)).to_glib()
 }
 
 unsafe extern "C" fn test_expand_row_trampoline<P>(this: *mut ffi::GtkTreeView, iter: *mut ffi::GtkTreeIter, path: *mut ffi::GtkTreePath, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P, &TreeIter, &TreePath) -> Inhibit + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(iter), &from_glib_borrow(path)).to_glib()
 }
 
 unsafe extern "C" fn toggle_cursor_row_trampoline<P>(this: *mut ffi::GtkTreeView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn unselect_all_trampoline<P>(this: *mut ffi::GtkTreeView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
@@ -1409,133 +1394,114 @@ where P: IsA<TreeView> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_activate_on_single_click_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_enable_grid_lines_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_enable_search_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_enable_tree_lines_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_expander_column_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_fixed_height_mode_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_headers_clickable_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_headers_visible_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_hover_expand_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_hover_selection_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_level_indentation_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_model_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_reorderable_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rubber_banding_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rules_hint_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_search_column_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_show_expanders_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_column_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_ubuntu_almost_fixed_height_mode_trampoline<P>(this: *mut ffi::GtkTreeView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeView::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/tree_view_column.rs b/src/auto/tree_view_column.rs
index 84887a708e..e5b6a397d0 100644
--- a/src/auto/tree_view_column.rs
+++ b/src/auto/tree_view_column.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Buildable;
@@ -640,140 +640,120 @@ impl<O: IsA<TreeViewColumn> + IsA<glib::object::Object>> TreeViewColumnExt for O
 
 unsafe extern "C" fn clicked_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_alignment_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_cell_area_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_clickable_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_expand_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_fixed_width_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_max_width_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_min_width_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_reorderable_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_resizable_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_sizing_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_sort_column_id_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_sort_indicator_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_sort_order_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_spacing_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_widget_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_x_offset_trampoline<P>(this: *mut ffi::GtkTreeViewColumn, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<TreeViewColumn> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&TreeViewColumn::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/viewport.rs b/src/auto/viewport.rs
index c9ba1b684c..595320a0fb 100644
--- a/src/auto/viewport.rs
+++ b/src/auto/viewport.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Adjustment;
@@ -93,7 +93,6 @@ impl<O: IsA<Viewport> + IsA<glib::object::Object>> ViewportExt for O {
 
 unsafe extern "C" fn notify_shadow_type_trampoline<P>(this: *mut ffi::GtkViewport, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Viewport> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Viewport::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/volume_button.rs b/src/auto/volume_button.rs
index f67c58e2a9..e28a759807 100644
--- a/src/auto/volume_button.rs
+++ b/src/auto/volume_button.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Actionable;
@@ -83,7 +83,6 @@ impl<O: IsA<VolumeButton> + IsA<glib::object::Object>> VolumeButtonExt for O {
 
 unsafe extern "C" fn notify_use_symbolic_trampoline<P>(this: *mut ffi::GtkVolumeButton, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<VolumeButton> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&VolumeButton::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/widget.rs b/src/auto/widget.rs
index d1370fb808..47d6cb6f30 100644
--- a/src/auto/widget.rs
+++ b/src/auto/widget.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AccelFlags;
@@ -3335,497 +3335,426 @@ impl<O: IsA<Widget> + IsA<glib::object::Object> + glib::object::ObjectExt> Widge
 
 unsafe extern "C" fn accel_closures_changed_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn button_press_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventButton, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventButton) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn button_release_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventButton, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventButton) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn can_activate_accel_trampoline<P>(this: *mut ffi::GtkWidget, signal_id: libc::c_uint, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, u32) -> bool + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), signal_id).to_glib()
 }
 
 unsafe extern "C" fn composited_changed_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn configure_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventConfigure, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventConfigure) -> bool + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn damage_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventExpose, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventExpose) -> bool + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn delete_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEvent, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::Event) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_none(event)).to_glib()
 }
 
 unsafe extern "C" fn destroy_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn destroy_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEvent, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::Event) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_none(event)).to_glib()
 }
 
 unsafe extern "C" fn direction_changed_trampoline<P>(this: *mut ffi::GtkWidget, previous_direction: ffi::GtkTextDirection, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, TextDirection) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), from_glib(previous_direction))
 }
 
 unsafe extern "C" fn drag_begin_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context))
 }
 
 unsafe extern "C" fn drag_data_delete_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context))
 }
 
 unsafe extern "C" fn drag_data_get_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, data: *mut ffi::GtkSelectionData, info: libc::c_uint, time: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext, &SelectionData, u32, u32) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), &from_glib_borrow(data), info, time)
 }
 
 unsafe extern "C" fn drag_data_received_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, x: libc::c_int, y: libc::c_int, data: *mut ffi::GtkSelectionData, info: libc::c_uint, time: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext, i32, i32, &SelectionData, u32, u32) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), x, y, &from_glib_borrow(data), info, time)
 }
 
 unsafe extern "C" fn drag_drop_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, x: libc::c_int, y: libc::c_int, time: libc::c_uint, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext, i32, i32, u32) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), x, y, time).to_glib()
 }
 
 unsafe extern "C" fn drag_end_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context))
 }
 
 unsafe extern "C" fn drag_failed_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, result: ffi::GtkDragResult, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext, DragResult) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), from_glib(result)).to_glib()
 }
 
 unsafe extern "C" fn drag_leave_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, time: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext, u32) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), time)
 }
 
 unsafe extern "C" fn drag_motion_trampoline<P>(this: *mut ffi::GtkWidget, context: *mut gdk_ffi::GdkDragContext, x: libc::c_int, y: libc::c_int, time: libc::c_uint, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::DragContext, i32, i32, u32) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context), x, y, time).to_glib()
 }
 
 unsafe extern "C" fn draw_trampoline<P>(this: *mut ffi::GtkWidget, cr: *mut cairo_ffi::cairo_t, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &cairo::Context) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(cr)).to_glib()
 }
 
 unsafe extern "C" fn enter_notify_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventCrossing, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventCrossing) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEvent, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::Event) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_none(event)).to_glib()
 }
 
 unsafe extern "C" fn event_after_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEvent, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::Event) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_none(event))
 }
 
 unsafe extern "C" fn focus_trampoline<P>(this: *mut ffi::GtkWidget, direction: ffi::GtkDirectionType, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, DirectionType) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), from_glib(direction)).to_glib()
 }
 
 unsafe extern "C" fn focus_in_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventFocus, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventFocus) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn focus_out_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventFocus, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventFocus) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn grab_broken_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventGrabBroken, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventGrabBroken) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn grab_focus_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn grab_notify_trampoline<P>(this: *mut ffi::GtkWidget, was_grabbed: glib_ffi::gboolean, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), from_glib(was_grabbed))
 }
 
 unsafe extern "C" fn hide_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn hierarchy_changed_trampoline<P>(this: *mut ffi::GtkWidget, previous_toplevel: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &Option<Widget>) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(previous_toplevel))
 }
 
 unsafe extern "C" fn key_press_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventKey, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventKey) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn key_release_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventKey, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventKey) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn keynav_failed_trampoline<P>(this: *mut ffi::GtkWidget, direction: ffi::GtkDirectionType, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, DirectionType) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), from_glib(direction)).to_glib()
 }
 
 unsafe extern "C" fn leave_notify_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventCrossing, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventCrossing) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn map_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn mnemonic_activate_trampoline<P>(this: *mut ffi::GtkWidget, group_cycling: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), from_glib(group_cycling)).to_glib()
 }
 
 unsafe extern "C" fn motion_notify_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventMotion, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventMotion) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn move_focus_trampoline<P>(this: *mut ffi::GtkWidget, direction: ffi::GtkDirectionType, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, DirectionType) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), from_glib(direction))
 }
 
 unsafe extern "C" fn parent_set_trampoline<P>(this: *mut ffi::GtkWidget, old_parent: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &Option<Widget>) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(old_parent))
 }
 
 unsafe extern "C" fn popup_menu_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn property_notify_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventProperty, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventProperty) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn proximity_in_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventProximity, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventProximity) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn proximity_out_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventProximity, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventProximity) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn query_tooltip_trampoline<P>(this: *mut ffi::GtkWidget, x: libc::c_int, y: libc::c_int, keyboard_mode: glib_ffi::gboolean, tooltip: *mut ffi::GtkTooltip, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, i32, i32, bool, &Tooltip) -> bool + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), x, y, from_glib(keyboard_mode), &from_glib_borrow(tooltip)).to_glib()
 }
 
 unsafe extern "C" fn realize_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn screen_changed_trampoline<P>(this: *mut ffi::GtkWidget, previous_screen: *mut gdk_ffi::GdkScreen, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &Option<gdk::Screen>) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(previous_screen))
 }
 
 unsafe extern "C" fn scroll_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventScroll, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventScroll) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn selection_clear_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventSelection, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventSelection) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn selection_get_trampoline<P>(this: *mut ffi::GtkWidget, data: *mut ffi::GtkSelectionData, info: libc::c_uint, time: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &SelectionData, u32, u32) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(data), info, time)
 }
 
 unsafe extern "C" fn selection_notify_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventSelection, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventSelection) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn selection_received_trampoline<P>(this: *mut ffi::GtkWidget, data: *mut ffi::GtkSelectionData, time: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &SelectionData, u32) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(data), time)
 }
 
 unsafe extern "C" fn selection_request_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventSelection, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventSelection) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn show_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn show_help_trampoline<P>(this: *mut ffi::GtkWidget, help_type: ffi::GtkWidgetHelpType, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, WidgetHelpType) -> bool + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), from_glib(help_type)).to_glib()
 }
 
 unsafe extern "C" fn size_allocate_trampoline<P>(this: *mut ffi::GtkWidget, allocation: *mut ffi::GtkAllocation, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &Allocation) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_none(allocation))
 }
 
 unsafe extern "C" fn state_flags_changed_trampoline<P>(this: *mut ffi::GtkWidget, flags: ffi::GtkStateFlags, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, StateFlags) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), from_glib(flags))
 }
 
 unsafe extern "C" fn style_updated_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn touch_event_trampoline<P>(this: *mut ffi::GtkWidget, object: *mut gdk_ffi::GdkEvent, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::Event) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_none(object)).to_glib()
 }
 
 unsafe extern "C" fn unmap_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn unrealize_trampoline<P>(this: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn visibility_notify_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventVisibility, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventVisibility) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn window_state_event_trampoline<P>(this: *mut ffi::GtkWidget, event: *mut gdk_ffi::GdkEventWindowState, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gdk::EventWindowState) -> Inhibit + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }
 
 unsafe extern "C" fn notify_app_paintable_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_can_default_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_can_focus_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_composite_child_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_double_buffered_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_events_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_expand_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
@@ -3833,77 +3762,66 @@ where P: IsA<Widget> {
 #[cfg(any(feature = "v3_20", feature = "dox"))]
 unsafe extern "C" fn notify_focus_on_click_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_halign_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_default_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_focus_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_tooltip_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_height_request_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_hexpand_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_hexpand_set_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_is_focus_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_margin_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_margin_bottom_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
@@ -3911,21 +3829,18 @@ where P: IsA<Widget> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_margin_end_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_margin_left_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_margin_right_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
@@ -3933,28 +3848,24 @@ where P: IsA<Widget> {
 #[cfg(any(feature = "v3_12", feature = "dox"))]
 unsafe extern "C" fn notify_margin_start_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_margin_top_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_name_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_no_show_all_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
@@ -3962,21 +3873,18 @@ where P: IsA<Widget> {
 #[cfg(any(feature = "v3_8", feature = "dox"))]
 unsafe extern "C" fn notify_opacity_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_parent_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_receives_default_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
@@ -3984,70 +3892,60 @@ where P: IsA<Widget> {
 #[cfg(any(feature = "v3_10", feature = "dox"))]
 unsafe extern "C" fn notify_scale_factor_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_sensitive_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_markup_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_tooltip_text_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_valign_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_vexpand_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_vexpand_set_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_visible_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_width_request_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_window_trampoline<P>(this: *mut ffi::GtkWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Widget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Widget::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/window.rs b/src/auto/window.rs
index edc01e2e7d..3ffdf145b1 100644
--- a/src/auto/window.rs
+++ b/src/auto/window.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use AccelGroup;
@@ -1542,266 +1542,228 @@ impl<O: IsA<Window> + IsA<glib::object::Object> + glib::object::ObjectExt> GtkWi
 
 unsafe extern "C" fn activate_default_trampoline<P>(this: *mut ffi::GtkWindow, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn activate_focus_trampoline<P>(this: *mut ffi::GtkWindow, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn enable_debugging_trampoline<P>(this: *mut ffi::GtkWindow, toggle: glib_ffi::gboolean, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P, bool) -> bool + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked(), from_glib(toggle)).to_glib()
 }
 
 unsafe extern "C" fn keys_changed_trampoline<P>(this: *mut ffi::GtkWindow, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn set_focus_trampoline<P>(this: *mut ffi::GtkWindow, object: *mut ffi::GtkWidget, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P, &Widget) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(object))
 }
 
 unsafe extern "C" fn notify_accept_focus_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_application_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_attached_to_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_decorated_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_default_height_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_default_width_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_deletable_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_destroy_with_parent_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_focus_on_map_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_focus_visible_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_gravity_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_resize_grip_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_has_toplevel_focus_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_hide_titlebar_when_maximized_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_icon_name_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_is_active_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_is_maximized_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mnemonics_visible_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_modal_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_resizable_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_resize_grip_visible_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_role_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_screen_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_skip_pager_hint_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_skip_taskbar_hint_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_startup_id_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_transient_for_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_type_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_type_hint_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_urgency_hint_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_window_position_trampoline<P>(this: *mut ffi::GtkWindow, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Window> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Window::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/window_group.rs b/src/auto/window_group.rs
index 23f605511d..260fc208a3 100644
--- a/src/auto/window_group.rs
+++ b/src/auto/window_group.rs
@@ -1,5 +1,5 @@
-// This file was generated by gir (https://github.com/gtk-rs/gir @ ea993ed)
-// from gir-files (https://github.com/gtk-rs/gir-files @ ???)
+// This file was generated by gir (https://github.com/gtk-rs/gir @ 8b9d0bb)
+// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
 // DO NOT EDIT
 
 use Widget;
diff --git a/src/clipboard.rs b/src/clipboard.rs
index f0f8228613..8a3d36d20e 100644
--- a/src/clipboard.rs
+++ b/src/clipboard.rs
@@ -46,13 +46,11 @@ impl<O: IsA<Clipboard>> ClipboardExtManual for O {
 }
 
 unsafe extern "C" fn trampoline(clipboard: *mut ffi::GtkClipboard, selection_data: *mut ffi::GtkSelectionData, info: c_uint, user_data: gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Clipboard, &SelectionData, u32) + 'static) = transmute(user_data);
     f(&from_glib_borrow(clipboard), &from_glib_borrow(selection_data), info);
 }
 
 
 unsafe extern "C" fn cleanup(_clipboard: *mut ffi::GtkClipboard, user_data: gpointer) {
-    callback_guard!();
     Box_::<Box_<Fn(&Clipboard, &SelectionData, u32) + 'static>>::from_raw(user_data as *mut _);
 }
diff --git a/src/rt.rs b/src/rt.rs
index 27b9c5b1d4..dae00cee0f 100644
--- a/src/rt.rs
+++ b/src/rt.rs
@@ -47,15 +47,6 @@ macro_rules! assert_not_initialized {
     )
 }
 
-macro_rules! callback_guard {
-    () => (
-        let _guard = ::glib::CallbackGuard::new();
-        if cfg!(debug_assertions) {
-            assert_initialized_main_thread!();
-        }
-    )
-}
-
 /// Returns `true` if GTK has been initialized.
 #[inline]
 pub fn is_initialized() -> bool {
diff --git a/src/signal.rs b/src/signal.rs
index a8c64f1df8..1daf466f6a 100644
--- a/src/signal.rs
+++ b/src/signal.rs
@@ -23,13 +23,11 @@ use {
 // idle_add and timeout_add fixed to the main thread
 
 unsafe extern "C" fn trampoline(func: gpointer) -> gboolean {
-    callback_guard!();
     let func: &RefCell<Box<FnMut() -> Continue + 'static>> = transmute(func);
     (&mut *func.borrow_mut())().to_glib()
 }
 
 unsafe extern "C" fn destroy_closure(ptr: gpointer) {
-    callback_guard!();
     Box::<RefCell<Box<FnMut() -> Continue + 'static>>>::from_raw(ptr as *mut _);
 }
 
@@ -150,7 +148,6 @@ mod editable {
     unsafe extern "C" fn trampoline<T>(this: *mut GtkEditable,
                                        f: &&(Fn(&T) + 'static))
     where T: IsA<Editable> {
-        callback_guard!();
         f(&Editable::from_glib_borrow(this).downcast_unchecked());
     }
 
@@ -159,7 +156,6 @@ mod editable {
                                               end_pos: c_int,
                                               f: &&(Fn(&T, i32, i32) + 'static))
     where T: IsA<Editable> {
-        callback_guard!();
         f(&Editable::from_glib_borrow(this).downcast_unchecked(), start_pos, end_pos);
     }
 
@@ -169,7 +165,6 @@ mod editable {
                                               position: *mut c_int,
                                               f: &&(Fn(&T, &str, &mut i32) + 'static))
     where T: IsA<Editable> {
-        callback_guard!();
         let buf = if new_text_length != -1 {
             slice::from_raw_parts(new_text as *mut c_uchar,
                                   new_text_length as usize)
@@ -263,7 +258,6 @@ mod spin_button {
     unsafe extern "C" fn change_trampoline(this: *mut GtkSpinButton,
                                            scroll: ScrollType,
                                            f: &&(Fn(&SpinButton, ScrollType) + 'static)) {
-        callback_guard!();
         f(&from_glib_borrow(this), scroll)
     }
 
@@ -271,7 +265,6 @@ mod spin_button {
                                           new_value: *mut c_double,
                                           f: &&(Fn(&SpinButton) -> Option<Result<f64, ()>> + 'static))
                                           -> c_int {
-        callback_guard!();
         match f(&from_glib_borrow(this)) {
             Some(Ok(v)) => {
                 *new_value = v;
@@ -285,13 +278,11 @@ mod spin_button {
     unsafe extern "C" fn output_trampoline(this: *mut GtkSpinButton,
                                            f: &&(Fn(&SpinButton) -> Inhibit + 'static))
                                            -> gboolean {
-        callback_guard!();
         f(&from_glib_borrow(this)).to_glib()
     }
 
     unsafe extern "C" fn trampoline(this: *mut GtkSpinButton,
                                     f: &&(Fn(&SpinButton) + 'static)) {
-        callback_guard!();
         f(&from_glib_borrow(this))
     }
 }
@@ -344,7 +335,6 @@ mod overlay {
     where
         T: IsA<Overlay> + IsA<Object>,
     {
-        callback_guard!();
         let f: &&(Fn(&T, &Widget) -> Option<Rectangle> + 'static) = transmute(f);
         match f(
             &Overlay::from_glib_borrow(this).downcast_unchecked(),
diff --git a/src/switch.rs b/src/switch.rs
index 5f154cdd82..cd86b66f89 100644
--- a/src/switch.rs
+++ b/src/switch.rs
@@ -27,7 +27,6 @@ impl<O: IsA<Switch> + IsA<glib::object::Object>> SwitchExtManual for O {
 }
 
 unsafe extern "C" fn changed_active_trampoline(this: *mut ffi::GtkSwitch, _gparamspec: glib_ffi::gpointer, f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&Switch) + 'static) = transmute(f);
     f(&from_glib_borrow(this))
 }
diff --git a/src/text_buffer.rs b/src/text_buffer.rs
index d6f5308f7a..0e3b4e0d79 100644
--- a/src/text_buffer.rs
+++ b/src/text_buffer.rs
@@ -34,7 +34,6 @@ unsafe extern "C" fn insert_text_trampoline(this: *mut ffi::GtkTextBuffer,
                                             text: *mut c_char,
                                             len: c_int,
                                             f: glib_ffi::gpointer) {
-    callback_guard!();
     let f: &&(Fn(&TextBuffer, &TextIter, &str) + 'static) = transmute(f);
     f(&from_glib_borrow(this),
       &from_glib_borrow(location),
diff --git a/src/tree_model_filter.rs b/src/tree_model_filter.rs
index cb874fdd9c..15ddc6c766 100644
--- a/src/tree_model_filter.rs
+++ b/src/tree_model_filter.rs
@@ -41,14 +41,12 @@ impl<O: IsA<TreeModelFilter>> TreeModelFilterExtManual for O {
 
 unsafe extern "C" fn trampoline(this: *mut GtkTreeModel, iter: *mut GtkTreeIter,
                                 f: gpointer) -> gboolean {
-    callback_guard!();
     let f: &&(Fn(&TreeModel, &TreeIter) -> bool) = transmute(f);
     f(&TreeModel::from_glib_none(this).downcast_unchecked(), &from_glib_borrow(iter))
     .to_glib()
 }
 
 unsafe extern "C" fn destroy_closure(ptr: gpointer) {
-    callback_guard!();
     Box::<Box<Fn(&TreeModel, &TreeIter) -> bool + 'static>>::from_raw(ptr as *mut _);
 }
 
diff --git a/src/tree_sortable.rs b/src/tree_sortable.rs
index 6eeededf43..8ca6479a86 100644
--- a/src/tree_sortable.rs
+++ b/src/tree_sortable.rs
@@ -62,14 +62,12 @@ pub trait TreeSortableExtManual {
 unsafe extern "C" fn trampoline<T>(this: *mut GtkTreeModel, iter: *mut GtkTreeIter,
                                    iter2: *mut GtkTreeIter, f: gpointer) -> i32
 where T: IsA<TreeModel> {
-    callback_guard!();
     let f: &&(Fn(&T, &TreeIter, &TreeIter) -> Ordering) = transmute(f);
     f(&TreeModel::from_glib_none(this).downcast_unchecked(), &from_glib_borrow(iter),
       &from_glib_borrow(iter2)).to_glib()
 }
 
 unsafe extern "C" fn destroy_closure<T>(ptr: gpointer) {
-    callback_guard!();
     Box::<Box<Fn(&T, &TreeIter, &TreeIter) -> Ordering + 'static>>::from_raw(ptr as *mut _);
 }
 
diff --git a/src/widget.rs b/src/widget.rs
index 60de1586f8..91f620f795 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -105,7 +105,6 @@ impl<O: IsA<Widget> + IsA<Object>> WidgetExtManual for O {
         ) -> gboolean
         where T: IsA<Widget>
         {
-            callback_guard!();
             let func: &RefCell<Box<FnMut(&T, &FrameClock) -> Continue + 'static>> = transmute(func);
 
             (&mut *func.borrow_mut())(
@@ -115,7 +114,6 @@ impl<O: IsA<Widget> + IsA<Object>> WidgetExtManual for O {
         }
 
         unsafe extern "C" fn destroy_closure<T>(func: gpointer) {
-            callback_guard!();
             Box::<RefCell<Box<FnMut(&T, &FrameClock) -> Continue + 'static>>>::from_raw(
                 func as *mut _
             );
@@ -157,6 +155,5 @@ unsafe extern "C" fn event_any_trampoline<T>(this: *mut ffi::GtkWidget,
                                              event: *mut gdk_ffi::GdkEventAny,
                                              f: &&(Fn(&T, &Event) -> Inhibit + 'static)) -> gboolean
 where T: IsA<Widget> {
-    callback_guard!();
     f(&Widget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(event)).to_glib()
 }