diff --git a/gir b/gir
index d50d839c..8b9d0bb3 160000
--- a/gir
+++ b/gir
@@ -1 +1 @@
-Subproject commit d50d839ceaed9cc5eabac729dbc161c295306270
+Subproject commit 8b9d0bb32ed3b76ff9931ee283c07d32af955b60
diff --git a/gir-files b/gir-files
index 10692592..77d1f70a 160000
--- a/gir-files
+++ b/gir-files
@@ -1 +1 @@
-Subproject commit 106925928e0ee8b170fa816cfc66a37bf7703908
+Subproject commit 77d1f70a9c4804961897d64827794442becb07d5
diff --git a/src/auto/authentication_request.rs b/src/auto/authentication_request.rs
index 0a01d6a3..478b24f3 100644
--- a/src/auto/authentication_request.rs
+++ b/src/auto/authentication_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_2", feature = "dox"))]
@@ -141,7 +142,6 @@ impl<O: IsA<AuthenticationRequest> + IsA<glib::object::Object>> AuthenticationRe
 #[cfg(any(feature = "v2_2", feature = "dox"))]
 unsafe extern "C" fn cancelled_trampoline<P>(this: *mut ffi::WebKitAuthenticationRequest, f: glib_ffi::gpointer)
 where P: IsA<AuthenticationRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&AuthenticationRequest::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/back_forward_list.rs b/src/auto/back_forward_list.rs
index 4a60ba36..5a0a0ccb 100644
--- a/src/auto/back_forward_list.rs
+++ b/src/auto/back_forward_list.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 BackForwardListItem;
diff --git a/src/auto/back_forward_list_item.rs b/src/auto/back_forward_list_item.rs
index d9357b4d..a3856cdd 100644
--- a/src/auto/back_forward_list_item.rs
+++ b/src/auto/back_forward_list_item.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/color_chooser_request.rs b/src/auto/color_chooser_request.rs
index b776168b..a86aaca4 100644
--- a/src/auto/color_chooser_request.rs
+++ b/src/auto/color_chooser_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -94,8 +95,7 @@ impl<O: IsA<ColorChooserRequest> + IsA<glib::object::Object>> ColorChooserReques
 
     fn get_property_rgba(&self) -> Option<gdk::RGBA> {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <gdk::RGBA as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<gdk::RGBA as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "rgba".to_glib_none().0, value.to_glib_none_mut().0);
             value.get()
         }
@@ -128,14 +128,12 @@ impl<O: IsA<ColorChooserRequest> + IsA<glib::object::Object>> ColorChooserReques
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn finished_trampoline<P>(this: *mut ffi::WebKitColorChooserRequest, f: glib_ffi::gpointer)
 where P: IsA<ColorChooserRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorChooserRequest::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_rgba_trampoline<P>(this: *mut ffi::WebKitColorChooserRequest, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ColorChooserRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ColorChooserRequest::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/context_menu.rs b/src/auto/context_menu.rs
index 486b7a70..eaef018a 100644
--- a/src/auto/context_menu.rs
+++ b/src/auto/context_menu.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 ContextMenuItem;
diff --git a/src/auto/context_menu_item.rs b/src/auto/context_menu_item.rs
index d9badee3..66a7409e 100644
--- a/src/auto/context_menu_item.rs
+++ b/src/auto/context_menu_item.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 ContextMenu;
@@ -20,6 +21,7 @@ glib_wrapper! {
 }
 
 impl ContextMenuItem {
+    //#[cfg_attr(feature = "v2_18", deprecated)]
     //pub fn new<P: IsA</*Ignored*/gtk::Action>>(action: &P) -> ContextMenuItem {
     //    unsafe { TODO: call ffi::webkit_context_menu_item_new() }
     //}
@@ -59,6 +61,7 @@ impl ContextMenuItem {
 }
 
 pub trait ContextMenuItemExt {
+    //#[cfg_attr(feature = "v2_18", deprecated)]
     //fn get_action(&self) -> /*Ignored*/Option<gtk::Action>;
 
     //#[cfg(any(feature = "v2_18", feature = "dox"))]
diff --git a/src/auto/cookie_manager.rs b/src/auto/cookie_manager.rs
index 2102e24d..fa56e21e 100644
--- a/src/auto/cookie_manager.rs
+++ b/src/auto/cookie_manager.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 CookieAcceptPolicy;
@@ -26,12 +27,15 @@ glib_wrapper! {
 }
 
 pub trait CookieManagerExt {
+    #[cfg_attr(feature = "v2_16", deprecated)]
     fn delete_all_cookies(&self);
 
+    #[cfg_attr(feature = "v2_16", deprecated)]
     fn delete_cookies_for_domain(&self, domain: &str);
 
     //fn get_accept_policy<'a, 'b, P: Into<Option<&'a gio::Cancellable>>, Q: Into<Option<&'b /*Ignored*/gio::AsyncReadyCallback>>, R: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, cancellable: P, callback: Q, user_data: R);
 
+    //#[cfg_attr(feature = "v2_16", deprecated)]
     //fn get_domains_with_cookies<'a, 'b, P: Into<Option<&'a gio::Cancellable>>, Q: Into<Option<&'b /*Ignored*/gio::AsyncReadyCallback>>, R: Into<Option</*Unimplemented*/Fundamental: Pointer>>>(&self, cancellable: P, callback: Q, user_data: R);
 
     fn set_accept_policy(&self, policy: CookieAcceptPolicy);
@@ -85,7 +89,6 @@ impl<O: IsA<CookieManager> + IsA<glib::object::Object>> CookieManagerExt for O {
 
 unsafe extern "C" fn changed_trampoline<P>(this: *mut ffi::WebKitCookieManager, f: glib_ffi::gpointer)
 where P: IsA<CookieManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&CookieManager::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/credential.rs b/src/auto/credential.rs
index a9795aaa..2076f92a 100644
--- a/src/auto/credential.rs
+++ b/src/auto/credential.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_2", feature = "dox"))]
diff --git a/src/auto/download.rs b/src/auto/download.rs
index 280b2afa..eeb7669e 100644
--- a/src/auto/download.rs
+++ b/src/auto/download.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -218,35 +219,30 @@ impl<O: IsA<Download> + IsA<glib::object::Object>> DownloadExt for O {
 
 unsafe extern "C" fn created_destination_trampoline<P>(this: *mut ffi::WebKitDownload, destination: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(destination))
 }
 
 unsafe extern "C" fn decide_destination_trampoline<P>(this: *mut ffi::WebKitDownload, suggested_filename: *mut libc::c_char, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P, &str) -> bool + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(suggested_filename)).to_glib()
 }
 
 unsafe extern "C" fn failed_trampoline<P>(this: *mut ffi::WebKitDownload, error: *mut glib_ffi::GError, f: glib_ffi::gpointer)
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P, &Error) + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(error))
 }
 
 unsafe extern "C" fn finished_trampoline<P>(this: *mut ffi::WebKitDownload, f: glib_ffi::gpointer)
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn received_data_trampoline<P>(this: *mut ffi::WebKitDownload, data_length: u64, f: glib_ffi::gpointer)
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P, u64) + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked(), data_length)
 }
@@ -254,28 +250,24 @@ where P: IsA<Download> {
 #[cfg(any(feature = "v2_6", feature = "dox"))]
 unsafe extern "C" fn notify_allow_overwrite_trampoline<P>(this: *mut ffi::WebKitDownload, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_destination_trampoline<P>(this: *mut ffi::WebKitDownload, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_estimated_progress_trampoline<P>(this: *mut ffi::WebKitDownload, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_response_trampoline<P>(this: *mut ffi::WebKitDownload, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Download> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Download::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/editor_state.rs b/src/auto/editor_state.rs
index 0e2b2656..8331cadf 100644
--- a/src/auto/editor_state.rs
+++ b/src/auto/editor_state.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -57,7 +58,6 @@ impl<O: IsA<EditorState> + IsA<glib::object::Object>> EditorStateExt for O {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_typing_attributes_trampoline<P>(this: *mut ffi::WebKitEditorState, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<EditorState> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&EditorState::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/enums.rs b/src/auto/enums.rs
index ddd83335..e80a66fe 100644
--- a/src/auto/enums.rs
+++ b/src/auto/enums.rs
@@ -1,14 +1,18 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
-use glib_ffi;
-use glib::error::ErrorDomain;
-use glib::Type;
 use glib::StaticType;
-use glib::value::{Value, SetValue, FromValue, FromValueOptional};
-use gobject_ffi;
+use glib::Type;
+use glib::error::ErrorDomain;
 use glib::translate::*;
+use glib::value::FromValue;
+use glib::value::FromValueOptional;
+use glib::value::SetValue;
+use glib::value::Value;
+use glib_ffi;
+use gobject_ffi;
 
 #[cfg(any(feature = "v2_2", feature = "dox"))]
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
diff --git a/src/auto/favicon_database.rs b/src/auto/favicon_database.rs
index 8d51ee20..d07ae05a 100644
--- a/src/auto/favicon_database.rs
+++ b/src/auto/favicon_database.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -62,7 +63,6 @@ impl<O: IsA<FaviconDatabase> + IsA<glib::object::Object>> FaviconDatabaseExt for
 
 unsafe extern "C" fn favicon_changed_trampoline<P>(this: *mut ffi::WebKitFaviconDatabase, page_uri: *mut libc::c_char, favicon_uri: *mut libc::c_char, f: glib_ffi::gpointer)
 where P: IsA<FaviconDatabase> {
-    callback_guard!();
     let f: &&(Fn(&P, &str, &str) + 'static) = transmute(f);
     f(&FaviconDatabase::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(page_uri), &String::from_glib_none(favicon_uri))
 }
diff --git a/src/auto/file_chooser_request.rs b/src/auto/file_chooser_request.rs
index b723a87d..73564e75 100644
--- a/src/auto/file_chooser_request.rs
+++ b/src/auto/file_chooser_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -89,8 +90,7 @@ impl<O: IsA<FileChooserRequest> + IsA<glib::object::Object>> FileChooserRequestE
 
     fn get_property_filter(&self) -> Option<gtk::FileFilter> {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <gtk::FileFilter as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<gtk::FileFilter as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "filter".to_glib_none().0, value.to_glib_none_mut().0);
             value.get()
         }
@@ -131,28 +131,24 @@ impl<O: IsA<FileChooserRequest> + IsA<glib::object::Object>> FileChooserRequestE
 
 unsafe extern "C" fn notify_filter_trampoline<P>(this: *mut ffi::WebKitFileChooserRequest, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserRequest::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mime_types_trampoline<P>(this: *mut ffi::WebKitFileChooserRequest, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserRequest::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_select_multiple_trampoline<P>(this: *mut ffi::WebKitFileChooserRequest, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserRequest::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_selected_files_trampoline<P>(this: *mut ffi::WebKitFileChooserRequest, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FileChooserRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FileChooserRequest::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/find_controller.rs b/src/auto/find_controller.rs
index ee9f27a1..69d56cd5 100644
--- a/src/auto/find_controller.rs
+++ b/src/auto/find_controller.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 WebView;
@@ -120,8 +121,7 @@ impl<O: IsA<FindController> + IsA<glib::object::Object>> FindControllerExt for O
 
     fn get_property_text(&self) -> Option<String> {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <String as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<String as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "text".to_glib_none().0, value.to_glib_none_mut().0);
             value.get()
         }
@@ -186,49 +186,42 @@ impl<O: IsA<FindController> + IsA<glib::object::Object>> FindControllerExt for O
 
 unsafe extern "C" fn counted_matches_trampoline<P>(this: *mut ffi::WebKitFindController, match_count: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<FindController> {
-    callback_guard!();
     let f: &&(Fn(&P, u32) + 'static) = transmute(f);
     f(&FindController::from_glib_borrow(this).downcast_unchecked(), match_count)
 }
 
 unsafe extern "C" fn failed_to_find_text_trampoline<P>(this: *mut ffi::WebKitFindController, f: glib_ffi::gpointer)
 where P: IsA<FindController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FindController::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn found_text_trampoline<P>(this: *mut ffi::WebKitFindController, match_count: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<FindController> {
-    callback_guard!();
     let f: &&(Fn(&P, u32) + 'static) = transmute(f);
     f(&FindController::from_glib_borrow(this).downcast_unchecked(), match_count)
 }
 
 unsafe extern "C" fn notify_max_match_count_trampoline<P>(this: *mut ffi::WebKitFindController, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FindController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FindController::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_options_trampoline<P>(this: *mut ffi::WebKitFindController, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FindController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FindController::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_text_trampoline<P>(this: *mut ffi::WebKitFindController, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FindController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FindController::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_web_view_trampoline<P>(this: *mut ffi::WebKitFindController, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<FindController> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&FindController::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/flags.rs b/src/auto/flags.rs
index 69655013..a0ea0453 100644
--- a/src/auto/flags.rs
+++ b/src/auto/flags.rs
@@ -1,12 +1,16 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
-use glib::Type;
 use glib::StaticType;
-use glib::value::{Value, SetValue, FromValue, FromValueOptional};
-use gobject_ffi;
+use glib::Type;
 use glib::translate::*;
+use glib::value::FromValue;
+use glib::value::FromValueOptional;
+use glib::value::SetValue;
+use glib::value::Value;
+use gobject_ffi;
 
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 bitflags! {
diff --git a/src/auto/form_submission_request.rs b/src/auto/form_submission_request.rs
index f9816979..6efa4bb7 100644
--- a/src/auto/form_submission_request.rs
+++ b/src/auto/form_submission_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/geolocation_permission_request.rs b/src/auto/geolocation_permission_request.rs
index 85fa1c85..6590ac03 100644
--- a/src/auto/geolocation_permission_request.rs
+++ b/src/auto/geolocation_permission_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 PermissionRequest;
diff --git a/src/auto/hit_test_result.rs b/src/auto/hit_test_result.rs
index 1f84ff7f..0abedafa 100644
--- a/src/auto/hit_test_result.rs
+++ b/src/auto/hit_test_result.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -187,42 +188,36 @@ impl<O: IsA<HitTestResult> + IsA<glib::object::Object>> HitTestResultExt for O {
 
 unsafe extern "C" fn notify_context_trampoline<P>(this: *mut ffi::WebKitHitTestResult, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HitTestResult> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HitTestResult::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_image_uri_trampoline<P>(this: *mut ffi::WebKitHitTestResult, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HitTestResult> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HitTestResult::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_link_label_trampoline<P>(this: *mut ffi::WebKitHitTestResult, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HitTestResult> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HitTestResult::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_link_title_trampoline<P>(this: *mut ffi::WebKitHitTestResult, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HitTestResult> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HitTestResult::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_link_uri_trampoline<P>(this: *mut ffi::WebKitHitTestResult, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HitTestResult> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HitTestResult::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_media_uri_trampoline<P>(this: *mut ffi::WebKitHitTestResult, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<HitTestResult> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&HitTestResult::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/install_missing_media_plugins_permission_request.rs b/src/auto/install_missing_media_plugins_permission_request.rs
index 95bae2b5..c75bfea1 100644
--- a/src/auto/install_missing_media_plugins_permission_request.rs
+++ b/src/auto/install_missing_media_plugins_permission_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 PermissionRequest;
diff --git a/src/auto/javascript_result.rs b/src/auto/javascript_result.rs
index d2380dd6..b6fba313 100644
--- a/src/auto/javascript_result.rs
+++ b/src/auto/javascript_result.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/mime_info.rs b/src/auto/mime_info.rs
index c6b00500..884f5bb7 100644
--- a/src/auto/mime_info.rs
+++ b/src/auto/mime_info.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/mod.rs b/src/auto/mod.rs
index 46ed03a8..1a1babbb 100644
--- a/src/auto/mod.rs
+++ b/src/auto/mod.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_2", feature = "dox"))]
diff --git a/src/auto/navigation_action.rs b/src/auto/navigation_action.rs
index 4fcfb497..688b4e2d 100644
--- a/src/auto/navigation_action.rs
+++ b/src/auto/navigation_action.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_6", feature = "dox"))]
diff --git a/src/auto/navigation_policy_decision.rs b/src/auto/navigation_policy_decision.rs
index 0165db3f..a1bbc550 100644
--- a/src/auto/navigation_policy_decision.rs
+++ b/src/auto/navigation_policy_decision.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_6", feature = "dox"))]
@@ -31,28 +32,36 @@ glib_wrapper! {
 pub trait NavigationPolicyDecisionExt {
     fn get_frame_name(&self) -> Option<String>;
 
+    #[cfg_attr(feature = "v2_6", deprecated)]
     fn get_modifiers(&self) -> u32;
 
+    #[cfg_attr(feature = "v2_6", deprecated)]
     fn get_mouse_button(&self) -> u32;
 
     #[cfg(any(feature = "v2_6", feature = "dox"))]
     fn get_navigation_action(&self) -> Option<NavigationAction>;
 
+    #[cfg_attr(feature = "v2_6", deprecated)]
     fn get_navigation_type(&self) -> NavigationType;
 
+    #[cfg_attr(feature = "v2_6", deprecated)]
     fn get_request(&self) -> Option<URIRequest>;
 
     fn connect_property_frame_name_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg_attr(feature = "v2_6", deprecated)]
     fn connect_property_modifiers_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg_attr(feature = "v2_6", deprecated)]
     fn connect_property_mouse_button_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
     #[cfg(any(feature = "v2_6", feature = "dox"))]
     fn connect_property_navigation_action_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg_attr(feature = "v2_6", deprecated)]
     fn connect_property_navigation_type_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg_attr(feature = "v2_6", deprecated)]
     fn connect_property_request_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 }
 
@@ -146,21 +155,18 @@ impl<O: IsA<NavigationPolicyDecision> + IsA<glib::object::Object>> NavigationPol
 
 unsafe extern "C" fn notify_frame_name_trampoline<P>(this: *mut ffi::WebKitNavigationPolicyDecision, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NavigationPolicyDecision> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NavigationPolicyDecision::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_modifiers_trampoline<P>(this: *mut ffi::WebKitNavigationPolicyDecision, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NavigationPolicyDecision> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NavigationPolicyDecision::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mouse_button_trampoline<P>(this: *mut ffi::WebKitNavigationPolicyDecision, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NavigationPolicyDecision> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NavigationPolicyDecision::from_glib_borrow(this).downcast_unchecked())
 }
@@ -168,21 +174,18 @@ where P: IsA<NavigationPolicyDecision> {
 #[cfg(any(feature = "v2_6", feature = "dox"))]
 unsafe extern "C" fn notify_navigation_action_trampoline<P>(this: *mut ffi::WebKitNavigationPolicyDecision, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NavigationPolicyDecision> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NavigationPolicyDecision::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_navigation_type_trampoline<P>(this: *mut ffi::WebKitNavigationPolicyDecision, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NavigationPolicyDecision> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NavigationPolicyDecision::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_request_trampoline<P>(this: *mut ffi::WebKitNavigationPolicyDecision, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<NavigationPolicyDecision> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&NavigationPolicyDecision::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/network_proxy_settings.rs b/src/auto/network_proxy_settings.rs
index 5719e720..d5a8f27b 100644
--- a/src/auto/network_proxy_settings.rs
+++ b/src/auto/network_proxy_settings.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/notification.rs b/src/auto/notification.rs
index eec67b72..98529814 100644
--- a/src/auto/notification.rs
+++ b/src/auto/notification.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -167,7 +168,6 @@ impl<O: IsA<Notification> + IsA<glib::object::Object>> NotificationExt for O {
 #[cfg(any(feature = "v2_12", feature = "dox"))]
 unsafe extern "C" fn clicked_trampoline<P>(this: *mut ffi::WebKitNotification, f: glib_ffi::gpointer)
 where P: IsA<Notification> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notification::from_glib_borrow(this).downcast_unchecked())
 }
@@ -175,7 +175,6 @@ where P: IsA<Notification> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn closed_trampoline<P>(this: *mut ffi::WebKitNotification, f: glib_ffi::gpointer)
 where P: IsA<Notification> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notification::from_glib_borrow(this).downcast_unchecked())
 }
@@ -183,7 +182,6 @@ where P: IsA<Notification> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn notify_body_trampoline<P>(this: *mut ffi::WebKitNotification, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notification> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notification::from_glib_borrow(this).downcast_unchecked())
 }
@@ -191,7 +189,6 @@ where P: IsA<Notification> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn notify_id_trampoline<P>(this: *mut ffi::WebKitNotification, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notification> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notification::from_glib_borrow(this).downcast_unchecked())
 }
@@ -199,7 +196,6 @@ where P: IsA<Notification> {
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn notify_tag_trampoline<P>(this: *mut ffi::WebKitNotification, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notification> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notification::from_glib_borrow(this).downcast_unchecked())
 }
@@ -207,7 +203,6 @@ where P: IsA<Notification> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::WebKitNotification, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<Notification> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&Notification::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/notification_permission_request.rs b/src/auto/notification_permission_request.rs
index 348dea67..e5e5d31c 100644
--- a/src/auto/notification_permission_request.rs
+++ b/src/auto/notification_permission_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 PermissionRequest;
diff --git a/src/auto/permission_request.rs b/src/auto/permission_request.rs
index f865e3da..8e10e4aa 100644
--- a/src/auto/permission_request.rs
+++ b/src/auto/permission_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/plugin.rs b/src/auto/plugin.rs
index ddd42adf..a9df5c29 100644
--- a/src/auto/plugin.rs
+++ b/src/auto/plugin.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 MimeInfo;
diff --git a/src/auto/policy_decision.rs b/src/auto/policy_decision.rs
index 00479496..76f3aaae 100644
--- a/src/auto/policy_decision.rs
+++ b/src/auto/policy_decision.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/print_custom_widget.rs b/src/auto/print_custom_widget.rs
index d84ab927..e3f7542e 100644
--- a/src/auto/print_custom_widget.rs
+++ b/src/auto/print_custom_widget.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -117,7 +118,6 @@ impl<O: IsA<PrintCustomWidget> + IsA<glib::object::Object>> PrintCustomWidgetExt
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn apply_trampoline<P>(this: *mut ffi::WebKitPrintCustomWidget, f: glib_ffi::gpointer)
 where P: IsA<PrintCustomWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintCustomWidget::from_glib_borrow(this).downcast_unchecked())
 }
@@ -125,7 +125,6 @@ where P: IsA<PrintCustomWidget> {
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn update_trampoline<P>(this: *mut ffi::WebKitPrintCustomWidget, page_setup: *mut gtk_ffi::GtkPageSetup, print_settings: *mut gtk_ffi::GtkPrintSettings, f: glib_ffi::gpointer)
 where P: IsA<PrintCustomWidget> {
-    callback_guard!();
     let f: &&(Fn(&P, &gtk::PageSetup, &gtk::PrintSettings) + 'static) = transmute(f);
     f(&PrintCustomWidget::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(page_setup), &from_glib_borrow(print_settings))
 }
@@ -133,7 +132,6 @@ where P: IsA<PrintCustomWidget> {
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::WebKitPrintCustomWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintCustomWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintCustomWidget::from_glib_borrow(this).downcast_unchecked())
 }
@@ -141,7 +139,6 @@ where P: IsA<PrintCustomWidget> {
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn notify_widget_trampoline<P>(this: *mut ffi::WebKitPrintCustomWidget, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<PrintCustomWidget> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&PrintCustomWidget::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/print_operation.rs b/src/auto/print_operation.rs
index 73e0538f..f6997b60 100644
--- a/src/auto/print_operation.rs
+++ b/src/auto/print_operation.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -110,8 +111,7 @@ impl<O: IsA<PrintOperation> + IsA<glib::object::Object>> PrintOperationExt for O
 
     fn get_property_web_view(&self) -> Option<WebView> {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <WebView as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<WebView as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "web-view".to_glib_none().0, value.to_glib_none_mut().0);
             value.get()
         }
@@ -170,42 +170,36 @@ impl<O: IsA<PrintOperation> + IsA<glib::object::Object>> PrintOperationExt for O
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn create_custom_widget_trampoline<P>(this: *mut ffi::WebKitPrintOperation, f: glib_ffi::gpointer) -> *mut ffi::WebKitPrintCustomWidget
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P) -> PrintCustomWidget + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked()).to_glib_full()
 }
 
 unsafe extern "C" fn failed_trampoline<P>(this: *mut ffi::WebKitPrintOperation, error: *mut glib_ffi::GError, f: glib_ffi::gpointer)
 where P: IsA<PrintOperation> {
-    callback_guard!();
     let f: &&(Fn(&P, &Error) + 'static) = transmute(f);
     f(&PrintOperation::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(error))
 }
 
 unsafe extern "C" fn finished_trampoline<P>(this: *mut ffi::WebKitPrintOperation, 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_page_setup_trampoline<P>(this: *mut ffi::WebKitPrintOperation, _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::WebKitPrintOperation, _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_web_view_trampoline<P>(this: *mut ffi::WebKitPrintOperation, _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/response_policy_decision.rs b/src/auto/response_policy_decision.rs
index 5a34660b..56cfc33f 100644
--- a/src/auto/response_policy_decision.rs
+++ b/src/auto/response_policy_decision.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 PolicyDecision;
@@ -78,14 +79,12 @@ impl<O: IsA<ResponsePolicyDecision> + IsA<glib::object::Object>> ResponsePolicyD
 
 unsafe extern "C" fn notify_request_trampoline<P>(this: *mut ffi::WebKitResponsePolicyDecision, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ResponsePolicyDecision> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ResponsePolicyDecision::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_response_trampoline<P>(this: *mut ffi::WebKitResponsePolicyDecision, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<ResponsePolicyDecision> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&ResponsePolicyDecision::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/security_manager.rs b/src/auto/security_manager.rs
index 973a9e4a..ddd21c06 100644
--- a/src/auto/security_manager.rs
+++ b/src/auto/security_manager.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/security_origin.rs b/src/auto/security_origin.rs
index 51ec34ea..893d8934 100644
--- a/src/auto/security_origin.rs
+++ b/src/auto/security_origin.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/settings.rs b/src/auto/settings.rs
index 195a9a77..73a56c22 100644
--- a/src/auto/settings.rs
+++ b/src/auto/settings.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_16", feature = "dox"))]
@@ -102,6 +103,7 @@ pub trait SettingsExt {
 
     fn get_enable_plugins(&self) -> bool;
 
+    #[cfg_attr(feature = "v2_16", deprecated)]
     fn get_enable_private_browsing(&self) -> bool;
 
     fn get_enable_resizable_text_areas(&self) -> bool;
@@ -212,6 +214,7 @@ pub trait SettingsExt {
 
     fn set_enable_plugins(&self, enabled: bool);
 
+    #[cfg_attr(feature = "v2_16", deprecated)]
     fn set_enable_private_browsing(&self, enabled: bool);
 
     fn set_enable_resizable_text_areas(&self, enabled: bool);
@@ -324,6 +327,7 @@ pub trait SettingsExt {
 
     fn connect_property_enable_plugins_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg_attr(feature = "v2_16", deprecated)]
     fn connect_property_enable_private_browsing_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
     fn connect_property_enable_resizable_text_areas_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
@@ -1439,14 +1443,12 @@ impl<O: IsA<Settings> + IsA<glib::object::Object>> SettingsExt for O {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_allow_file_access_from_file_urls_trampoline<P>(this: *mut ffi::WebKitSettings, _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_allow_modal_dialogs_trampoline<P>(this: *mut ffi::WebKitSettings, _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())
 }
@@ -1454,56 +1456,48 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v2_14", feature = "dox"))]
 unsafe extern "C" fn notify_allow_universal_access_from_file_urls_trampoline<P>(this: *mut ffi::WebKitSettings, _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_auto_load_images_trampoline<P>(this: *mut ffi::WebKitSettings, _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_cursive_font_family_trampoline<P>(this: *mut ffi::WebKitSettings, _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_default_charset_trampoline<P>(this: *mut ffi::WebKitSettings, _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_default_font_family_trampoline<P>(this: *mut ffi::WebKitSettings, _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_default_font_size_trampoline<P>(this: *mut ffi::WebKitSettings, _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_default_monospace_font_size_trampoline<P>(this: *mut ffi::WebKitSettings, _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_draw_compositing_indicators_trampoline<P>(this: *mut ffi::WebKitSettings, _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())
 }
@@ -1511,77 +1505,66 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v2_2", feature = "dox"))]
 unsafe extern "C" fn notify_enable_accelerated_2d_canvas_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_caret_browsing_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_developer_extras_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_dns_prefetching_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_frame_flattening_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_fullscreen_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_html5_database_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_html5_local_storage_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_hyperlink_auditing_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_java_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_javascript_trampoline<P>(this: *mut ffi::WebKitSettings, _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())
 }
@@ -1589,7 +1572,6 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v2_4", feature = "dox"))]
 unsafe extern "C" fn notify_enable_media_stream_trampoline<P>(this: *mut ffi::WebKitSettings, _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())
 }
@@ -1597,56 +1579,48 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v2_4", feature = "dox"))]
 unsafe extern "C" fn notify_enable_mediasource_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_offline_web_application_cache_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_page_cache_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_plugins_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_private_browsing_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_resizable_text_areas_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_site_specific_quirks_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_smooth_scrolling_trampoline<P>(this: *mut ffi::WebKitSettings, _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())
 }
@@ -1654,28 +1628,24 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v2_4", feature = "dox"))]
 unsafe extern "C" fn notify_enable_spatial_navigation_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_tabs_to_links_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_webaudio_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_webgl_trampoline<P>(this: *mut ffi::WebKitSettings, _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())
 }
@@ -1683,21 +1653,18 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v2_2", feature = "dox"))]
 unsafe extern "C" fn notify_enable_write_console_messages_to_stdout_trampoline<P>(this: *mut ffi::WebKitSettings, _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_enable_xss_auditor_trampoline<P>(this: *mut ffi::WebKitSettings, _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_fantasy_font_family_trampoline<P>(this: *mut ffi::WebKitSettings, _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())
 }
@@ -1705,98 +1672,84 @@ where P: IsA<Settings> {
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn notify_hardware_acceleration_policy_trampoline<P>(this: *mut ffi::WebKitSettings, _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_javascript_can_access_clipboard_trampoline<P>(this: *mut ffi::WebKitSettings, _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_javascript_can_open_windows_automatically_trampoline<P>(this: *mut ffi::WebKitSettings, _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_load_icons_ignoring_image_load_setting_trampoline<P>(this: *mut ffi::WebKitSettings, _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_media_playback_allows_inline_trampoline<P>(this: *mut ffi::WebKitSettings, _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_media_playback_requires_user_gesture_trampoline<P>(this: *mut ffi::WebKitSettings, _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_minimum_font_size_trampoline<P>(this: *mut ffi::WebKitSettings, _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_monospace_font_family_trampoline<P>(this: *mut ffi::WebKitSettings, _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_pictograph_font_family_trampoline<P>(this: *mut ffi::WebKitSettings, _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_print_backgrounds_trampoline<P>(this: *mut ffi::WebKitSettings, _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_sans_serif_font_family_trampoline<P>(this: *mut ffi::WebKitSettings, _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_serif_font_family_trampoline<P>(this: *mut ffi::WebKitSettings, _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_user_agent_trampoline<P>(this: *mut ffi::WebKitSettings, _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_zoom_text_only_trampoline<P>(this: *mut ffi::WebKitSettings, _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/uri_request.rs b/src/auto/uri_request.rs
index 63ceba0c..97a8ddfd 100644
--- a/src/auto/uri_request.rs
+++ b/src/auto/uri_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -80,7 +81,6 @@ impl<O: IsA<URIRequest> + IsA<glib::object::Object>> URIRequestExt for O {
 
 unsafe extern "C" fn notify_uri_trampoline<P>(this: *mut ffi::WebKitURIRequest, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<URIRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&URIRequest::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/uri_response.rs b/src/auto/uri_response.rs
index ab6e8250..0b53a54f 100644
--- a/src/auto/uri_response.rs
+++ b/src/auto/uri_response.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -139,7 +140,6 @@ impl<O: IsA<URIResponse> + IsA<glib::object::Object>> URIResponseExt for O {
 
 unsafe extern "C" fn notify_content_length_trampoline<P>(this: *mut ffi::WebKitURIResponse, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<URIResponse> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&URIResponse::from_glib_borrow(this).downcast_unchecked())
 }
@@ -147,35 +147,30 @@ where P: IsA<URIResponse> {
 #[cfg(any(feature = "v2_6", feature = "dox"))]
 unsafe extern "C" fn notify_http_headers_trampoline<P>(this: *mut ffi::WebKitURIResponse, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<URIResponse> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&URIResponse::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_mime_type_trampoline<P>(this: *mut ffi::WebKitURIResponse, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<URIResponse> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&URIResponse::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_status_code_trampoline<P>(this: *mut ffi::WebKitURIResponse, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<URIResponse> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&URIResponse::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_suggested_filename_trampoline<P>(this: *mut ffi::WebKitURIResponse, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<URIResponse> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&URIResponse::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_uri_trampoline<P>(this: *mut ffi::WebKitURIResponse, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<URIResponse> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&URIResponse::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/uri_scheme_request.rs b/src/auto/uri_scheme_request.rs
index 565f0d81..9fcfb01c 100644
--- a/src/auto/uri_scheme_request.rs
+++ b/src/auto/uri_scheme_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_2", feature = "dox"))]
diff --git a/src/auto/user_content_manager.rs b/src/auto/user_content_manager.rs
index 3f858b29..fa3e69d3 100644
--- a/src/auto/user_content_manager.rs
+++ b/src/auto/user_content_manager.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_8", feature = "dox"))]
@@ -130,7 +131,6 @@ impl<O: IsA<UserContentManager> + IsA<glib::object::Object>> UserContentManagerE
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn script_message_received_trampoline<P>(this: *mut ffi::WebKitUserContentManager, js_result: *mut ffi::WebKitJavascriptResult, f: glib_ffi::gpointer)
 where P: IsA<UserContentManager> {
-    callback_guard!();
     let f: &&(Fn(&P, &JavascriptResult) + 'static) = transmute(f);
     f(&UserContentManager::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(js_result))
 }
diff --git a/src/auto/user_media_permission_request.rs b/src/auto/user_media_permission_request.rs
index 12be7d4b..d072f972 100644
--- a/src/auto/user_media_permission_request.rs
+++ b/src/auto/user_media_permission_request.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 PermissionRequest;
@@ -39,8 +40,7 @@ pub trait UserMediaPermissionRequestExt {
 impl<O: IsA<UserMediaPermissionRequest> + IsA<glib::object::Object>> UserMediaPermissionRequestExt for O {
     fn get_property_is_for_audio_device(&self) -> bool {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <bool as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<bool as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "is-for-audio-device".to_glib_none().0, value.to_glib_none_mut().0);
             value.get().unwrap()
         }
@@ -48,8 +48,7 @@ impl<O: IsA<UserMediaPermissionRequest> + IsA<glib::object::Object>> UserMediaPe
 
     fn get_property_is_for_video_device(&self) -> bool {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <bool as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<bool as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "is-for-video-device".to_glib_none().0, value.to_glib_none_mut().0);
             value.get().unwrap()
         }
@@ -74,14 +73,12 @@ impl<O: IsA<UserMediaPermissionRequest> + IsA<glib::object::Object>> UserMediaPe
 
 unsafe extern "C" fn notify_is_for_audio_device_trampoline<P>(this: *mut ffi::WebKitUserMediaPermissionRequest, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<UserMediaPermissionRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&UserMediaPermissionRequest::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_is_for_video_device_trampoline<P>(this: *mut ffi::WebKitUserMediaPermissionRequest, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<UserMediaPermissionRequest> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&UserMediaPermissionRequest::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/user_script.rs b/src/auto/user_script.rs
index 1e62f86b..00d18040 100644
--- a/src/auto/user_script.rs
+++ b/src/auto/user_script.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_6", feature = "dox"))]
diff --git a/src/auto/user_style_sheet.rs b/src/auto/user_style_sheet.rs
index 784df49b..7614acd7 100644
--- a/src/auto/user_style_sheet.rs
+++ b/src/auto/user_style_sheet.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_6", feature = "dox"))]
diff --git a/src/auto/web_context.rs b/src/auto/web_context.rs
index 90eabe20..d282004c 100644
--- a/src/auto/web_context.rs
+++ b/src/auto/web_context.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 CacheModel;
@@ -136,6 +137,7 @@ pub trait WebContextExt {
 
     fn set_cache_model(&self, cache_model: CacheModel);
 
+    #[cfg_attr(feature = "v2_10", deprecated)]
     fn set_disk_cache_directory(&self, directory: &str);
 
     fn set_favicon_database_directory<'a, P: Into<Option<&'a str>>>(&self, path: P);
@@ -159,6 +161,7 @@ pub trait WebContextExt {
     #[cfg(any(feature = "v2_10", feature = "dox"))]
     fn set_web_process_count_limit(&self, limit: u32);
 
+    #[cfg_attr(feature = "v2_10", deprecated)]
     #[cfg(any(feature = "v2_8", feature = "dox"))]
     fn get_property_local_storage_directory(&self) -> Option<String>;
 
@@ -173,6 +176,7 @@ pub trait WebContextExt {
     #[cfg(any(feature = "v2_4", feature = "dox"))]
     fn connect_initialize_web_extensions<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
+    #[cfg_attr(feature = "v2_10", deprecated)]
     #[cfg(any(feature = "v2_8", feature = "dox"))]
     fn connect_property_local_storage_directory_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 
@@ -391,8 +395,7 @@ impl<O: IsA<WebContext> + IsA<glib::object::Object>> WebContextExt for O {
     #[cfg(any(feature = "v2_8", feature = "dox"))]
     fn get_property_local_storage_directory(&self) -> Option<String> {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <String as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<String as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "local-storage-directory".to_glib_none().0, value.to_glib_none_mut().0);
             value.get()
         }
@@ -450,7 +453,6 @@ impl<O: IsA<WebContext> + IsA<glib::object::Object>> WebContextExt for O {
 
 unsafe extern "C" fn download_started_trampoline<P>(this: *mut ffi::WebKitWebContext, download: *mut ffi::WebKitDownload, f: glib_ffi::gpointer)
 where P: IsA<WebContext> {
-    callback_guard!();
     let f: &&(Fn(&P, &Download) + 'static) = transmute(f);
     f(&WebContext::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(download))
 }
@@ -458,7 +460,6 @@ where P: IsA<WebContext> {
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn initialize_notification_permissions_trampoline<P>(this: *mut ffi::WebKitWebContext, f: glib_ffi::gpointer)
 where P: IsA<WebContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -466,7 +467,6 @@ where P: IsA<WebContext> {
 #[cfg(any(feature = "v2_4", feature = "dox"))]
 unsafe extern "C" fn initialize_web_extensions_trampoline<P>(this: *mut ffi::WebKitWebContext, f: glib_ffi::gpointer)
 where P: IsA<WebContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -474,7 +474,6 @@ where P: IsA<WebContext> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn notify_local_storage_directory_trampoline<P>(this: *mut ffi::WebKitWebContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebContext::from_glib_borrow(this).downcast_unchecked())
 }
@@ -482,7 +481,6 @@ where P: IsA<WebContext> {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_website_data_manager_trampoline<P>(this: *mut ffi::WebKitWebContext, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebContext> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebContext::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/web_inspector.rs b/src/auto/web_inspector.rs
index 07a5362c..78c2ed8e 100644
--- a/src/auto/web_inspector.rs
+++ b/src/auto/web_inspector.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 WebViewBase;
@@ -186,42 +187,36 @@ impl<O: IsA<WebInspector> + IsA<glib::object::Object>> WebInspectorExt for O {
 
 unsafe extern "C" fn attach_trampoline<P>(this: *mut ffi::WebKitWebInspector, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebInspector> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&WebInspector::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn bring_to_front_trampoline<P>(this: *mut ffi::WebKitWebInspector, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebInspector> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&WebInspector::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn closed_trampoline<P>(this: *mut ffi::WebKitWebInspector, f: glib_ffi::gpointer)
 where P: IsA<WebInspector> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebInspector::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn detach_trampoline<P>(this: *mut ffi::WebKitWebInspector, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebInspector> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&WebInspector::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn open_window_trampoline<P>(this: *mut ffi::WebKitWebInspector, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebInspector> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&WebInspector::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn notify_attached_height_trampoline<P>(this: *mut ffi::WebKitWebInspector, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebInspector> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebInspector::from_glib_borrow(this).downcast_unchecked())
 }
@@ -229,14 +224,12 @@ where P: IsA<WebInspector> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn notify_can_attach_trampoline<P>(this: *mut ffi::WebKitWebInspector, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebInspector> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebInspector::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_inspected_uri_trampoline<P>(this: *mut ffi::WebKitWebInspector, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebInspector> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebInspector::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/web_resource.rs b/src/auto/web_resource.rs
index 58d28eda..dfe7c9c2 100644
--- a/src/auto/web_resource.rs
+++ b/src/auto/web_resource.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -130,7 +131,6 @@ impl<O: IsA<WebResource> + IsA<glib::object::Object>> WebResourceExt for O {
 
 unsafe extern "C" fn failed_trampoline<P>(this: *mut ffi::WebKitWebResource, error: *mut glib_ffi::GError, f: glib_ffi::gpointer)
 where P: IsA<WebResource> {
-    callback_guard!();
     let f: &&(Fn(&P, &Error) + 'static) = transmute(f);
     f(&WebResource::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(error))
 }
@@ -138,42 +138,36 @@ where P: IsA<WebResource> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn failed_with_tls_errors_trampoline<P>(this: *mut ffi::WebKitWebResource, certificate: *mut gio_ffi::GTlsCertificate, errors: gio_ffi::GTlsCertificateFlags, f: glib_ffi::gpointer)
 where P: IsA<WebResource> {
-    callback_guard!();
     let f: &&(Fn(&P, &gio::TlsCertificate, gio::TlsCertificateFlags) + 'static) = transmute(f);
     f(&WebResource::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(certificate), from_glib(errors))
 }
 
 unsafe extern "C" fn finished_trampoline<P>(this: *mut ffi::WebKitWebResource, f: glib_ffi::gpointer)
 where P: IsA<WebResource> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebResource::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn received_data_trampoline<P>(this: *mut ffi::WebKitWebResource, data_length: u64, f: glib_ffi::gpointer)
 where P: IsA<WebResource> {
-    callback_guard!();
     let f: &&(Fn(&P, u64) + 'static) = transmute(f);
     f(&WebResource::from_glib_borrow(this).downcast_unchecked(), data_length)
 }
 
 unsafe extern "C" fn sent_request_trampoline<P>(this: *mut ffi::WebKitWebResource, request: *mut ffi::WebKitURIRequest, redirected_response: *mut ffi::WebKitURIResponse, f: glib_ffi::gpointer)
 where P: IsA<WebResource> {
-    callback_guard!();
     let f: &&(Fn(&P, &URIRequest, &URIResponse) + 'static) = transmute(f);
     f(&WebResource::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(request), &from_glib_borrow(redirected_response))
 }
 
 unsafe extern "C" fn notify_response_trampoline<P>(this: *mut ffi::WebKitWebResource, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebResource> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebResource::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_uri_trampoline<P>(this: *mut ffi::WebKitWebResource, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebResource> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebResource::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/web_view.rs b/src/auto/web_view.rs
index 7f6eb31a..131bc311 100644
--- a/src/auto/web_view.rs
+++ b/src/auto/web_view.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_2", feature = "dox"))]
@@ -726,8 +727,7 @@ impl<O: IsA<WebView> + IsA<glib::object::Object>> WebViewExt for O {
     #[cfg(any(feature = "v2_8", feature = "dox"))]
     fn get_property_editable(&self) -> bool {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <bool as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<bool as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "editable".to_glib_none().0, value.to_glib_none_mut().0);
             value.get().unwrap()
         }
@@ -736,8 +736,7 @@ impl<O: IsA<WebView> + IsA<glib::object::Object>> WebViewExt for O {
     #[cfg(any(feature = "v2_18", feature = "dox"))]
     fn get_property_is_controlled_by_automation(&self) -> bool {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <bool as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<bool as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "is-controlled-by-automation".to_glib_none().0, value.to_glib_none_mut().0);
             value.get().unwrap()
         }
@@ -746,8 +745,7 @@ impl<O: IsA<WebView> + IsA<glib::object::Object>> WebViewExt for O {
     #[cfg(any(feature = "v2_16", feature = "dox"))]
     fn get_property_is_ephemeral(&self) -> bool {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <bool as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<bool as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "is-ephemeral".to_glib_none().0, value.to_glib_none_mut().0);
             value.get().unwrap()
         }
@@ -755,8 +753,7 @@ impl<O: IsA<WebView> + IsA<glib::object::Object>> WebViewExt for O {
 
     fn get_property_is_loading(&self) -> bool {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <bool as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<bool as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "is-loading".to_glib_none().0, value.to_glib_none_mut().0);
             value.get().unwrap()
         }
@@ -765,8 +762,7 @@ impl<O: IsA<WebView> + IsA<glib::object::Object>> WebViewExt for O {
     #[cfg(any(feature = "v2_8", feature = "dox"))]
     fn get_property_is_playing_audio(&self) -> bool {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <bool as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<bool as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "is-playing-audio".to_glib_none().0, value.to_glib_none_mut().0);
             value.get().unwrap()
         }
@@ -774,8 +770,7 @@ impl<O: IsA<WebView> + IsA<glib::object::Object>> WebViewExt for O {
 
     fn get_property_web_context(&self) -> Option<WebContext> {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <WebContext as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<WebContext as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "web-context".to_glib_none().0, value.to_glib_none_mut().0);
             value.get()
         }
@@ -1106,28 +1101,24 @@ impl<O: IsA<WebView> + IsA<glib::object::Object>> WebViewExt for O {
 #[cfg(any(feature = "v2_2", feature = "dox"))]
 unsafe extern "C" fn authenticate_trampoline<P>(this: *mut ffi::WebKitWebView, request: *mut ffi::WebKitAuthenticationRequest, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &AuthenticationRequest) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(request)).to_glib()
 }
 
 unsafe extern "C" fn close_trampoline<P>(this: *mut ffi::WebKitWebView, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn context_menu_trampoline<P>(this: *mut ffi::WebKitWebView, context_menu: *mut ffi::WebKitContextMenu, event: *mut gdk_ffi::GdkEvent, hit_test_result: *mut ffi::WebKitHitTestResult, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &ContextMenu, &gdk::Event, &HitTestResult) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(context_menu), &from_glib_none(event), &from_glib_borrow(hit_test_result)).to_glib()
 }
 
 unsafe extern "C" fn context_menu_dismissed_trampoline<P>(this: *mut ffi::WebKitWebView, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1135,49 +1126,42 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_6", feature = "dox"))]
 unsafe extern "C" fn create_trampoline<P>(this: *mut ffi::WebKitWebView, navigation_action: *mut ffi::WebKitNavigationAction, f: glib_ffi::gpointer) -> *mut gtk_ffi::GtkWidget
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &NavigationAction) -> Option<gtk::Widget> + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(navigation_action)).to_glib_full()
 }
 
 unsafe extern "C" fn decide_policy_trampoline<P>(this: *mut ffi::WebKitWebView, decision: *mut ffi::WebKitPolicyDecision, decision_type: ffi::WebKitPolicyDecisionType, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &PolicyDecision, PolicyDecisionType) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(decision), from_glib(decision_type)).to_glib()
 }
 
 unsafe extern "C" fn enter_fullscreen_trampoline<P>(this: *mut ffi::WebKitWebView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn insecure_content_detected_trampoline<P>(this: *mut ffi::WebKitWebView, event: ffi::WebKitInsecureContentEvent, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, InsecureContentEvent) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), from_glib(event))
 }
 
 unsafe extern "C" fn leave_fullscreen_trampoline<P>(this: *mut ffi::WebKitWebView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
 
 unsafe extern "C" fn load_changed_trampoline<P>(this: *mut ffi::WebKitWebView, load_event: ffi::WebKitLoadEvent, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, LoadEvent) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), from_glib(load_event))
 }
 
 unsafe extern "C" fn load_failed_trampoline<P>(this: *mut ffi::WebKitWebView, load_event: ffi::WebKitLoadEvent, failing_uri: *mut libc::c_char, error: *mut glib_ffi::GError, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, LoadEvent, &str, &Error) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), from_glib(load_event), &String::from_glib_none(failing_uri), &from_glib_borrow(error)).to_glib()
 }
@@ -1185,49 +1169,42 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_6", feature = "dox"))]
 unsafe extern "C" fn load_failed_with_tls_errors_trampoline<P>(this: *mut ffi::WebKitWebView, failing_uri: *mut libc::c_char, certificate: *mut gio_ffi::GTlsCertificate, errors: gio_ffi::GTlsCertificateFlags, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &str, &gio::TlsCertificate, gio::TlsCertificateFlags) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &String::from_glib_none(failing_uri), &from_glib_borrow(certificate), from_glib(errors)).to_glib()
 }
 
 unsafe extern "C" fn mouse_target_changed_trampoline<P>(this: *mut ffi::WebKitWebView, hit_test_result: *mut ffi::WebKitHitTestResult, modifiers: libc::c_uint, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &HitTestResult, u32) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(hit_test_result), modifiers)
 }
 
 unsafe extern "C" fn permission_request_trampoline<P>(this: *mut ffi::WebKitWebView, request: *mut ffi::WebKitPermissionRequest, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &PermissionRequest) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(request)).to_glib()
 }
 
 unsafe extern "C" fn print_trampoline<P>(this: *mut ffi::WebKitWebView, print_operation: *mut ffi::WebKitPrintOperation, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &PrintOperation) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(print_operation)).to_glib()
 }
 
 unsafe extern "C" fn ready_to_show_trampoline<P>(this: *mut ffi::WebKitWebView, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn resource_load_started_trampoline<P>(this: *mut ffi::WebKitWebView, resource: *mut ffi::WebKitWebResource, request: *mut ffi::WebKitURIRequest, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &WebResource, &URIRequest) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(resource), &from_glib_borrow(request))
 }
 
 unsafe extern "C" fn run_as_modal_trampoline<P>(this: *mut ffi::WebKitWebView, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1235,21 +1212,18 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn run_color_chooser_trampoline<P>(this: *mut ffi::WebKitWebView, request: *mut ffi::WebKitColorChooserRequest, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &ColorChooserRequest) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(request)).to_glib()
 }
 
 unsafe extern "C" fn run_file_chooser_trampoline<P>(this: *mut ffi::WebKitWebView, request: *mut ffi::WebKitFileChooserRequest, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &FileChooserRequest) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(request)).to_glib()
 }
 
 unsafe extern "C" fn script_dialog_trampoline<P>(this: *mut ffi::WebKitWebView, dialog: *mut ffi::WebKitScriptDialog, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &ScriptDialog) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(dialog)).to_glib()
 }
@@ -1257,21 +1231,18 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn show_notification_trampoline<P>(this: *mut ffi::WebKitWebView, notification: *mut ffi::WebKitNotification, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &Notification) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(notification)).to_glib()
 }
 
 unsafe extern "C" fn submit_form_trampoline<P>(this: *mut ffi::WebKitWebView, request: *mut ffi::WebKitFormSubmissionRequest, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P, &FormSubmissionRequest) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked(), &from_glib_borrow(request))
 }
 
 unsafe extern "C" fn web_process_crashed_trampoline<P>(this: *mut ffi::WebKitWebView, f: glib_ffi::gpointer) -> glib_ffi::gboolean
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) -> bool + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked()).to_glib()
 }
@@ -1279,21 +1250,18 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn notify_editable_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_estimated_load_progress_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_favicon_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1301,7 +1269,6 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_18", feature = "dox"))]
 unsafe extern "C" fn notify_is_controlled_by_automation_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1309,14 +1276,12 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn notify_is_ephemeral_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_is_loading_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1324,7 +1289,6 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_8", feature = "dox"))]
 unsafe extern "C" fn notify_is_playing_audio_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1332,7 +1296,6 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_4", feature = "dox"))]
 unsafe extern "C" fn notify_related_view_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1340,21 +1303,18 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_6", feature = "dox"))]
 unsafe extern "C" fn notify_settings_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_title_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_uri_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
@@ -1362,21 +1322,18 @@ where P: IsA<WebView> {
 #[cfg(any(feature = "v2_6", feature = "dox"))]
 unsafe extern "C" fn notify_user_content_manager_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_web_context_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_zoom_level_trampoline<P>(this: *mut ffi::WebKitWebView, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebView> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebView::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/web_view_base.rs b/src/auto/web_view_base.rs
index bb9ee2e5..3135bfaa 100644
--- a/src/auto/web_view_base.rs
+++ b/src/auto/web_view_base.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/web_view_session_state.rs b/src/auto/web_view_session_state.rs
index 7fd26937..89a5abcc 100644
--- a/src/auto/web_view_session_state.rs
+++ b/src/auto/web_view_session_state.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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/website_data_manager.rs b/src/auto/website_data_manager.rs
index 7d25d410..c311b6fb 100644
--- a/src/auto/website_data_manager.rs
+++ b/src/auto/website_data_manager.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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 = "v2_16", feature = "dox"))]
@@ -196,8 +197,7 @@ impl<O: IsA<WebsiteDataManager> + IsA<glib::object::Object>> WebsiteDataManagerE
     #[cfg(any(feature = "v2_16", feature = "dox"))]
     fn get_property_is_ephemeral(&self) -> bool {
         unsafe {
-            let mut value = Value::uninitialized();
-            gobject_ffi::g_value_init(value.to_glib_none_mut().0, <bool as StaticType>::static_type().to_glib());
+            let mut value = Value::from_type(<bool as StaticType>::static_type());
             gobject_ffi::g_object_get_property(self.to_glib_none().0, "is-ephemeral".to_glib_none().0, value.to_glib_none_mut().0);
             value.get().unwrap()
         }
@@ -279,7 +279,6 @@ impl<O: IsA<WebsiteDataManager> + IsA<glib::object::Object>> WebsiteDataManagerE
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_base_cache_directory_trampoline<P>(this: *mut ffi::WebKitWebsiteDataManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebsiteDataManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebsiteDataManager::from_glib_borrow(this).downcast_unchecked())
 }
@@ -287,7 +286,6 @@ where P: IsA<WebsiteDataManager> {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_base_data_directory_trampoline<P>(this: *mut ffi::WebKitWebsiteDataManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebsiteDataManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebsiteDataManager::from_glib_borrow(this).downcast_unchecked())
 }
@@ -295,7 +293,6 @@ where P: IsA<WebsiteDataManager> {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_disk_cache_directory_trampoline<P>(this: *mut ffi::WebKitWebsiteDataManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebsiteDataManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebsiteDataManager::from_glib_borrow(this).downcast_unchecked())
 }
@@ -303,7 +300,6 @@ where P: IsA<WebsiteDataManager> {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_indexeddb_directory_trampoline<P>(this: *mut ffi::WebKitWebsiteDataManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebsiteDataManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebsiteDataManager::from_glib_borrow(this).downcast_unchecked())
 }
@@ -311,7 +307,6 @@ where P: IsA<WebsiteDataManager> {
 #[cfg(any(feature = "v2_16", feature = "dox"))]
 unsafe extern "C" fn notify_is_ephemeral_trampoline<P>(this: *mut ffi::WebKitWebsiteDataManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebsiteDataManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebsiteDataManager::from_glib_borrow(this).downcast_unchecked())
 }
@@ -319,7 +314,6 @@ where P: IsA<WebsiteDataManager> {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_local_storage_directory_trampoline<P>(this: *mut ffi::WebKitWebsiteDataManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebsiteDataManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebsiteDataManager::from_glib_borrow(this).downcast_unchecked())
 }
@@ -327,7 +321,6 @@ where P: IsA<WebsiteDataManager> {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_offline_application_cache_directory_trampoline<P>(this: *mut ffi::WebKitWebsiteDataManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebsiteDataManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebsiteDataManager::from_glib_borrow(this).downcast_unchecked())
 }
@@ -335,7 +328,6 @@ where P: IsA<WebsiteDataManager> {
 #[cfg(any(feature = "v2_10", feature = "dox"))]
 unsafe extern "C" fn notify_websql_directory_trampoline<P>(this: *mut ffi::WebKitWebsiteDataManager, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WebsiteDataManager> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WebsiteDataManager::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/auto/window_properties.rs b/src/auto/window_properties.rs
index bd98809f..c57ad357 100644
--- a/src/auto/window_properties.rs
+++ b/src/auto/window_properties.rs
@@ -1,4 +1,5 @@
-// This file was generated by gir (d50d839) from gir-files (469db10)
+// 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;
@@ -176,56 +177,48 @@ impl<O: IsA<WindowProperties> + IsA<glib::object::Object>> WindowPropertiesExt f
 
 unsafe extern "C" fn notify_fullscreen_trampoline<P>(this: *mut ffi::WebKitWindowProperties, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WindowProperties> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WindowProperties::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_geometry_trampoline<P>(this: *mut ffi::WebKitWindowProperties, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WindowProperties> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WindowProperties::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_locationbar_visible_trampoline<P>(this: *mut ffi::WebKitWindowProperties, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WindowProperties> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WindowProperties::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_menubar_visible_trampoline<P>(this: *mut ffi::WebKitWindowProperties, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WindowProperties> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WindowProperties::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_resizable_trampoline<P>(this: *mut ffi::WebKitWindowProperties, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WindowProperties> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WindowProperties::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_scrollbars_visible_trampoline<P>(this: *mut ffi::WebKitWindowProperties, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WindowProperties> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WindowProperties::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_statusbar_visible_trampoline<P>(this: *mut ffi::WebKitWindowProperties, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WindowProperties> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WindowProperties::from_glib_borrow(this).downcast_unchecked())
 }
 
 unsafe extern "C" fn notify_toolbar_visible_trampoline<P>(this: *mut ffi::WebKitWindowProperties, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
 where P: IsA<WindowProperties> {
-    callback_guard!();
     let f: &&(Fn(&P) + 'static) = transmute(f);
     f(&WindowProperties::from_glib_borrow(this).downcast_unchecked())
 }
diff --git a/src/lib.rs b/src/lib.rs
index 97845c42..38c444e0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,12 +40,6 @@ macro_rules! skip_assert_initialized {
     () => ()
 }
 
-macro_rules! callback_guard {
-    () => (
-        let _guard = ::glib::CallbackGuard::new();
-    )
-}
-
 mod auto;
 mod script_dialog;
 mod web_view;
diff --git a/src/web_view.rs b/src/web_view.rs
index 4ff4d6fa..a9e65165 100644
--- a/src/web_view.rs
+++ b/src/web_view.rs
@@ -98,7 +98,6 @@ impl<O> WebViewExtManual for O
 }
 
 unsafe extern "C" fn async_ready_trampoline(this: *mut gobject_ffi::GObject, result: *mut gio_ffi::GAsyncResult, f: glib_ffi::gpointer) {
-    callback_guard!();
     let mut error = ptr::null_mut();
     let javascript_result = ffi::webkit_web_view_run_javascript_finish(this as *mut _, result, &mut error);
     let value =