diff --git a/gdk4-macos/src/auto/versions.txt b/gdk4-macos/src/auto/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4-macos/src/auto/versions.txt
+++ b/gdk4-macos/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4-macos/sys/versions.txt b/gdk4-macos/sys/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4-macos/sys/versions.txt
+++ b/gdk4-macos/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4-wayland/src/auto/versions.txt
+++ b/gdk4-wayland/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4-wayland/sys/versions.txt
+++ b/gdk4-wayland/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4-win32/src/auto/versions.txt
+++ b/gdk4-win32/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4-win32/src/auto/win32_display.rs b/gdk4-win32/src/auto/win32_display.rs
index 5f2b1b16d0c6..aef3b67e8378 100644
--- a/gdk4-win32/src/auto/win32_display.rs
+++ b/gdk4-win32/src/auto/win32_display.rs
@@ -27,11 +27,11 @@ impl Win32Display {
     }
 
     #[doc(alias = "gdk_win32_display_set_cursor_theme")]
-    pub fn set_cursor_theme(&self, name: Option<&str>, size: i32) {
+    pub fn set_cursor_theme<'a>(&self, name: impl Into<Option<&'a str>>, size: i32) {
         unsafe {
             ffi::gdk_win32_display_set_cursor_theme(
                 self.to_glib_none().0,
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
                 size,
             );
         }
diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4-win32/sys/versions.txt
+++ b/gdk4-win32/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4-x11/src/auto/functions.rs b/gdk4-x11/src/auto/functions.rs
index 2b3a94fbd057..34730cc5ee3b 100644
--- a/gdk4-x11/src/auto/functions.rs
+++ b/gdk4-x11/src/auto/functions.rs
@@ -32,9 +32,9 @@ pub fn x11_get_server_time(surface: &X11Surface) -> u32 {
 }
 
 #[doc(alias = "gdk_x11_set_sm_client_id")]
-pub fn x11_set_sm_client_id(sm_client_id: Option<&str>) {
+pub fn x11_set_sm_client_id<'a>(sm_client_id: impl Into<Option<&'a str>>) {
     assert_initialized_main_thread!();
     unsafe {
-        ffi::gdk_x11_set_sm_client_id(sm_client_id.to_glib_none().0);
+        ffi::gdk_x11_set_sm_client_id(sm_client_id.into().to_glib_none().0);
     }
 }
diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4-x11/src/auto/versions.txt
+++ b/gdk4-x11/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4-x11/src/auto/x11_device_manager_xi2.rs b/gdk4-x11/src/auto/x11_device_manager_xi2.rs
index bd6b9999fd00..bab813f6060a 100644
--- a/gdk4-x11/src/auto/x11_device_manager_xi2.rs
+++ b/gdk4-x11/src/auto/x11_device_manager_xi2.rs
@@ -58,7 +58,7 @@ impl X11DeviceManagerXI2Builder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
diff --git a/gdk4-x11/src/auto/x11_device_xi2.rs b/gdk4-x11/src/auto/x11_device_xi2.rs
index 3ac52ad6eaa8..92935353b65d 100644
--- a/gdk4-x11/src/auto/x11_device_xi2.rs
+++ b/gdk4-x11/src/auto/x11_device_xi2.rs
@@ -53,7 +53,7 @@ impl X11DeviceXI2Builder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
diff --git a/gdk4-x11/src/auto/x11_display.rs b/gdk4-x11/src/auto/x11_display.rs
index 904bb69e3629..c117130f60ad 100644
--- a/gdk4-x11/src/auto/x11_display.rs
+++ b/gdk4-x11/src/auto/x11_display.rs
@@ -134,11 +134,11 @@ impl X11Display {
     #[cfg_attr(feature = "v4_16", deprecated = "Since 4.16")]
     #[allow(deprecated)]
     #[doc(alias = "gdk_x11_display_set_cursor_theme")]
-    pub fn set_cursor_theme(&self, theme: Option<&str>, size: i32) {
+    pub fn set_cursor_theme<'a>(&self, theme: impl Into<Option<&'a str>>, size: i32) {
         unsafe {
             ffi::gdk_x11_display_set_cursor_theme(
                 self.to_glib_none().0,
-                theme.to_glib_none().0,
+                theme.into().to_glib_none().0,
                 size,
             );
         }
@@ -222,8 +222,12 @@ impl X11Display {
     }
 
     #[doc(alias = "gdk_x11_display_open")]
-    pub fn open(display_name: Option<&str>) -> Option<gdk::Display> {
+    pub fn open<'a>(display_name: impl Into<Option<&'a str>>) -> Option<gdk::Display> {
         assert_initialized_main_thread!();
-        unsafe { from_glib_full(ffi::gdk_x11_display_open(display_name.to_glib_none().0)) }
+        unsafe {
+            from_glib_full(ffi::gdk_x11_display_open(
+                display_name.into().to_glib_none().0,
+            ))
+        }
     }
 }
diff --git a/gdk4-x11/src/auto/x11_surface.rs b/gdk4-x11/src/auto/x11_surface.rs
index dff4cace4bea..4eccd833b017 100644
--- a/gdk4-x11/src/auto/x11_surface.rs
+++ b/gdk4-x11/src/auto/x11_surface.rs
@@ -100,12 +100,12 @@ impl X11Surface {
     }
 
     #[doc(alias = "gdk_x11_surface_set_utf8_property")]
-    pub fn set_utf8_property(&self, name: &str, value: Option<&str>) {
+    pub fn set_utf8_property<'a>(&self, name: &str, value: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gdk_x11_surface_set_utf8_property(
                 self.to_glib_none().0,
                 name.to_glib_none().0,
-                value.to_glib_none().0,
+                value.into().to_glib_none().0,
             );
         }
     }
diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4-x11/sys/versions.txt
+++ b/gdk4-x11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4/src/auto/app_launch_context.rs b/gdk4/src/auto/app_launch_context.rs
index c3c18a945158..9e0c37867b10 100644
--- a/gdk4/src/auto/app_launch_context.rs
+++ b/gdk4/src/auto/app_launch_context.rs
@@ -37,21 +37,21 @@ pub trait GdkAppLaunchContextExt: IsA<AppLaunchContext> + 'static {
     }
 
     #[doc(alias = "gdk_app_launch_context_set_icon")]
-    fn set_icon(&self, icon: Option<&impl IsA<gio::Icon>>) {
+    fn set_icon<'a, P: IsA<gio::Icon>>(&self, icon: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gdk_app_launch_context_set_icon(
                 self.as_ref().to_glib_none().0,
-                icon.map(|p| p.as_ref()).to_glib_none().0,
+                icon.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gdk_app_launch_context_set_icon_name")]
-    fn set_icon_name(&self, icon_name: Option<&str>) {
+    fn set_icon_name<'a>(&self, icon_name: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gdk_app_launch_context_set_icon_name(
                 self.as_ref().to_glib_none().0,
-                icon_name.to_glib_none().0,
+                icon_name.into().to_glib_none().0,
             );
         }
     }
diff --git a/gdk4/src/auto/clipboard.rs b/gdk4/src/auto/clipboard.rs
index 91fe1874e7be..ee8494824e68 100644
--- a/gdk4/src/auto/clipboard.rs
+++ b/gdk4/src/auto/clipboard.rs
@@ -45,10 +45,14 @@ impl Clipboard {
     }
 
     #[doc(alias = "gdk_clipboard_read_text_async")]
-    pub fn read_text_async<P: FnOnce(Result<Option<glib::GString>, glib::Error>) + 'static>(
+    pub fn read_text_async<
+        'a,
+        P: IsA<gio::Cancellable>,
+        Q: FnOnce(Result<Option<glib::GString>, glib::Error>) + 'static,
+    >(
         &self,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        cancellable: impl Into<Option<&'a P>>,
+        callback: Q,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -60,10 +64,10 @@ impl Clipboard {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<Q>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn read_text_async_trampoline<
-            P: FnOnce(Result<Option<glib::GString>, glib::Error>) + 'static,
+            Q: FnOnce(Result<Option<glib::GString>, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -77,16 +81,21 @@ impl Clipboard {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<Q>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: Q = callback.into_inner();
             callback(result);
         }
-        let callback = read_text_async_trampoline::<P>;
+        let callback = read_text_async_trampoline::<Q>;
         unsafe {
             ffi::gdk_clipboard_read_text_async(
                 self.to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
@@ -108,10 +117,14 @@ impl Clipboard {
     }
 
     #[doc(alias = "gdk_clipboard_read_texture_async")]
-    pub fn read_texture_async<P: FnOnce(Result<Option<Texture>, glib::Error>) + 'static>(
+    pub fn read_texture_async<
+        'a,
+        P: IsA<gio::Cancellable>,
+        Q: FnOnce(Result<Option<Texture>, glib::Error>) + 'static,
+    >(
         &self,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        cancellable: impl Into<Option<&'a P>>,
+        callback: Q,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -123,10 +136,10 @@ impl Clipboard {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<Q>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn read_texture_async_trampoline<
-            P: FnOnce(Result<Option<Texture>, glib::Error>) + 'static,
+            Q: FnOnce(Result<Option<Texture>, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -140,16 +153,21 @@ impl Clipboard {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<Q>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: Q = callback.into_inner();
             callback(result);
         }
-        let callback = read_texture_async_trampoline::<P>;
+        let callback = read_texture_async_trampoline::<Q>;
         unsafe {
             ffi::gdk_clipboard_read_texture_async(
                 self.to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
@@ -168,12 +186,16 @@ impl Clipboard {
     }
 
     #[doc(alias = "gdk_clipboard_read_value_async")]
-    pub fn read_value_async<P: FnOnce(Result<glib::Value, glib::Error>) + 'static>(
+    pub fn read_value_async<
+        'a,
+        P: IsA<gio::Cancellable>,
+        Q: FnOnce(Result<glib::Value, glib::Error>) + 'static,
+    >(
         &self,
         type_: glib::types::Type,
         io_priority: glib::Priority,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        cancellable: impl Into<Option<&'a P>>,
+        callback: Q,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -185,10 +207,10 @@ impl Clipboard {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<Q>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn read_value_async_trampoline<
-            P: FnOnce(Result<glib::Value, glib::Error>) + 'static,
+            Q: FnOnce(Result<glib::Value, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -202,18 +224,23 @@ impl Clipboard {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<Q>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: Q = callback.into_inner();
             callback(result);
         }
-        let callback = read_value_async_trampoline::<P>;
+        let callback = read_value_async_trampoline::<Q>;
         unsafe {
             ffi::gdk_clipboard_read_value_async(
                 self.to_glib_none().0,
                 type_.into_glib(),
                 io_priority.into_glib(),
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
@@ -234,15 +261,20 @@ impl Clipboard {
     }
 
     #[doc(alias = "gdk_clipboard_set_content")]
-    pub fn set_content(
+    pub fn set_content<'a, P: IsA<ContentProvider>>(
         &self,
-        provider: Option<&impl IsA<ContentProvider>>,
+        provider: impl Into<Option<&'a P>>,
     ) -> Result<(), glib::error::BoolError> {
         unsafe {
             glib::result_from_gboolean!(
                 ffi::gdk_clipboard_set_content(
                     self.to_glib_none().0,
-                    provider.map(|p| p.as_ref()).to_glib_none().0
+                    provider
+                        .into()
+                        .as_ref()
+                        .map(|p| p.as_ref())
+                        .to_glib_none()
+                        .0
                 ),
                 "Can't set new clipboard content"
             )
@@ -267,11 +299,15 @@ impl Clipboard {
     }
 
     #[doc(alias = "gdk_clipboard_store_async")]
-    pub fn store_async<P: FnOnce(Result<(), glib::Error>) + 'static>(
+    pub fn store_async<
+        'a,
+        P: IsA<gio::Cancellable>,
+        Q: FnOnce(Result<(), glib::Error>) + 'static,
+    >(
         &self,
         io_priority: glib::Priority,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        cancellable: impl Into<Option<&'a P>>,
+        callback: Q,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -283,10 +319,10 @@ impl Clipboard {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<Q>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn store_async_trampoline<
-            P: FnOnce(Result<(), glib::Error>) + 'static,
+            Q: FnOnce(Result<(), glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -299,17 +335,22 @@ impl Clipboard {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<Q>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: Q = callback.into_inner();
             callback(result);
         }
-        let callback = store_async_trampoline::<P>;
+        let callback = store_async_trampoline::<Q>;
         unsafe {
             ffi::gdk_clipboard_store_async(
                 self.to_glib_none().0,
                 io_priority.into_glib(),
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
diff --git a/gdk4/src/auto/content_provider.rs b/gdk4/src/auto/content_provider.rs
index bea48c3f8af7..467f42c6d4d6 100644
--- a/gdk4/src/auto/content_provider.rs
+++ b/gdk4/src/auto/content_provider.rs
@@ -88,13 +88,17 @@ pub trait ContentProviderExt: IsA<ContentProvider> + 'static {
     }
 
     #[doc(alias = "gdk_content_provider_write_mime_type_async")]
-    fn write_mime_type_async<P: FnOnce(Result<(), glib::Error>) + 'static>(
+    fn write_mime_type_async<
+        'a,
+        P: IsA<gio::Cancellable>,
+        Q: FnOnce(Result<(), glib::Error>) + 'static,
+    >(
         &self,
         mime_type: &str,
         stream: &impl IsA<gio::OutputStream>,
         io_priority: glib::Priority,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        cancellable: impl Into<Option<&'a P>>,
+        callback: Q,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -106,10 +110,10 @@ pub trait ContentProviderExt: IsA<ContentProvider> + 'static {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<Q>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn write_mime_type_async_trampoline<
-            P: FnOnce(Result<(), glib::Error>) + 'static,
+            Q: FnOnce(Result<(), glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -126,19 +130,24 @@ pub trait ContentProviderExt: IsA<ContentProvider> + 'static {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<Q>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: Q = callback.into_inner();
             callback(result);
         }
-        let callback = write_mime_type_async_trampoline::<P>;
+        let callback = write_mime_type_async_trampoline::<Q>;
         unsafe {
             ffi::gdk_content_provider_write_mime_type_async(
                 self.as_ref().to_glib_none().0,
                 mime_type.to_glib_none().0,
                 stream.as_ref().to_glib_none().0,
                 io_priority.into_glib(),
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
diff --git a/gdk4/src/auto/cursor.rs b/gdk4/src/auto/cursor.rs
index ba7fde592e67..a68381487868 100644
--- a/gdk4/src/auto/cursor.rs
+++ b/gdk4/src/auto/cursor.rs
@@ -17,23 +17,23 @@ glib::wrapper! {
 impl Cursor {
     #[doc(alias = "gdk_cursor_new_from_name")]
     #[doc(alias = "new_from_name")]
-    pub fn from_name(name: &str, fallback: Option<&Cursor>) -> Option<Cursor> {
+    pub fn from_name<'a>(name: &str, fallback: impl Into<Option<&'a Cursor>>) -> Option<Cursor> {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gdk_cursor_new_from_name(
                 name.to_glib_none().0,
-                fallback.to_glib_none().0,
+                fallback.into().to_glib_none().0,
             ))
         }
     }
 
     #[doc(alias = "gdk_cursor_new_from_texture")]
     #[doc(alias = "new_from_texture")]
-    pub fn from_texture(
+    pub fn from_texture<'a>(
         texture: &impl IsA<Texture>,
         hotspot_x: i32,
         hotspot_y: i32,
-        fallback: Option<&Cursor>,
+        fallback: impl Into<Option<&'a Cursor>>,
     ) -> Cursor {
         skip_assert_initialized!();
         unsafe {
@@ -41,7 +41,7 @@ impl Cursor {
                 texture.as_ref().to_glib_none().0,
                 hotspot_x,
                 hotspot_y,
-                fallback.to_glib_none().0,
+                fallback.into().to_glib_none().0,
             ))
         }
     }
@@ -130,7 +130,7 @@ impl CursorBuilder {
 
     pub fn texture(self, texture: &impl IsA<Texture>) -> Self {
         Self {
-            builder: self.builder.property("texture", texture.clone().upcast()),
+            builder: self.builder.property("texture", texture.as_ref().clone()),
         }
     }
 
diff --git a/gdk4/src/auto/device.rs b/gdk4/src/auto/device.rs
index ef71d92f8c8c..e19be64690f0 100644
--- a/gdk4/src/auto/device.rs
+++ b/gdk4/src/auto/device.rs
@@ -198,8 +198,12 @@ pub trait DeviceExt: IsA<Device> + 'static {
         ObjectExt::property(self.as_ref(), "n-axes")
     }
 
-    fn set_seat<P: IsA<Seat>>(&self, seat: Option<&P>) {
-        ObjectExt::set_property(self.as_ref(), "seat", seat)
+    fn set_seat<'a, P: IsA<Seat>>(&self, seat: impl Into<Option<&'a P>>) {
+        ObjectExt::set_property(
+            self.as_ref(),
+            "seat",
+            seat.into().as_ref().map(|p| p.as_ref()),
+        )
     }
 
     #[doc(alias = "changed")]
diff --git a/gdk4/src/auto/display.rs b/gdk4/src/auto/display.rs
index 3e165b9e25f4..2a4962608600 100644
--- a/gdk4/src/auto/display.rs
+++ b/gdk4/src/auto/display.rs
@@ -38,9 +38,9 @@ impl Display {
     }
 
     #[doc(alias = "gdk_display_open")]
-    pub fn open(display_name: Option<&str>) -> Option<Display> {
+    pub fn open<'a>(display_name: impl Into<Option<&'a str>>) -> Option<Display> {
         assert_initialized_main_thread!();
-        unsafe { from_glib_none(ffi::gdk_display_open(display_name.to_glib_none().0)) }
+        unsafe { from_glib_none(ffi::gdk_display_open(display_name.into().to_glib_none().0)) }
     }
 }
 
diff --git a/gdk4/src/auto/display_manager.rs b/gdk4/src/auto/display_manager.rs
index b059894cd767..4991578891fa 100644
--- a/gdk4/src/auto/display_manager.rs
+++ b/gdk4/src/auto/display_manager.rs
@@ -41,11 +41,11 @@ impl DisplayManager {
     }
 
     #[doc(alias = "gdk_display_manager_open_display")]
-    pub fn open_display(&self, name: Option<&str>) -> Option<Display> {
+    pub fn open_display<'a>(&self, name: impl Into<Option<&'a str>>) -> Option<Display> {
         unsafe {
             from_glib_none(ffi::gdk_display_manager_open_display(
                 self.to_glib_none().0,
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
             ))
         }
     }
diff --git a/gdk4/src/auto/dmabuf_texture_builder.rs b/gdk4/src/auto/dmabuf_texture_builder.rs
index f53242bb08b4..6d58f9d32199 100644
--- a/gdk4/src/auto/dmabuf_texture_builder.rs
+++ b/gdk4/src/auto/dmabuf_texture_builder.rs
@@ -138,11 +138,11 @@ impl DmabufTextureBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
     #[doc(alias = "gdk_dmabuf_texture_builder_set_color_state")]
     #[doc(alias = "color-state")]
-    pub fn set_color_state(&self, color_state: Option<&ColorState>) {
+    pub fn set_color_state<'a>(&self, color_state: impl Into<Option<&'a ColorState>>) {
         unsafe {
             ffi::gdk_dmabuf_texture_builder_set_color_state(
                 self.to_glib_none().0,
-                color_state.to_glib_none().0,
+                color_state.into().to_glib_none().0,
             );
         }
     }
@@ -224,22 +224,22 @@ impl DmabufTextureBuilder {
 
     #[doc(alias = "gdk_dmabuf_texture_builder_set_update_region")]
     #[doc(alias = "update-region")]
-    pub fn set_update_region(&self, region: Option<&cairo::Region>) {
+    pub fn set_update_region<'a>(&self, region: impl Into<Option<&'a cairo::Region>>) {
         unsafe {
             ffi::gdk_dmabuf_texture_builder_set_update_region(
                 self.to_glib_none().0,
-                mut_override(region.to_glib_none().0),
+                mut_override(region.into().to_glib_none().0),
             );
         }
     }
 
     #[doc(alias = "gdk_dmabuf_texture_builder_set_update_texture")]
     #[doc(alias = "update-texture")]
-    pub fn set_update_texture(&self, texture: Option<&impl IsA<Texture>>) {
+    pub fn set_update_texture<'a, P: IsA<Texture>>(&self, texture: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gdk_dmabuf_texture_builder_set_update_texture(
                 self.to_glib_none().0,
-                texture.map(|p| p.as_ref()).to_glib_none().0,
+                texture.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gdk4/src/auto/drop.rs b/gdk4/src/auto/drop.rs
index db441535deb2..a6c967d413e7 100644
--- a/gdk4/src/auto/drop.rs
+++ b/gdk4/src/auto/drop.rs
@@ -64,12 +64,16 @@ impl Drop {
     }
 
     #[doc(alias = "gdk_drop_read_value_async")]
-    pub fn read_value_async<P: FnOnce(Result<glib::Value, glib::Error>) + 'static>(
+    pub fn read_value_async<
+        'a,
+        P: IsA<gio::Cancellable>,
+        Q: FnOnce(Result<glib::Value, glib::Error>) + 'static,
+    >(
         &self,
         type_: glib::types::Type,
         io_priority: glib::Priority,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        cancellable: impl Into<Option<&'a P>>,
+        callback: Q,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -81,10 +85,10 @@ impl Drop {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<Q>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn read_value_async_trampoline<
-            P: FnOnce(Result<glib::Value, glib::Error>) + 'static,
+            Q: FnOnce(Result<glib::Value, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -97,18 +101,23 @@ impl Drop {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<Q>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: Q = callback.into_inner();
             callback(result);
         }
-        let callback = read_value_async_trampoline::<P>;
+        let callback = read_value_async_trampoline::<Q>;
         unsafe {
             ffi::gdk_drop_read_value_async(
                 self.to_glib_none().0,
                 type_.into_glib(),
                 io_priority.into_glib(),
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
diff --git a/gdk4/src/auto/memory_texture_builder.rs b/gdk4/src/auto/memory_texture_builder.rs
index 07a6b36f50fe..2ebb70fe229f 100644
--- a/gdk4/src/auto/memory_texture_builder.rs
+++ b/gdk4/src/auto/memory_texture_builder.rs
@@ -104,22 +104,22 @@ impl MemoryTextureBuilder {
 
     #[doc(alias = "gdk_memory_texture_builder_set_bytes")]
     #[doc(alias = "bytes")]
-    pub fn set_bytes(&self, bytes: Option<&glib::Bytes>) {
+    pub fn set_bytes<'a>(&self, bytes: impl Into<Option<&'a glib::Bytes>>) {
         unsafe {
             ffi::gdk_memory_texture_builder_set_bytes(
                 self.to_glib_none().0,
-                bytes.to_glib_none().0,
+                bytes.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gdk_memory_texture_builder_set_color_state")]
     #[doc(alias = "color-state")]
-    pub fn set_color_state(&self, color_state: Option<&ColorState>) {
+    pub fn set_color_state<'a>(&self, color_state: impl Into<Option<&'a ColorState>>) {
         unsafe {
             ffi::gdk_memory_texture_builder_set_color_state(
                 self.to_glib_none().0,
-                color_state.to_glib_none().0,
+                color_state.into().to_glib_none().0,
             );
         }
     }
@@ -150,22 +150,22 @@ impl MemoryTextureBuilder {
 
     #[doc(alias = "gdk_memory_texture_builder_set_update_region")]
     #[doc(alias = "update-region")]
-    pub fn set_update_region(&self, region: Option<&cairo::Region>) {
+    pub fn set_update_region<'a>(&self, region: impl Into<Option<&'a cairo::Region>>) {
         unsafe {
             ffi::gdk_memory_texture_builder_set_update_region(
                 self.to_glib_none().0,
-                mut_override(region.to_glib_none().0),
+                mut_override(region.into().to_glib_none().0),
             );
         }
     }
 
     #[doc(alias = "gdk_memory_texture_builder_set_update_texture")]
     #[doc(alias = "update-texture")]
-    pub fn set_update_texture(&self, texture: Option<&impl IsA<Texture>>) {
+    pub fn set_update_texture<'a, P: IsA<Texture>>(&self, texture: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gdk_memory_texture_builder_set_update_texture(
                 self.to_glib_none().0,
-                texture.map(|p| p.as_ref()).to_glib_none().0,
+                texture.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gdk4/src/auto/surface.rs b/gdk4/src/auto/surface.rs
index f5cba7d9e6db..636e2cbd993b 100644
--- a/gdk4/src/auto/surface.rs
+++ b/gdk4/src/auto/surface.rs
@@ -228,9 +228,12 @@ pub trait SurfaceExt: IsA<Surface> + 'static {
 
     #[doc(alias = "gdk_surface_set_cursor")]
     #[doc(alias = "cursor")]
-    fn set_cursor(&self, cursor: Option<&Cursor>) {
+    fn set_cursor<'a>(&self, cursor: impl Into<Option<&'a Cursor>>) {
         unsafe {
-            ffi::gdk_surface_set_cursor(self.as_ref().to_glib_none().0, cursor.to_glib_none().0);
+            ffi::gdk_surface_set_cursor(
+                self.as_ref().to_glib_none().0,
+                cursor.into().to_glib_none().0,
+            );
         }
     }
 
@@ -258,11 +261,11 @@ pub trait SurfaceExt: IsA<Surface> + 'static {
     #[cfg_attr(feature = "v4_16", deprecated = "Since 4.16")]
     #[allow(deprecated)]
     #[doc(alias = "gdk_surface_set_opaque_region")]
-    fn set_opaque_region(&self, region: Option<&cairo::Region>) {
+    fn set_opaque_region<'a>(&self, region: impl Into<Option<&'a cairo::Region>>) {
         unsafe {
             ffi::gdk_surface_set_opaque_region(
                 self.as_ref().to_glib_none().0,
-                mut_override(region.to_glib_none().0),
+                mut_override(region.into().to_glib_none().0),
             );
         }
     }
diff --git a/gdk4/src/auto/toplevel.rs b/gdk4/src/auto/toplevel.rs
index 2e418a207652..c853738cfbc2 100644
--- a/gdk4/src/auto/toplevel.rs
+++ b/gdk4/src/auto/toplevel.rs
@@ -45,10 +45,10 @@ pub trait ToplevelExt: IsA<Toplevel> + 'static {
     }
 
     #[doc(alias = "gdk_toplevel_begin_resize")]
-    fn begin_resize(
+    fn begin_resize<'a, P: IsA<Device>>(
         &self,
         edge: SurfaceEdge,
-        device: Option<&impl IsA<Device>>,
+        device: impl Into<Option<&'a P>>,
         button: i32,
         x: f64,
         y: f64,
@@ -58,7 +58,7 @@ pub trait ToplevelExt: IsA<Toplevel> + 'static {
             ffi::gdk_toplevel_begin_resize(
                 self.as_ref().to_glib_none().0,
                 edge.into_glib(),
-                device.map(|p| p.as_ref()).to_glib_none().0,
+                device.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 button,
                 x,
                 y,
diff --git a/gdk4/src/auto/toplevel_layout.rs b/gdk4/src/auto/toplevel_layout.rs
index aadf8d03245a..1a4b92c80507 100644
--- a/gdk4/src/auto/toplevel_layout.rs
+++ b/gdk4/src/auto/toplevel_layout.rs
@@ -94,12 +94,16 @@ impl ToplevelLayout {
     }
 
     #[doc(alias = "gdk_toplevel_layout_set_fullscreen")]
-    pub fn set_fullscreen(&self, fullscreen: bool, monitor: Option<&impl IsA<Monitor>>) {
+    pub fn set_fullscreen<'a, P: IsA<Monitor>>(
+        &self,
+        fullscreen: bool,
+        monitor: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gdk_toplevel_layout_set_fullscreen(
                 self.to_glib_none().0,
                 fullscreen.into_glib(),
-                monitor.map(|p| p.as_ref()).to_glib_none().0,
+                monitor.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4/src/auto/versions.txt
+++ b/gdk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gdk4/sys/versions.txt
+++ b/gdk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gsk4/src/auto/renderer.rs b/gsk4/src/auto/renderer.rs
index 7025bdfea9a9..bb0c21031177 100644
--- a/gsk4/src/auto/renderer.rs
+++ b/gsk4/src/auto/renderer.rs
@@ -52,12 +52,12 @@ pub trait GskRendererExt: IsA<Renderer> + 'static {
     }
 
     #[doc(alias = "gsk_renderer_realize")]
-    fn realize(&self, surface: Option<&gdk::Surface>) -> Result<(), glib::Error> {
+    fn realize<'a>(&self, surface: impl Into<Option<&'a gdk::Surface>>) -> Result<(), glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
             let is_ok = ffi::gsk_renderer_realize(
                 self.as_ref().to_glib_none().0,
-                surface.to_glib_none().0,
+                surface.into().to_glib_none().0,
                 &mut error,
             );
             debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
@@ -90,27 +90,31 @@ pub trait GskRendererExt: IsA<Renderer> + 'static {
     }
 
     #[doc(alias = "gsk_renderer_render")]
-    fn render(&self, root: impl AsRef<RenderNode>, region: Option<&cairo::Region>) {
+    fn render<'a>(
+        &self,
+        root: impl AsRef<RenderNode>,
+        region: impl Into<Option<&'a cairo::Region>>,
+    ) {
         unsafe {
             ffi::gsk_renderer_render(
                 self.as_ref().to_glib_none().0,
                 root.as_ref().to_glib_none().0,
-                region.to_glib_none().0,
+                region.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gsk_renderer_render_texture")]
-    fn render_texture(
+    fn render_texture<'a>(
         &self,
         root: impl AsRef<RenderNode>,
-        viewport: Option<&graphene::Rect>,
+        viewport: impl Into<Option<&'a graphene::Rect>>,
     ) -> gdk::Texture {
         unsafe {
             from_glib_full(ffi::gsk_renderer_render_texture(
                 self.as_ref().to_glib_none().0,
                 root.as_ref().to_glib_none().0,
-                viewport.to_glib_none().0,
+                viewport.into().to_glib_none().0,
             ))
         }
     }
diff --git a/gsk4/src/auto/repeat_node.rs b/gsk4/src/auto/repeat_node.rs
index 55a31004491e..f264a3492760 100644
--- a/gsk4/src/auto/repeat_node.rs
+++ b/gsk4/src/auto/repeat_node.rs
@@ -23,17 +23,17 @@ impl StaticType for RepeatNode {
 
 impl RepeatNode {
     #[doc(alias = "gsk_repeat_node_new")]
-    pub fn new(
+    pub fn new<'a>(
         bounds: &graphene::Rect,
         child: impl AsRef<RenderNode>,
-        child_bounds: Option<&graphene::Rect>,
+        child_bounds: impl Into<Option<&'a graphene::Rect>>,
     ) -> RepeatNode {
         skip_assert_initialized!();
         unsafe {
             from_glib_full(ffi::gsk_repeat_node_new(
                 bounds.to_glib_none().0,
                 child.as_ref().to_glib_none().0,
-                child_bounds.to_glib_none().0,
+                child_bounds.into().to_glib_none().0,
             ))
         }
     }
diff --git a/gsk4/src/auto/shader_args_builder.rs b/gsk4/src/auto/shader_args_builder.rs
index 50a79e2b44e7..972a36a83475 100644
--- a/gsk4/src/auto/shader_args_builder.rs
+++ b/gsk4/src/auto/shader_args_builder.rs
@@ -20,12 +20,15 @@ impl ShaderArgsBuilder {
     #[cfg_attr(feature = "v4_16", deprecated = "Since 4.16")]
     #[allow(deprecated)]
     #[doc(alias = "gsk_shader_args_builder_new")]
-    pub fn new(shader: &GLShader, initial_values: Option<&glib::Bytes>) -> ShaderArgsBuilder {
+    pub fn new<'a>(
+        shader: &GLShader,
+        initial_values: impl Into<Option<&'a glib::Bytes>>,
+    ) -> ShaderArgsBuilder {
         skip_assert_initialized!();
         unsafe {
             from_glib_full(ffi::gsk_shader_args_builder_new(
                 shader.to_glib_none().0,
-                initial_values.to_glib_none().0,
+                initial_values.into().to_glib_none().0,
             ))
         }
     }
diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gsk4/src/auto/versions.txt
+++ b/gsk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gsk4/sys/versions.txt
+++ b/gsk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gtk4/src/auto/about_dialog.rs b/gtk4/src/auto/about_dialog.rs
index fcdc48b3ca77..235c8bff2742 100644
--- a/gtk4/src/auto/about_dialog.rs
+++ b/gtk4/src/auto/about_dialog.rs
@@ -209,17 +209,23 @@ impl AboutDialog {
 
     #[doc(alias = "gtk_about_dialog_set_comments")]
     #[doc(alias = "comments")]
-    pub fn set_comments(&self, comments: Option<&str>) {
+    pub fn set_comments<'a>(&self, comments: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_about_dialog_set_comments(self.to_glib_none().0, comments.to_glib_none().0);
+            ffi::gtk_about_dialog_set_comments(
+                self.to_glib_none().0,
+                comments.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_about_dialog_set_copyright")]
     #[doc(alias = "copyright")]
-    pub fn set_copyright(&self, copyright: Option<&str>) {
+    pub fn set_copyright<'a>(&self, copyright: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_about_dialog_set_copyright(self.to_glib_none().0, copyright.to_glib_none().0);
+            ffi::gtk_about_dialog_set_copyright(
+                self.to_glib_none().0,
+                copyright.into().to_glib_none().0,
+            );
         }
     }
 
@@ -236,9 +242,12 @@ impl AboutDialog {
 
     #[doc(alias = "gtk_about_dialog_set_license")]
     #[doc(alias = "license")]
-    pub fn set_license(&self, license: Option<&str>) {
+    pub fn set_license<'a>(&self, license: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_about_dialog_set_license(self.to_glib_none().0, license.to_glib_none().0);
+            ffi::gtk_about_dialog_set_license(
+                self.to_glib_none().0,
+                license.into().to_glib_none().0,
+            );
         }
     }
 
@@ -252,69 +261,78 @@ impl AboutDialog {
 
     #[doc(alias = "gtk_about_dialog_set_logo")]
     #[doc(alias = "logo")]
-    pub fn set_logo(&self, logo: Option<&impl IsA<gdk::Paintable>>) {
+    pub fn set_logo<'a, P: IsA<gdk::Paintable>>(&self, logo: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_about_dialog_set_logo(
                 self.to_glib_none().0,
-                logo.map(|p| p.as_ref()).to_glib_none().0,
+                logo.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_about_dialog_set_logo_icon_name")]
     #[doc(alias = "logo-icon-name")]
-    pub fn set_logo_icon_name(&self, icon_name: Option<&str>) {
+    pub fn set_logo_icon_name<'a>(&self, icon_name: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_about_dialog_set_logo_icon_name(
                 self.to_glib_none().0,
-                icon_name.to_glib_none().0,
+                icon_name.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_about_dialog_set_program_name")]
     #[doc(alias = "program-name")]
-    pub fn set_program_name(&self, name: Option<&str>) {
+    pub fn set_program_name<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_about_dialog_set_program_name(self.to_glib_none().0, name.to_glib_none().0);
+            ffi::gtk_about_dialog_set_program_name(
+                self.to_glib_none().0,
+                name.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_about_dialog_set_system_information")]
     #[doc(alias = "system-information")]
-    pub fn set_system_information(&self, system_information: Option<&str>) {
+    pub fn set_system_information<'a>(&self, system_information: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_about_dialog_set_system_information(
                 self.to_glib_none().0,
-                system_information.to_glib_none().0,
+                system_information.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_about_dialog_set_translator_credits")]
     #[doc(alias = "translator-credits")]
-    pub fn set_translator_credits(&self, translator_credits: Option<&str>) {
+    pub fn set_translator_credits<'a>(&self, translator_credits: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_about_dialog_set_translator_credits(
                 self.to_glib_none().0,
-                translator_credits.to_glib_none().0,
+                translator_credits.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_about_dialog_set_version")]
     #[doc(alias = "version")]
-    pub fn set_version(&self, version: Option<&str>) {
+    pub fn set_version<'a>(&self, version: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_about_dialog_set_version(self.to_glib_none().0, version.to_glib_none().0);
+            ffi::gtk_about_dialog_set_version(
+                self.to_glib_none().0,
+                version.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_about_dialog_set_website")]
     #[doc(alias = "website")]
-    pub fn set_website(&self, website: Option<&str>) {
+    pub fn set_website<'a>(&self, website: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_about_dialog_set_website(self.to_glib_none().0, website.to_glib_none().0);
+            ffi::gtk_about_dialog_set_website(
+                self.to_glib_none().0,
+                website.into().to_glib_none().0,
+            );
         }
     }
 
@@ -810,7 +828,7 @@ impl AboutDialogBuilder {
 
     pub fn logo(self, logo: &impl IsA<gdk::Paintable>) -> Self {
         Self {
-            builder: self.builder.property("logo", logo.clone().upcast()),
+            builder: self.builder.property("logo", logo.as_ref().clone()),
         }
     }
 
@@ -872,13 +890,13 @@ impl AboutDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -898,7 +916,7 @@ impl AboutDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -924,7 +942,7 @@ impl AboutDialogBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -938,7 +956,7 @@ impl AboutDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -1012,7 +1030,7 @@ impl AboutDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -1020,7 +1038,7 @@ impl AboutDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -1100,7 +1118,7 @@ impl AboutDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/accessible.rs b/gtk4/src/auto/accessible.rs
index 8b971495683d..e68fee04f6aa 100644
--- a/gtk4/src/auto/accessible.rs
+++ b/gtk4/src/auto/accessible.rs
@@ -178,16 +178,21 @@ pub trait AccessibleExt: IsA<Accessible> + 'static {
     #[cfg(feature = "v4_10")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))]
     #[doc(alias = "gtk_accessible_set_accessible_parent")]
-    fn set_accessible_parent(
+    fn set_accessible_parent<'a, P: IsA<Accessible>, Q: IsA<Accessible>>(
         &self,
-        parent: Option<&impl IsA<Accessible>>,
-        next_sibling: Option<&impl IsA<Accessible>>,
+        parent: impl Into<Option<&'a P>>,
+        next_sibling: impl Into<Option<&'a Q>>,
     ) {
         unsafe {
             ffi::gtk_accessible_set_accessible_parent(
                 self.as_ref().to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                next_sibling.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                next_sibling
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -195,11 +200,19 @@ pub trait AccessibleExt: IsA<Accessible> + 'static {
     #[cfg(feature = "v4_10")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))]
     #[doc(alias = "gtk_accessible_update_next_accessible_sibling")]
-    fn update_next_accessible_sibling(&self, new_sibling: Option<&impl IsA<Accessible>>) {
+    fn update_next_accessible_sibling<'a, P: IsA<Accessible>>(
+        &self,
+        new_sibling: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_accessible_update_next_accessible_sibling(
                 self.as_ref().to_glib_none().0,
-                new_sibling.map(|p| p.as_ref()).to_glib_none().0,
+                new_sibling
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
diff --git a/gtk4/src/auto/action_bar.rs b/gtk4/src/auto/action_bar.rs
index d9d1d0d99054..d0d356bf838f 100644
--- a/gtk4/src/auto/action_bar.rs
+++ b/gtk4/src/auto/action_bar.rs
@@ -72,11 +72,16 @@ impl ActionBar {
     }
 
     #[doc(alias = "gtk_action_bar_set_center_widget")]
-    pub fn set_center_widget(&self, center_widget: Option<&impl IsA<Widget>>) {
+    pub fn set_center_widget<'a, P: IsA<Widget>>(&self, center_widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_action_bar_set_center_widget(
                 self.to_glib_none().0,
-                center_widget.map(|p| p.as_ref()).to_glib_none().0,
+                center_widget
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -217,7 +222,7 @@ impl ActionBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/actionable.rs b/gtk4/src/auto/actionable.rs
index b2848705be46..902ad64ff341 100644
--- a/gtk4/src/auto/actionable.rs
+++ b/gtk4/src/auto/actionable.rs
@@ -48,22 +48,22 @@ pub trait ActionableExt: IsA<Actionable> + 'static {
 
     #[doc(alias = "gtk_actionable_set_action_name")]
     #[doc(alias = "action-name")]
-    fn set_action_name(&self, action_name: Option<&str>) {
+    fn set_action_name<'a>(&self, action_name: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_actionable_set_action_name(
                 self.as_ref().to_glib_none().0,
-                action_name.to_glib_none().0,
+                action_name.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_actionable_set_action_target_value")]
     #[doc(alias = "action-target")]
-    fn set_action_target_value(&self, target_value: Option<&glib::Variant>) {
+    fn set_action_target_value<'a>(&self, target_value: impl Into<Option<&'a glib::Variant>>) {
         unsafe {
             ffi::gtk_actionable_set_action_target_value(
                 self.as_ref().to_glib_none().0,
-                target_value.to_glib_none().0,
+                target_value.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/alert_dialog.rs b/gtk4/src/auto/alert_dialog.rs
index f9835f9a2679..34a2dba572b2 100644
--- a/gtk4/src/auto/alert_dialog.rs
+++ b/gtk4/src/auto/alert_dialog.rs
@@ -34,11 +34,16 @@ impl AlertDialog {
     }
 
     #[doc(alias = "gtk_alert_dialog_choose")]
-    pub fn choose<P: FnOnce(Result<i32, glib::Error>) + 'static>(
+    pub fn choose<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<i32, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -50,9 +55,9 @@ impl AlertDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
-        unsafe extern "C" fn choose_trampoline<P: FnOnce(Result<i32, glib::Error>) + 'static>(
+        unsafe extern "C" fn choose_trampoline<R: FnOnce(Result<i32, glib::Error>) + 'static>(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
             user_data: glib::ffi::gpointer,
@@ -65,28 +70,33 @@ impl AlertDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = choose_trampoline::<P>;
+        let callback = choose_trampoline::<R>;
         unsafe {
             ffi::gtk_alert_dialog_choose(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn choose_future(
+    pub fn choose_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<i32, glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.choose(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -190,11 +200,11 @@ impl AlertDialog {
     }
 
     #[doc(alias = "gtk_alert_dialog_show")]
-    pub fn show(&self, parent: Option<&impl IsA<Window>>) {
+    pub fn show<'a, P: IsA<Window>>(&self, parent: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_alert_dialog_show(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/alternative_trigger.rs b/gtk4/src/auto/alternative_trigger.rs
index 2dcc8dee18b7..1dd4296897e0 100644
--- a/gtk4/src/auto/alternative_trigger.rs
+++ b/gtk4/src/auto/alternative_trigger.rs
@@ -83,13 +83,13 @@ impl AlternativeTriggerBuilder {
 
     pub fn first(self, first: &impl IsA<ShortcutTrigger>) -> Self {
         Self {
-            builder: self.builder.property("first", first.clone().upcast()),
+            builder: self.builder.property("first", first.as_ref().clone()),
         }
     }
 
     pub fn second(self, second: &impl IsA<ShortcutTrigger>) -> Self {
         Self {
-            builder: self.builder.property("second", second.clone().upcast()),
+            builder: self.builder.property("second", second.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/app_chooser_button.rs b/gtk4/src/auto/app_chooser_button.rs
index 357a937aacbe..50ca446039cc 100644
--- a/gtk4/src/auto/app_chooser_button.rs
+++ b/gtk4/src/auto/app_chooser_button.rs
@@ -489,7 +489,7 @@ impl AppChooserButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/app_chooser_dialog.rs b/gtk4/src/auto/app_chooser_dialog.rs
index 0b9b8f52fab5..b50c3d76008e 100644
--- a/gtk4/src/auto/app_chooser_dialog.rs
+++ b/gtk4/src/auto/app_chooser_dialog.rs
@@ -27,15 +27,15 @@ impl AppChooserDialog {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_app_chooser_dialog_new")]
-    pub fn new(
-        parent: Option<&impl IsA<Window>>,
+    pub fn new<'a, P: IsA<Window>>(
+        parent: impl Into<Option<&'a P>>,
         flags: DialogFlags,
         file: &impl IsA<gio::File>,
     ) -> AppChooserDialog {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_app_chooser_dialog_new(
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 flags.into_glib(),
                 file.as_ref().to_glib_none().0,
             ))
@@ -47,15 +47,15 @@ impl AppChooserDialog {
     #[allow(deprecated)]
     #[doc(alias = "gtk_app_chooser_dialog_new_for_content_type")]
     #[doc(alias = "new_for_content_type")]
-    pub fn for_content_type(
-        parent: Option<&impl IsA<Window>>,
+    pub fn for_content_type<'a, P: IsA<Window>>(
+        parent: impl Into<Option<&'a P>>,
         flags: DialogFlags,
         content_type: &str,
     ) -> AppChooserDialog {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_app_chooser_dialog_new_for_content_type(
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 flags.into_glib(),
                 content_type.to_glib_none().0,
             ))
diff --git a/gtk4/src/auto/app_chooser_widget.rs b/gtk4/src/auto/app_chooser_widget.rs
index 9aea93dbb953..4e5b6427d060 100644
--- a/gtk4/src/auto/app_chooser_widget.rs
+++ b/gtk4/src/auto/app_chooser_widget.rs
@@ -526,7 +526,7 @@ impl AppChooserWidgetBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/application.rs b/gtk4/src/auto/application.rs
index 5e58259f827d..28ef85d1d790 100644
--- a/gtk4/src/auto/application.rs
+++ b/gtk4/src/auto/application.rs
@@ -49,7 +49,7 @@ impl ApplicationBuilder {
 
     pub fn menubar(self, menubar: &impl IsA<gio::MenuModel>) -> Self {
         Self {
-            builder: self.builder.property("menubar", menubar.clone().upcast()),
+            builder: self.builder.property("menubar", menubar.as_ref().clone()),
         }
     }
 
@@ -196,18 +196,18 @@ pub trait GtkApplicationExt: IsA<Application> + 'static {
     }
 
     #[doc(alias = "gtk_application_inhibit")]
-    fn inhibit(
+    fn inhibit<'a, P: IsA<Window>>(
         &self,
-        window: Option<&impl IsA<Window>>,
+        window: impl Into<Option<&'a P>>,
         flags: ApplicationInhibitFlags,
-        reason: Option<&str>,
+        reason: impl Into<Option<&'a str>>,
     ) -> u32 {
         unsafe {
             ffi::gtk_application_inhibit(
                 self.as_ref().to_glib_none().0,
-                window.map(|p| p.as_ref()).to_glib_none().0,
+                window.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 flags.into_glib(),
-                reason.to_glib_none().0,
+                reason.into().to_glib_none().0,
             )
         }
     }
@@ -244,11 +244,11 @@ pub trait GtkApplicationExt: IsA<Application> + 'static {
 
     #[doc(alias = "gtk_application_set_menubar")]
     #[doc(alias = "menubar")]
-    fn set_menubar(&self, menubar: Option<&impl IsA<gio::MenuModel>>) {
+    fn set_menubar<'a, P: IsA<gio::MenuModel>>(&self, menubar: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_application_set_menubar(
                 self.as_ref().to_glib_none().0,
-                menubar.map(|p| p.as_ref()).to_glib_none().0,
+                menubar.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/application_window.rs b/gtk4/src/auto/application_window.rs
index 349e7ca927cd..7506f052bfcc 100644
--- a/gtk4/src/auto/application_window.rs
+++ b/gtk4/src/auto/application_window.rs
@@ -77,13 +77,13 @@ impl ApplicationWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -103,7 +103,7 @@ impl ApplicationWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -129,7 +129,7 @@ impl ApplicationWindowBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -143,7 +143,7 @@ impl ApplicationWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -217,7 +217,7 @@ impl ApplicationWindowBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -225,7 +225,7 @@ impl ApplicationWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -305,7 +305,7 @@ impl ApplicationWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -451,11 +451,11 @@ pub trait ApplicationWindowExt: IsA<ApplicationWindow> + 'static {
     }
 
     #[doc(alias = "gtk_application_window_set_help_overlay")]
-    fn set_help_overlay(&self, help_overlay: Option<&ShortcutsWindow>) {
+    fn set_help_overlay<'a>(&self, help_overlay: impl Into<Option<&'a ShortcutsWindow>>) {
         unsafe {
             ffi::gtk_application_window_set_help_overlay(
                 self.as_ref().to_glib_none().0,
-                help_overlay.to_glib_none().0,
+                help_overlay.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/aspect_frame.rs b/gtk4/src/auto/aspect_frame.rs
index bbf8c91fa25b..bc128b5a74b9 100644
--- a/gtk4/src/auto/aspect_frame.rs
+++ b/gtk4/src/auto/aspect_frame.rs
@@ -78,11 +78,11 @@ impl AspectFrame {
 
     #[doc(alias = "gtk_aspect_frame_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_aspect_frame_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -259,7 +259,7 @@ impl AspectFrameBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -363,7 +363,7 @@ impl AspectFrameBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/assistant.rs b/gtk4/src/auto/assistant.rs
index 9323ff2d84c1..9fd74509d41c 100644
--- a/gtk4/src/auto/assistant.rs
+++ b/gtk4/src/auto/assistant.rs
@@ -490,13 +490,13 @@ impl AssistantBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -516,7 +516,7 @@ impl AssistantBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -542,7 +542,7 @@ impl AssistantBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -556,7 +556,7 @@ impl AssistantBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -630,7 +630,7 @@ impl AssistantBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -638,7 +638,7 @@ impl AssistantBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -718,7 +718,7 @@ impl AssistantBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/assistant_page.rs b/gtk4/src/auto/assistant_page.rs
index cd6befbe54b5..554ffadb911f 100644
--- a/gtk4/src/auto/assistant_page.rs
+++ b/gtk4/src/auto/assistant_page.rs
@@ -57,8 +57,8 @@ impl AssistantPage {
     }
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
-    pub fn set_title(&self, title: Option<&str>) {
-        ObjectExt::set_property(self, "title", title)
+    pub fn set_title<'a>(&self, title: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "title", title.into())
     }
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
diff --git a/gtk4/src/auto/at_context.rs b/gtk4/src/auto/at_context.rs
index 34e79926e6f4..cc2ea42fe75c 100644
--- a/gtk4/src/auto/at_context.rs
+++ b/gtk4/src/auto/at_context.rs
@@ -62,8 +62,8 @@ impl ATContext {
         ObjectExt::property(self, "display")
     }
 
-    pub fn set_display<P: IsA<gdk::Display>>(&self, display: Option<&P>) {
-        ObjectExt::set_property(self, "display", display)
+    pub fn set_display<'a, P: IsA<gdk::Display>>(&self, display: impl Into<Option<&'a P>>) {
+        ObjectExt::set_property(self, "display", display.into().as_ref().map(|p| p.as_ref()))
     }
 
     #[doc(alias = "state-change")]
diff --git a/gtk4/src/auto/bookmark_list.rs b/gtk4/src/auto/bookmark_list.rs
index 57acb0a13bc7..ca18853411f1 100644
--- a/gtk4/src/auto/bookmark_list.rs
+++ b/gtk4/src/auto/bookmark_list.rs
@@ -21,15 +21,15 @@ glib::wrapper! {
 
 impl BookmarkList {
     #[doc(alias = "gtk_bookmark_list_new")]
-    pub fn new(
+    pub fn new<'a>(
         filename: Option<impl AsRef<std::path::Path>>,
-        attributes: Option<&str>,
+        attributes: impl Into<Option<&'a str>>,
     ) -> BookmarkList {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_bookmark_list_new(
                 filename.as_ref().map(|p| p.as_ref()).to_glib_none().0,
-                attributes.to_glib_none().0,
+                attributes.into().to_glib_none().0,
             ))
         }
     }
@@ -54,11 +54,11 @@ impl BookmarkList {
 
     #[doc(alias = "gtk_bookmark_list_set_attributes")]
     #[doc(alias = "attributes")]
-    pub fn set_attributes(&self, attributes: Option<&str>) {
+    pub fn set_attributes<'a>(&self, attributes: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_bookmark_list_set_attributes(
                 self.to_glib_none().0,
-                attributes.to_glib_none().0,
+                attributes.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/box_.rs b/gtk4/src/auto/box_.rs
index cb16f488c261..aef35974ed3e 100644
--- a/gtk4/src/auto/box_.rs
+++ b/gtk4/src/auto/box_.rs
@@ -168,7 +168,7 @@ impl BoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -336,12 +336,16 @@ pub trait BoxExt: IsA<Box> + 'static {
     }
 
     #[doc(alias = "gtk_box_insert_child_after")]
-    fn insert_child_after(&self, child: &impl IsA<Widget>, sibling: Option<&impl IsA<Widget>>) {
+    fn insert_child_after<'a, P: IsA<Widget>>(
+        &self,
+        child: &impl IsA<Widget>,
+        sibling: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_box_insert_child_after(
                 self.as_ref().to_glib_none().0,
                 child.as_ref().to_glib_none().0,
-                sibling.map(|p| p.as_ref()).to_glib_none().0,
+                sibling.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -367,12 +371,16 @@ pub trait BoxExt: IsA<Box> + 'static {
     }
 
     #[doc(alias = "gtk_box_reorder_child_after")]
-    fn reorder_child_after(&self, child: &impl IsA<Widget>, sibling: Option<&impl IsA<Widget>>) {
+    fn reorder_child_after<'a, P: IsA<Widget>>(
+        &self,
+        child: &impl IsA<Widget>,
+        sibling: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_box_reorder_child_after(
                 self.as_ref().to_glib_none().0,
                 child.as_ref().to_glib_none().0,
-                sibling.map(|p| p.as_ref()).to_glib_none().0,
+                sibling.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/builder.rs b/gtk4/src/auto/builder.rs
index 9bf1e521d604..a8ad214978c3 100644
--- a/gtk4/src/auto/builder.rs
+++ b/gtk4/src/auto/builder.rs
@@ -160,11 +160,11 @@ impl Builder {
     }
 
     #[doc(alias = "gtk_builder_create_closure")]
-    pub fn create_closure(
+    pub fn create_closure<'a, P: IsA<glib::Object>>(
         &self,
         function_name: &str,
         flags: BuilderClosureFlags,
-        object: Option<&impl IsA<glib::Object>>,
+        object: impl Into<Option<&'a P>>,
     ) -> Result<Option<glib::Closure>, glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
@@ -172,7 +172,7 @@ impl Builder {
                 self.to_glib_none().0,
                 function_name.to_glib_none().0,
                 flags.into_glib(),
-                object.map(|p| p.as_ref()).to_glib_none().0,
+                object.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 &mut error,
             );
             if error.is_null() {
@@ -261,31 +261,42 @@ impl Builder {
 
     #[doc(alias = "gtk_builder_set_current_object")]
     #[doc(alias = "current-object")]
-    pub fn set_current_object(&self, current_object: Option<&impl IsA<glib::Object>>) {
+    pub fn set_current_object<'a, P: IsA<glib::Object>>(
+        &self,
+        current_object: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_builder_set_current_object(
                 self.to_glib_none().0,
-                current_object.map(|p| p.as_ref()).to_glib_none().0,
+                current_object
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
 
     #[doc(alias = "gtk_builder_set_scope")]
     #[doc(alias = "scope")]
-    pub fn set_scope(&self, scope: Option<&impl IsA<BuilderScope>>) {
+    pub fn set_scope<'a, P: IsA<BuilderScope>>(&self, scope: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_builder_set_scope(
                 self.to_glib_none().0,
-                scope.map(|p| p.as_ref()).to_glib_none().0,
+                scope.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_builder_set_translation_domain")]
     #[doc(alias = "translation-domain")]
-    pub fn set_translation_domain(&self, domain: Option<&str>) {
+    pub fn set_translation_domain<'a>(&self, domain: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_builder_set_translation_domain(self.to_glib_none().0, domain.to_glib_none().0);
+            ffi::gtk_builder_set_translation_domain(
+                self.to_glib_none().0,
+                domain.into().to_glib_none().0,
+            );
         }
     }
 
diff --git a/gtk4/src/auto/builder_list_item_factory.rs b/gtk4/src/auto/builder_list_item_factory.rs
index 2b07ec973243..645256c8439a 100644
--- a/gtk4/src/auto/builder_list_item_factory.rs
+++ b/gtk4/src/auto/builder_list_item_factory.rs
@@ -17,14 +17,14 @@ glib::wrapper! {
 impl BuilderListItemFactory {
     #[doc(alias = "gtk_builder_list_item_factory_new_from_bytes")]
     #[doc(alias = "new_from_bytes")]
-    pub fn from_bytes(
-        scope: Option<&impl IsA<BuilderScope>>,
+    pub fn from_bytes<'a, P: IsA<BuilderScope>>(
+        scope: impl Into<Option<&'a P>>,
         bytes: &glib::Bytes,
     ) -> BuilderListItemFactory {
         assert_initialized_main_thread!();
         unsafe {
             ListItemFactory::from_glib_full(ffi::gtk_builder_list_item_factory_new_from_bytes(
-                scope.map(|p| p.as_ref()).to_glib_none().0,
+                scope.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 bytes.to_glib_none().0,
             ))
             .unsafe_cast()
@@ -33,14 +33,14 @@ impl BuilderListItemFactory {
 
     #[doc(alias = "gtk_builder_list_item_factory_new_from_resource")]
     #[doc(alias = "new_from_resource")]
-    pub fn from_resource(
-        scope: Option<&impl IsA<BuilderScope>>,
+    pub fn from_resource<'a, P: IsA<BuilderScope>>(
+        scope: impl Into<Option<&'a P>>,
         resource_path: &str,
     ) -> BuilderListItemFactory {
         assert_initialized_main_thread!();
         unsafe {
             ListItemFactory::from_glib_full(ffi::gtk_builder_list_item_factory_new_from_resource(
-                scope.map(|p| p.as_ref()).to_glib_none().0,
+                scope.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 resource_path.to_glib_none().0,
             ))
             .unsafe_cast()
diff --git a/gtk4/src/auto/button.rs b/gtk4/src/auto/button.rs
index 538b6d4c920c..a78ae9b79d05 100644
--- a/gtk4/src/auto/button.rs
+++ b/gtk4/src/auto/button.rs
@@ -104,7 +104,7 @@ impl ButtonBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -208,7 +208,7 @@ impl ButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -410,11 +410,11 @@ pub trait ButtonExt: IsA<Button> + 'static {
 
     #[doc(alias = "gtk_button_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_button_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/calendar.rs b/gtk4/src/auto/calendar.rs
index e7d5da2bd56a..28a363fc03a8 100644
--- a/gtk4/src/auto/calendar.rs
+++ b/gtk4/src/auto/calendar.rs
@@ -573,7 +573,7 @@ impl CalendarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/cell_area.rs b/gtk4/src/auto/cell_area.rs
index a1a9b6836822..ada74deaff1d 100644
--- a/gtk4/src/auto/cell_area.rs
+++ b/gtk4/src/auto/cell_area.rs
@@ -637,11 +637,16 @@ pub trait CellAreaExt: IsA<CellArea> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_cell_area_set_focus_cell")]
     #[doc(alias = "focus-cell")]
-    fn set_focus_cell(&self, renderer: Option<&impl IsA<CellRenderer>>) {
+    fn set_focus_cell<'a, P: IsA<CellRenderer>>(&self, renderer: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_cell_area_set_focus_cell(
                 self.as_ref().to_glib_none().0,
-                renderer.map(|p| p.as_ref()).to_glib_none().0,
+                renderer
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
diff --git a/gtk4/src/auto/cell_area_box.rs b/gtk4/src/auto/cell_area_box.rs
index d469a3af4c95..a920394864c1 100644
--- a/gtk4/src/auto/cell_area_box.rs
+++ b/gtk4/src/auto/cell_area_box.rs
@@ -153,7 +153,7 @@ impl CellAreaBoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-cell", focus_cell.clone().upcast()),
+                .property("focus-cell", focus_cell.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/cell_renderer.rs b/gtk4/src/auto/cell_renderer.rs
index aa9730dd9be7..8a51f89b36fb 100644
--- a/gtk4/src/auto/cell_renderer.rs
+++ b/gtk4/src/auto/cell_renderer.rs
@@ -274,15 +274,15 @@ pub trait CellRendererExt: IsA<CellRenderer> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_cell_renderer_get_state")]
     #[doc(alias = "get_state")]
-    fn state(
+    fn state<'a, P: IsA<Widget>>(
         &self,
-        widget: Option<&impl IsA<Widget>>,
+        widget: impl Into<Option<&'a P>>,
         cell_state: CellRendererState,
     ) -> StateFlags {
         unsafe {
             from_glib(ffi::gtk_cell_renderer_get_state(
                 self.as_ref().to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 cell_state.into_glib(),
             ))
         }
@@ -449,8 +449,8 @@ pub trait CellRendererExt: IsA<CellRenderer> + 'static {
     }
 
     #[doc(alias = "cell-background")]
-    fn set_cell_background(&self, cell_background: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "cell-background", cell_background)
+    fn set_cell_background<'a>(&self, cell_background: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "cell-background", cell_background.into())
     }
 
     #[doc(alias = "cell-background-rgba")]
@@ -459,8 +459,12 @@ pub trait CellRendererExt: IsA<CellRenderer> + 'static {
     }
 
     #[doc(alias = "cell-background-rgba")]
-    fn set_cell_background_rgba(&self, cell_background_rgba: Option<&gdk::RGBA>) {
-        ObjectExt::set_property(self.as_ref(), "cell-background-rgba", cell_background_rgba)
+    fn set_cell_background_rgba<'a>(&self, cell_background_rgba: impl Into<Option<&'a gdk::RGBA>>) {
+        ObjectExt::set_property(
+            self.as_ref(),
+            "cell-background-rgba",
+            cell_background_rgba.into(),
+        )
     }
 
     #[doc(alias = "cell-background-set")]
diff --git a/gtk4/src/auto/cell_renderer_combo.rs b/gtk4/src/auto/cell_renderer_combo.rs
index 7c342ce5749f..dd1759e6b7e4 100644
--- a/gtk4/src/auto/cell_renderer_combo.rs
+++ b/gtk4/src/auto/cell_renderer_combo.rs
@@ -51,8 +51,8 @@ impl CellRendererCombo {
         ObjectExt::property(self, "model")
     }
 
-    pub fn set_model<P: IsA<TreeModel>>(&self, model: Option<&P>) {
-        ObjectExt::set_property(self, "model", model)
+    pub fn set_model<'a, P: IsA<TreeModel>>(&self, model: impl Into<Option<&'a P>>) {
+        ObjectExt::set_property(self, "model", model.into().as_ref().map(|p| p.as_ref()))
     }
 
     #[doc(alias = "text-column")]
@@ -195,7 +195,7 @@ impl CellRendererComboBuilder {
 
     pub fn model(self, model: &impl IsA<TreeModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/cell_renderer_pixbuf.rs b/gtk4/src/auto/cell_renderer_pixbuf.rs
index 72d64a63a0ec..60aeca5db653 100644
--- a/gtk4/src/auto/cell_renderer_pixbuf.rs
+++ b/gtk4/src/auto/cell_renderer_pixbuf.rs
@@ -41,8 +41,8 @@ impl CellRendererPixbuf {
         ObjectExt::property(self, "gicon")
     }
 
-    pub fn set_gicon<P: IsA<gio::Icon>>(&self, gicon: Option<&P>) {
-        ObjectExt::set_property(self, "gicon", gicon)
+    pub fn set_gicon<'a, P: IsA<gio::Icon>>(&self, gicon: impl Into<Option<&'a P>>) {
+        ObjectExt::set_property(self, "gicon", gicon.into().as_ref().map(|p| p.as_ref()))
     }
 
     #[doc(alias = "icon-name")]
@@ -51,8 +51,8 @@ impl CellRendererPixbuf {
     }
 
     #[doc(alias = "icon-name")]
-    pub fn set_icon_name(&self, icon_name: Option<&str>) {
-        ObjectExt::set_property(self, "icon-name", icon_name)
+    pub fn set_icon_name<'a>(&self, icon_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "icon-name", icon_name.into())
     }
 
     #[doc(alias = "icon-size")]
@@ -65,8 +65,8 @@ impl CellRendererPixbuf {
         ObjectExt::set_property(self, "icon-size", icon_size)
     }
 
-    pub fn set_pixbuf(&self, pixbuf: Option<&gdk_pixbuf::Pixbuf>) {
-        ObjectExt::set_property(self, "pixbuf", pixbuf)
+    pub fn set_pixbuf<'a>(&self, pixbuf: impl Into<Option<&'a gdk_pixbuf::Pixbuf>>) {
+        ObjectExt::set_property(self, "pixbuf", pixbuf.into())
     }
 
     #[doc(alias = "pixbuf-expander-closed")]
@@ -75,8 +75,15 @@ impl CellRendererPixbuf {
     }
 
     #[doc(alias = "pixbuf-expander-closed")]
-    pub fn set_pixbuf_expander_closed(&self, pixbuf_expander_closed: Option<&gdk_pixbuf::Pixbuf>) {
-        ObjectExt::set_property(self, "pixbuf-expander-closed", pixbuf_expander_closed)
+    pub fn set_pixbuf_expander_closed<'a>(
+        &self,
+        pixbuf_expander_closed: impl Into<Option<&'a gdk_pixbuf::Pixbuf>>,
+    ) {
+        ObjectExt::set_property(
+            self,
+            "pixbuf-expander-closed",
+            pixbuf_expander_closed.into(),
+        )
     }
 
     #[doc(alias = "pixbuf-expander-open")]
@@ -85,16 +92,19 @@ impl CellRendererPixbuf {
     }
 
     #[doc(alias = "pixbuf-expander-open")]
-    pub fn set_pixbuf_expander_open(&self, pixbuf_expander_open: Option<&gdk_pixbuf::Pixbuf>) {
-        ObjectExt::set_property(self, "pixbuf-expander-open", pixbuf_expander_open)
+    pub fn set_pixbuf_expander_open<'a>(
+        &self,
+        pixbuf_expander_open: impl Into<Option<&'a gdk_pixbuf::Pixbuf>>,
+    ) {
+        ObjectExt::set_property(self, "pixbuf-expander-open", pixbuf_expander_open.into())
     }
 
     pub fn texture(&self) -> Option<gdk::Texture> {
         ObjectExt::property(self, "texture")
     }
 
-    pub fn set_texture<P: IsA<gdk::Texture>>(&self, texture: Option<&P>) {
-        ObjectExt::set_property(self, "texture", texture)
+    pub fn set_texture<'a, P: IsA<gdk::Texture>>(&self, texture: impl Into<Option<&'a P>>) {
+        ObjectExt::set_property(self, "texture", texture.into().as_ref().map(|p| p.as_ref()))
     }
 
     #[doc(alias = "gicon")]
@@ -293,7 +303,7 @@ impl CellRendererPixbufBuilder {
 
     pub fn gicon(self, gicon: &impl IsA<gio::Icon>) -> Self {
         Self {
-            builder: self.builder.property("gicon", gicon.clone().upcast()),
+            builder: self.builder.property("gicon", gicon.as_ref().clone()),
         }
     }
 
@@ -333,7 +343,7 @@ impl CellRendererPixbufBuilder {
 
     pub fn texture(self, texture: &impl IsA<gdk::Texture>) -> Self {
         Self {
-            builder: self.builder.property("texture", texture.clone().upcast()),
+            builder: self.builder.property("texture", texture.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/cell_renderer_progress.rs b/gtk4/src/auto/cell_renderer_progress.rs
index 5856eb62ccc9..9dcf17bd7d7a 100644
--- a/gtk4/src/auto/cell_renderer_progress.rs
+++ b/gtk4/src/auto/cell_renderer_progress.rs
@@ -57,8 +57,8 @@ impl CellRendererProgress {
         ObjectExt::property(self, "text")
     }
 
-    pub fn set_text(&self, text: Option<&str>) {
-        ObjectExt::set_property(self, "text", text)
+    pub fn set_text<'a>(&self, text: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "text", text.into())
     }
 
     #[doc(alias = "text-xalign")]
diff --git a/gtk4/src/auto/cell_renderer_spin.rs b/gtk4/src/auto/cell_renderer_spin.rs
index 28aa055b830d..d7a090d5f413 100644
--- a/gtk4/src/auto/cell_renderer_spin.rs
+++ b/gtk4/src/auto/cell_renderer_spin.rs
@@ -41,8 +41,12 @@ impl CellRendererSpin {
         ObjectExt::property(self, "adjustment")
     }
 
-    pub fn set_adjustment<P: IsA<Adjustment>>(&self, adjustment: Option<&P>) {
-        ObjectExt::set_property(self, "adjustment", adjustment)
+    pub fn set_adjustment<'a, P: IsA<Adjustment>>(&self, adjustment: impl Into<Option<&'a P>>) {
+        ObjectExt::set_property(
+            self,
+            "adjustment",
+            adjustment.into().as_ref().map(|p| p.as_ref()),
+        )
     }
 
     #[doc(alias = "climb-rate")]
@@ -159,7 +163,7 @@ impl CellRendererSpinBuilder {
         Self {
             builder: self
                 .builder
-                .property("adjustment", adjustment.clone().upcast()),
+                .property("adjustment", adjustment.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/cell_renderer_text.rs b/gtk4/src/auto/cell_renderer_text.rs
index 077aa4d4dc0e..5f17fac44cc1 100644
--- a/gtk4/src/auto/cell_renderer_text.rs
+++ b/gtk4/src/auto/cell_renderer_text.rs
@@ -473,12 +473,12 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
         ObjectExt::property(self.as_ref(), "attributes")
     }
 
-    fn set_attributes(&self, attributes: Option<&pango::AttrList>) {
-        ObjectExt::set_property(self.as_ref(), "attributes", attributes)
+    fn set_attributes<'a>(&self, attributes: impl Into<Option<&'a pango::AttrList>>) {
+        ObjectExt::set_property(self.as_ref(), "attributes", attributes.into())
     }
 
-    fn set_background(&self, background: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "background", background)
+    fn set_background<'a>(&self, background: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "background", background.into())
     }
 
     #[doc(alias = "background-rgba")]
@@ -487,8 +487,8 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
     }
 
     #[doc(alias = "background-rgba")]
-    fn set_background_rgba(&self, background_rgba: Option<&gdk::RGBA>) {
-        ObjectExt::set_property(self.as_ref(), "background-rgba", background_rgba)
+    fn set_background_rgba<'a>(&self, background_rgba: impl Into<Option<&'a gdk::RGBA>>) {
+        ObjectExt::set_property(self.as_ref(), "background-rgba", background_rgba.into())
     }
 
     #[doc(alias = "background-set")]
@@ -526,8 +526,8 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
         ObjectExt::property(self.as_ref(), "family")
     }
 
-    fn set_family(&self, family: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "family", family)
+    fn set_family<'a>(&self, family: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "family", family.into())
     }
 
     #[doc(alias = "family-set")]
@@ -539,8 +539,8 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
         ObjectExt::property(self.as_ref(), "font")
     }
 
-    fn set_font(&self, font: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "font", font)
+    fn set_font<'a>(&self, font: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "font", font.into())
     }
 
     #[doc(alias = "font-desc")]
@@ -549,12 +549,12 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
     }
 
     #[doc(alias = "font-desc")]
-    fn set_font_desc(&self, font_desc: Option<&pango::FontDescription>) {
-        ObjectExt::set_property(self.as_ref(), "font-desc", font_desc)
+    fn set_font_desc<'a>(&self, font_desc: impl Into<Option<&'a pango::FontDescription>>) {
+        ObjectExt::set_property(self.as_ref(), "font-desc", font_desc.into())
     }
 
-    fn set_foreground(&self, foreground: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "foreground", foreground)
+    fn set_foreground<'a>(&self, foreground: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "foreground", foreground.into())
     }
 
     #[doc(alias = "foreground-rgba")]
@@ -563,8 +563,8 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
     }
 
     #[doc(alias = "foreground-rgba")]
-    fn set_foreground_rgba(&self, foreground_rgba: Option<&gdk::RGBA>) {
-        ObjectExt::set_property(self.as_ref(), "foreground-rgba", foreground_rgba)
+    fn set_foreground_rgba<'a>(&self, foreground_rgba: impl Into<Option<&'a gdk::RGBA>>) {
+        ObjectExt::set_property(self.as_ref(), "foreground-rgba", foreground_rgba.into())
     }
 
     #[doc(alias = "foreground-set")]
@@ -576,8 +576,8 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
         ObjectExt::property(self.as_ref(), "language")
     }
 
-    fn set_language(&self, language: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "language", language)
+    fn set_language<'a>(&self, language: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "language", language.into())
     }
 
     #[doc(alias = "language-set")]
@@ -585,8 +585,8 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
         ObjectExt::property(self.as_ref(), "language-set")
     }
 
-    fn set_markup(&self, markup: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "markup", markup)
+    fn set_markup<'a>(&self, markup: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "markup", markup.into())
     }
 
     #[doc(alias = "max-width-chars")]
@@ -605,8 +605,8 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
     }
 
     #[doc(alias = "placeholder-text")]
-    fn set_placeholder_text(&self, placeholder_text: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "placeholder-text", placeholder_text)
+    fn set_placeholder_text<'a>(&self, placeholder_text: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "placeholder-text", placeholder_text.into())
     }
 
     fn rise(&self) -> i32 {
@@ -715,8 +715,8 @@ pub trait CellRendererTextExt: IsA<CellRendererText> + 'static {
         ObjectExt::property(self.as_ref(), "text")
     }
 
-    fn set_text(&self, text: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "text", text)
+    fn set_text<'a>(&self, text: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "text", text.into())
     }
 
     fn underline(&self) -> pango::Underline {
diff --git a/gtk4/src/auto/cell_view.rs b/gtk4/src/auto/cell_view.rs
index db1f31c50d53..17bff361e0cb 100644
--- a/gtk4/src/auto/cell_view.rs
+++ b/gtk4/src/auto/cell_view.rs
@@ -134,11 +134,11 @@ impl CellView {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_cell_view_set_displayed_row")]
-    pub fn set_displayed_row(&self, path: Option<&TreePath>) {
+    pub fn set_displayed_row<'a>(&self, path: impl Into<Option<&'a TreePath>>) {
         unsafe {
             ffi::gtk_cell_view_set_displayed_row(
                 self.to_glib_none().0,
-                mut_override(path.to_glib_none().0),
+                mut_override(path.into().to_glib_none().0),
             );
         }
     }
@@ -170,11 +170,11 @@ impl CellView {
     #[allow(deprecated)]
     #[doc(alias = "gtk_cell_view_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<TreeModel>>) {
+    pub fn set_model<'a, P: IsA<TreeModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_cell_view_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -285,7 +285,7 @@ impl CellViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("cell-area", cell_area.clone().upcast()),
+                .property("cell-area", cell_area.as_ref().clone()),
         }
     }
 
@@ -293,7 +293,7 @@ impl CellViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("cell-area-context", cell_area_context.clone().upcast()),
+                .property("cell-area-context", cell_area_context.as_ref().clone()),
         }
     }
 
@@ -311,7 +311,7 @@ impl CellViewBuilder {
 
     pub fn model(self, model: &impl IsA<TreeModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -391,7 +391,7 @@ impl CellViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/center_box.rs b/gtk4/src/auto/center_box.rs
index ef16e6ce7b5d..e7f8e462c022 100644
--- a/gtk4/src/auto/center_box.rs
+++ b/gtk4/src/auto/center_box.rs
@@ -92,22 +92,22 @@ impl CenterBox {
 
     #[doc(alias = "gtk_center_box_set_center_widget")]
     #[doc(alias = "center-widget")]
-    pub fn set_center_widget(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_center_widget<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_center_box_set_center_widget(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_center_box_set_end_widget")]
     #[doc(alias = "end-widget")]
-    pub fn set_end_widget(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_end_widget<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_center_box_set_end_widget(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -127,11 +127,11 @@ impl CenterBox {
 
     #[doc(alias = "gtk_center_box_set_start_widget")]
     #[doc(alias = "start-widget")]
-    pub fn set_start_widget(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_start_widget<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_center_box_set_start_widget(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -302,7 +302,7 @@ impl CenterBoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("center-widget", center_widget.clone().upcast()),
+                .property("center-widget", center_widget.as_ref().clone()),
         }
     }
 
@@ -312,7 +312,7 @@ impl CenterBoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("end-widget", end_widget.clone().upcast()),
+                .property("end-widget", end_widget.as_ref().clone()),
         }
     }
 
@@ -332,7 +332,7 @@ impl CenterBoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("start-widget", start_widget.clone().upcast()),
+                .property("start-widget", start_widget.as_ref().clone()),
         }
     }
 
@@ -412,7 +412,7 @@ impl CenterBoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/center_layout.rs b/gtk4/src/auto/center_layout.rs
index 58748776ea6e..e02e269bd2de 100644
--- a/gtk4/src/auto/center_layout.rs
+++ b/gtk4/src/auto/center_layout.rs
@@ -97,21 +97,21 @@ impl CenterLayout {
     }
 
     #[doc(alias = "gtk_center_layout_set_center_widget")]
-    pub fn set_center_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    pub fn set_center_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_center_layout_set_center_widget(
                 self.to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_center_layout_set_end_widget")]
-    pub fn set_end_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    pub fn set_end_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_center_layout_set_end_widget(
                 self.to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -137,11 +137,11 @@ impl CenterLayout {
     }
 
     #[doc(alias = "gtk_center_layout_set_start_widget")]
-    pub fn set_start_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    pub fn set_start_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_center_layout_set_start_widget(
                 self.to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/check_button.rs b/gtk4/src/auto/check_button.rs
index 7e140079b089..827f04325981 100644
--- a/gtk4/src/auto/check_button.rs
+++ b/gtk4/src/auto/check_button.rs
@@ -94,13 +94,13 @@ impl CheckButtonBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
     pub fn group(self, group: &impl IsA<CheckButton>) -> Self {
         Self {
-            builder: self.builder.property("group", group.clone().upcast()),
+            builder: self.builder.property("group", group.as_ref().clone()),
         }
     }
 
@@ -198,7 +198,7 @@ impl CheckButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -397,22 +397,22 @@ pub trait CheckButtonExt: IsA<CheckButton> + 'static {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
     #[doc(alias = "gtk_check_button_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_check_button_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_check_button_set_group")]
     #[doc(alias = "group")]
-    fn set_group(&self, group: Option<&impl IsA<CheckButton>>) {
+    fn set_group<'a, P: IsA<CheckButton>>(&self, group: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_check_button_set_group(
                 self.as_ref().to_glib_none().0,
-                group.map(|p| p.as_ref()).to_glib_none().0,
+                group.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -430,9 +430,12 @@ pub trait CheckButtonExt: IsA<CheckButton> + 'static {
 
     #[doc(alias = "gtk_check_button_set_label")]
     #[doc(alias = "label")]
-    fn set_label(&self, label: Option<&str>) {
+    fn set_label<'a>(&self, label: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_check_button_set_label(self.as_ref().to_glib_none().0, label.to_glib_none().0);
+            ffi::gtk_check_button_set_label(
+                self.as_ref().to_glib_none().0,
+                label.into().to_glib_none().0,
+            );
         }
     }
 
diff --git a/gtk4/src/auto/color_button.rs b/gtk4/src/auto/color_button.rs
index 8ea9abc610a5..f3ad8449943c 100644
--- a/gtk4/src/auto/color_button.rs
+++ b/gtk4/src/auto/color_button.rs
@@ -335,7 +335,7 @@ impl ColorButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/color_chooser_dialog.rs b/gtk4/src/auto/color_chooser_dialog.rs
index c6e2cf0e8d39..8caff11d9be3 100644
--- a/gtk4/src/auto/color_chooser_dialog.rs
+++ b/gtk4/src/auto/color_chooser_dialog.rs
@@ -27,12 +27,15 @@ impl ColorChooserDialog {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_color_chooser_dialog_new")]
-    pub fn new(title: Option<&str>, parent: Option<&impl IsA<Window>>) -> ColorChooserDialog {
+    pub fn new<'a, P: IsA<Window>>(
+        title: impl Into<Option<&'a str>>,
+        parent: impl Into<Option<&'a P>>,
+    ) -> ColorChooserDialog {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_color_chooser_dialog_new(
-                title.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                title.into().to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -119,13 +122,13 @@ impl ColorChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -145,7 +148,7 @@ impl ColorChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -171,7 +174,7 @@ impl ColorChooserDialogBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -185,7 +188,7 @@ impl ColorChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -259,7 +262,7 @@ impl ColorChooserDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -267,7 +270,7 @@ impl ColorChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -347,7 +350,7 @@ impl ColorChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/color_chooser_widget.rs b/gtk4/src/auto/color_chooser_widget.rs
index 028ef7bd4265..929ec5fbd2ab 100644
--- a/gtk4/src/auto/color_chooser_widget.rs
+++ b/gtk4/src/auto/color_chooser_widget.rs
@@ -175,7 +175,7 @@ impl ColorChooserWidgetBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/color_dialog.rs b/gtk4/src/auto/color_dialog.rs
index 2b21100d92aa..e7528c03e9d4 100644
--- a/gtk4/src/auto/color_dialog.rs
+++ b/gtk4/src/auto/color_dialog.rs
@@ -35,12 +35,17 @@ impl ColorDialog {
     }
 
     #[doc(alias = "gtk_color_dialog_choose_rgba")]
-    pub fn choose_rgba<P: FnOnce(Result<gdk::RGBA, glib::Error>) + 'static>(
+    pub fn choose_rgba<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<gdk::RGBA, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        initial_color: Option<&gdk::RGBA>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        initial_color: impl Into<Option<&'a gdk::RGBA>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -52,10 +57,10 @@ impl ColorDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn choose_rgba_trampoline<
-            P: FnOnce(Result<gdk::RGBA, glib::Error>) + 'static,
+            R: FnOnce(Result<gdk::RGBA, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -69,31 +74,36 @@ impl ColorDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = choose_rgba_trampoline::<P>;
+        let callback = choose_rgba_trampoline::<R>;
         unsafe {
             ffi::gtk_color_dialog_choose_rgba(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                initial_color.to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                initial_color.into().to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn choose_rgba_future(
+    pub fn choose_rgba_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
-        initial_color: Option<&gdk::RGBA>,
+        parent: impl Into<Option<&'a P>>,
+        initial_color: impl Into<Option<&'a gdk::RGBA>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<gdk::RGBA, glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
-        let initial_color = initial_color.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
+        let initial_color = initial_color.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.choose_rgba(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
diff --git a/gtk4/src/auto/color_dialog_button.rs b/gtk4/src/auto/color_dialog_button.rs
index 7b1cf711d36e..9d809df63b6b 100644
--- a/gtk4/src/auto/color_dialog_button.rs
+++ b/gtk4/src/auto/color_dialog_button.rs
@@ -269,7 +269,7 @@ impl ColorDialogButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/column_view.rs b/gtk4/src/auto/column_view.rs
index e67c22cdca04..9b82b2eb5c83 100644
--- a/gtk4/src/auto/column_view.rs
+++ b/gtk4/src/auto/column_view.rs
@@ -174,20 +174,20 @@ impl ColumnView {
     #[cfg(feature = "v4_12")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_column_view_scroll_to")]
-    pub fn scroll_to(
+    pub fn scroll_to<'a>(
         &self,
         pos: u32,
-        column: Option<&ColumnViewColumn>,
+        column: impl Into<Option<&'a ColumnViewColumn>>,
         flags: ListScrollFlags,
-        scroll: Option<ScrollInfo>,
+        scroll: impl Into<Option<ScrollInfo>>,
     ) {
         unsafe {
             ffi::gtk_column_view_scroll_to(
                 self.to_glib_none().0,
                 pos,
-                column.to_glib_none().0,
+                column.into().to_glib_none().0,
                 flags.into_glib(),
-                scroll.into_glib_ptr(),
+                scroll.into().into_glib_ptr(),
             );
         }
     }
@@ -207,22 +207,25 @@ impl ColumnView {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_column_view_set_header_factory")]
     #[doc(alias = "header-factory")]
-    pub fn set_header_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_header_factory<'a, P: IsA<ListItemFactory>>(
+        &self,
+        factory: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_column_view_set_header_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_column_view_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<SelectionModel>>) {
+    pub fn set_model<'a, P: IsA<SelectionModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_column_view_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -239,11 +242,11 @@ impl ColumnView {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_column_view_set_row_factory")]
     #[doc(alias = "row-factory")]
-    pub fn set_row_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_row_factory<'a, P: IsA<ListItemFactory>>(&self, factory: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_column_view_set_row_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -292,11 +295,15 @@ impl ColumnView {
     }
 
     #[doc(alias = "gtk_column_view_sort_by_column")]
-    pub fn sort_by_column(&self, column: Option<&ColumnViewColumn>, direction: SortType) {
+    pub fn sort_by_column<'a>(
+        &self,
+        column: impl Into<Option<&'a ColumnViewColumn>>,
+        direction: SortType,
+    ) {
         unsafe {
             ffi::gtk_column_view_sort_by_column(
                 self.to_glib_none().0,
-                column.to_glib_none().0,
+                column.into().to_glib_none().0,
                 direction.into_glib(),
             );
         }
@@ -637,13 +644,13 @@ impl ColumnViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("header-factory", header_factory.clone().upcast()),
+                .property("header-factory", header_factory.as_ref().clone()),
         }
     }
 
     pub fn model(self, model: &impl IsA<SelectionModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -659,7 +666,7 @@ impl ColumnViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("row-factory", row_factory.clone().upcast()),
+                .property("row-factory", row_factory.as_ref().clone()),
         }
     }
 
@@ -771,7 +778,7 @@ impl ColumnViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -883,7 +890,7 @@ impl ColumnViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("hadjustment", hadjustment.clone().upcast()),
+                .property("hadjustment", hadjustment.as_ref().clone()),
         }
     }
 
@@ -897,7 +904,7 @@ impl ColumnViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("vadjustment", vadjustment.clone().upcast()),
+                .property("vadjustment", vadjustment.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/column_view_cell.rs b/gtk4/src/auto/column_view_cell.rs
index 171a23f6b24e..c243c1720f2d 100644
--- a/gtk4/src/auto/column_view_cell.rs
+++ b/gtk4/src/auto/column_view_cell.rs
@@ -67,11 +67,11 @@ impl ColumnViewCell {
 
     #[doc(alias = "gtk_column_view_cell_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_column_view_cell_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -107,7 +107,7 @@ impl ColumnViewCellBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/column_view_column.rs b/gtk4/src/auto/column_view_column.rs
index 776af7488fc5..fdb3b4f83897 100644
--- a/gtk4/src/auto/column_view_column.rs
+++ b/gtk4/src/auto/column_view_column.rs
@@ -21,14 +21,14 @@ glib::wrapper! {
 
 impl ColumnViewColumn {
     #[doc(alias = "gtk_column_view_column_new")]
-    pub fn new(
-        title: Option<&str>,
+    pub fn new<'a>(
+        title: impl Into<Option<&'a str>>,
         factory: Option<impl IsA<ListItemFactory>>,
     ) -> ColumnViewColumn {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_column_view_column_new(
-                title.to_glib_none().0,
+                title.into().to_glib_none().0,
                 factory.map(|p| p.upcast()).into_glib_ptr(),
             ))
         }
@@ -148,11 +148,11 @@ impl ColumnViewColumn {
 
     #[doc(alias = "gtk_column_view_column_set_factory")]
     #[doc(alias = "factory")]
-    pub fn set_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_factory<'a, P: IsA<ListItemFactory>>(&self, factory: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_column_view_column_set_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -167,11 +167,11 @@ impl ColumnViewColumn {
 
     #[doc(alias = "gtk_column_view_column_set_header_menu")]
     #[doc(alias = "header-menu")]
-    pub fn set_header_menu(&self, menu: Option<&impl IsA<gio::MenuModel>>) {
+    pub fn set_header_menu<'a, P: IsA<gio::MenuModel>>(&self, menu: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_column_view_column_set_header_menu(
                 self.to_glib_none().0,
-                menu.map(|p| p.as_ref()).to_glib_none().0,
+                menu.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -180,9 +180,9 @@ impl ColumnViewColumn {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))]
     #[doc(alias = "gtk_column_view_column_set_id")]
     #[doc(alias = "id")]
-    pub fn set_id(&self, id: Option<&str>) {
+    pub fn set_id<'a>(&self, id: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_column_view_column_set_id(self.to_glib_none().0, id.to_glib_none().0);
+            ffi::gtk_column_view_column_set_id(self.to_glib_none().0, id.into().to_glib_none().0);
         }
     }
 
@@ -196,20 +196,23 @@ impl ColumnViewColumn {
 
     #[doc(alias = "gtk_column_view_column_set_sorter")]
     #[doc(alias = "sorter")]
-    pub fn set_sorter(&self, sorter: Option<&impl IsA<Sorter>>) {
+    pub fn set_sorter<'a, P: IsA<Sorter>>(&self, sorter: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_column_view_column_set_sorter(
                 self.to_glib_none().0,
-                sorter.map(|p| p.as_ref()).to_glib_none().0,
+                sorter.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_column_view_column_set_title")]
     #[doc(alias = "title")]
-    pub fn set_title(&self, title: Option<&str>) {
+    pub fn set_title<'a>(&self, title: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_column_view_column_set_title(self.to_glib_none().0, title.to_glib_none().0);
+            ffi::gtk_column_view_column_set_title(
+                self.to_glib_none().0,
+                title.into().to_glib_none().0,
+            );
         }
     }
 
@@ -484,7 +487,7 @@ impl ColumnViewColumnBuilder {
 
     pub fn factory(self, factory: &impl IsA<ListItemFactory>) -> Self {
         Self {
-            builder: self.builder.property("factory", factory.clone().upcast()),
+            builder: self.builder.property("factory", factory.as_ref().clone()),
         }
     }
 
@@ -498,7 +501,7 @@ impl ColumnViewColumnBuilder {
         Self {
             builder: self
                 .builder
-                .property("header-menu", header_menu.clone().upcast()),
+                .property("header-menu", header_menu.as_ref().clone()),
         }
     }
 
@@ -518,7 +521,7 @@ impl ColumnViewColumnBuilder {
 
     pub fn sorter(self, sorter: &impl IsA<Sorter>) -> Self {
         Self {
-            builder: self.builder.property("sorter", sorter.clone().upcast()),
+            builder: self.builder.property("sorter", sorter.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/combo_box.rs b/gtk4/src/auto/combo_box.rs
index 5bfa58cbe86a..d52cc297290f 100644
--- a/gtk4/src/auto/combo_box.rs
+++ b/gtk4/src/auto/combo_box.rs
@@ -124,7 +124,7 @@ impl ComboBoxBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -156,7 +156,7 @@ impl ComboBoxBuilder {
 
     pub fn model(self, model: &impl IsA<TreeModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -244,7 +244,7 @@ impl ComboBoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -507,11 +507,11 @@ pub trait ComboBoxExt: IsA<ComboBox> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_combo_box_set_active_id")]
     #[doc(alias = "active-id")]
-    fn set_active_id(&self, active_id: Option<&str>) -> bool {
+    fn set_active_id<'a>(&self, active_id: impl Into<Option<&'a str>>) -> bool {
         unsafe {
             from_glib(ffi::gtk_combo_box_set_active_id(
                 self.as_ref().to_glib_none().0,
-                active_id.to_glib_none().0,
+                active_id.into().to_glib_none().0,
             ))
         }
     }
@@ -519,11 +519,11 @@ pub trait ComboBoxExt: IsA<ComboBox> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_combo_box_set_active_iter")]
-    fn set_active_iter(&self, iter: Option<&TreeIter>) {
+    fn set_active_iter<'a>(&self, iter: impl Into<Option<&'a TreeIter>>) {
         unsafe {
             ffi::gtk_combo_box_set_active_iter(
                 self.as_ref().to_glib_none().0,
-                mut_override(iter.to_glib_none().0),
+                mut_override(iter.into().to_glib_none().0),
             );
         }
     }
@@ -545,11 +545,11 @@ pub trait ComboBoxExt: IsA<ComboBox> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_combo_box_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_combo_box_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -578,11 +578,11 @@ pub trait ComboBoxExt: IsA<ComboBox> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_combo_box_set_model")]
     #[doc(alias = "model")]
-    fn set_model(&self, model: Option<&impl IsA<TreeModel>>) {
+    fn set_model<'a, P: IsA<TreeModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_combo_box_set_model(
                 self.as_ref().to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/combo_box_text.rs b/gtk4/src/auto/combo_box_text.rs
index 24518434292b..d0aa9b00f11f 100644
--- a/gtk4/src/auto/combo_box_text.rs
+++ b/gtk4/src/auto/combo_box_text.rs
@@ -47,11 +47,11 @@ impl ComboBoxText {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_combo_box_text_append")]
-    pub fn append(&self, id: Option<&str>, text: &str) {
+    pub fn append<'a>(&self, id: impl Into<Option<&'a str>>, text: &str) {
         unsafe {
             ffi::gtk_combo_box_text_append(
                 self.to_glib_none().0,
-                id.to_glib_none().0,
+                id.into().to_glib_none().0,
                 text.to_glib_none().0,
             );
         }
@@ -81,12 +81,12 @@ impl ComboBoxText {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_combo_box_text_insert")]
-    pub fn insert(&self, position: i32, id: Option<&str>, text: &str) {
+    pub fn insert<'a>(&self, position: i32, id: impl Into<Option<&'a str>>, text: &str) {
         unsafe {
             ffi::gtk_combo_box_text_insert(
                 self.to_glib_none().0,
                 position,
-                id.to_glib_none().0,
+                id.into().to_glib_none().0,
                 text.to_glib_none().0,
             );
         }
@@ -108,11 +108,11 @@ impl ComboBoxText {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_combo_box_text_prepend")]
-    pub fn prepend(&self, id: Option<&str>, text: &str) {
+    pub fn prepend<'a>(&self, id: impl Into<Option<&'a str>>, text: &str) {
         unsafe {
             ffi::gtk_combo_box_text_prepend(
                 self.to_glib_none().0,
-                id.to_glib_none().0,
+                id.into().to_glib_none().0,
                 text.to_glib_none().0,
             );
         }
@@ -190,7 +190,7 @@ impl ComboBoxTextBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -222,7 +222,7 @@ impl ComboBoxTextBuilder {
 
     pub fn model(self, model: &impl IsA<TreeModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -310,7 +310,7 @@ impl ComboBoxTextBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/constraint.rs b/gtk4/src/auto/constraint.rs
index 01a09defbfa1..ae0f2630b96a 100644
--- a/gtk4/src/auto/constraint.rs
+++ b/gtk4/src/auto/constraint.rs
@@ -16,11 +16,11 @@ glib::wrapper! {
 
 impl Constraint {
     #[doc(alias = "gtk_constraint_new")]
-    pub fn new(
-        target: Option<&impl IsA<ConstraintTarget>>,
+    pub fn new<'a, P: IsA<ConstraintTarget>, Q: IsA<ConstraintTarget>>(
+        target: impl Into<Option<&'a P>>,
         target_attribute: ConstraintAttribute,
         relation: ConstraintRelation,
-        source: Option<&impl IsA<ConstraintTarget>>,
+        source: impl Into<Option<&'a Q>>,
         source_attribute: ConstraintAttribute,
         multiplier: f64,
         constant: f64,
@@ -29,10 +29,10 @@ impl Constraint {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_constraint_new(
-                target.map(|p| p.as_ref()).to_glib_none().0,
+                target.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 target_attribute.into_glib(),
                 relation.into_glib(),
-                source.map(|p| p.as_ref()).to_glib_none().0,
+                source.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 source_attribute.into_glib(),
                 multiplier,
                 constant,
@@ -42,8 +42,8 @@ impl Constraint {
     }
 
     #[doc(alias = "gtk_constraint_new_constant")]
-    pub fn new_constant(
-        target: Option<&impl IsA<ConstraintTarget>>,
+    pub fn new_constant<'a, P: IsA<ConstraintTarget>>(
+        target: impl Into<Option<&'a P>>,
         target_attribute: ConstraintAttribute,
         relation: ConstraintRelation,
         constant: f64,
@@ -52,7 +52,7 @@ impl Constraint {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_constraint_new_constant(
-                target.map(|p| p.as_ref()).to_glib_none().0,
+                target.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 target_attribute.into_glib(),
                 relation.into_glib(),
                 constant,
@@ -185,7 +185,7 @@ impl ConstraintBuilder {
 
     pub fn source(self, source: &impl IsA<ConstraintTarget>) -> Self {
         Self {
-            builder: self.builder.property("source", source.clone().upcast()),
+            builder: self.builder.property("source", source.as_ref().clone()),
         }
     }
 
@@ -203,7 +203,7 @@ impl ConstraintBuilder {
 
     pub fn target(self, target: &impl IsA<ConstraintTarget>) -> Self {
         Self {
-            builder: self.builder.property("target", target.clone().upcast()),
+            builder: self.builder.property("target", target.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/constraint_guide.rs b/gtk4/src/auto/constraint_guide.rs
index daffd9afc6a6..5af9b036b332 100644
--- a/gtk4/src/auto/constraint_guide.rs
+++ b/gtk4/src/auto/constraint_guide.rs
@@ -66,9 +66,9 @@ impl ConstraintGuide {
 
     #[doc(alias = "gtk_constraint_guide_set_name")]
     #[doc(alias = "name")]
-    pub fn set_name(&self, name: Option<&str>) {
+    pub fn set_name<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_constraint_guide_set_name(self.to_glib_none().0, name.to_glib_none().0);
+            ffi::gtk_constraint_guide_set_name(self.to_glib_none().0, name.into().to_glib_none().0);
         }
     }
 
diff --git a/gtk4/src/auto/css_provider.rs b/gtk4/src/auto/css_provider.rs
index c4062e24ccb1..222649667e25 100644
--- a/gtk4/src/auto/css_provider.rs
+++ b/gtk4/src/auto/css_provider.rs
@@ -90,12 +90,12 @@ impl CssProvider {
     }
 
     #[doc(alias = "gtk_css_provider_load_named")]
-    pub fn load_named(&self, name: &str, variant: Option<&str>) {
+    pub fn load_named<'a>(&self, name: &str, variant: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_css_provider_load_named(
                 self.to_glib_none().0,
                 name.to_glib_none().0,
-                variant.to_glib_none().0,
+                variant.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/css_section.rs b/gtk4/src/auto/css_section.rs
index 2afc24366001..bce2f5c14d31 100644
--- a/gtk4/src/auto/css_section.rs
+++ b/gtk4/src/auto/css_section.rs
@@ -18,15 +18,15 @@ glib::wrapper! {
 
 impl CssSection {
     #[doc(alias = "gtk_css_section_new")]
-    pub fn new(
-        file: Option<&impl IsA<gio::File>>,
+    pub fn new<'a, P: IsA<gio::File>>(
+        file: impl Into<Option<&'a P>>,
         start: &CssLocation,
         end: &CssLocation,
     ) -> CssSection {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_css_section_new(
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 start.to_glib_none().0,
                 end.to_glib_none().0,
             ))
@@ -37,17 +37,17 @@ impl CssSection {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
     #[doc(alias = "gtk_css_section_new_with_bytes")]
     #[doc(alias = "new_with_bytes")]
-    pub fn with_bytes(
-        file: Option<&impl IsA<gio::File>>,
-        bytes: Option<&glib::Bytes>,
+    pub fn with_bytes<'a, P: IsA<gio::File>>(
+        file: impl Into<Option<&'a P>>,
+        bytes: impl Into<Option<&'a glib::Bytes>>,
         start: &CssLocation,
         end: &CssLocation,
     ) -> CssSection {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_css_section_new_with_bytes(
-                file.map(|p| p.as_ref()).to_glib_none().0,
-                bytes.to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                bytes.into().to_glib_none().0,
                 start.to_glib_none().0,
                 end.to_glib_none().0,
             ))
diff --git a/gtk4/src/auto/dialog.rs b/gtk4/src/auto/dialog.rs
index 4cd533b70aef..56a255c88ba0 100644
--- a/gtk4/src/auto/dialog.rs
+++ b/gtk4/src/auto/dialog.rs
@@ -77,13 +77,13 @@ impl DialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -103,7 +103,7 @@ impl DialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -129,7 +129,7 @@ impl DialogBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -143,7 +143,7 @@ impl DialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -217,7 +217,7 @@ impl DialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -225,7 +225,7 @@ impl DialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -305,7 +305,7 @@ impl DialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/directory_list.rs b/gtk4/src/auto/directory_list.rs
index 923ba42217c3..2e6a7d915e53 100644
--- a/gtk4/src/auto/directory_list.rs
+++ b/gtk4/src/auto/directory_list.rs
@@ -21,12 +21,15 @@ glib::wrapper! {
 
 impl DirectoryList {
     #[doc(alias = "gtk_directory_list_new")]
-    pub fn new(attributes: Option<&str>, file: Option<&impl IsA<gio::File>>) -> DirectoryList {
+    pub fn new<'a, P: IsA<gio::File>>(
+        attributes: impl Into<Option<&'a str>>,
+        file: impl Into<Option<&'a P>>,
+    ) -> DirectoryList {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_directory_list_new(
-                attributes.to_glib_none().0,
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                attributes.into().to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -68,22 +71,22 @@ impl DirectoryList {
 
     #[doc(alias = "gtk_directory_list_set_attributes")]
     #[doc(alias = "attributes")]
-    pub fn set_attributes(&self, attributes: Option<&str>) {
+    pub fn set_attributes<'a>(&self, attributes: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_directory_list_set_attributes(
                 self.to_glib_none().0,
-                attributes.to_glib_none().0,
+                attributes.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_directory_list_set_file")]
     #[doc(alias = "file")]
-    pub fn set_file(&self, file: Option<&impl IsA<gio::File>>) {
+    pub fn set_file<'a, P: IsA<gio::File>>(&self, file: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_directory_list_set_file(
                 self.to_glib_none().0,
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/drag_icon.rs b/gtk4/src/auto/drag_icon.rs
index 2639cdddc178..7765fb89303a 100644
--- a/gtk4/src/auto/drag_icon.rs
+++ b/gtk4/src/auto/drag_icon.rs
@@ -38,11 +38,11 @@ impl DragIcon {
 
     #[doc(alias = "gtk_drag_icon_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_drag_icon_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/drag_source.rs b/gtk4/src/auto/drag_source.rs
index 94ecf49afc4c..7df107e6f819 100644
--- a/gtk4/src/auto/drag_source.rs
+++ b/gtk4/src/auto/drag_source.rs
@@ -69,21 +69,31 @@ impl DragSource {
 
     #[doc(alias = "gtk_drag_source_set_content")]
     #[doc(alias = "content")]
-    pub fn set_content(&self, content: Option<&impl IsA<gdk::ContentProvider>>) {
+    pub fn set_content<'a, P: IsA<gdk::ContentProvider>>(&self, content: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_drag_source_set_content(
                 self.to_glib_none().0,
-                content.map(|p| p.as_ref()).to_glib_none().0,
+                content.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_drag_source_set_icon")]
-    pub fn set_icon(&self, paintable: Option<&impl IsA<gdk::Paintable>>, hot_x: i32, hot_y: i32) {
+    pub fn set_icon<'a, P: IsA<gdk::Paintable>>(
+        &self,
+        paintable: impl Into<Option<&'a P>>,
+        hot_x: i32,
+        hot_y: i32,
+    ) {
         unsafe {
             ffi::gtk_drag_source_set_icon(
                 self.to_glib_none().0,
-                paintable.map(|p| p.as_ref()).to_glib_none().0,
+                paintable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 hot_x,
                 hot_y,
             );
@@ -286,7 +296,7 @@ impl DragSourceBuilder {
 
     pub fn content(self, content: &impl IsA<gdk::ContentProvider>) -> Self {
         Self {
-            builder: self.builder.property("content", content.clone().upcast()),
+            builder: self.builder.property("content", content.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/drawing_area.rs b/gtk4/src/auto/drawing_area.rs
index dc4ee14c1f14..d038495de2d5 100644
--- a/gtk4/src/auto/drawing_area.rs
+++ b/gtk4/src/auto/drawing_area.rs
@@ -150,7 +150,7 @@ impl DrawingAreaBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/drop_down.rs b/gtk4/src/auto/drop_down.rs
index debb2eddcf8b..aa5b80949024 100644
--- a/gtk4/src/auto/drop_down.rs
+++ b/gtk4/src/auto/drop_down.rs
@@ -160,11 +160,11 @@ impl DropDown {
 
     #[doc(alias = "gtk_drop_down_set_factory")]
     #[doc(alias = "factory")]
-    pub fn set_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_factory<'a, P: IsA<ListItemFactory>>(&self, factory: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_drop_down_set_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -173,33 +173,36 @@ impl DropDown {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_drop_down_set_header_factory")]
     #[doc(alias = "header-factory")]
-    pub fn set_header_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_header_factory<'a, P: IsA<ListItemFactory>>(
+        &self,
+        factory: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_drop_down_set_header_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_drop_down_set_list_factory")]
     #[doc(alias = "list-factory")]
-    pub fn set_list_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_list_factory<'a, P: IsA<ListItemFactory>>(&self, factory: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_drop_down_set_list_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_drop_down_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_drop_down_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -543,7 +546,7 @@ impl DropDownBuilder {
 
     pub fn factory(self, factory: &impl IsA<ListItemFactory>) -> Self {
         Self {
-            builder: self.builder.property("factory", factory.clone().upcast()),
+            builder: self.builder.property("factory", factory.as_ref().clone()),
         }
     }
 
@@ -553,7 +556,7 @@ impl DropDownBuilder {
         Self {
             builder: self
                 .builder
-                .property("header-factory", header_factory.clone().upcast()),
+                .property("header-factory", header_factory.as_ref().clone()),
         }
     }
 
@@ -561,13 +564,13 @@ impl DropDownBuilder {
         Self {
             builder: self
                 .builder
-                .property("list-factory", list_factory.clone().upcast()),
+                .property("list-factory", list_factory.as_ref().clone()),
         }
     }
 
     pub fn model(self, model: &impl IsA<gio::ListModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -671,7 +674,7 @@ impl DropDownBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/drop_target_async.rs b/gtk4/src/auto/drop_target_async.rs
index 4660b2ac6a75..3f23ab413db4 100644
--- a/gtk4/src/auto/drop_target_async.rs
+++ b/gtk4/src/auto/drop_target_async.rs
@@ -21,11 +21,14 @@ glib::wrapper! {
 
 impl DropTargetAsync {
     #[doc(alias = "gtk_drop_target_async_new")]
-    pub fn new(formats: Option<gdk::ContentFormats>, actions: gdk::DragAction) -> DropTargetAsync {
+    pub fn new(
+        formats: impl Into<Option<gdk::ContentFormats>>,
+        actions: gdk::DragAction,
+    ) -> DropTargetAsync {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_drop_target_async_new(
-                formats.into_glib_ptr(),
+                formats.into().into_glib_ptr(),
                 actions.into_glib(),
             ))
         }
@@ -76,9 +79,12 @@ impl DropTargetAsync {
 
     #[doc(alias = "gtk_drop_target_async_set_formats")]
     #[doc(alias = "formats")]
-    pub fn set_formats(&self, formats: Option<&gdk::ContentFormats>) {
+    pub fn set_formats<'a>(&self, formats: impl Into<Option<&'a gdk::ContentFormats>>) {
         unsafe {
-            ffi::gtk_drop_target_async_set_formats(self.to_glib_none().0, formats.to_glib_none().0);
+            ffi::gtk_drop_target_async_set_formats(
+                self.to_glib_none().0,
+                formats.into().to_glib_none().0,
+            );
         }
     }
 
diff --git a/gtk4/src/auto/editable_label.rs b/gtk4/src/auto/editable_label.rs
index 0cbcef56c0f0..11a89af225c9 100644
--- a/gtk4/src/auto/editable_label.rs
+++ b/gtk4/src/auto/editable_label.rs
@@ -168,7 +168,7 @@ impl EditableLabelBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/emoji_chooser.rs b/gtk4/src/auto/emoji_chooser.rs
index c8a8243d93e4..4fc13f852c50 100644
--- a/gtk4/src/auto/emoji_chooser.rs
+++ b/gtk4/src/auto/emoji_chooser.rs
@@ -100,7 +100,7 @@ impl EmojiChooserBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -108,7 +108,7 @@ impl EmojiChooserBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -214,7 +214,7 @@ impl EmojiChooserBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/entry.rs b/gtk4/src/auto/entry.rs
index f35b149edbec..ecdb0c4593bc 100644
--- a/gtk4/src/auto/entry.rs
+++ b/gtk4/src/auto/entry.rs
@@ -92,7 +92,7 @@ impl EntryBuilder {
 
     pub fn buffer(self, buffer: &impl IsA<EntryBuffer>) -> Self {
         Self {
-            builder: self.builder.property("buffer", buffer.clone().upcast()),
+            builder: self.builder.property("buffer", buffer.as_ref().clone()),
         }
     }
 
@@ -115,7 +115,7 @@ impl EntryBuilder {
         Self {
             builder: self
                 .builder
-                .property("extra-menu", extra_menu.clone().upcast()),
+                .property("extra-menu", extra_menu.as_ref().clone()),
         }
     }
 
@@ -189,7 +189,7 @@ impl EntryBuilder {
         Self {
             builder: self
                 .builder
-                .property("primary-icon-gicon", primary_icon_gicon.clone().upcast()),
+                .property("primary-icon-gicon", primary_icon_gicon.as_ref().clone()),
         }
     }
 
@@ -205,7 +205,7 @@ impl EntryBuilder {
         Self {
             builder: self.builder.property(
                 "primary-icon-paintable",
-                primary_icon_paintable.clone().upcast(),
+                primary_icon_paintable.as_ref().clone(),
             ),
         }
     }
@@ -270,7 +270,7 @@ impl EntryBuilder {
         Self {
             builder: self.builder.property(
                 "secondary-icon-gicon",
-                secondary_icon_gicon.clone().upcast(),
+                secondary_icon_gicon.as_ref().clone(),
             ),
         }
     }
@@ -290,7 +290,7 @@ impl EntryBuilder {
         Self {
             builder: self.builder.property(
                 "secondary-icon-paintable",
-                secondary_icon_paintable.clone().upcast(),
+                secondary_icon_paintable.as_ref().clone(),
             ),
         }
     }
@@ -429,7 +429,7 @@ impl EntryBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -919,22 +919,22 @@ pub trait EntryExt: IsA<Entry> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_entry_set_completion")]
     #[doc(alias = "completion")]
-    fn set_completion(&self, completion: Option<&EntryCompletion>) {
+    fn set_completion<'a>(&self, completion: impl Into<Option<&'a EntryCompletion>>) {
         unsafe {
             ffi::gtk_entry_set_completion(
                 self.as_ref().to_glib_none().0,
-                completion.to_glib_none().0,
+                completion.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_entry_set_extra_menu")]
     #[doc(alias = "extra-menu")]
-    fn set_extra_menu(&self, model: Option<&impl IsA<gio::MenuModel>>) {
+    fn set_extra_menu<'a, P: IsA<gio::MenuModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_entry_set_extra_menu(
                 self.as_ref().to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -976,38 +976,51 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "gtk_entry_set_icon_from_gicon")]
-    fn set_icon_from_gicon(&self, icon_pos: EntryIconPosition, icon: Option<&impl IsA<gio::Icon>>) {
+    fn set_icon_from_gicon<'a, P: IsA<gio::Icon>>(
+        &self,
+        icon_pos: EntryIconPosition,
+        icon: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_entry_set_icon_from_gicon(
                 self.as_ref().to_glib_none().0,
                 icon_pos.into_glib(),
-                icon.map(|p| p.as_ref()).to_glib_none().0,
+                icon.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_entry_set_icon_from_icon_name")]
-    fn set_icon_from_icon_name(&self, icon_pos: EntryIconPosition, icon_name: Option<&str>) {
+    fn set_icon_from_icon_name<'a>(
+        &self,
+        icon_pos: EntryIconPosition,
+        icon_name: impl Into<Option<&'a str>>,
+    ) {
         unsafe {
             ffi::gtk_entry_set_icon_from_icon_name(
                 self.as_ref().to_glib_none().0,
                 icon_pos.into_glib(),
-                icon_name.to_glib_none().0,
+                icon_name.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_entry_set_icon_from_paintable")]
-    fn set_icon_from_paintable(
+    fn set_icon_from_paintable<'a, P: IsA<gdk::Paintable>>(
         &self,
         icon_pos: EntryIconPosition,
-        paintable: Option<&impl IsA<gdk::Paintable>>,
+        paintable: impl Into<Option<&'a P>>,
     ) {
         unsafe {
             ffi::gtk_entry_set_icon_from_paintable(
                 self.as_ref().to_glib_none().0,
                 icon_pos.into_glib(),
-                paintable.map(|p| p.as_ref()).to_glib_none().0,
+                paintable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -1024,23 +1037,31 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "gtk_entry_set_icon_tooltip_markup")]
-    fn set_icon_tooltip_markup(&self, icon_pos: EntryIconPosition, tooltip: Option<&str>) {
+    fn set_icon_tooltip_markup<'a>(
+        &self,
+        icon_pos: EntryIconPosition,
+        tooltip: impl Into<Option<&'a str>>,
+    ) {
         unsafe {
             ffi::gtk_entry_set_icon_tooltip_markup(
                 self.as_ref().to_glib_none().0,
                 icon_pos.into_glib(),
-                tooltip.to_glib_none().0,
+                tooltip.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_entry_set_icon_tooltip_text")]
-    fn set_icon_tooltip_text(&self, icon_pos: EntryIconPosition, tooltip: Option<&str>) {
+    fn set_icon_tooltip_text<'a>(
+        &self,
+        icon_pos: EntryIconPosition,
+        tooltip: impl Into<Option<&'a str>>,
+    ) {
         unsafe {
             ffi::gtk_entry_set_icon_tooltip_text(
                 self.as_ref().to_glib_none().0,
                 icon_pos.into_glib(),
-                tooltip.to_glib_none().0,
+                tooltip.into().to_glib_none().0,
             );
         }
     }
@@ -1063,9 +1084,12 @@ pub trait EntryExt: IsA<Entry> + 'static {
 
     #[doc(alias = "gtk_entry_set_invisible_char")]
     #[doc(alias = "invisible-char")]
-    fn set_invisible_char(&self, ch: Option<char>) {
+    fn set_invisible_char(&self, ch: impl Into<Option<char>>) {
         unsafe {
-            ffi::gtk_entry_set_invisible_char(self.as_ref().to_glib_none().0, ch.into_glib());
+            ffi::gtk_entry_set_invisible_char(
+                self.as_ref().to_glib_none().0,
+                ch.into().into_glib(),
+            );
         }
     }
 
@@ -1090,11 +1114,11 @@ pub trait EntryExt: IsA<Entry> + 'static {
 
     #[doc(alias = "gtk_entry_set_placeholder_text")]
     #[doc(alias = "placeholder-text")]
-    fn set_placeholder_text(&self, text: Option<&str>) {
+    fn set_placeholder_text<'a>(&self, text: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_entry_set_placeholder_text(
                 self.as_ref().to_glib_none().0,
-                text.to_glib_none().0,
+                text.into().to_glib_none().0,
             );
         }
     }
@@ -1117,11 +1141,11 @@ pub trait EntryExt: IsA<Entry> + 'static {
 
     #[doc(alias = "gtk_entry_set_tabs")]
     #[doc(alias = "tabs")]
-    fn set_tabs(&self, tabs: Option<&pango::TabArray>) {
+    fn set_tabs<'a>(&self, tabs: impl Into<Option<&'a pango::TabArray>>) {
         unsafe {
             ffi::gtk_entry_set_tabs(
                 self.as_ref().to_glib_none().0,
-                mut_override(tabs.to_glib_none().0),
+                mut_override(tabs.into().to_glib_none().0),
             );
         }
     }
@@ -1161,8 +1185,8 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "im-module")]
-    fn set_im_module(&self, im_module: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "im-module", im_module)
+    fn set_im_module<'a>(&self, im_module: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "im-module", im_module.into())
     }
 
     #[doc(alias = "invisible-char-set")]
@@ -1190,8 +1214,15 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "primary-icon-gicon")]
-    fn set_primary_icon_gicon<P: IsA<gio::Icon>>(&self, primary_icon_gicon: Option<&P>) {
-        ObjectExt::set_property(self.as_ref(), "primary-icon-gicon", primary_icon_gicon)
+    fn set_primary_icon_gicon<'a, P: IsA<gio::Icon>>(
+        &self,
+        primary_icon_gicon: impl Into<Option<&'a P>>,
+    ) {
+        ObjectExt::set_property(
+            self.as_ref(),
+            "primary-icon-gicon",
+            primary_icon_gicon.into().as_ref().map(|p| p.as_ref()),
+        )
     }
 
     #[doc(alias = "primary-icon-name")]
@@ -1200,8 +1231,8 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "primary-icon-name")]
-    fn set_primary_icon_name(&self, primary_icon_name: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "primary-icon-name", primary_icon_name)
+    fn set_primary_icon_name<'a>(&self, primary_icon_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "primary-icon-name", primary_icon_name.into())
     }
 
     #[doc(alias = "primary-icon-paintable")]
@@ -1210,14 +1241,14 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "primary-icon-paintable")]
-    fn set_primary_icon_paintable<P: IsA<gdk::Paintable>>(
+    fn set_primary_icon_paintable<'a, P: IsA<gdk::Paintable>>(
         &self,
-        primary_icon_paintable: Option<&P>,
+        primary_icon_paintable: impl Into<Option<&'a P>>,
     ) {
         ObjectExt::set_property(
             self.as_ref(),
             "primary-icon-paintable",
-            primary_icon_paintable,
+            primary_icon_paintable.into().as_ref().map(|p| p.as_ref()),
         )
     }
 
@@ -1246,11 +1277,14 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "primary-icon-tooltip-markup")]
-    fn set_primary_icon_tooltip_markup(&self, primary_icon_tooltip_markup: Option<&str>) {
+    fn set_primary_icon_tooltip_markup<'a>(
+        &self,
+        primary_icon_tooltip_markup: impl Into<Option<&'a str>>,
+    ) {
         ObjectExt::set_property(
             self.as_ref(),
             "primary-icon-tooltip-markup",
-            primary_icon_tooltip_markup,
+            primary_icon_tooltip_markup.into(),
         )
     }
 
@@ -1260,11 +1294,14 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "primary-icon-tooltip-text")]
-    fn set_primary_icon_tooltip_text(&self, primary_icon_tooltip_text: Option<&str>) {
+    fn set_primary_icon_tooltip_text<'a>(
+        &self,
+        primary_icon_tooltip_text: impl Into<Option<&'a str>>,
+    ) {
         ObjectExt::set_property(
             self.as_ref(),
             "primary-icon-tooltip-text",
-            primary_icon_tooltip_text,
+            primary_icon_tooltip_text.into(),
         )
     }
 
@@ -1293,8 +1330,15 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "secondary-icon-gicon")]
-    fn set_secondary_icon_gicon<P: IsA<gio::Icon>>(&self, secondary_icon_gicon: Option<&P>) {
-        ObjectExt::set_property(self.as_ref(), "secondary-icon-gicon", secondary_icon_gicon)
+    fn set_secondary_icon_gicon<'a, P: IsA<gio::Icon>>(
+        &self,
+        secondary_icon_gicon: impl Into<Option<&'a P>>,
+    ) {
+        ObjectExt::set_property(
+            self.as_ref(),
+            "secondary-icon-gicon",
+            secondary_icon_gicon.into().as_ref().map(|p| p.as_ref()),
+        )
     }
 
     #[doc(alias = "secondary-icon-name")]
@@ -1303,8 +1347,12 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "secondary-icon-name")]
-    fn set_secondary_icon_name(&self, secondary_icon_name: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "secondary-icon-name", secondary_icon_name)
+    fn set_secondary_icon_name<'a>(&self, secondary_icon_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(
+            self.as_ref(),
+            "secondary-icon-name",
+            secondary_icon_name.into(),
+        )
     }
 
     #[doc(alias = "secondary-icon-paintable")]
@@ -1313,14 +1361,14 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "secondary-icon-paintable")]
-    fn set_secondary_icon_paintable<P: IsA<gdk::Paintable>>(
+    fn set_secondary_icon_paintable<'a, P: IsA<gdk::Paintable>>(
         &self,
-        secondary_icon_paintable: Option<&P>,
+        secondary_icon_paintable: impl Into<Option<&'a P>>,
     ) {
         ObjectExt::set_property(
             self.as_ref(),
             "secondary-icon-paintable",
-            secondary_icon_paintable,
+            secondary_icon_paintable.into().as_ref().map(|p| p.as_ref()),
         )
     }
 
@@ -1349,11 +1397,14 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "secondary-icon-tooltip-markup")]
-    fn set_secondary_icon_tooltip_markup(&self, secondary_icon_tooltip_markup: Option<&str>) {
+    fn set_secondary_icon_tooltip_markup<'a>(
+        &self,
+        secondary_icon_tooltip_markup: impl Into<Option<&'a str>>,
+    ) {
         ObjectExt::set_property(
             self.as_ref(),
             "secondary-icon-tooltip-markup",
-            secondary_icon_tooltip_markup,
+            secondary_icon_tooltip_markup.into(),
         )
     }
 
@@ -1363,11 +1414,14 @@ pub trait EntryExt: IsA<Entry> + 'static {
     }
 
     #[doc(alias = "secondary-icon-tooltip-text")]
-    fn set_secondary_icon_tooltip_text(&self, secondary_icon_tooltip_text: Option<&str>) {
+    fn set_secondary_icon_tooltip_text<'a>(
+        &self,
+        secondary_icon_tooltip_text: impl Into<Option<&'a str>>,
+    ) {
         ObjectExt::set_property(
             self.as_ref(),
             "secondary-icon-tooltip-text",
-            secondary_icon_tooltip_text,
+            secondary_icon_tooltip_text.into(),
         )
     }
 
diff --git a/gtk4/src/auto/entry_completion.rs b/gtk4/src/auto/entry_completion.rs
index 0a23ff711915..58c5496bed36 100644
--- a/gtk4/src/auto/entry_completion.rs
+++ b/gtk4/src/auto/entry_completion.rs
@@ -265,11 +265,11 @@ impl EntryCompletion {
     #[allow(deprecated)]
     #[doc(alias = "gtk_entry_completion_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<TreeModel>>) {
+    pub fn set_model<'a, P: IsA<TreeModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_entry_completion_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -686,7 +686,7 @@ impl EntryCompletionBuilder {
         Self {
             builder: self
                 .builder
-                .property("cell-area", cell_area.clone().upcast()),
+                .property("cell-area", cell_area.as_ref().clone()),
         }
     }
 
@@ -714,7 +714,7 @@ impl EntryCompletionBuilder {
 
     pub fn model(self, model: &impl IsA<TreeModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/event_controller.rs b/gtk4/src/auto/event_controller.rs
index b47e115db1c0..04914c7b68fa 100644
--- a/gtk4/src/auto/event_controller.rs
+++ b/gtk4/src/auto/event_controller.rs
@@ -111,11 +111,11 @@ pub trait EventControllerExt: IsA<EventController> + 'static {
 
     #[doc(alias = "gtk_event_controller_set_name")]
     #[doc(alias = "name")]
-    fn set_name(&self, name: Option<&str>) {
+    fn set_name<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_event_controller_set_name(
                 self.as_ref().to_glib_none().0,
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
             );
         }
     }
@@ -145,11 +145,11 @@ pub trait EventControllerExt: IsA<EventController> + 'static {
     #[cfg(feature = "v4_8")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
     #[doc(alias = "gtk_event_controller_set_static_name")]
-    fn set_static_name(&self, name: Option<&str>) {
+    fn set_static_name<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_event_controller_set_static_name(
                 self.as_ref().to_glib_none().0,
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/event_controller_key.rs b/gtk4/src/auto/event_controller_key.rs
index d6c2e38dcc10..b64af4bffa97 100644
--- a/gtk4/src/auto/event_controller_key.rs
+++ b/gtk4/src/auto/event_controller_key.rs
@@ -63,11 +63,16 @@ impl EventControllerKey {
     }
 
     #[doc(alias = "gtk_event_controller_key_set_im_context")]
-    pub fn set_im_context(&self, im_context: Option<&impl IsA<IMContext>>) {
+    pub fn set_im_context<'a, P: IsA<IMContext>>(&self, im_context: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_event_controller_key_set_im_context(
                 self.to_glib_none().0,
-                im_context.map(|p| p.as_ref()).to_glib_none().0,
+                im_context
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
diff --git a/gtk4/src/auto/expander.rs b/gtk4/src/auto/expander.rs
index d820ad69780f..38ef7ebff483 100644
--- a/gtk4/src/auto/expander.rs
+++ b/gtk4/src/auto/expander.rs
@@ -24,10 +24,11 @@ glib::wrapper! {
 
 impl Expander {
     #[doc(alias = "gtk_expander_new")]
-    pub fn new(label: Option<&str>) -> Expander {
+    pub fn new<'a>(label: impl Into<Option<&'a str>>) -> Expander {
         assert_initialized_main_thread!();
         unsafe {
-            Widget::from_glib_none(ffi::gtk_expander_new(label.to_glib_none().0)).unsafe_cast()
+            Widget::from_glib_none(ffi::gtk_expander_new(label.into().to_glib_none().0))
+                .unsafe_cast()
         }
     }
 
@@ -98,11 +99,11 @@ impl Expander {
 
     #[doc(alias = "gtk_expander_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_expander_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -117,19 +118,24 @@ impl Expander {
 
     #[doc(alias = "gtk_expander_set_label")]
     #[doc(alias = "label")]
-    pub fn set_label(&self, label: Option<&str>) {
+    pub fn set_label<'a>(&self, label: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_expander_set_label(self.to_glib_none().0, label.to_glib_none().0);
+            ffi::gtk_expander_set_label(self.to_glib_none().0, label.into().to_glib_none().0);
         }
     }
 
     #[doc(alias = "gtk_expander_set_label_widget")]
     #[doc(alias = "label-widget")]
-    pub fn set_label_widget(&self, label_widget: Option<&impl IsA<Widget>>) {
+    pub fn set_label_widget<'a, P: IsA<Widget>>(&self, label_widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_expander_set_label_widget(
                 self.to_glib_none().0,
-                label_widget.map(|p| p.as_ref()).to_glib_none().0,
+                label_widget
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -373,7 +379,7 @@ impl ExpanderBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -393,7 +399,7 @@ impl ExpanderBuilder {
         Self {
             builder: self
                 .builder
-                .property("label-widget", label_widget.clone().upcast()),
+                .property("label-widget", label_widget.as_ref().clone()),
         }
     }
 
@@ -491,7 +497,7 @@ impl ExpanderBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/expression.rs b/gtk4/src/auto/expression.rs
index a2d3fc6a8537..5b250840239f 100644
--- a/gtk4/src/auto/expression.rs
+++ b/gtk4/src/auto/expression.rs
@@ -26,18 +26,18 @@ impl Expression {
     pub const NONE: Option<&'static Expression> = None;
 
     #[doc(alias = "gtk_expression_bind")]
-    pub fn bind(
+    pub fn bind<'a, P: IsA<glib::Object>>(
         &self,
         target: &impl IsA<glib::Object>,
         property: &str,
-        this_: Option<&impl IsA<glib::Object>>,
+        this_: impl Into<Option<&'a P>>,
     ) -> ExpressionWatch {
         unsafe {
             from_glib_none(ffi::gtk_expression_bind(
                 self.as_ref().to_glib_full(),
                 target.as_ref().to_glib_none().0,
                 property.to_glib_none().0,
-                this_.map(|p| p.as_ref()).to_glib_none().0,
+                this_.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -62,26 +62,26 @@ impl Expression {
     }
 
     #[doc(alias = "gtk_expression_watch")]
-    pub fn watch<P: Fn() + 'static>(
+    pub fn watch<'a, P: IsA<glib::Object>, Q: Fn() + 'static>(
         &self,
-        this_: Option<&impl IsA<glib::Object>>,
-        notify: P,
+        this_: impl Into<Option<&'a P>>,
+        notify: Q,
     ) -> ExpressionWatch {
-        let notify_data: Box_<P> = Box_::new(notify);
-        unsafe extern "C" fn notify_func<P: Fn() + 'static>(user_data: glib::ffi::gpointer) {
-            let callback = &*(user_data as *mut P);
+        let notify_data: Box_<Q> = Box_::new(notify);
+        unsafe extern "C" fn notify_func<Q: Fn() + 'static>(user_data: glib::ffi::gpointer) {
+            let callback = &*(user_data as *mut Q);
             (*callback)()
         }
-        let notify = Some(notify_func::<P> as _);
-        unsafe extern "C" fn user_destroy_func<P: Fn() + 'static>(data: glib::ffi::gpointer) {
-            let _callback = Box_::from_raw(data as *mut P);
+        let notify = Some(notify_func::<Q> as _);
+        unsafe extern "C" fn user_destroy_func<Q: Fn() + 'static>(data: glib::ffi::gpointer) {
+            let _callback = Box_::from_raw(data as *mut Q);
         }
-        let destroy_call4 = Some(user_destroy_func::<P> as _);
-        let super_callback0: Box_<P> = notify_data;
+        let destroy_call4 = Some(user_destroy_func::<Q> as _);
+        let super_callback0: Box_<Q> = notify_data;
         unsafe {
             from_glib_none(ffi::gtk_expression_watch(
                 self.as_ref().to_glib_none().0,
-                this_.map(|p| p.as_ref()).to_glib_none().0,
+                this_.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 notify,
                 Box_::into_raw(super_callback0) as *mut _,
                 destroy_call4,
diff --git a/gtk4/src/auto/file_chooser_dialog.rs b/gtk4/src/auto/file_chooser_dialog.rs
index f8e17d75242d..7d6e227871ec 100644
--- a/gtk4/src/auto/file_chooser_dialog.rs
+++ b/gtk4/src/auto/file_chooser_dialog.rs
@@ -56,13 +56,13 @@ impl FileChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -82,7 +82,7 @@ impl FileChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -108,7 +108,7 @@ impl FileChooserDialogBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -122,7 +122,7 @@ impl FileChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -196,7 +196,7 @@ impl FileChooserDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -204,7 +204,7 @@ impl FileChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -284,7 +284,7 @@ impl FileChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/file_chooser_native.rs b/gtk4/src/auto/file_chooser_native.rs
index ae96b81c3143..737dbf44dbf7 100644
--- a/gtk4/src/auto/file_chooser_native.rs
+++ b/gtk4/src/auto/file_chooser_native.rs
@@ -24,21 +24,21 @@ impl FileChooserNative {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_file_chooser_native_new")]
-    pub fn new(
-        title: Option<&str>,
-        parent: Option<&impl IsA<Window>>,
+    pub fn new<'a, P: IsA<Window>>(
+        title: impl Into<Option<&'a str>>,
+        parent: impl Into<Option<&'a P>>,
         action: FileChooserAction,
-        accept_label: Option<&str>,
-        cancel_label: Option<&str>,
+        accept_label: impl Into<Option<&'a str>>,
+        cancel_label: impl Into<Option<&'a str>>,
     ) -> FileChooserNative {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_file_chooser_native_new(
-                title.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                title.into().to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 action.into_glib(),
-                accept_label.to_glib_none().0,
-                cancel_label.to_glib_none().0,
+                accept_label.into().to_glib_none().0,
+                cancel_label.into().to_glib_none().0,
             ))
         }
     }
@@ -81,11 +81,11 @@ impl FileChooserNative {
     #[allow(deprecated)]
     #[doc(alias = "gtk_file_chooser_native_set_accept_label")]
     #[doc(alias = "accept-label")]
-    pub fn set_accept_label(&self, accept_label: Option<&str>) {
+    pub fn set_accept_label<'a>(&self, accept_label: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_file_chooser_native_set_accept_label(
                 self.to_glib_none().0,
-                accept_label.to_glib_none().0,
+                accept_label.into().to_glib_none().0,
             );
         }
     }
@@ -94,11 +94,11 @@ impl FileChooserNative {
     #[allow(deprecated)]
     #[doc(alias = "gtk_file_chooser_native_set_cancel_label")]
     #[doc(alias = "cancel-label")]
-    pub fn set_cancel_label(&self, cancel_label: Option<&str>) {
+    pub fn set_cancel_label<'a>(&self, cancel_label: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_file_chooser_native_set_cancel_label(
                 self.to_glib_none().0,
-                cancel_label.to_glib_none().0,
+                cancel_label.into().to_glib_none().0,
             );
         }
     }
@@ -200,7 +200,7 @@ impl FileChooserNativeBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/file_chooser_widget.rs b/gtk4/src/auto/file_chooser_widget.rs
index 71aec3ed0a21..ba2cd931ce1f 100644
--- a/gtk4/src/auto/file_chooser_widget.rs
+++ b/gtk4/src/auto/file_chooser_widget.rs
@@ -563,7 +563,7 @@ impl FileChooserWidgetBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/file_dialog.rs b/gtk4/src/auto/file_dialog.rs
index 644e88fb25fd..14976f365d14 100644
--- a/gtk4/src/auto/file_dialog.rs
+++ b/gtk4/src/auto/file_dialog.rs
@@ -97,11 +97,16 @@ impl FileDialog {
     }
 
     #[doc(alias = "gtk_file_dialog_open")]
-    pub fn open<P: FnOnce(Result<gio::File, glib::Error>) + 'static>(
+    pub fn open<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<gio::File, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -113,10 +118,10 @@ impl FileDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn open_trampoline<
-            P: FnOnce(Result<gio::File, glib::Error>) + 'static,
+            R: FnOnce(Result<gio::File, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -129,28 +134,33 @@ impl FileDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = open_trampoline::<P>;
+        let callback = open_trampoline::<R>;
         unsafe {
             ffi::gtk_file_dialog_open(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn open_future(
+    pub fn open_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<gio::File, glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.open(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -163,11 +173,16 @@ impl FileDialog {
     }
 
     #[doc(alias = "gtk_file_dialog_open_multiple")]
-    pub fn open_multiple<P: FnOnce(Result<gio::ListModel, glib::Error>) + 'static>(
+    pub fn open_multiple<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<gio::ListModel, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -179,10 +194,10 @@ impl FileDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn open_multiple_trampoline<
-            P: FnOnce(Result<gio::ListModel, glib::Error>) + 'static,
+            R: FnOnce(Result<gio::ListModel, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -199,29 +214,34 @@ impl FileDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = open_multiple_trampoline::<P>;
+        let callback = open_multiple_trampoline::<R>;
         unsafe {
             ffi::gtk_file_dialog_open_multiple(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn open_multiple_future(
+    pub fn open_multiple_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<gio::ListModel, glib::Error>> + 'static>>
     {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.open_multiple(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -234,11 +254,16 @@ impl FileDialog {
     }
 
     #[doc(alias = "gtk_file_dialog_save")]
-    pub fn save<P: FnOnce(Result<gio::File, glib::Error>) + 'static>(
+    pub fn save<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<gio::File, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -250,10 +275,10 @@ impl FileDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn save_trampoline<
-            P: FnOnce(Result<gio::File, glib::Error>) + 'static,
+            R: FnOnce(Result<gio::File, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -266,28 +291,33 @@ impl FileDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = save_trampoline::<P>;
+        let callback = save_trampoline::<R>;
         unsafe {
             ffi::gtk_file_dialog_save(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn save_future(
+    pub fn save_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<gio::File, glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.save(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -300,11 +330,16 @@ impl FileDialog {
     }
 
     #[doc(alias = "gtk_file_dialog_select_folder")]
-    pub fn select_folder<P: FnOnce(Result<gio::File, glib::Error>) + 'static>(
+    pub fn select_folder<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<gio::File, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -316,10 +351,10 @@ impl FileDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn select_folder_trampoline<
-            P: FnOnce(Result<gio::File, glib::Error>) + 'static,
+            R: FnOnce(Result<gio::File, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -336,28 +371,33 @@ impl FileDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = select_folder_trampoline::<P>;
+        let callback = select_folder_trampoline::<R>;
         unsafe {
             ffi::gtk_file_dialog_select_folder(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn select_folder_future(
+    pub fn select_folder_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<gio::File, glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.select_folder(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -370,11 +410,16 @@ impl FileDialog {
     }
 
     #[doc(alias = "gtk_file_dialog_select_multiple_folders")]
-    pub fn select_multiple_folders<P: FnOnce(Result<gio::ListModel, glib::Error>) + 'static>(
+    pub fn select_multiple_folders<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<gio::ListModel, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -386,10 +431,10 @@ impl FileDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn select_multiple_folders_trampoline<
-            P: FnOnce(Result<gio::ListModel, glib::Error>) + 'static,
+            R: FnOnce(Result<gio::ListModel, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -406,29 +451,34 @@ impl FileDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = select_multiple_folders_trampoline::<P>;
+        let callback = select_multiple_folders_trampoline::<R>;
         unsafe {
             ffi::gtk_file_dialog_select_multiple_folders(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn select_multiple_folders_future(
+    pub fn select_multiple_folders_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<gio::ListModel, glib::Error>> + 'static>>
     {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.select_multiple_folders(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -442,61 +492,67 @@ impl FileDialog {
 
     #[doc(alias = "gtk_file_dialog_set_accept_label")]
     #[doc(alias = "accept-label")]
-    pub fn set_accept_label(&self, accept_label: Option<&str>) {
+    pub fn set_accept_label<'a>(&self, accept_label: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_file_dialog_set_accept_label(
                 self.to_glib_none().0,
-                accept_label.to_glib_none().0,
+                accept_label.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_file_dialog_set_default_filter")]
     #[doc(alias = "default-filter")]
-    pub fn set_default_filter(&self, filter: Option<&FileFilter>) {
+    pub fn set_default_filter<'a>(&self, filter: impl Into<Option<&'a FileFilter>>) {
         unsafe {
-            ffi::gtk_file_dialog_set_default_filter(self.to_glib_none().0, filter.to_glib_none().0);
+            ffi::gtk_file_dialog_set_default_filter(
+                self.to_glib_none().0,
+                filter.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_file_dialog_set_filters")]
     #[doc(alias = "filters")]
-    pub fn set_filters(&self, filters: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_filters<'a, P: IsA<gio::ListModel>>(&self, filters: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_file_dialog_set_filters(
                 self.to_glib_none().0,
-                filters.map(|p| p.as_ref()).to_glib_none().0,
+                filters.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_file_dialog_set_initial_file")]
     #[doc(alias = "initial-file")]
-    pub fn set_initial_file(&self, file: Option<&impl IsA<gio::File>>) {
+    pub fn set_initial_file<'a, P: IsA<gio::File>>(&self, file: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_file_dialog_set_initial_file(
                 self.to_glib_none().0,
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_file_dialog_set_initial_folder")]
     #[doc(alias = "initial-folder")]
-    pub fn set_initial_folder(&self, folder: Option<&impl IsA<gio::File>>) {
+    pub fn set_initial_folder<'a, P: IsA<gio::File>>(&self, folder: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_file_dialog_set_initial_folder(
                 self.to_glib_none().0,
-                folder.map(|p| p.as_ref()).to_glib_none().0,
+                folder.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_file_dialog_set_initial_name")]
     #[doc(alias = "initial-name")]
-    pub fn set_initial_name(&self, name: Option<&str>) {
+    pub fn set_initial_name<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_file_dialog_set_initial_name(self.to_glib_none().0, name.to_glib_none().0);
+            ffi::gtk_file_dialog_set_initial_name(
+                self.to_glib_none().0,
+                name.into().to_glib_none().0,
+            );
         }
     }
 
@@ -763,7 +819,7 @@ impl FileDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))]
     pub fn filters(self, filters: &impl IsA<gio::ListModel>) -> Self {
         Self {
-            builder: self.builder.property("filters", filters.clone().upcast()),
+            builder: self.builder.property("filters", filters.as_ref().clone()),
         }
     }
 
@@ -773,7 +829,7 @@ impl FileDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("initial-file", initial_file.clone().upcast()),
+                .property("initial-file", initial_file.as_ref().clone()),
         }
     }
 
@@ -783,7 +839,7 @@ impl FileDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("initial-folder", initial_folder.clone().upcast()),
+                .property("initial-folder", initial_folder.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/file_filter.rs b/gtk4/src/auto/file_filter.rs
index f82e45efaef8..0d5308987fe0 100644
--- a/gtk4/src/auto/file_filter.rs
+++ b/gtk4/src/auto/file_filter.rs
@@ -85,9 +85,9 @@ impl FileFilter {
 
     #[doc(alias = "gtk_file_filter_set_name")]
     #[doc(alias = "name")]
-    pub fn set_name(&self, name: Option<&str>) {
+    pub fn set_name<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_file_filter_set_name(self.to_glib_none().0, name.to_glib_none().0);
+            ffi::gtk_file_filter_set_name(self.to_glib_none().0, name.into().to_glib_none().0);
         }
     }
 
diff --git a/gtk4/src/auto/file_launcher.rs b/gtk4/src/auto/file_launcher.rs
index 826324709d6c..aa56423fa7dc 100644
--- a/gtk4/src/auto/file_launcher.rs
+++ b/gtk4/src/auto/file_launcher.rs
@@ -21,11 +21,11 @@ glib::wrapper! {
 
 impl FileLauncher {
     #[doc(alias = "gtk_file_launcher_new")]
-    pub fn new(file: Option<&impl IsA<gio::File>>) -> FileLauncher {
+    pub fn new<'a, P: IsA<gio::File>>(file: impl Into<Option<&'a P>>) -> FileLauncher {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_file_launcher_new(
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -55,11 +55,16 @@ impl FileLauncher {
     }
 
     #[doc(alias = "gtk_file_launcher_launch")]
-    pub fn launch<P: FnOnce(Result<(), glib::Error>) + 'static>(
+    pub fn launch<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<(), glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -71,9 +76,9 @@ impl FileLauncher {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
-        unsafe extern "C" fn launch_trampoline<P: FnOnce(Result<(), glib::Error>) + 'static>(
+        unsafe extern "C" fn launch_trampoline<R: FnOnce(Result<(), glib::Error>) + 'static>(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
             user_data: glib::ffi::gpointer,
@@ -85,28 +90,33 @@ impl FileLauncher {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = launch_trampoline::<P>;
+        let callback = launch_trampoline::<R>;
         unsafe {
             ffi::gtk_file_launcher_launch(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn launch_future(
+    pub fn launch_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.launch(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -119,11 +129,16 @@ impl FileLauncher {
     }
 
     #[doc(alias = "gtk_file_launcher_open_containing_folder")]
-    pub fn open_containing_folder<P: FnOnce(Result<(), glib::Error>) + 'static>(
+    pub fn open_containing_folder<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<(), glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -135,10 +150,10 @@ impl FileLauncher {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn open_containing_folder_trampoline<
-            P: FnOnce(Result<(), glib::Error>) + 'static,
+            R: FnOnce(Result<(), glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -155,28 +170,33 @@ impl FileLauncher {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = open_containing_folder_trampoline::<P>;
+        let callback = open_containing_folder_trampoline::<R>;
         unsafe {
             ffi::gtk_file_launcher_open_containing_folder(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn open_containing_folder_future(
+    pub fn open_containing_folder_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.open_containing_folder(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -200,11 +220,11 @@ impl FileLauncher {
 
     #[doc(alias = "gtk_file_launcher_set_file")]
     #[doc(alias = "file")]
-    pub fn set_file(&self, file: Option<&impl IsA<gio::File>>) {
+    pub fn set_file<'a, P: IsA<gio::File>>(&self, file: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_file_launcher_set_file(
                 self.to_glib_none().0,
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/filter_list_model.rs b/gtk4/src/auto/filter_list_model.rs
index 1c99888971e2..cfd892fe0a22 100644
--- a/gtk4/src/auto/filter_list_model.rs
+++ b/gtk4/src/auto/filter_list_model.rs
@@ -88,11 +88,11 @@ impl FilterListModel {
 
     #[doc(alias = "gtk_filter_list_model_set_filter")]
     #[doc(alias = "filter")]
-    pub fn set_filter(&self, filter: Option<&impl IsA<Filter>>) {
+    pub fn set_filter<'a, P: IsA<Filter>>(&self, filter: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_filter_list_model_set_filter(
                 self.to_glib_none().0,
-                filter.map(|p| p.as_ref()).to_glib_none().0,
+                filter.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -110,11 +110,11 @@ impl FilterListModel {
 
     #[doc(alias = "gtk_filter_list_model_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_filter_list_model_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -236,7 +236,7 @@ impl FilterListModelBuilder {
 
     pub fn filter(self, filter: &impl IsA<Filter>) -> Self {
         Self {
-            builder: self.builder.property("filter", filter.clone().upcast()),
+            builder: self.builder.property("filter", filter.as_ref().clone()),
         }
     }
 
@@ -248,7 +248,7 @@ impl FilterListModelBuilder {
 
     pub fn model(self, model: &impl IsA<gio::ListModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/fixed.rs b/gtk4/src/auto/fixed.rs
index dda22bb3bdfd..1b72467c5f6d 100644
--- a/gtk4/src/auto/fixed.rs
+++ b/gtk4/src/auto/fixed.rs
@@ -133,7 +133,7 @@ impl FixedBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -314,12 +314,16 @@ pub trait FixedExt: IsA<Fixed> + 'static {
     }
 
     #[doc(alias = "gtk_fixed_set_child_transform")]
-    fn set_child_transform(&self, widget: &impl IsA<Widget>, transform: Option<&gsk::Transform>) {
+    fn set_child_transform<'a>(
+        &self,
+        widget: &impl IsA<Widget>,
+        transform: impl Into<Option<&'a gsk::Transform>>,
+    ) {
         unsafe {
             ffi::gtk_fixed_set_child_transform(
                 self.as_ref().to_glib_none().0,
                 widget.as_ref().to_glib_none().0,
-                transform.to_glib_none().0,
+                transform.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/flatten_list_model.rs b/gtk4/src/auto/flatten_list_model.rs
index eb2a60333cac..7d588edbbd79 100644
--- a/gtk4/src/auto/flatten_list_model.rs
+++ b/gtk4/src/auto/flatten_list_model.rs
@@ -64,11 +64,11 @@ impl FlattenListModel {
 
     #[doc(alias = "gtk_flatten_list_model_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_flatten_list_model_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/flow_box.rs b/gtk4/src/auto/flow_box.rs
index d3d46e052005..b9abed3ff630 100644
--- a/gtk4/src/auto/flow_box.rs
+++ b/gtk4/src/auto/flow_box.rs
@@ -47,32 +47,32 @@ impl FlowBox {
     }
 
     #[doc(alias = "gtk_flow_box_bind_model")]
-    pub fn bind_model<P: Fn(&glib::Object) -> Widget + 'static>(
+    pub fn bind_model<'a, P: IsA<gio::ListModel>, Q: Fn(&glib::Object) -> Widget + 'static>(
         &self,
-        model: Option<&impl IsA<gio::ListModel>>,
-        create_widget_func: P,
+        model: impl Into<Option<&'a P>>,
+        create_widget_func: Q,
     ) {
-        let create_widget_func_data: Box_<P> = Box_::new(create_widget_func);
-        unsafe extern "C" fn create_widget_func_func<P: Fn(&glib::Object) -> Widget + 'static>(
+        let create_widget_func_data: Box_<Q> = Box_::new(create_widget_func);
+        unsafe extern "C" fn create_widget_func_func<Q: Fn(&glib::Object) -> Widget + 'static>(
             item: *mut glib::gobject_ffi::GObject,
             user_data: glib::ffi::gpointer,
         ) -> *mut ffi::GtkWidget {
             let item = from_glib_borrow(item);
-            let callback = &*(user_data as *mut P);
+            let callback = &*(user_data as *mut Q);
             (*callback)(&item).to_glib_full()
         }
-        let create_widget_func = Some(create_widget_func_func::<P> as _);
-        unsafe extern "C" fn user_data_free_func_func<P: Fn(&glib::Object) -> Widget + 'static>(
+        let create_widget_func = Some(create_widget_func_func::<Q> as _);
+        unsafe extern "C" fn user_data_free_func_func<Q: Fn(&glib::Object) -> Widget + 'static>(
             data: glib::ffi::gpointer,
         ) {
-            let _callback = Box_::from_raw(data as *mut P);
+            let _callback = Box_::from_raw(data as *mut Q);
         }
-        let destroy_call4 = Some(user_data_free_func_func::<P> as _);
-        let super_callback0: Box_<P> = create_widget_func_data;
+        let destroy_call4 = Some(user_data_free_func_func::<Q> as _);
+        let super_callback0: Box_<Q> = create_widget_func_data;
         unsafe {
             ffi::gtk_flow_box_bind_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 create_widget_func,
                 Box_::into_raw(super_callback0) as *mut _,
                 destroy_call4,
@@ -949,7 +949,7 @@ impl FlowBoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/flow_box_child.rs b/gtk4/src/auto/flow_box_child.rs
index 00254447d3c7..9bd447d6a2f5 100644
--- a/gtk4/src/auto/flow_box_child.rs
+++ b/gtk4/src/auto/flow_box_child.rs
@@ -64,7 +64,7 @@ impl FlowBoxChildBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -144,7 +144,7 @@ impl FlowBoxChildBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -296,11 +296,11 @@ pub trait FlowBoxChildExt: IsA<FlowBoxChild> + 'static {
 
     #[doc(alias = "gtk_flow_box_child_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_flow_box_child_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/font_button.rs b/gtk4/src/auto/font_button.rs
index d9e15d4c57f4..e3e74a331c33 100644
--- a/gtk4/src/auto/font_button.rs
+++ b/gtk4/src/auto/font_button.rs
@@ -396,7 +396,7 @@ impl FontButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/font_chooser.rs b/gtk4/src/auto/font_chooser.rs
index 2ec48f0bca44..3bcd0b7471c3 100644
--- a/gtk4/src/auto/font_chooser.rs
+++ b/gtk4/src/auto/font_chooser.rs
@@ -226,11 +226,11 @@ pub trait FontChooserExt: IsA<FontChooser> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_font_chooser_set_font_map")]
-    fn set_font_map(&self, fontmap: Option<&impl IsA<pango::FontMap>>) {
+    fn set_font_map<'a, P: IsA<pango::FontMap>>(&self, fontmap: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_font_chooser_set_font_map(
                 self.as_ref().to_glib_none().0,
-                fontmap.map(|p| p.as_ref()).to_glib_none().0,
+                fontmap.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/font_chooser_dialog.rs b/gtk4/src/auto/font_chooser_dialog.rs
index 8b8952000881..6d4022401ee5 100644
--- a/gtk4/src/auto/font_chooser_dialog.rs
+++ b/gtk4/src/auto/font_chooser_dialog.rs
@@ -23,12 +23,15 @@ impl FontChooserDialog {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_font_chooser_dialog_new")]
-    pub fn new(title: Option<&str>, parent: Option<&impl IsA<Window>>) -> FontChooserDialog {
+    pub fn new<'a, P: IsA<Window>>(
+        title: impl Into<Option<&'a str>>,
+        parent: impl Into<Option<&'a P>>,
+    ) -> FontChooserDialog {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_font_chooser_dialog_new(
-                title.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                title.into().to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -76,13 +79,13 @@ impl FontChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -102,7 +105,7 @@ impl FontChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -128,7 +131,7 @@ impl FontChooserDialogBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -142,7 +145,7 @@ impl FontChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -216,7 +219,7 @@ impl FontChooserDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -224,7 +227,7 @@ impl FontChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -304,7 +307,7 @@ impl FontChooserDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/font_chooser_widget.rs b/gtk4/src/auto/font_chooser_widget.rs
index b3676506a355..fa84b83bca0c 100644
--- a/gtk4/src/auto/font_chooser_widget.rs
+++ b/gtk4/src/auto/font_chooser_widget.rs
@@ -167,7 +167,7 @@ impl FontChooserWidgetBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/font_dialog.rs b/gtk4/src/auto/font_dialog.rs
index 2b24e8cf1ab8..7dbc1590b891 100644
--- a/gtk4/src/auto/font_dialog.rs
+++ b/gtk4/src/auto/font_dialog.rs
@@ -35,12 +35,18 @@ impl FontDialog {
     }
 
     #[doc(alias = "gtk_font_dialog_choose_face")]
-    pub fn choose_face<P: FnOnce(Result<pango::FontFace, glib::Error>) + 'static>(
+    pub fn choose_face<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<pango::FontFace>,
+        R: IsA<gio::Cancellable>,
+        S: FnOnce(Result<pango::FontFace, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        initial_value: Option<&impl IsA<pango::FontFace>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        initial_value: impl Into<Option<&'a Q>>,
+        cancellable: impl Into<Option<&'a R>>,
+        callback: S,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -52,10 +58,10 @@ impl FontDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<S>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn choose_face_trampoline<
-            P: FnOnce(Result<pango::FontFace, glib::Error>) + 'static,
+            S: FnOnce(Result<pango::FontFace, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -69,32 +75,46 @@ impl FontDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<S>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: S = callback.into_inner();
             callback(result);
         }
-        let callback = choose_face_trampoline::<P>;
+        let callback = choose_face_trampoline::<S>;
         unsafe {
             ffi::gtk_font_dialog_choose_face(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                initial_value.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                initial_value
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn choose_face_future(
+    pub fn choose_face_future<
+        'a,
+        P: IsA<Window> + Clone + 'static,
+        Q: IsA<pango::FontFace> + Clone + 'static,
+    >(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
-        initial_value: Option<&(impl IsA<pango::FontFace> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
+        initial_value: impl Into<Option<&'a Q>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<pango::FontFace, glib::Error>> + 'static>>
     {
-        let parent = parent.map(ToOwned::to_owned);
-        let initial_value = initial_value.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
+        let initial_value = initial_value.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.choose_face(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -108,12 +128,18 @@ impl FontDialog {
     }
 
     #[doc(alias = "gtk_font_dialog_choose_family")]
-    pub fn choose_family<P: FnOnce(Result<pango::FontFamily, glib::Error>) + 'static>(
+    pub fn choose_family<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<pango::FontFamily>,
+        R: IsA<gio::Cancellable>,
+        S: FnOnce(Result<pango::FontFamily, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        initial_value: Option<&impl IsA<pango::FontFamily>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        initial_value: impl Into<Option<&'a Q>>,
+        cancellable: impl Into<Option<&'a R>>,
+        callback: S,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -125,10 +151,10 @@ impl FontDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<S>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn choose_family_trampoline<
-            P: FnOnce(Result<pango::FontFamily, glib::Error>) + 'static,
+            S: FnOnce(Result<pango::FontFamily, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -145,32 +171,46 @@ impl FontDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<S>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: S = callback.into_inner();
             callback(result);
         }
-        let callback = choose_family_trampoline::<P>;
+        let callback = choose_family_trampoline::<S>;
         unsafe {
             ffi::gtk_font_dialog_choose_family(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                initial_value.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                initial_value
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn choose_family_future(
+    pub fn choose_family_future<
+        'a,
+        P: IsA<Window> + Clone + 'static,
+        Q: IsA<pango::FontFamily> + Clone + 'static,
+    >(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
-        initial_value: Option<&(impl IsA<pango::FontFamily> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
+        initial_value: impl Into<Option<&'a Q>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<pango::FontFamily, glib::Error>> + 'static>>
     {
-        let parent = parent.map(ToOwned::to_owned);
-        let initial_value = initial_value.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
+        let initial_value = initial_value.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.choose_family(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -184,12 +224,17 @@ impl FontDialog {
     }
 
     #[doc(alias = "gtk_font_dialog_choose_font")]
-    pub fn choose_font<P: FnOnce(Result<pango::FontDescription, glib::Error>) + 'static>(
+    pub fn choose_font<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<pango::FontDescription, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        initial_value: Option<&pango::FontDescription>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        initial_value: impl Into<Option<&'a pango::FontDescription>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -201,10 +246,10 @@ impl FontDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn choose_font_trampoline<
-            P: FnOnce(Result<pango::FontDescription, glib::Error>) + 'static,
+            R: FnOnce(Result<pango::FontDescription, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -218,35 +263,40 @@ impl FontDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = choose_font_trampoline::<P>;
+        let callback = choose_font_trampoline::<R>;
         unsafe {
             ffi::gtk_font_dialog_choose_font(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                mut_override(initial_value.to_glib_none().0),
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                mut_override(initial_value.into().to_glib_none().0),
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn choose_font_future(
+    pub fn choose_font_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
-        initial_value: Option<&pango::FontDescription>,
+        parent: impl Into<Option<&'a P>>,
+        initial_value: impl Into<Option<&'a pango::FontDescription>>,
     ) -> Pin<
         Box_<
             dyn std::future::Future<Output = Result<pango::FontDescription, glib::Error>> + 'static,
         >,
     > {
-        let parent = parent.map(ToOwned::to_owned);
-        let initial_value = initial_value.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
+        let initial_value = initial_value.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.choose_font(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -293,22 +343,22 @@ impl FontDialog {
 
     #[doc(alias = "gtk_font_dialog_set_filter")]
     #[doc(alias = "filter")]
-    pub fn set_filter(&self, filter: Option<&impl IsA<Filter>>) {
+    pub fn set_filter<'a, P: IsA<Filter>>(&self, filter: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_font_dialog_set_filter(
                 self.to_glib_none().0,
-                filter.map(|p| p.as_ref()).to_glib_none().0,
+                filter.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_font_dialog_set_font_map")]
     #[doc(alias = "font-map")]
-    pub fn set_font_map(&self, fontmap: Option<&impl IsA<pango::FontMap>>) {
+    pub fn set_font_map<'a, P: IsA<pango::FontMap>>(&self, fontmap: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_font_dialog_set_font_map(
                 self.to_glib_none().0,
-                fontmap.map(|p| p.as_ref()).to_glib_none().0,
+                fontmap.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -494,7 +544,7 @@ impl FontDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))]
     pub fn filter(self, filter: &impl IsA<Filter>) -> Self {
         Self {
-            builder: self.builder.property("filter", filter.clone().upcast()),
+            builder: self.builder.property("filter", filter.as_ref().clone()),
         }
     }
 
@@ -502,7 +552,7 @@ impl FontDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))]
     pub fn font_map(self, font_map: &impl IsA<pango::FontMap>) -> Self {
         Self {
-            builder: self.builder.property("font-map", font_map.clone().upcast()),
+            builder: self.builder.property("font-map", font_map.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/font_dialog_button.rs b/gtk4/src/auto/font_dialog_button.rs
index 3f2fab378661..7204256c7b7b 100644
--- a/gtk4/src/auto/font_dialog_button.rs
+++ b/gtk4/src/auto/font_dialog_button.rs
@@ -131,22 +131,22 @@ impl FontDialogButton {
 
     #[doc(alias = "gtk_font_dialog_button_set_font_features")]
     #[doc(alias = "font-features")]
-    pub fn set_font_features(&self, font_features: Option<&str>) {
+    pub fn set_font_features<'a>(&self, font_features: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_font_dialog_button_set_font_features(
                 self.to_glib_none().0,
-                font_features.to_glib_none().0,
+                font_features.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_font_dialog_button_set_language")]
     #[doc(alias = "language")]
-    pub fn set_language(&self, language: Option<&pango::Language>) {
+    pub fn set_language<'a>(&self, language: impl Into<Option<&'a pango::Language>>) {
         unsafe {
             ffi::gtk_font_dialog_button_set_language(
                 self.to_glib_none().0,
-                mut_override(language.to_glib_none().0),
+                mut_override(language.into().to_glib_none().0),
             );
         }
     }
@@ -565,7 +565,7 @@ impl FontDialogButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/frame.rs b/gtk4/src/auto/frame.rs
index 194fdc61cc1e..e9e7f43f04cd 100644
--- a/gtk4/src/auto/frame.rs
+++ b/gtk4/src/auto/frame.rs
@@ -26,9 +26,11 @@ impl Frame {
     pub const NONE: Option<&'static Frame> = None;
 
     #[doc(alias = "gtk_frame_new")]
-    pub fn new(label: Option<&str>) -> Frame {
+    pub fn new<'a>(label: impl Into<Option<&'a str>>) -> Frame {
         assert_initialized_main_thread!();
-        unsafe { Widget::from_glib_none(ffi::gtk_frame_new(label.to_glib_none().0)).unsafe_cast() }
+        unsafe {
+            Widget::from_glib_none(ffi::gtk_frame_new(label.into().to_glib_none().0)).unsafe_cast()
+        }
     }
 
     // rustdoc-stripper-ignore-next
@@ -64,7 +66,7 @@ impl FrameBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -78,7 +80,7 @@ impl FrameBuilder {
         Self {
             builder: self
                 .builder
-                .property("label-widget", label_widget.clone().upcast()),
+                .property("label-widget", label_widget.as_ref().clone()),
         }
     }
 
@@ -164,7 +166,7 @@ impl FrameBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -314,20 +316,23 @@ pub trait FrameExt: IsA<Frame> + 'static {
 
     #[doc(alias = "gtk_frame_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_frame_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_frame_set_label")]
     #[doc(alias = "label")]
-    fn set_label(&self, label: Option<&str>) {
+    fn set_label<'a>(&self, label: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_frame_set_label(self.as_ref().to_glib_none().0, label.to_glib_none().0);
+            ffi::gtk_frame_set_label(
+                self.as_ref().to_glib_none().0,
+                label.into().to_glib_none().0,
+            );
         }
     }
 
@@ -341,11 +346,16 @@ pub trait FrameExt: IsA<Frame> + 'static {
 
     #[doc(alias = "gtk_frame_set_label_widget")]
     #[doc(alias = "label-widget")]
-    fn set_label_widget(&self, label_widget: Option<&impl IsA<Widget>>) {
+    fn set_label_widget<'a, P: IsA<Widget>>(&self, label_widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_frame_set_label_widget(
                 self.as_ref().to_glib_none().0,
-                label_widget.map(|p| p.as_ref()).to_glib_none().0,
+                label_widget
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
diff --git a/gtk4/src/auto/functions.rs b/gtk4/src/auto/functions.rs
index 79a31b2ec186..e8f7edd68384 100644
--- a/gtk4/src/auto/functions.rs
+++ b/gtk4/src/auto/functions.rs
@@ -149,44 +149,48 @@ pub fn hsv_to_rgb(h: f32, s: f32, v: f32) -> (f32, f32, f32) {
 }
 
 #[doc(alias = "gtk_print_run_page_setup_dialog")]
-pub fn print_run_page_setup_dialog(
-    parent: Option<&impl IsA<Window>>,
-    page_setup: Option<&PageSetup>,
+pub fn print_run_page_setup_dialog<'a, P: IsA<Window>>(
+    parent: impl Into<Option<&'a P>>,
+    page_setup: impl Into<Option<&'a PageSetup>>,
     settings: &PrintSettings,
 ) -> PageSetup {
     skip_assert_initialized!();
     unsafe {
         from_glib_full(ffi::gtk_print_run_page_setup_dialog(
-            parent.map(|p| p.as_ref()).to_glib_none().0,
-            page_setup.to_glib_none().0,
+            parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+            page_setup.into().to_glib_none().0,
             settings.to_glib_none().0,
         ))
     }
 }
 
 #[doc(alias = "gtk_print_run_page_setup_dialog_async")]
-pub fn print_run_page_setup_dialog_async<P: FnOnce(&PageSetup) + Send + Sync + 'static>(
-    parent: Option<&impl IsA<Window>>,
-    page_setup: Option<&PageSetup>,
+pub fn print_run_page_setup_dialog_async<
+    'a,
+    P: IsA<Window>,
+    Q: FnOnce(&PageSetup) + Send + Sync + 'static,
+>(
+    parent: impl Into<Option<&'a P>>,
+    page_setup: impl Into<Option<&'a PageSetup>>,
     settings: &PrintSettings,
-    done_cb: P,
+    done_cb: Q,
 ) {
     skip_assert_initialized!();
-    let done_cb_data: Box_<P> = Box_::new(done_cb);
-    unsafe extern "C" fn done_cb_func<P: FnOnce(&PageSetup) + Send + Sync + 'static>(
+    let done_cb_data: Box_<Q> = Box_::new(done_cb);
+    unsafe extern "C" fn done_cb_func<Q: FnOnce(&PageSetup) + Send + Sync + 'static>(
         page_setup: *mut ffi::GtkPageSetup,
         data: glib::ffi::gpointer,
     ) {
         let page_setup = from_glib_borrow(page_setup);
-        let callback = Box_::from_raw(data as *mut P);
+        let callback = Box_::from_raw(data as *mut Q);
         (*callback)(&page_setup)
     }
-    let done_cb = Some(done_cb_func::<P> as _);
-    let super_callback0: Box_<P> = done_cb_data;
+    let done_cb = Some(done_cb_func::<Q> as _);
+    let super_callback0: Box_<Q> = done_cb_data;
     unsafe {
         ffi::gtk_print_run_page_setup_dialog_async(
-            parent.map(|p| p.as_ref()).to_glib_none().0,
-            page_setup.to_glib_none().0,
+            parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+            page_setup.into().to_glib_none().0,
             settings.to_glib_none().0,
             done_cb,
             Box_::into_raw(super_callback0) as *mut _,
@@ -501,11 +505,11 @@ pub fn set_debug_flags(flags: DebugFlags) {
 #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
 #[allow(deprecated)]
 #[doc(alias = "gtk_show_uri")]
-pub fn show_uri(parent: Option<&impl IsA<Window>>, uri: &str, timestamp: u32) {
+pub fn show_uri<'a, P: IsA<Window>>(parent: impl Into<Option<&'a P>>, uri: &str, timestamp: u32) {
     assert_initialized_main_thread!();
     unsafe {
         ffi::gtk_show_uri(
-            parent.map(|p| p.as_ref()).to_glib_none().0,
+            parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             uri.to_glib_none().0,
             timestamp,
         );
diff --git a/gtk4/src/auto/gesture.rs b/gtk4/src/auto/gesture.rs
index 061d51cf4d71..54af20785747 100644
--- a/gtk4/src/auto/gesture.rs
+++ b/gtk4/src/auto/gesture.rs
@@ -79,11 +79,14 @@ pub trait GestureExt: IsA<Gesture> + 'static {
 
     #[doc(alias = "gtk_gesture_get_last_event")]
     #[doc(alias = "get_last_event")]
-    fn last_event(&self, sequence: Option<&gdk::EventSequence>) -> Option<gdk::Event> {
+    fn last_event<'a>(
+        &self,
+        sequence: impl Into<Option<&'a gdk::EventSequence>>,
+    ) -> Option<gdk::Event> {
         unsafe {
             from_glib_none(ffi::gtk_gesture_get_last_event(
                 self.as_ref().to_glib_none().0,
-                mut_override(sequence.to_glib_none().0),
+                mut_override(sequence.into().to_glib_none().0),
             ))
         }
     }
@@ -100,13 +103,13 @@ pub trait GestureExt: IsA<Gesture> + 'static {
 
     #[doc(alias = "gtk_gesture_get_point")]
     #[doc(alias = "get_point")]
-    fn point(&self, sequence: Option<&gdk::EventSequence>) -> Option<(f64, f64)> {
+    fn point<'a>(&self, sequence: impl Into<Option<&'a gdk::EventSequence>>) -> Option<(f64, f64)> {
         unsafe {
             let mut x = std::mem::MaybeUninit::uninit();
             let mut y = std::mem::MaybeUninit::uninit();
             let ret = from_glib(ffi::gtk_gesture_get_point(
                 self.as_ref().to_glib_none().0,
-                mut_override(sequence.to_glib_none().0),
+                mut_override(sequence.into().to_glib_none().0),
                 x.as_mut_ptr(),
                 y.as_mut_ptr(),
             ));
@@ -151,11 +154,11 @@ pub trait GestureExt: IsA<Gesture> + 'static {
     }
 
     #[doc(alias = "gtk_gesture_handles_sequence")]
-    fn handles_sequence(&self, sequence: Option<&gdk::EventSequence>) -> bool {
+    fn handles_sequence<'a>(&self, sequence: impl Into<Option<&'a gdk::EventSequence>>) -> bool {
         unsafe {
             from_glib(ffi::gtk_gesture_handles_sequence(
                 self.as_ref().to_glib_none().0,
-                mut_override(sequence.to_glib_none().0),
+                mut_override(sequence.into().to_glib_none().0),
             ))
         }
     }
diff --git a/gtk4/src/auto/gl_area.rs b/gtk4/src/auto/gl_area.rs
index 8c3043bccc7b..25698b29c6f5 100644
--- a/gtk4/src/auto/gl_area.rs
+++ b/gtk4/src/auto/gl_area.rs
@@ -174,7 +174,7 @@ impl GLAreaBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -425,9 +425,12 @@ pub trait GLAreaExt: IsA<GLArea> + 'static {
     }
 
     #[doc(alias = "gtk_gl_area_set_error")]
-    fn set_error(&self, error: Option<&glib::Error>) {
+    fn set_error<'a>(&self, error: impl Into<Option<&'a glib::Error>>) {
         unsafe {
-            ffi::gtk_gl_area_set_error(self.as_ref().to_glib_none().0, error.to_glib_none().0);
+            ffi::gtk_gl_area_set_error(
+                self.as_ref().to_glib_none().0,
+                error.into().to_glib_none().0,
+            );
         }
     }
 
diff --git a/gtk4/src/auto/graphics_offload.rs b/gtk4/src/auto/graphics_offload.rs
index a12ceaf8dea2..185baa1d9842 100644
--- a/gtk4/src/auto/graphics_offload.rs
+++ b/gtk4/src/auto/graphics_offload.rs
@@ -24,11 +24,11 @@ glib::wrapper! {
 
 impl GraphicsOffload {
     #[doc(alias = "gtk_graphics_offload_new")]
-    pub fn new(child: Option<&impl IsA<Widget>>) -> GraphicsOffload {
+    pub fn new<'a, P: IsA<Widget>>(child: impl Into<Option<&'a P>>) -> GraphicsOffload {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_graphics_offload_new(
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -82,11 +82,11 @@ impl GraphicsOffload {
 
     #[doc(alias = "gtk_graphics_offload_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_graphics_offload_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -213,7 +213,7 @@ impl GraphicsOffloadBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))]
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -301,7 +301,7 @@ impl GraphicsOffloadBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/grid.rs b/gtk4/src/auto/grid.rs
index 80da49d04b3b..884b971060e8 100644
--- a/gtk4/src/auto/grid.rs
+++ b/gtk4/src/auto/grid.rs
@@ -170,7 +170,7 @@ impl GridBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -309,10 +309,10 @@ pub trait GridExt: IsA<Grid> + 'static {
     }
 
     #[doc(alias = "gtk_grid_attach_next_to")]
-    fn attach_next_to(
+    fn attach_next_to<'a, P: IsA<Widget>>(
         &self,
         child: &impl IsA<Widget>,
-        sibling: Option<&impl IsA<Widget>>,
+        sibling: impl Into<Option<&'a P>>,
         side: PositionType,
         width: i32,
         height: i32,
@@ -321,7 +321,7 @@ pub trait GridExt: IsA<Grid> + 'static {
             ffi::gtk_grid_attach_next_to(
                 self.as_ref().to_glib_none().0,
                 child.as_ref().to_glib_none().0,
-                sibling.map(|p| p.as_ref()).to_glib_none().0,
+                sibling.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 side.into_glib(),
                 width,
                 height,
diff --git a/gtk4/src/auto/grid_view.rs b/gtk4/src/auto/grid_view.rs
index 9dc3cce36d67..fd6386c6d384 100644
--- a/gtk4/src/auto/grid_view.rs
+++ b/gtk4/src/auto/grid_view.rs
@@ -110,13 +110,18 @@ impl GridView {
     #[cfg(feature = "v4_12")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_grid_view_scroll_to")]
-    pub fn scroll_to(&self, pos: u32, flags: ListScrollFlags, scroll: Option<ScrollInfo>) {
+    pub fn scroll_to(
+        &self,
+        pos: u32,
+        flags: ListScrollFlags,
+        scroll: impl Into<Option<ScrollInfo>>,
+    ) {
         unsafe {
             ffi::gtk_grid_view_scroll_to(
                 self.to_glib_none().0,
                 pos,
                 flags.into_glib(),
-                scroll.into_glib_ptr(),
+                scroll.into().into_glib_ptr(),
             );
         }
     }
@@ -134,11 +139,11 @@ impl GridView {
 
     #[doc(alias = "gtk_grid_view_set_factory")]
     #[doc(alias = "factory")]
-    pub fn set_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_factory<'a, P: IsA<ListItemFactory>>(&self, factory: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_grid_view_set_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -161,11 +166,11 @@ impl GridView {
 
     #[doc(alias = "gtk_grid_view_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<SelectionModel>>) {
+    pub fn set_model<'a, P: IsA<SelectionModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_grid_view_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -416,7 +421,7 @@ impl GridViewBuilder {
 
     pub fn factory(self, factory: &impl IsA<ListItemFactory>) -> Self {
         Self {
-            builder: self.builder.property("factory", factory.clone().upcast()),
+            builder: self.builder.property("factory", factory.as_ref().clone()),
         }
     }
 
@@ -434,7 +439,7 @@ impl GridViewBuilder {
 
     pub fn model(self, model: &impl IsA<SelectionModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -536,7 +541,7 @@ impl GridViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -648,7 +653,7 @@ impl GridViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("hadjustment", hadjustment.clone().upcast()),
+                .property("hadjustment", hadjustment.as_ref().clone()),
         }
     }
 
@@ -662,7 +667,7 @@ impl GridViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("vadjustment", vadjustment.clone().upcast()),
+                .property("vadjustment", vadjustment.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/header_bar.rs b/gtk4/src/auto/header_bar.rs
index 1e7c217cdff0..713b1c4f7e80 100644
--- a/gtk4/src/auto/header_bar.rs
+++ b/gtk4/src/auto/header_bar.rs
@@ -89,11 +89,11 @@ impl HeaderBar {
 
     #[doc(alias = "gtk_header_bar_set_decoration_layout")]
     #[doc(alias = "decoration-layout")]
-    pub fn set_decoration_layout(&self, layout: Option<&str>) {
+    pub fn set_decoration_layout<'a>(&self, layout: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_header_bar_set_decoration_layout(
                 self.to_glib_none().0,
-                layout.to_glib_none().0,
+                layout.into().to_glib_none().0,
             );
         }
     }
@@ -108,11 +108,16 @@ impl HeaderBar {
 
     #[doc(alias = "gtk_header_bar_set_title_widget")]
     #[doc(alias = "title-widget")]
-    pub fn set_title_widget(&self, title_widget: Option<&impl IsA<Widget>>) {
+    pub fn set_title_widget<'a, P: IsA<Widget>>(&self, title_widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_header_bar_set_title_widget(
                 self.to_glib_none().0,
-                title_widget.map(|p| p.as_ref()).to_glib_none().0,
+                title_widget
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -235,7 +240,7 @@ impl HeaderBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("title-widget", title_widget.clone().upcast()),
+                .property("title-widget", title_widget.as_ref().clone()),
         }
     }
 
@@ -315,7 +320,7 @@ impl HeaderBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/icon_theme.rs b/gtk4/src/auto/icon_theme.rs
index c2107da5a19e..30ce1d24ff64 100644
--- a/gtk4/src/auto/icon_theme.rs
+++ b/gtk4/src/auto/icon_theme.rs
@@ -181,14 +181,17 @@ impl IconTheme {
 
     #[doc(alias = "gtk_icon_theme_set_theme_name")]
     #[doc(alias = "theme-name")]
-    pub fn set_theme_name(&self, theme_name: Option<&str>) {
+    pub fn set_theme_name<'a>(&self, theme_name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_icon_theme_set_theme_name(self.to_glib_none().0, theme_name.to_glib_none().0);
+            ffi::gtk_icon_theme_set_theme_name(
+                self.to_glib_none().0,
+                theme_name.into().to_glib_none().0,
+            );
         }
     }
 
-    pub fn set_display<P: IsA<gdk::Display>>(&self, display: Option<&P>) {
-        ObjectExt::set_property(self, "display", display)
+    pub fn set_display<'a, P: IsA<gdk::Display>>(&self, display: impl Into<Option<&'a P>>) {
+        ObjectExt::set_property(self, "display", display.into().as_ref().map(|p| p.as_ref()))
     }
 
     #[doc(alias = "gtk_icon_theme_get_for_display")]
@@ -364,7 +367,7 @@ impl IconThemeBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/icon_view.rs b/gtk4/src/auto/icon_view.rs
index aac3480fb53f..3cddfd89c2ea 100644
--- a/gtk4/src/auto/icon_view.rs
+++ b/gtk4/src/auto/icon_view.rs
@@ -131,17 +131,17 @@ impl IconView {
     #[allow(deprecated)]
     #[doc(alias = "gtk_icon_view_get_cell_rect")]
     #[doc(alias = "get_cell_rect")]
-    pub fn cell_rect(
+    pub fn cell_rect<'a, P: IsA<CellRenderer>>(
         &self,
         path: &TreePath,
-        cell: Option<&impl IsA<CellRenderer>>,
+        cell: impl Into<Option<&'a P>>,
     ) -> Option<gdk::Rectangle> {
         unsafe {
             let mut rect = gdk::Rectangle::uninitialized();
             let ret = from_glib(ffi::gtk_icon_view_get_cell_rect(
                 self.to_glib_none().0,
                 mut_override(path.to_glib_none().0),
-                cell.map(|p| p.as_ref()).to_glib_none().0,
+                cell.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 rect.to_glib_none_mut().0,
             ));
             if ret {
@@ -601,17 +601,17 @@ impl IconView {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_icon_view_set_cursor")]
-    pub fn set_cursor(
+    pub fn set_cursor<'a, P: IsA<CellRenderer>>(
         &self,
         path: &TreePath,
-        cell: Option<&impl IsA<CellRenderer>>,
+        cell: impl Into<Option<&'a P>>,
         start_editing: bool,
     ) {
         unsafe {
             ffi::gtk_icon_view_set_cursor(
                 self.to_glib_none().0,
                 mut_override(path.to_glib_none().0),
-                cell.map(|p| p.as_ref()).to_glib_none().0,
+                cell.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 start_editing.into_glib(),
             );
         }
@@ -620,11 +620,15 @@ impl IconView {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_icon_view_set_drag_dest_item")]
-    pub fn set_drag_dest_item(&self, path: Option<&TreePath>, pos: IconViewDropPosition) {
+    pub fn set_drag_dest_item<'a>(
+        &self,
+        path: impl Into<Option<&'a TreePath>>,
+        pos: IconViewDropPosition,
+    ) {
         unsafe {
             ffi::gtk_icon_view_set_drag_dest_item(
                 self.to_glib_none().0,
-                mut_override(path.to_glib_none().0),
+                mut_override(path.into().to_glib_none().0),
                 pos.into_glib(),
             );
         }
@@ -684,11 +688,11 @@ impl IconView {
     #[allow(deprecated)]
     #[doc(alias = "gtk_icon_view_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<TreeModel>>) {
+    pub fn set_model<'a, P: IsA<TreeModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_icon_view_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -756,18 +760,18 @@ impl IconView {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_icon_view_set_tooltip_cell")]
-    pub fn set_tooltip_cell(
+    pub fn set_tooltip_cell<'a, P: IsA<CellRenderer>>(
         &self,
         tooltip: &Tooltip,
         path: &TreePath,
-        cell: Option<&impl IsA<CellRenderer>>,
+        cell: impl Into<Option<&'a P>>,
     ) {
         unsafe {
             ffi::gtk_icon_view_set_tooltip_cell(
                 self.to_glib_none().0,
                 tooltip.to_glib_none().0,
                 mut_override(path.to_glib_none().0),
-                cell.map(|p| p.as_ref()).to_glib_none().0,
+                cell.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -1476,7 +1480,7 @@ impl IconViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("cell-area", cell_area.clone().upcast()),
+                .property("cell-area", cell_area.as_ref().clone()),
         }
     }
 
@@ -1524,7 +1528,7 @@ impl IconViewBuilder {
 
     pub fn model(self, model: &impl IsA<TreeModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -1646,7 +1650,7 @@ impl IconViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -1758,7 +1762,7 @@ impl IconViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("hadjustment", hadjustment.clone().upcast()),
+                .property("hadjustment", hadjustment.as_ref().clone()),
         }
     }
 
@@ -1772,7 +1776,7 @@ impl IconViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("vadjustment", vadjustment.clone().upcast()),
+                .property("vadjustment", vadjustment.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/im_context.rs b/gtk4/src/auto/im_context.rs
index 3a8f0bbab1f3..fb588f6795cd 100644
--- a/gtk4/src/auto/im_context.rs
+++ b/gtk4/src/auto/im_context.rs
@@ -174,11 +174,11 @@ pub trait IMContextExt: IsA<IMContext> + 'static {
     }
 
     #[doc(alias = "gtk_im_context_set_client_widget")]
-    fn set_client_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    fn set_client_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_im_context_set_client_widget(
                 self.as_ref().to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/im_multicontext.rs b/gtk4/src/auto/im_multicontext.rs
index d57bf4a7ee72..e0b379367376 100644
--- a/gtk4/src/auto/im_multicontext.rs
+++ b/gtk4/src/auto/im_multicontext.rs
@@ -87,11 +87,11 @@ pub trait IMMulticontextExt: IsA<IMMulticontext> + 'static {
     }
 
     #[doc(alias = "gtk_im_multicontext_set_context_id")]
-    fn set_context_id(&self, context_id: Option<&str>) {
+    fn set_context_id<'a>(&self, context_id: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_im_multicontext_set_context_id(
                 self.as_ref().to_glib_none().0,
-                context_id.to_glib_none().0,
+                context_id.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/image.rs b/gtk4/src/auto/image.rs
index 9900c36b63e8..7b8be23938dd 100644
--- a/gtk4/src/auto/image.rs
+++ b/gtk4/src/auto/image.rs
@@ -68,11 +68,18 @@ impl Image {
 
     #[doc(alias = "gtk_image_new_from_paintable")]
     #[doc(alias = "new_from_paintable")]
-    pub fn from_paintable(paintable: Option<&impl IsA<gdk::Paintable>>) -> Image {
+    pub fn from_paintable<'a, P: IsA<gdk::Paintable>>(
+        paintable: impl Into<Option<&'a P>>,
+    ) -> Image {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_image_new_from_paintable(
-                paintable.map(|p| p.as_ref()).to_glib_none().0,
+                paintable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             ))
             .unsafe_cast()
         }
@@ -82,11 +89,13 @@ impl Image {
     #[allow(deprecated)]
     #[doc(alias = "gtk_image_new_from_pixbuf")]
     #[doc(alias = "new_from_pixbuf")]
-    pub fn from_pixbuf(pixbuf: Option<&gdk_pixbuf::Pixbuf>) -> Image {
+    pub fn from_pixbuf<'a>(pixbuf: impl Into<Option<&'a gdk_pixbuf::Pixbuf>>) -> Image {
         assert_initialized_main_thread!();
         unsafe {
-            Widget::from_glib_none(ffi::gtk_image_new_from_pixbuf(pixbuf.to_glib_none().0))
-                .unsafe_cast()
+            Widget::from_glib_none(ffi::gtk_image_new_from_pixbuf(
+                pixbuf.into().to_glib_none().0,
+            ))
+            .unsafe_cast()
         }
     }
 
@@ -179,20 +188,28 @@ impl Image {
     #[doc(alias = "gtk_image_set_from_icon_name")]
     #[doc(alias = "set_from_icon_name")]
     #[doc(alias = "icon-name")]
-    pub fn set_icon_name(&self, icon_name: Option<&str>) {
+    pub fn set_icon_name<'a>(&self, icon_name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_image_set_from_icon_name(self.to_glib_none().0, icon_name.to_glib_none().0);
+            ffi::gtk_image_set_from_icon_name(
+                self.to_glib_none().0,
+                icon_name.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_image_set_from_paintable")]
     #[doc(alias = "set_from_paintable")]
     #[doc(alias = "paintable")]
-    pub fn set_paintable(&self, paintable: Option<&impl IsA<gdk::Paintable>>) {
+    pub fn set_paintable<'a, P: IsA<gdk::Paintable>>(&self, paintable: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_image_set_from_paintable(
                 self.to_glib_none().0,
-                paintable.map(|p| p.as_ref()).to_glib_none().0,
+                paintable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -200,18 +217,21 @@ impl Image {
     #[cfg_attr(feature = "v4_12", deprecated = "Since 4.12")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_image_set_from_pixbuf")]
-    pub fn set_from_pixbuf(&self, pixbuf: Option<&gdk_pixbuf::Pixbuf>) {
+    pub fn set_from_pixbuf<'a>(&self, pixbuf: impl Into<Option<&'a gdk_pixbuf::Pixbuf>>) {
         unsafe {
-            ffi::gtk_image_set_from_pixbuf(self.to_glib_none().0, pixbuf.to_glib_none().0);
+            ffi::gtk_image_set_from_pixbuf(self.to_glib_none().0, pixbuf.into().to_glib_none().0);
         }
     }
 
     #[doc(alias = "gtk_image_set_from_resource")]
     #[doc(alias = "set_from_resource")]
     #[doc(alias = "resource")]
-    pub fn set_resource(&self, resource_path: Option<&str>) {
+    pub fn set_resource<'a>(&self, resource_path: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_image_set_from_resource(self.to_glib_none().0, resource_path.to_glib_none().0);
+            ffi::gtk_image_set_from_resource(
+                self.to_glib_none().0,
+                resource_path.into().to_glib_none().0,
+            );
         }
     }
 
@@ -487,7 +507,7 @@ impl ImageBuilder {
 
     pub fn gicon(self, gicon: &impl IsA<gio::Icon>) -> Self {
         Self {
-            builder: self.builder.property("gicon", gicon.clone().upcast()),
+            builder: self.builder.property("gicon", gicon.as_ref().clone()),
         }
     }
 
@@ -507,7 +527,7 @@ impl ImageBuilder {
         Self {
             builder: self
                 .builder
-                .property("paintable", paintable.clone().upcast()),
+                .property("paintable", paintable.as_ref().clone()),
         }
     }
 
@@ -605,7 +625,7 @@ impl ImageBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/info_bar.rs b/gtk4/src/auto/info_bar.rs
index e9dcee89ccf4..b17126d121f0 100644
--- a/gtk4/src/auto/info_bar.rs
+++ b/gtk4/src/auto/info_bar.rs
@@ -428,7 +428,7 @@ impl InfoBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/inscription.rs b/gtk4/src/auto/inscription.rs
index 4c5599d21b63..0373bd87a9d9 100644
--- a/gtk4/src/auto/inscription.rs
+++ b/gtk4/src/auto/inscription.rs
@@ -39,10 +39,11 @@ glib::wrapper! {
 
 impl Inscription {
     #[doc(alias = "gtk_inscription_new")]
-    pub fn new(text: Option<&str>) -> Inscription {
+    pub fn new<'a>(text: impl Into<Option<&'a str>>) -> Inscription {
         assert_initialized_main_thread!();
         unsafe {
-            Widget::from_glib_none(ffi::gtk_inscription_new(text.to_glib_none().0)).unsafe_cast()
+            Widget::from_glib_none(ffi::gtk_inscription_new(text.into().to_glib_none().0))
+                .unsafe_cast()
         }
     }
 
@@ -126,17 +127,20 @@ impl Inscription {
 
     #[doc(alias = "gtk_inscription_set_attributes")]
     #[doc(alias = "attributes")]
-    pub fn set_attributes(&self, attrs: Option<&pango::AttrList>) {
+    pub fn set_attributes<'a>(&self, attrs: impl Into<Option<&'a pango::AttrList>>) {
         unsafe {
-            ffi::gtk_inscription_set_attributes(self.to_glib_none().0, attrs.to_glib_none().0);
+            ffi::gtk_inscription_set_attributes(
+                self.to_glib_none().0,
+                attrs.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_inscription_set_markup")]
     #[doc(alias = "markup")]
-    pub fn set_markup(&self, markup: Option<&str>) {
+    pub fn set_markup<'a>(&self, markup: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_inscription_set_markup(self.to_glib_none().0, markup.to_glib_none().0);
+            ffi::gtk_inscription_set_markup(self.to_glib_none().0, markup.into().to_glib_none().0);
         }
     }
 
@@ -174,9 +178,9 @@ impl Inscription {
 
     #[doc(alias = "gtk_inscription_set_text")]
     #[doc(alias = "text")]
-    pub fn set_text(&self, text: Option<&str>) {
+    pub fn set_text<'a>(&self, text: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_inscription_set_text(self.to_glib_none().0, text.to_glib_none().0);
+            ffi::gtk_inscription_set_text(self.to_glib_none().0, text.into().to_glib_none().0);
         }
     }
 
@@ -676,7 +680,7 @@ impl InscriptionBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/label.rs b/gtk4/src/auto/label.rs
index cb69d63576dd..5f4ce6beef95 100644
--- a/gtk4/src/auto/label.rs
+++ b/gtk4/src/auto/label.rs
@@ -42,9 +42,11 @@ glib::wrapper! {
 
 impl Label {
     #[doc(alias = "gtk_label_new")]
-    pub fn new(str: Option<&str>) -> Label {
+    pub fn new<'a>(str: impl Into<Option<&'a str>>) -> Label {
         assert_initialized_main_thread!();
-        unsafe { Widget::from_glib_none(ffi::gtk_label_new(str.to_glib_none().0)).unsafe_cast() }
+        unsafe {
+            Widget::from_glib_none(ffi::gtk_label_new(str.into().to_glib_none().0)).unsafe_cast()
+        }
     }
 
     #[doc(alias = "gtk_label_new_with_mnemonic")]
@@ -255,9 +257,9 @@ impl Label {
 
     #[doc(alias = "gtk_label_set_attributes")]
     #[doc(alias = "attributes")]
-    pub fn set_attributes(&self, attrs: Option<&pango::AttrList>) {
+    pub fn set_attributes<'a>(&self, attrs: impl Into<Option<&'a pango::AttrList>>) {
         unsafe {
-            ffi::gtk_label_set_attributes(self.to_glib_none().0, attrs.to_glib_none().0);
+            ffi::gtk_label_set_attributes(self.to_glib_none().0, attrs.into().to_glib_none().0);
         }
     }
 
@@ -271,11 +273,11 @@ impl Label {
 
     #[doc(alias = "gtk_label_set_extra_menu")]
     #[doc(alias = "extra-menu")]
-    pub fn set_extra_menu(&self, model: Option<&impl IsA<gio::MenuModel>>) {
+    pub fn set_extra_menu<'a, P: IsA<gio::MenuModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_label_set_extra_menu(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -328,11 +330,11 @@ impl Label {
 
     #[doc(alias = "gtk_label_set_mnemonic_widget")]
     #[doc(alias = "mnemonic-widget")]
-    pub fn set_mnemonic_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    pub fn set_mnemonic_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_label_set_mnemonic_widget(
                 self.to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -370,9 +372,12 @@ impl Label {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))]
     #[doc(alias = "gtk_label_set_tabs")]
     #[doc(alias = "tabs")]
-    pub fn set_tabs(&self, tabs: Option<&pango::TabArray>) {
+    pub fn set_tabs<'a>(&self, tabs: impl Into<Option<&'a pango::TabArray>>) {
         unsafe {
-            ffi::gtk_label_set_tabs(self.to_glib_none().0, mut_override(tabs.to_glib_none().0));
+            ffi::gtk_label_set_tabs(
+                self.to_glib_none().0,
+                mut_override(tabs.into().to_glib_none().0),
+            );
         }
     }
 
@@ -1075,7 +1080,7 @@ impl LabelBuilder {
         Self {
             builder: self
                 .builder
-                .property("extra-menu", extra_menu.clone().upcast()),
+                .property("extra-menu", extra_menu.as_ref().clone()),
         }
     }
 
@@ -1107,7 +1112,7 @@ impl LabelBuilder {
         Self {
             builder: self
                 .builder
-                .property("mnemonic-widget", mnemonic_widget.clone().upcast()),
+                .property("mnemonic-widget", mnemonic_widget.as_ref().clone()),
         }
     }
 
@@ -1259,7 +1264,7 @@ impl LabelBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/level_bar.rs b/gtk4/src/auto/level_bar.rs
index a8cba9af79c7..2ce66643be95 100644
--- a/gtk4/src/auto/level_bar.rs
+++ b/gtk4/src/auto/level_bar.rs
@@ -102,12 +102,12 @@ impl LevelBar {
 
     #[doc(alias = "gtk_level_bar_get_offset_value")]
     #[doc(alias = "get_offset_value")]
-    pub fn offset_value(&self, name: Option<&str>) -> Option<f64> {
+    pub fn offset_value<'a>(&self, name: impl Into<Option<&'a str>>) -> Option<f64> {
         unsafe {
             let mut value = std::mem::MaybeUninit::uninit();
             let ret = from_glib(ffi::gtk_level_bar_get_offset_value(
                 self.to_glib_none().0,
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
                 value.as_mut_ptr(),
             ));
             if ret {
@@ -125,9 +125,12 @@ impl LevelBar {
     }
 
     #[doc(alias = "gtk_level_bar_remove_offset_value")]
-    pub fn remove_offset_value(&self, name: Option<&str>) {
+    pub fn remove_offset_value<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_level_bar_remove_offset_value(self.to_glib_none().0, name.to_glib_none().0);
+            ffi::gtk_level_bar_remove_offset_value(
+                self.to_glib_none().0,
+                name.into().to_glib_none().0,
+            );
         }
     }
 
@@ -449,7 +452,7 @@ impl LevelBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/link_button.rs b/gtk4/src/auto/link_button.rs
index 4e76b094771d..47becf7e281b 100644
--- a/gtk4/src/auto/link_button.rs
+++ b/gtk4/src/auto/link_button.rs
@@ -199,7 +199,7 @@ impl LinkButtonBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -303,7 +303,7 @@ impl LinkButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/list_box.rs b/gtk4/src/auto/list_box.rs
index 2e85ab75ad6a..212bf9521eff 100644
--- a/gtk4/src/auto/list_box.rs
+++ b/gtk4/src/auto/list_box.rs
@@ -48,32 +48,32 @@ impl ListBox {
     }
 
     #[doc(alias = "gtk_list_box_bind_model")]
-    pub fn bind_model<P: Fn(&glib::Object) -> Widget + 'static>(
+    pub fn bind_model<'a, P: IsA<gio::ListModel>, Q: Fn(&glib::Object) -> Widget + 'static>(
         &self,
-        model: Option<&impl IsA<gio::ListModel>>,
-        create_widget_func: P,
+        model: impl Into<Option<&'a P>>,
+        create_widget_func: Q,
     ) {
-        let create_widget_func_data: Box_<P> = Box_::new(create_widget_func);
-        unsafe extern "C" fn create_widget_func_func<P: Fn(&glib::Object) -> Widget + 'static>(
+        let create_widget_func_data: Box_<Q> = Box_::new(create_widget_func);
+        unsafe extern "C" fn create_widget_func_func<Q: Fn(&glib::Object) -> Widget + 'static>(
             item: *mut glib::gobject_ffi::GObject,
             user_data: glib::ffi::gpointer,
         ) -> *mut ffi::GtkWidget {
             let item = from_glib_borrow(item);
-            let callback = &*(user_data as *mut P);
+            let callback = &*(user_data as *mut Q);
             (*callback)(&item).to_glib_full()
         }
-        let create_widget_func = Some(create_widget_func_func::<P> as _);
-        unsafe extern "C" fn user_data_free_func_func<P: Fn(&glib::Object) -> Widget + 'static>(
+        let create_widget_func = Some(create_widget_func_func::<Q> as _);
+        unsafe extern "C" fn user_data_free_func_func<Q: Fn(&glib::Object) -> Widget + 'static>(
             data: glib::ffi::gpointer,
         ) {
-            let _callback = Box_::from_raw(data as *mut P);
+            let _callback = Box_::from_raw(data as *mut Q);
         }
-        let destroy_call4 = Some(user_data_free_func_func::<P> as _);
-        let super_callback0: Box_<P> = create_widget_func_data;
+        let destroy_call4 = Some(user_data_free_func_func::<Q> as _);
+        let super_callback0: Box_<Q> = create_widget_func_data;
         unsafe {
             ffi::gtk_list_box_bind_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 create_widget_func,
                 Box_::into_raw(super_callback0) as *mut _,
                 destroy_call4,
@@ -234,11 +234,11 @@ impl ListBox {
     }
 
     #[doc(alias = "gtk_list_box_select_row")]
-    pub fn select_row(&self, row: Option<&impl IsA<ListBoxRow>>) {
+    pub fn select_row<'a, P: IsA<ListBoxRow>>(&self, row: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_box_select_row(
                 self.to_glib_none().0,
-                row.map(|p| p.as_ref()).to_glib_none().0,
+                row.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -279,11 +279,16 @@ impl ListBox {
     }
 
     #[doc(alias = "gtk_list_box_set_adjustment")]
-    pub fn set_adjustment(&self, adjustment: Option<&impl IsA<Adjustment>>) {
+    pub fn set_adjustment<'a, P: IsA<Adjustment>>(&self, adjustment: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_box_set_adjustment(
                 self.to_glib_none().0,
-                adjustment.map(|p| p.as_ref()).to_glib_none().0,
+                adjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -354,11 +359,16 @@ impl ListBox {
     }
 
     #[doc(alias = "gtk_list_box_set_placeholder")]
-    pub fn set_placeholder(&self, placeholder: Option<&impl IsA<Widget>>) {
+    pub fn set_placeholder<'a, P: IsA<Widget>>(&self, placeholder: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_box_set_placeholder(
                 self.to_glib_none().0,
-                placeholder.map(|p| p.as_ref()).to_glib_none().0,
+                placeholder
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -904,7 +914,7 @@ impl ListBoxBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/list_box_row.rs b/gtk4/src/auto/list_box_row.rs
index 6834724e0e90..0794d43e9bf9 100644
--- a/gtk4/src/auto/list_box_row.rs
+++ b/gtk4/src/auto/list_box_row.rs
@@ -70,7 +70,7 @@ impl ListBoxRowBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -156,7 +156,7 @@ impl ListBoxRowBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -365,21 +365,21 @@ pub trait ListBoxRowExt: IsA<ListBoxRow> + 'static {
 
     #[doc(alias = "gtk_list_box_row_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_box_row_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_list_box_row_set_header")]
-    fn set_header(&self, header: Option<&impl IsA<Widget>>) {
+    fn set_header<'a, P: IsA<Widget>>(&self, header: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_box_row_set_header(
                 self.as_ref().to_glib_none().0,
-                header.map(|p| p.as_ref()).to_glib_none().0,
+                header.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/list_header.rs b/gtk4/src/auto/list_header.rs
index e87e567d5f64..dcf2bbdfbf77 100644
--- a/gtk4/src/auto/list_header.rs
+++ b/gtk4/src/auto/list_header.rs
@@ -53,11 +53,11 @@ impl ListHeader {
 
     #[doc(alias = "gtk_list_header_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_header_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/list_item.rs b/gtk4/src/auto/list_item.rs
index 4402b1f2c25b..631f2ace9b18 100644
--- a/gtk4/src/auto/list_item.rs
+++ b/gtk4/src/auto/list_item.rs
@@ -153,11 +153,11 @@ pub trait ListItemExt: IsA<ListItem> + 'static {
 
     #[doc(alias = "gtk_list_item_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_item_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/list_store.rs b/gtk4/src/auto/list_store.rs
index 9d4c9ce316a0..142bee3abefe 100644
--- a/gtk4/src/auto/list_store.rs
+++ b/gtk4/src/auto/list_store.rs
@@ -50,13 +50,13 @@ impl ListStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_list_store_insert_after")]
-    pub fn insert_after(&self, sibling: Option<&TreeIter>) -> TreeIter {
+    pub fn insert_after<'a>(&self, sibling: impl Into<Option<&'a TreeIter>>) -> TreeIter {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             ffi::gtk_list_store_insert_after(
                 self.to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(sibling.to_glib_none().0),
+                mut_override(sibling.into().to_glib_none().0),
             );
             iter
         }
@@ -65,13 +65,13 @@ impl ListStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_list_store_insert_before")]
-    pub fn insert_before(&self, sibling: Option<&TreeIter>) -> TreeIter {
+    pub fn insert_before<'a>(&self, sibling: impl Into<Option<&'a TreeIter>>) -> TreeIter {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             ffi::gtk_list_store_insert_before(
                 self.to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(sibling.to_glib_none().0),
+                mut_override(sibling.into().to_glib_none().0),
             );
             iter
         }
@@ -92,12 +92,12 @@ impl ListStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_list_store_move_after")]
-    pub fn move_after(&self, iter: &TreeIter, position: Option<&TreeIter>) {
+    pub fn move_after<'a>(&self, iter: &TreeIter, position: impl Into<Option<&'a TreeIter>>) {
         unsafe {
             ffi::gtk_list_store_move_after(
                 self.to_glib_none().0,
                 mut_override(iter.to_glib_none().0),
-                mut_override(position.to_glib_none().0),
+                mut_override(position.into().to_glib_none().0),
             );
         }
     }
@@ -105,12 +105,12 @@ impl ListStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_list_store_move_before")]
-    pub fn move_before(&self, iter: &TreeIter, position: Option<&TreeIter>) {
+    pub fn move_before<'a>(&self, iter: &TreeIter, position: impl Into<Option<&'a TreeIter>>) {
         unsafe {
             ffi::gtk_list_store_move_before(
                 self.to_glib_none().0,
                 mut_override(iter.to_glib_none().0),
-                mut_override(position.to_glib_none().0),
+                mut_override(position.into().to_glib_none().0),
             );
         }
     }
diff --git a/gtk4/src/auto/list_view.rs b/gtk4/src/auto/list_view.rs
index 9246ee3ba726..1f7fee5d7934 100644
--- a/gtk4/src/auto/list_view.rs
+++ b/gtk4/src/auto/list_view.rs
@@ -116,13 +116,18 @@ impl ListView {
     #[cfg(feature = "v4_12")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_list_view_scroll_to")]
-    pub fn scroll_to(&self, pos: u32, flags: ListScrollFlags, scroll: Option<ScrollInfo>) {
+    pub fn scroll_to(
+        &self,
+        pos: u32,
+        flags: ListScrollFlags,
+        scroll: impl Into<Option<ScrollInfo>>,
+    ) {
         unsafe {
             ffi::gtk_list_view_scroll_to(
                 self.to_glib_none().0,
                 pos,
                 flags.into_glib(),
-                scroll.into_glib_ptr(),
+                scroll.into().into_glib_ptr(),
             );
         }
     }
@@ -140,11 +145,11 @@ impl ListView {
 
     #[doc(alias = "gtk_list_view_set_factory")]
     #[doc(alias = "factory")]
-    pub fn set_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_factory<'a, P: IsA<ListItemFactory>>(&self, factory: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_view_set_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -153,22 +158,25 @@ impl ListView {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_list_view_set_header_factory")]
     #[doc(alias = "header-factory")]
-    pub fn set_header_factory(&self, factory: Option<&impl IsA<ListItemFactory>>) {
+    pub fn set_header_factory<'a, P: IsA<ListItemFactory>>(
+        &self,
+        factory: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_list_view_set_header_factory(
                 self.to_glib_none().0,
-                factory.map(|p| p.as_ref()).to_glib_none().0,
+                factory.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_list_view_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<SelectionModel>>) {
+    pub fn set_model<'a, P: IsA<SelectionModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_list_view_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -432,7 +440,7 @@ impl ListViewBuilder {
 
     pub fn factory(self, factory: &impl IsA<ListItemFactory>) -> Self {
         Self {
-            builder: self.builder.property("factory", factory.clone().upcast()),
+            builder: self.builder.property("factory", factory.as_ref().clone()),
         }
     }
 
@@ -442,13 +450,13 @@ impl ListViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("header-factory", header_factory.clone().upcast()),
+                .property("header-factory", header_factory.as_ref().clone()),
         }
     }
 
     pub fn model(self, model: &impl IsA<SelectionModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -556,7 +564,7 @@ impl ListViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -668,7 +676,7 @@ impl ListViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("hadjustment", hadjustment.clone().upcast()),
+                .property("hadjustment", hadjustment.as_ref().clone()),
         }
     }
 
@@ -682,7 +690,7 @@ impl ListViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("vadjustment", vadjustment.clone().upcast()),
+                .property("vadjustment", vadjustment.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/lock_button.rs b/gtk4/src/auto/lock_button.rs
index 70011ec3aebc..c83c185af9fe 100644
--- a/gtk4/src/auto/lock_button.rs
+++ b/gtk4/src/auto/lock_button.rs
@@ -27,11 +27,16 @@ impl LockButton {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_lock_button_new")]
-    pub fn new(permission: Option<&impl IsA<gio::Permission>>) -> LockButton {
+    pub fn new<'a, P: IsA<gio::Permission>>(permission: impl Into<Option<&'a P>>) -> LockButton {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_lock_button_new(
-                permission.map(|p| p.as_ref()).to_glib_none().0,
+                permission
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             ))
             .unsafe_cast()
         }
@@ -57,11 +62,19 @@ impl LockButton {
     #[allow(deprecated)]
     #[doc(alias = "gtk_lock_button_set_permission")]
     #[doc(alias = "permission")]
-    pub fn set_permission(&self, permission: Option<&impl IsA<gio::Permission>>) {
+    pub fn set_permission<'a, P: IsA<gio::Permission>>(
+        &self,
+        permission: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_lock_button_set_permission(
                 self.to_glib_none().0,
-                permission.map(|p| p.as_ref()).to_glib_none().0,
+                permission
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -74,8 +87,8 @@ impl LockButton {
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[doc(alias = "text-lock")]
-    pub fn set_text_lock(&self, text_lock: Option<&str>) {
-        ObjectExt::set_property(self, "text-lock", text_lock)
+    pub fn set_text_lock<'a>(&self, text_lock: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "text-lock", text_lock.into())
     }
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
@@ -86,8 +99,8 @@ impl LockButton {
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[doc(alias = "text-unlock")]
-    pub fn set_text_unlock(&self, text_unlock: Option<&str>) {
-        ObjectExt::set_property(self, "text-unlock", text_unlock)
+    pub fn set_text_unlock<'a>(&self, text_unlock: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "text-unlock", text_unlock.into())
     }
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
@@ -98,8 +111,8 @@ impl LockButton {
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[doc(alias = "tooltip-lock")]
-    pub fn set_tooltip_lock(&self, tooltip_lock: Option<&str>) {
-        ObjectExt::set_property(self, "tooltip-lock", tooltip_lock)
+    pub fn set_tooltip_lock<'a>(&self, tooltip_lock: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "tooltip-lock", tooltip_lock.into())
     }
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
@@ -110,8 +123,15 @@ impl LockButton {
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[doc(alias = "tooltip-not-authorized")]
-    pub fn set_tooltip_not_authorized(&self, tooltip_not_authorized: Option<&str>) {
-        ObjectExt::set_property(self, "tooltip-not-authorized", tooltip_not_authorized)
+    pub fn set_tooltip_not_authorized<'a>(
+        &self,
+        tooltip_not_authorized: impl Into<Option<&'a str>>,
+    ) {
+        ObjectExt::set_property(
+            self,
+            "tooltip-not-authorized",
+            tooltip_not_authorized.into(),
+        )
     }
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
@@ -122,8 +142,8 @@ impl LockButton {
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[doc(alias = "tooltip-unlock")]
-    pub fn set_tooltip_unlock(&self, tooltip_unlock: Option<&str>) {
-        ObjectExt::set_property(self, "tooltip-unlock", tooltip_unlock)
+    pub fn set_tooltip_unlock<'a>(&self, tooltip_unlock: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "tooltip-unlock", tooltip_unlock.into())
     }
 
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
@@ -303,7 +323,7 @@ impl LockButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("permission", permission.clone().upcast()),
+                .property("permission", permission.as_ref().clone()),
         }
     }
 
@@ -356,7 +376,7 @@ impl LockButtonBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -460,7 +480,7 @@ impl LockButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/map_list_model.rs b/gtk4/src/auto/map_list_model.rs
index 46b232272944..911fc98a2e51 100644
--- a/gtk4/src/auto/map_list_model.rs
+++ b/gtk4/src/auto/map_list_model.rs
@@ -110,11 +110,11 @@ impl MapListModel {
     }
 
     #[doc(alias = "gtk_map_list_model_set_model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_map_list_model_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/media_controls.rs b/gtk4/src/auto/media_controls.rs
index 7e3ea43e9993..dc4d7dc04a39 100644
--- a/gtk4/src/auto/media_controls.rs
+++ b/gtk4/src/auto/media_controls.rs
@@ -24,11 +24,11 @@ glib::wrapper! {
 
 impl MediaControls {
     #[doc(alias = "gtk_media_controls_new")]
-    pub fn new(stream: Option<&impl IsA<MediaStream>>) -> MediaControls {
+    pub fn new<'a, P: IsA<MediaStream>>(stream: impl Into<Option<&'a P>>) -> MediaControls {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_media_controls_new(
-                stream.map(|p| p.as_ref()).to_glib_none().0,
+                stream.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -55,11 +55,11 @@ impl MediaControls {
 
     #[doc(alias = "gtk_media_controls_set_media_stream")]
     #[doc(alias = "media-stream")]
-    pub fn set_media_stream(&self, stream: Option<&impl IsA<MediaStream>>) {
+    pub fn set_media_stream<'a, P: IsA<MediaStream>>(&self, stream: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_media_controls_set_media_stream(
                 self.to_glib_none().0,
-                stream.map(|p| p.as_ref()).to_glib_none().0,
+                stream.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -114,7 +114,7 @@ impl MediaControlsBuilder {
         Self {
             builder: self
                 .builder
-                .property("media-stream", media_stream.clone().upcast()),
+                .property("media-stream", media_stream.as_ref().clone()),
         }
     }
 
@@ -194,7 +194,7 @@ impl MediaControlsBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/media_file.rs b/gtk4/src/auto/media_file.rs
index bbe2a3c07bcc..4dfa063ba65e 100644
--- a/gtk4/src/auto/media_file.rs
+++ b/gtk4/src/auto/media_file.rs
@@ -106,11 +106,11 @@ pub trait MediaFileExt: IsA<MediaFile> + 'static {
 
     #[doc(alias = "gtk_media_file_set_file")]
     #[doc(alias = "file")]
-    fn set_file(&self, file: Option<&impl IsA<gio::File>>) {
+    fn set_file<'a, P: IsA<gio::File>>(&self, file: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_media_file_set_file(
                 self.as_ref().to_glib_none().0,
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -127,21 +127,21 @@ pub trait MediaFileExt: IsA<MediaFile> + 'static {
 
     #[doc(alias = "gtk_media_file_set_input_stream")]
     #[doc(alias = "input-stream")]
-    fn set_input_stream(&self, stream: Option<&impl IsA<gio::InputStream>>) {
+    fn set_input_stream<'a, P: IsA<gio::InputStream>>(&self, stream: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_media_file_set_input_stream(
                 self.as_ref().to_glib_none().0,
-                stream.map(|p| p.as_ref()).to_glib_none().0,
+                stream.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_media_file_set_resource")]
-    fn set_resource(&self, resource_path: Option<&str>) {
+    fn set_resource<'a>(&self, resource_path: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_media_file_set_resource(
                 self.as_ref().to_glib_none().0,
-                resource_path.to_glib_none().0,
+                resource_path.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/menu_button.rs b/gtk4/src/auto/menu_button.rs
index afe5269323b3..c7a6ea71790d 100644
--- a/gtk4/src/auto/menu_button.rs
+++ b/gtk4/src/auto/menu_button.rs
@@ -186,11 +186,11 @@ impl MenuButton {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     #[doc(alias = "gtk_menu_button_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_menu_button_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -258,22 +258,27 @@ impl MenuButton {
 
     #[doc(alias = "gtk_menu_button_set_menu_model")]
     #[doc(alias = "menu-model")]
-    pub fn set_menu_model(&self, menu_model: Option<&impl IsA<gio::MenuModel>>) {
+    pub fn set_menu_model<'a, P: IsA<gio::MenuModel>>(&self, menu_model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_menu_button_set_menu_model(
                 self.to_glib_none().0,
-                menu_model.map(|p| p.as_ref()).to_glib_none().0,
+                menu_model
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
 
     #[doc(alias = "gtk_menu_button_set_popover")]
     #[doc(alias = "popover")]
-    pub fn set_popover(&self, popover: Option<&impl IsA<Widget>>) {
+    pub fn set_popover<'a, P: IsA<Widget>>(&self, popover: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_menu_button_set_popover(
                 self.to_glib_none().0,
-                popover.map(|p| p.as_ref()).to_glib_none().0,
+                popover.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -671,7 +676,7 @@ impl MenuButtonBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -703,13 +708,13 @@ impl MenuButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("menu-model", menu_model.clone().upcast()),
+                .property("menu-model", menu_model.as_ref().clone()),
         }
     }
 
     pub fn popover(self, popover: &impl IsA<Popover>) -> Self {
         Self {
-            builder: self.builder.property("popover", popover.clone().upcast()),
+            builder: self.builder.property("popover", popover.as_ref().clone()),
         }
     }
 
@@ -803,7 +808,7 @@ impl MenuButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/message_dialog.rs b/gtk4/src/auto/message_dialog.rs
index d83977c0797e..a3a7ff50aef2 100644
--- a/gtk4/src/auto/message_dialog.rs
+++ b/gtk4/src/auto/message_dialog.rs
@@ -70,8 +70,8 @@ impl MessageDialog {
     }
 
     #[doc(alias = "secondary-text")]
-    pub fn set_secondary_text(&self, secondary_text: Option<&str>) {
-        ObjectExt::set_property(self, "secondary-text", secondary_text)
+    pub fn set_secondary_text<'a>(&self, secondary_text: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "secondary-text", secondary_text.into())
     }
 
     #[doc(alias = "secondary-use-markup")]
@@ -88,8 +88,8 @@ impl MessageDialog {
         ObjectExt::property(self, "text")
     }
 
-    pub fn set_text(&self, text: Option<&str>) {
-        ObjectExt::set_property(self, "text", text)
+    pub fn set_text<'a>(&self, text: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "text", text.into())
     }
 
     #[doc(alias = "use-markup")]
@@ -313,13 +313,13 @@ impl MessageDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -339,7 +339,7 @@ impl MessageDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -365,7 +365,7 @@ impl MessageDialogBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -379,7 +379,7 @@ impl MessageDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -453,7 +453,7 @@ impl MessageDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -461,7 +461,7 @@ impl MessageDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -541,7 +541,7 @@ impl MessageDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/mount_operation.rs b/gtk4/src/auto/mount_operation.rs
index 38a66afc53bb..b491029949a2 100644
--- a/gtk4/src/auto/mount_operation.rs
+++ b/gtk4/src/auto/mount_operation.rs
@@ -23,11 +23,11 @@ impl MountOperation {
     pub const NONE: Option<&'static MountOperation> = None;
 
     #[doc(alias = "gtk_mount_operation_new")]
-    pub fn new(parent: Option<&impl IsA<Window>>) -> MountOperation {
+    pub fn new<'a, P: IsA<Window>>(parent: impl Into<Option<&'a P>>) -> MountOperation {
         assert_initialized_main_thread!();
         unsafe {
             gio::MountOperation::from_glib_full(ffi::gtk_mount_operation_new(
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -66,13 +66,13 @@ impl MountOperationBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
     pub fn parent(self, parent: &impl IsA<Window>) -> Self {
         Self {
-            builder: self.builder.property("parent", parent.clone().upcast()),
+            builder: self.builder.property("parent", parent.as_ref().clone()),
         }
     }
 
@@ -187,11 +187,11 @@ pub trait GtkMountOperationExt: IsA<MountOperation> + 'static {
 
     #[doc(alias = "gtk_mount_operation_set_parent")]
     #[doc(alias = "parent")]
-    fn set_parent(&self, parent: Option<&impl IsA<Window>>) {
+    fn set_parent<'a, P: IsA<Window>>(&self, parent: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_mount_operation_set_parent(
                 self.as_ref().to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/multi_selection.rs b/gtk4/src/auto/multi_selection.rs
index 75b22dbf8998..5a05c8571f6b 100644
--- a/gtk4/src/auto/multi_selection.rs
+++ b/gtk4/src/auto/multi_selection.rs
@@ -53,11 +53,11 @@ impl MultiSelection {
 
     #[doc(alias = "gtk_multi_selection_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_multi_selection_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/native_dialog.rs b/gtk4/src/auto/native_dialog.rs
index 6c65ee67d5d1..ecd44696221d 100644
--- a/gtk4/src/auto/native_dialog.rs
+++ b/gtk4/src/auto/native_dialog.rs
@@ -102,11 +102,11 @@ pub trait NativeDialogExt: IsA<NativeDialog> + 'static {
 
     #[doc(alias = "gtk_native_dialog_set_transient_for")]
     #[doc(alias = "transient-for")]
-    fn set_transient_for(&self, parent: Option<&impl IsA<Window>>) {
+    fn set_transient_for<'a, P: IsA<Window>>(&self, parent: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_native_dialog_set_transient_for(
                 self.as_ref().to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/no_selection.rs b/gtk4/src/auto/no_selection.rs
index 8a1272ee33d4..70f899b4c1b0 100644
--- a/gtk4/src/auto/no_selection.rs
+++ b/gtk4/src/auto/no_selection.rs
@@ -53,11 +53,11 @@ impl NoSelection {
 
     #[doc(alias = "gtk_no_selection_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_no_selection_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/notebook.rs b/gtk4/src/auto/notebook.rs
index 0fd688535990..be7cfc0c4d6e 100644
--- a/gtk4/src/auto/notebook.rs
+++ b/gtk4/src/auto/notebook.rs
@@ -214,19 +214,31 @@ impl Notebook {
 
     #[doc(alias = "gtk_notebook_set_group_name")]
     #[doc(alias = "group-name")]
-    pub fn set_group_name(&self, group_name: Option<&str>) {
+    pub fn set_group_name<'a>(&self, group_name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_notebook_set_group_name(self.to_glib_none().0, group_name.to_glib_none().0);
+            ffi::gtk_notebook_set_group_name(
+                self.to_glib_none().0,
+                group_name.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_notebook_set_menu_label")]
-    pub fn set_menu_label(&self, child: &impl IsA<Widget>, menu_label: Option<&impl IsA<Widget>>) {
+    pub fn set_menu_label<'a, P: IsA<Widget>>(
+        &self,
+        child: &impl IsA<Widget>,
+        menu_label: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_notebook_set_menu_label(
                 self.to_glib_none().0,
                 child.as_ref().to_glib_none().0,
-                menu_label.map(|p| p.as_ref()).to_glib_none().0,
+                menu_label
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -278,12 +290,21 @@ impl Notebook {
     }
 
     #[doc(alias = "gtk_notebook_set_tab_label")]
-    pub fn set_tab_label(&self, child: &impl IsA<Widget>, tab_label: Option<&impl IsA<Widget>>) {
+    pub fn set_tab_label<'a, P: IsA<Widget>>(
+        &self,
+        child: &impl IsA<Widget>,
+        tab_label: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_notebook_set_tab_label(
                 self.to_glib_none().0,
                 child.as_ref().to_glib_none().0,
-                tab_label.map(|p| p.as_ref()).to_glib_none().0,
+                tab_label
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -955,7 +976,7 @@ impl NotebookBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/notebook_page.rs b/gtk4/src/auto/notebook_page.rs
index 488596cd2e9e..90e45dc69aea 100644
--- a/gtk4/src/auto/notebook_page.rs
+++ b/gtk4/src/auto/notebook_page.rs
@@ -44,8 +44,8 @@ impl NotebookPage {
     }
 
     #[doc(alias = "menu-label")]
-    pub fn set_menu_label(&self, menu_label: Option<&str>) {
-        ObjectExt::set_property(self, "menu-label", menu_label)
+    pub fn set_menu_label<'a>(&self, menu_label: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "menu-label", menu_label.into())
     }
 
     pub fn position(&self) -> i32 {
@@ -94,8 +94,8 @@ impl NotebookPage {
     }
 
     #[doc(alias = "tab-label")]
-    pub fn set_tab_label(&self, tab_label: Option<&str>) {
-        ObjectExt::set_property(self, "tab-label", tab_label)
+    pub fn set_tab_label<'a>(&self, tab_label: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "tab-label", tab_label.into())
     }
 
     #[doc(alias = "detachable")]
diff --git a/gtk4/src/auto/overlay.rs b/gtk4/src/auto/overlay.rs
index c2a057f5749e..f971fc695116 100644
--- a/gtk4/src/auto/overlay.rs
+++ b/gtk4/src/auto/overlay.rs
@@ -84,11 +84,11 @@ impl Overlay {
 
     #[doc(alias = "gtk_overlay_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_overlay_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -163,7 +163,7 @@ impl OverlayBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -243,7 +243,7 @@ impl OverlayBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/pad_controller.rs b/gtk4/src/auto/pad_controller.rs
index a73275a3e0c8..76460949b55d 100644
--- a/gtk4/src/auto/pad_controller.rs
+++ b/gtk4/src/auto/pad_controller.rs
@@ -18,12 +18,15 @@ glib::wrapper! {
 
 impl PadController {
     #[doc(alias = "gtk_pad_controller_new")]
-    pub fn new(group: &impl IsA<gio::ActionGroup>, pad: Option<&gdk::Device>) -> PadController {
+    pub fn new<'a>(
+        group: &impl IsA<gio::ActionGroup>,
+        pad: impl Into<Option<&'a gdk::Device>>,
+    ) -> PadController {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_pad_controller_new(
                 group.as_ref().to_glib_none().0,
-                pad.to_glib_none().0,
+                pad.into().to_glib_none().0,
             ))
         }
     }
@@ -105,7 +108,7 @@ impl PadControllerBuilder {
         Self {
             builder: self
                 .builder
-                .property("action-group", action_group.clone().upcast()),
+                .property("action-group", action_group.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/page_setup.rs b/gtk4/src/auto/page_setup.rs
index 56f20371cca6..ca1ca65bf92c 100644
--- a/gtk4/src/auto/page_setup.rs
+++ b/gtk4/src/auto/page_setup.rs
@@ -50,16 +50,16 @@ impl PageSetup {
 
     #[doc(alias = "gtk_page_setup_new_from_key_file")]
     #[doc(alias = "new_from_key_file")]
-    pub fn from_key_file(
+    pub fn from_key_file<'a>(
         key_file: &glib::KeyFile,
-        group_name: Option<&str>,
+        group_name: impl Into<Option<&'a str>>,
     ) -> Result<PageSetup, glib::Error> {
         assert_initialized_main_thread!();
         unsafe {
             let mut error = std::ptr::null_mut();
             let ret = ffi::gtk_page_setup_new_from_key_file(
                 key_file.to_glib_none().0,
-                group_name.to_glib_none().0,
+                group_name.into().to_glib_none().0,
                 &mut error,
             );
             if error.is_null() {
@@ -155,17 +155,17 @@ impl PageSetup {
     }
 
     #[doc(alias = "gtk_page_setup_load_key_file")]
-    pub fn load_key_file(
+    pub fn load_key_file<'a>(
         &self,
         key_file: &glib::KeyFile,
-        group_name: Option<&str>,
+        group_name: impl Into<Option<&'a str>>,
     ) -> Result<(), glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
             let is_ok = ffi::gtk_page_setup_load_key_file(
                 self.to_glib_none().0,
                 key_file.to_glib_none().0,
-                group_name.to_glib_none().0,
+                group_name.into().to_glib_none().0,
                 &mut error,
             );
             debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
@@ -256,12 +256,16 @@ impl PageSetup {
     }
 
     #[doc(alias = "gtk_page_setup_to_key_file")]
-    pub fn to_key_file(&self, key_file: &glib::KeyFile, group_name: Option<&str>) {
+    pub fn to_key_file<'a>(
+        &self,
+        key_file: &glib::KeyFile,
+        group_name: impl Into<Option<&'a str>>,
+    ) {
         unsafe {
             ffi::gtk_page_setup_to_key_file(
                 self.to_glib_none().0,
                 key_file.to_glib_none().0,
-                group_name.to_glib_none().0,
+                group_name.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/page_setup_unix_dialog.rs b/gtk4/src/auto/page_setup_unix_dialog.rs
index a22debb272a1..af76c4e6dd2e 100644
--- a/gtk4/src/auto/page_setup_unix_dialog.rs
+++ b/gtk4/src/auto/page_setup_unix_dialog.rs
@@ -20,12 +20,15 @@ glib::wrapper! {
 
 impl PageSetupUnixDialog {
     #[doc(alias = "gtk_page_setup_unix_dialog_new")]
-    pub fn new(title: Option<&str>, parent: Option<&impl IsA<Window>>) -> PageSetupUnixDialog {
+    pub fn new<'a, P: IsA<Window>>(
+        title: impl Into<Option<&'a str>>,
+        parent: impl Into<Option<&'a P>>,
+    ) -> PageSetupUnixDialog {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_page_setup_unix_dialog_new(
-                title.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                title.into().to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -70,11 +73,11 @@ impl PageSetupUnixDialog {
     }
 
     #[doc(alias = "gtk_page_setup_unix_dialog_set_print_settings")]
-    pub fn set_print_settings(&self, print_settings: Option<&PrintSettings>) {
+    pub fn set_print_settings<'a>(&self, print_settings: impl Into<Option<&'a PrintSettings>>) {
         unsafe {
             ffi::gtk_page_setup_unix_dialog_set_print_settings(
                 self.to_glib_none().0,
-                print_settings.to_glib_none().0,
+                print_settings.into().to_glib_none().0,
             );
         }
     }
@@ -113,13 +116,13 @@ impl PageSetupUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -139,7 +142,7 @@ impl PageSetupUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -165,7 +168,7 @@ impl PageSetupUnixDialogBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -179,7 +182,7 @@ impl PageSetupUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -253,7 +256,7 @@ impl PageSetupUnixDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -261,7 +264,7 @@ impl PageSetupUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -341,7 +344,7 @@ impl PageSetupUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/paned.rs b/gtk4/src/auto/paned.rs
index 4efee5e3ae51..2030da6818e2 100644
--- a/gtk4/src/auto/paned.rs
+++ b/gtk4/src/auto/paned.rs
@@ -109,11 +109,11 @@ impl Paned {
 
     #[doc(alias = "gtk_paned_set_end_child")]
     #[doc(alias = "end-child")]
-    pub fn set_end_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_end_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_paned_set_end_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -160,11 +160,11 @@ impl Paned {
 
     #[doc(alias = "gtk_paned_set_start_child")]
     #[doc(alias = "start-child")]
-    pub fn set_start_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_start_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_paned_set_start_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -651,7 +651,7 @@ impl PanedBuilder {
         Self {
             builder: self
                 .builder
-                .property("end-child", end_child.clone().upcast()),
+                .property("end-child", end_child.as_ref().clone()),
         }
     }
 
@@ -699,7 +699,7 @@ impl PanedBuilder {
         Self {
             builder: self
                 .builder
-                .property("start-child", start_child.clone().upcast()),
+                .property("start-child", start_child.as_ref().clone()),
         }
     }
 
@@ -785,7 +785,7 @@ impl PanedBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/paper_size.rs b/gtk4/src/auto/paper_size.rs
index ec3a5eb565f8..b058f5576b1c 100644
--- a/gtk4/src/auto/paper_size.rs
+++ b/gtk4/src/auto/paper_size.rs
@@ -18,9 +18,9 @@ glib::wrapper! {
 
 impl PaperSize {
     #[doc(alias = "gtk_paper_size_new")]
-    pub fn new(name: Option<&str>) -> PaperSize {
+    pub fn new<'a>(name: impl Into<Option<&'a str>>) -> PaperSize {
         assert_initialized_main_thread!();
-        unsafe { from_glib_full(ffi::gtk_paper_size_new(name.to_glib_none().0)) }
+        unsafe { from_glib_full(ffi::gtk_paper_size_new(name.into().to_glib_none().0)) }
     }
 
     #[doc(alias = "gtk_paper_size_new_custom")]
@@ -69,16 +69,16 @@ impl PaperSize {
 
     #[doc(alias = "gtk_paper_size_new_from_key_file")]
     #[doc(alias = "new_from_key_file")]
-    pub fn from_key_file(
+    pub fn from_key_file<'a>(
         key_file: &glib::KeyFile,
-        group_name: Option<&str>,
+        group_name: impl Into<Option<&'a str>>,
     ) -> Result<PaperSize, glib::Error> {
         assert_initialized_main_thread!();
         unsafe {
             let mut error = std::ptr::null_mut();
             let ret = ffi::gtk_paper_size_new_from_key_file(
                 key_file.to_glib_none().0,
-                group_name.to_glib_none().0,
+                group_name.into().to_glib_none().0,
                 &mut error,
             );
             if error.is_null() {
diff --git a/gtk4/src/auto/password_entry.rs b/gtk4/src/auto/password_entry.rs
index 33082e74f84a..71faadb41a25 100644
--- a/gtk4/src/auto/password_entry.rs
+++ b/gtk4/src/auto/password_entry.rs
@@ -61,11 +61,11 @@ impl PasswordEntry {
 
     #[doc(alias = "gtk_password_entry_set_extra_menu")]
     #[doc(alias = "extra-menu")]
-    pub fn set_extra_menu(&self, model: Option<&impl IsA<gio::MenuModel>>) {
+    pub fn set_extra_menu<'a, P: IsA<gio::MenuModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_password_entry_set_extra_menu(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -97,8 +97,8 @@ impl PasswordEntry {
     }
 
     #[doc(alias = "placeholder-text")]
-    pub fn set_placeholder_text(&self, placeholder_text: Option<&str>) {
-        ObjectExt::set_property(self, "placeholder-text", placeholder_text)
+    pub fn set_placeholder_text<'a>(&self, placeholder_text: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "placeholder-text", placeholder_text.into())
     }
 
     #[doc(alias = "activate")]
@@ -259,7 +259,7 @@ impl PasswordEntryBuilder {
         Self {
             builder: self
                 .builder
-                .property("extra-menu", extra_menu.clone().upcast()),
+                .property("extra-menu", extra_menu.as_ref().clone()),
         }
     }
 
@@ -353,7 +353,7 @@ impl PasswordEntryBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/picture.rs b/gtk4/src/auto/picture.rs
index 2ae7ef213617..8816065e5a47 100644
--- a/gtk4/src/auto/picture.rs
+++ b/gtk4/src/auto/picture.rs
@@ -151,11 +151,11 @@ impl Picture {
 
     #[doc(alias = "gtk_picture_set_alternative_text")]
     #[doc(alias = "alternative-text")]
-    pub fn set_alternative_text(&self, alternative_text: Option<&str>) {
+    pub fn set_alternative_text<'a>(&self, alternative_text: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_picture_set_alternative_text(
                 self.to_glib_none().0,
-                alternative_text.to_glib_none().0,
+                alternative_text.into().to_glib_none().0,
             );
         }
     }
@@ -180,11 +180,11 @@ impl Picture {
 
     #[doc(alias = "gtk_picture_set_file")]
     #[doc(alias = "file")]
-    pub fn set_file(&self, file: Option<&impl IsA<gio::File>>) {
+    pub fn set_file<'a, P: IsA<gio::File>>(&self, file: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_picture_set_file(
                 self.to_glib_none().0,
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -214,11 +214,16 @@ impl Picture {
 
     #[doc(alias = "gtk_picture_set_paintable")]
     #[doc(alias = "paintable")]
-    pub fn set_paintable(&self, paintable: Option<&impl IsA<gdk::Paintable>>) {
+    pub fn set_paintable<'a, P: IsA<gdk::Paintable>>(&self, paintable: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_picture_set_paintable(
                 self.to_glib_none().0,
-                paintable.map(|p| p.as_ref()).to_glib_none().0,
+                paintable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -226,16 +231,19 @@ impl Picture {
     #[cfg_attr(feature = "v4_12", deprecated = "Since 4.12")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_picture_set_pixbuf")]
-    pub fn set_pixbuf(&self, pixbuf: Option<&gdk_pixbuf::Pixbuf>) {
+    pub fn set_pixbuf<'a>(&self, pixbuf: impl Into<Option<&'a gdk_pixbuf::Pixbuf>>) {
         unsafe {
-            ffi::gtk_picture_set_pixbuf(self.to_glib_none().0, pixbuf.to_glib_none().0);
+            ffi::gtk_picture_set_pixbuf(self.to_glib_none().0, pixbuf.into().to_glib_none().0);
         }
     }
 
     #[doc(alias = "gtk_picture_set_resource")]
-    pub fn set_resource(&self, resource_path: Option<&str>) {
+    pub fn set_resource<'a>(&self, resource_path: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_picture_set_resource(self.to_glib_none().0, resource_path.to_glib_none().0);
+            ffi::gtk_picture_set_resource(
+                self.to_glib_none().0,
+                resource_path.into().to_glib_none().0,
+            );
         }
     }
 
@@ -430,7 +438,7 @@ impl PictureBuilder {
 
     pub fn file(self, file: &impl IsA<gio::File>) -> Self {
         Self {
-            builder: self.builder.property("file", file.clone().upcast()),
+            builder: self.builder.property("file", file.as_ref().clone()),
         }
     }
 
@@ -447,7 +455,7 @@ impl PictureBuilder {
         Self {
             builder: self
                 .builder
-                .property("paintable", paintable.clone().upcast()),
+                .property("paintable", paintable.as_ref().clone()),
         }
     }
 
@@ -527,7 +535,7 @@ impl PictureBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/popover.rs b/gtk4/src/auto/popover.rs
index 068676daaf90..4ada7c109ec9 100644
--- a/gtk4/src/auto/popover.rs
+++ b/gtk4/src/auto/popover.rs
@@ -76,7 +76,7 @@ impl PopoverBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -84,7 +84,7 @@ impl PopoverBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -190,7 +190,7 @@ impl PopoverBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -439,22 +439,22 @@ pub trait PopoverExt: IsA<Popover> + 'static {
 
     #[doc(alias = "gtk_popover_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_popover_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_popover_set_default_widget")]
     #[doc(alias = "default-widget")]
-    fn set_default_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    fn set_default_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_popover_set_default_widget(
                 self.as_ref().to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -487,9 +487,12 @@ pub trait PopoverExt: IsA<Popover> + 'static {
 
     #[doc(alias = "gtk_popover_set_pointing_to")]
     #[doc(alias = "pointing-to")]
-    fn set_pointing_to(&self, rect: Option<&gdk::Rectangle>) {
+    fn set_pointing_to<'a>(&self, rect: impl Into<Option<&'a gdk::Rectangle>>) {
         unsafe {
-            ffi::gtk_popover_set_pointing_to(self.as_ref().to_glib_none().0, rect.to_glib_none().0);
+            ffi::gtk_popover_set_pointing_to(
+                self.as_ref().to_glib_none().0,
+                rect.into().to_glib_none().0,
+            );
         }
     }
 
diff --git a/gtk4/src/auto/popover_menu.rs b/gtk4/src/auto/popover_menu.rs
index 2831235325ce..fef3ac09f540 100644
--- a/gtk4/src/auto/popover_menu.rs
+++ b/gtk4/src/auto/popover_menu.rs
@@ -25,11 +25,11 @@ glib::wrapper! {
 impl PopoverMenu {
     #[doc(alias = "gtk_popover_menu_new_from_model")]
     #[doc(alias = "new_from_model")]
-    pub fn from_model(model: Option<&impl IsA<gio::MenuModel>>) -> PopoverMenu {
+    pub fn from_model<'a, P: IsA<gio::MenuModel>>(model: impl Into<Option<&'a P>>) -> PopoverMenu {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_popover_menu_new_from_model(
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -107,11 +107,11 @@ impl PopoverMenu {
 
     #[doc(alias = "gtk_popover_menu_set_menu_model")]
     #[doc(alias = "menu-model")]
-    pub fn set_menu_model(&self, model: Option<&impl IsA<gio::MenuModel>>) {
+    pub fn set_menu_model<'a, P: IsA<gio::MenuModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_popover_menu_set_menu_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -122,8 +122,8 @@ impl PopoverMenu {
     }
 
     #[doc(alias = "visible-submenu")]
-    pub fn set_visible_submenu(&self, visible_submenu: Option<&str>) {
-        ObjectExt::set_property(self, "visible-submenu", visible_submenu)
+    pub fn set_visible_submenu<'a>(&self, visible_submenu: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "visible-submenu", visible_submenu.into())
     }
 
     #[cfg(feature = "v4_14")]
@@ -226,7 +226,7 @@ impl PopoverMenuBuilder {
         Self {
             builder: self
                 .builder
-                .property("menu-model", menu_model.clone().upcast()),
+                .property("menu-model", menu_model.as_ref().clone()),
         }
     }
 
@@ -252,7 +252,7 @@ impl PopoverMenuBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -260,7 +260,7 @@ impl PopoverMenuBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -366,7 +366,7 @@ impl PopoverMenuBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/popover_menu_bar.rs b/gtk4/src/auto/popover_menu_bar.rs
index 95d43e4e484a..618ab0265f17 100644
--- a/gtk4/src/auto/popover_menu_bar.rs
+++ b/gtk4/src/auto/popover_menu_bar.rs
@@ -25,11 +25,13 @@ glib::wrapper! {
 impl PopoverMenuBar {
     #[doc(alias = "gtk_popover_menu_bar_new_from_model")]
     #[doc(alias = "new_from_model")]
-    pub fn from_model(model: Option<&impl IsA<gio::MenuModel>>) -> PopoverMenuBar {
+    pub fn from_model<'a, P: IsA<gio::MenuModel>>(
+        model: impl Into<Option<&'a P>>,
+    ) -> PopoverMenuBar {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_popover_menu_bar_new_from_model(
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -77,11 +79,11 @@ impl PopoverMenuBar {
 
     #[doc(alias = "gtk_popover_menu_bar_set_menu_model")]
     #[doc(alias = "menu-model")]
-    pub fn set_menu_model(&self, model: Option<&impl IsA<gio::MenuModel>>) {
+    pub fn set_menu_model<'a, P: IsA<gio::MenuModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_popover_menu_bar_set_menu_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -130,7 +132,7 @@ impl PopoverMenuBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("menu-model", menu_model.clone().upcast()),
+                .property("menu-model", menu_model.as_ref().clone()),
         }
     }
 
@@ -210,7 +212,7 @@ impl PopoverMenuBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/print_dialog.rs b/gtk4/src/auto/print_dialog.rs
index f50955b66e47..f29fd0bbad9d 100644
--- a/gtk4/src/auto/print_dialog.rs
+++ b/gtk4/src/auto/print_dialog.rs
@@ -77,12 +77,17 @@ impl PrintDialog {
     }
 
     #[doc(alias = "gtk_print_dialog_print")]
-    pub fn print<P: FnOnce(Result<gio::OutputStream, glib::Error>) + 'static>(
+    pub fn print<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<gio::OutputStream, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        setup: Option<&PrintSetup>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        setup: impl Into<Option<&'a PrintSetup>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -94,10 +99,10 @@ impl PrintDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn print_trampoline<
-            P: FnOnce(Result<gio::OutputStream, glib::Error>) + 'static,
+            R: FnOnce(Result<gio::OutputStream, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -110,32 +115,37 @@ impl PrintDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = print_trampoline::<P>;
+        let callback = print_trampoline::<R>;
         unsafe {
             ffi::gtk_print_dialog_print(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                setup.to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                setup.into().to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn print_future(
+    pub fn print_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
-        setup: Option<&PrintSetup>,
+        parent: impl Into<Option<&'a P>>,
+        setup: impl Into<Option<&'a PrintSetup>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<gio::OutputStream, glib::Error>> + 'static>>
     {
-        let parent = parent.map(ToOwned::to_owned);
-        let setup = setup.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
+        let setup = setup.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.print(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -149,13 +159,18 @@ impl PrintDialog {
     }
 
     #[doc(alias = "gtk_print_dialog_print_file")]
-    pub fn print_file<P: FnOnce(Result<(), glib::Error>) + 'static>(
+    pub fn print_file<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<(), glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        setup: Option<&PrintSetup>,
+        parent: impl Into<Option<&'a P>>,
+        setup: impl Into<Option<&'a PrintSetup>>,
         file: &impl IsA<gio::File>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -167,9 +182,9 @@ impl PrintDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
-        unsafe extern "C" fn print_file_trampoline<P: FnOnce(Result<(), glib::Error>) + 'static>(
+        unsafe extern "C" fn print_file_trampoline<R: FnOnce(Result<(), glib::Error>) + 'static>(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
             user_data: glib::ffi::gpointer,
@@ -182,33 +197,38 @@ impl PrintDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = print_file_trampoline::<P>;
+        let callback = print_file_trampoline::<R>;
         unsafe {
             ffi::gtk_print_dialog_print_file(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                setup.to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                setup.into().to_glib_none().0,
                 file.as_ref().to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn print_file_future(
+    pub fn print_file_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
-        setup: Option<&PrintSetup>,
+        parent: impl Into<Option<&'a P>>,
+        setup: impl Into<Option<&'a PrintSetup>>,
         file: &(impl IsA<gio::File> + Clone + 'static),
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
-        let setup = setup.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
+        let setup = setup.into().map(ToOwned::to_owned);
         let file = file.clone();
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.print_file(
@@ -273,11 +293,16 @@ impl PrintDialog {
     }
 
     #[doc(alias = "gtk_print_dialog_setup")]
-    pub fn setup<P: FnOnce(Result<PrintSetup, glib::Error>) + 'static>(
+    pub fn setup<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<PrintSetup, glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -289,10 +314,10 @@ impl PrintDialog {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
         unsafe extern "C" fn setup_trampoline<
-            P: FnOnce(Result<PrintSetup, glib::Error>) + 'static,
+            R: FnOnce(Result<PrintSetup, glib::Error>) + 'static,
         >(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
@@ -305,29 +330,34 @@ impl PrintDialog {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = setup_trampoline::<P>;
+        let callback = setup_trampoline::<R>;
         unsafe {
             ffi::gtk_print_dialog_setup(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn setup_future(
+    pub fn setup_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<PrintSetup, glib::Error>> + 'static>>
     {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.setup(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
diff --git a/gtk4/src/auto/print_operation.rs b/gtk4/src/auto/print_operation.rs
index 9c29a0420d08..4373729ef882 100644
--- a/gtk4/src/auto/print_operation.rs
+++ b/gtk4/src/auto/print_operation.rs
@@ -281,17 +281,17 @@ pub trait PrintOperationExt: IsA<PrintOperation> + 'static {
     }
 
     #[doc(alias = "gtk_print_operation_run")]
-    fn run(
+    fn run<'a, P: IsA<Window>>(
         &self,
         action: PrintOperationAction,
-        parent: Option<&impl IsA<Window>>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Result<PrintOperationResult, glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
             let ret = ffi::gtk_print_operation_run(
                 self.as_ref().to_glib_none().0,
                 action.into_glib(),
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
                 &mut error,
             );
             if error.is_null() {
@@ -323,22 +323,22 @@ pub trait PrintOperationExt: IsA<PrintOperation> + 'static {
 
     #[doc(alias = "gtk_print_operation_set_custom_tab_label")]
     #[doc(alias = "custom-tab-label")]
-    fn set_custom_tab_label(&self, label: Option<&str>) {
+    fn set_custom_tab_label<'a>(&self, label: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_print_operation_set_custom_tab_label(
                 self.as_ref().to_glib_none().0,
-                label.to_glib_none().0,
+                label.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_print_operation_set_default_page_setup")]
     #[doc(alias = "default-page-setup")]
-    fn set_default_page_setup(&self, default_page_setup: Option<&PageSetup>) {
+    fn set_default_page_setup<'a>(&self, default_page_setup: impl Into<Option<&'a PageSetup>>) {
         unsafe {
             ffi::gtk_print_operation_set_default_page_setup(
                 self.as_ref().to_glib_none().0,
-                default_page_setup.to_glib_none().0,
+                default_page_setup.into().to_glib_none().0,
             );
         }
     }
@@ -404,11 +404,11 @@ pub trait PrintOperationExt: IsA<PrintOperation> + 'static {
 
     #[doc(alias = "gtk_print_operation_set_print_settings")]
     #[doc(alias = "print-settings")]
-    fn set_print_settings(&self, print_settings: Option<&PrintSettings>) {
+    fn set_print_settings<'a>(&self, print_settings: impl Into<Option<&'a PrintSettings>>) {
         unsafe {
             ffi::gtk_print_operation_set_print_settings(
                 self.as_ref().to_glib_none().0,
-                print_settings.to_glib_none().0,
+                print_settings.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/print_settings.rs b/gtk4/src/auto/print_settings.rs
index cd78166a19d8..1d490a844226 100644
--- a/gtk4/src/auto/print_settings.rs
+++ b/gtk4/src/auto/print_settings.rs
@@ -55,16 +55,16 @@ impl PrintSettings {
 
     #[doc(alias = "gtk_print_settings_new_from_key_file")]
     #[doc(alias = "new_from_key_file")]
-    pub fn from_key_file(
+    pub fn from_key_file<'a>(
         key_file: &glib::KeyFile,
-        group_name: Option<&str>,
+        group_name: impl Into<Option<&'a str>>,
     ) -> Result<PrintSettings, glib::Error> {
         assert_initialized_main_thread!();
         unsafe {
             let mut error = std::ptr::null_mut();
             let ret = ffi::gtk_print_settings_new_from_key_file(
                 key_file.to_glib_none().0,
-                group_name.to_glib_none().0,
+                group_name.into().to_glib_none().0,
                 &mut error,
             );
             if error.is_null() {
@@ -401,17 +401,17 @@ impl PrintSettings {
     }
 
     #[doc(alias = "gtk_print_settings_load_key_file")]
-    pub fn load_key_file(
+    pub fn load_key_file<'a>(
         &self,
         key_file: &glib::KeyFile,
-        group_name: Option<&str>,
+        group_name: impl Into<Option<&'a str>>,
     ) -> Result<(), glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
             let is_ok = ffi::gtk_print_settings_load_key_file(
                 self.to_glib_none().0,
                 key_file.to_glib_none().0,
-                group_name.to_glib_none().0,
+                group_name.into().to_glib_none().0,
                 &mut error,
             );
             debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
@@ -424,12 +424,12 @@ impl PrintSettings {
     }
 
     #[doc(alias = "gtk_print_settings_set")]
-    pub fn set(&self, key: &str, value: Option<&str>) {
+    pub fn set<'a>(&self, key: &str, value: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_print_settings_set(
                 self.to_glib_none().0,
                 key.to_glib_none().0,
-                value.to_glib_none().0,
+                value.into().to_glib_none().0,
             );
         }
     }
@@ -689,12 +689,16 @@ impl PrintSettings {
     }
 
     #[doc(alias = "gtk_print_settings_to_key_file")]
-    pub fn to_key_file(&self, key_file: &glib::KeyFile, group_name: Option<&str>) {
+    pub fn to_key_file<'a>(
+        &self,
+        key_file: &glib::KeyFile,
+        group_name: impl Into<Option<&'a str>>,
+    ) {
         unsafe {
             ffi::gtk_print_settings_to_key_file(
                 self.to_glib_none().0,
                 key_file.to_glib_none().0,
-                group_name.to_glib_none().0,
+                group_name.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/print_unix_dialog.rs b/gtk4/src/auto/print_unix_dialog.rs
index cf65c39d4737..16ff1da80f26 100644
--- a/gtk4/src/auto/print_unix_dialog.rs
+++ b/gtk4/src/auto/print_unix_dialog.rs
@@ -25,12 +25,15 @@ glib::wrapper! {
 
 impl PrintUnixDialog {
     #[doc(alias = "gtk_print_unix_dialog_new")]
-    pub fn new(title: Option<&str>, parent: Option<&impl IsA<Window>>) -> PrintUnixDialog {
+    pub fn new<'a, P: IsA<Window>>(
+        title: impl Into<Option<&'a str>>,
+        parent: impl Into<Option<&'a P>>,
+    ) -> PrintUnixDialog {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_print_unix_dialog_new(
-                title.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                title.into().to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -203,11 +206,11 @@ impl PrintUnixDialog {
 
     #[doc(alias = "gtk_print_unix_dialog_set_settings")]
     #[doc(alias = "print-settings")]
-    pub fn set_settings(&self, settings: Option<&PrintSettings>) {
+    pub fn set_settings<'a>(&self, settings: impl Into<Option<&'a PrintSettings>>) {
         unsafe {
             ffi::gtk_print_unix_dialog_set_settings(
                 self.to_glib_none().0,
-                settings.to_glib_none().0,
+                settings.into().to_glib_none().0,
             );
         }
     }
@@ -503,13 +506,13 @@ impl PrintUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -529,7 +532,7 @@ impl PrintUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -555,7 +558,7 @@ impl PrintUnixDialogBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -569,7 +572,7 @@ impl PrintUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -643,7 +646,7 @@ impl PrintUnixDialogBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -651,7 +654,7 @@ impl PrintUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -731,7 +734,7 @@ impl PrintUnixDialogBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/progress_bar.rs b/gtk4/src/auto/progress_bar.rs
index 81fa2d733e6b..77f425270e13 100644
--- a/gtk4/src/auto/progress_bar.rs
+++ b/gtk4/src/auto/progress_bar.rs
@@ -140,9 +140,9 @@ impl ProgressBar {
 
     #[doc(alias = "gtk_progress_bar_set_text")]
     #[doc(alias = "text")]
-    pub fn set_text(&self, text: Option<&str>) {
+    pub fn set_text<'a>(&self, text: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_progress_bar_set_text(self.to_glib_none().0, text.to_glib_none().0);
+            ffi::gtk_progress_bar_set_text(self.to_glib_none().0, text.into().to_glib_none().0);
         }
     }
 
@@ -419,7 +419,7 @@ impl ProgressBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/recent_info.rs b/gtk4/src/auto/recent_info.rs
index da4ee66d4b86..388f74d800e4 100644
--- a/gtk4/src/auto/recent_info.rs
+++ b/gtk4/src/auto/recent_info.rs
@@ -18,15 +18,15 @@ glib::wrapper! {
 
 impl RecentInfo {
     #[doc(alias = "gtk_recent_info_create_app_info")]
-    pub fn create_app_info(
+    pub fn create_app_info<'a>(
         &self,
-        app_name: Option<&str>,
+        app_name: impl Into<Option<&'a str>>,
     ) -> Result<Option<gio::AppInfo>, glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
             let ret = ffi::gtk_recent_info_create_app_info(
                 self.to_glib_none().0,
-                app_name.to_glib_none().0,
+                app_name.into().to_glib_none().0,
                 &mut error,
             );
             if error.is_null() {
diff --git a/gtk4/src/auto/recent_manager.rs b/gtk4/src/auto/recent_manager.rs
index 16357b888ec5..bccbbf860e8d 100644
--- a/gtk4/src/auto/recent_manager.rs
+++ b/gtk4/src/auto/recent_manager.rs
@@ -103,13 +103,17 @@ pub trait RecentManagerExt: IsA<RecentManager> + 'static {
     }
 
     #[doc(alias = "gtk_recent_manager_move_item")]
-    fn move_item(&self, uri: &str, new_uri: Option<&str>) -> Result<(), glib::Error> {
+    fn move_item<'a>(
+        &self,
+        uri: &str,
+        new_uri: impl Into<Option<&'a str>>,
+    ) -> Result<(), glib::Error> {
         unsafe {
             let mut error = std::ptr::null_mut();
             let is_ok = ffi::gtk_recent_manager_move_item(
                 self.as_ref().to_glib_none().0,
                 uri.to_glib_none().0,
-                new_uri.to_glib_none().0,
+                new_uri.into().to_glib_none().0,
                 &mut error,
             );
             debug_assert_eq!(is_ok == glib::ffi::GFALSE, !error.is_null());
diff --git a/gtk4/src/auto/revealer.rs b/gtk4/src/auto/revealer.rs
index 8ae6a815cad9..64fc95282c85 100644
--- a/gtk4/src/auto/revealer.rs
+++ b/gtk4/src/auto/revealer.rs
@@ -73,11 +73,11 @@ impl Revealer {
 
     #[doc(alias = "gtk_revealer_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_revealer_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -249,7 +249,7 @@ impl RevealerBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -349,7 +349,7 @@ impl RevealerBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/root.rs b/gtk4/src/auto/root.rs
index 2cb841403dea..82c9ee41e178 100644
--- a/gtk4/src/auto/root.rs
+++ b/gtk4/src/auto/root.rs
@@ -32,11 +32,11 @@ pub trait RootExt: IsA<Root> + 'static {
     }
 
     #[doc(alias = "gtk_root_set_focus")]
-    fn set_focus(&self, focus: Option<&impl IsA<Widget>>) {
+    fn set_focus<'a, P: IsA<Widget>>(&self, focus: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_root_set_focus(
                 self.as_ref().to_glib_none().0,
-                focus.map(|p| p.as_ref()).to_glib_none().0,
+                focus.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/scale.rs b/gtk4/src/auto/scale.rs
index 54fdf044c7c5..ae174d1b319f 100644
--- a/gtk4/src/auto/scale.rs
+++ b/gtk4/src/auto/scale.rs
@@ -41,12 +41,20 @@ impl Scale {
     pub const NONE: Option<&'static Scale> = None;
 
     #[doc(alias = "gtk_scale_new")]
-    pub fn new(orientation: Orientation, adjustment: Option<&impl IsA<Adjustment>>) -> Scale {
+    pub fn new<'a, P: IsA<Adjustment>>(
+        orientation: Orientation,
+        adjustment: impl Into<Option<&'a P>>,
+    ) -> Scale {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_scale_new(
                 orientation.into_glib(),
-                adjustment.map(|p| p.as_ref()).to_glib_none().0,
+                adjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             ))
             .unsafe_cast()
         }
@@ -126,7 +134,7 @@ impl ScaleBuilder {
         Self {
             builder: self
                 .builder
-                .property("adjustment", adjustment.clone().upcast()),
+                .property("adjustment", adjustment.as_ref().clone()),
         }
     }
 
@@ -238,7 +246,7 @@ impl ScaleBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -363,13 +371,13 @@ impl ScaleBuilder {
 
 pub trait ScaleExt: IsA<Scale> + 'static {
     #[doc(alias = "gtk_scale_add_mark")]
-    fn add_mark(&self, value: f64, position: PositionType, markup: Option<&str>) {
+    fn add_mark<'a>(&self, value: f64, position: PositionType, markup: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_scale_add_mark(
                 self.as_ref().to_glib_none().0,
                 value,
                 position.into_glib(),
-                markup.to_glib_none().0,
+                markup.into().to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/scale_button.rs b/gtk4/src/auto/scale_button.rs
index 7aa484b65c69..da107bffa8fa 100644
--- a/gtk4/src/auto/scale_button.rs
+++ b/gtk4/src/auto/scale_button.rs
@@ -89,7 +89,7 @@ impl ScaleButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("adjustment", adjustment.clone().upcast()),
+                .property("adjustment", adjustment.as_ref().clone()),
         }
     }
 
@@ -189,7 +189,7 @@ impl ScaleButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/scrollable.rs b/gtk4/src/auto/scrollable.rs
index 7231ab53e053..1a31083d77a0 100644
--- a/gtk4/src/auto/scrollable.rs
+++ b/gtk4/src/auto/scrollable.rs
@@ -85,11 +85,16 @@ pub trait ScrollableExt: IsA<Scrollable> + 'static {
 
     #[doc(alias = "gtk_scrollable_set_hadjustment")]
     #[doc(alias = "hadjustment")]
-    fn set_hadjustment(&self, hadjustment: Option<&impl IsA<Adjustment>>) {
+    fn set_hadjustment<'a, P: IsA<Adjustment>>(&self, hadjustment: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_scrollable_set_hadjustment(
                 self.as_ref().to_glib_none().0,
-                hadjustment.map(|p| p.as_ref()).to_glib_none().0,
+                hadjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -107,11 +112,16 @@ pub trait ScrollableExt: IsA<Scrollable> + 'static {
 
     #[doc(alias = "gtk_scrollable_set_vadjustment")]
     #[doc(alias = "vadjustment")]
-    fn set_vadjustment(&self, vadjustment: Option<&impl IsA<Adjustment>>) {
+    fn set_vadjustment<'a, P: IsA<Adjustment>>(&self, vadjustment: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_scrollable_set_vadjustment(
                 self.as_ref().to_glib_none().0,
-                vadjustment.map(|p| p.as_ref()).to_glib_none().0,
+                vadjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
diff --git a/gtk4/src/auto/scrollbar.rs b/gtk4/src/auto/scrollbar.rs
index 9ed2a1ea5f6a..2c35003546e2 100644
--- a/gtk4/src/auto/scrollbar.rs
+++ b/gtk4/src/auto/scrollbar.rs
@@ -39,12 +39,20 @@ glib::wrapper! {
 
 impl Scrollbar {
     #[doc(alias = "gtk_scrollbar_new")]
-    pub fn new(orientation: Orientation, adjustment: Option<&impl IsA<Adjustment>>) -> Scrollbar {
+    pub fn new<'a, P: IsA<Adjustment>>(
+        orientation: Orientation,
+        adjustment: impl Into<Option<&'a P>>,
+    ) -> Scrollbar {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_scrollbar_new(
                 orientation.into_glib(),
-                adjustment.map(|p| p.as_ref()).to_glib_none().0,
+                adjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             ))
             .unsafe_cast()
         }
@@ -66,11 +74,16 @@ impl Scrollbar {
 
     #[doc(alias = "gtk_scrollbar_set_adjustment")]
     #[doc(alias = "adjustment")]
-    pub fn set_adjustment(&self, adjustment: Option<&impl IsA<Adjustment>>) {
+    pub fn set_adjustment<'a, P: IsA<Adjustment>>(&self, adjustment: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_scrollbar_set_adjustment(
                 self.to_glib_none().0,
-                adjustment.map(|p| p.as_ref()).to_glib_none().0,
+                adjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -125,7 +138,7 @@ impl ScrollbarBuilder {
         Self {
             builder: self
                 .builder
-                .property("adjustment", adjustment.clone().upcast()),
+                .property("adjustment", adjustment.as_ref().clone()),
         }
     }
 
@@ -205,7 +218,7 @@ impl ScrollbarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/scrolled_window.rs b/gtk4/src/auto/scrolled_window.rs
index 4c78f687fc6c..1f99e3cff5b7 100644
--- a/gtk4/src/auto/scrolled_window.rs
+++ b/gtk4/src/auto/scrolled_window.rs
@@ -197,22 +197,27 @@ impl ScrolledWindow {
 
     #[doc(alias = "gtk_scrolled_window_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_scrolled_window_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_scrolled_window_set_hadjustment")]
     #[doc(alias = "hadjustment")]
-    pub fn set_hadjustment(&self, hadjustment: Option<&impl IsA<Adjustment>>) {
+    pub fn set_hadjustment<'a, P: IsA<Adjustment>>(&self, hadjustment: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_scrolled_window_set_hadjustment(
                 self.to_glib_none().0,
-                hadjustment.map(|p| p.as_ref()).to_glib_none().0,
+                hadjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -325,11 +330,16 @@ impl ScrolledWindow {
 
     #[doc(alias = "gtk_scrolled_window_set_vadjustment")]
     #[doc(alias = "vadjustment")]
-    pub fn set_vadjustment(&self, vadjustment: Option<&impl IsA<Adjustment>>) {
+    pub fn set_vadjustment<'a, P: IsA<Adjustment>>(&self, vadjustment: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_scrolled_window_set_vadjustment(
                 self.to_glib_none().0,
-                vadjustment.map(|p| p.as_ref()).to_glib_none().0,
+                vadjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -909,7 +919,7 @@ impl ScrolledWindowBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -917,7 +927,7 @@ impl ScrolledWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("hadjustment", hadjustment.clone().upcast()),
+                .property("hadjustment", hadjustment.as_ref().clone()),
         }
     }
 
@@ -1003,7 +1013,7 @@ impl ScrolledWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("vadjustment", vadjustment.clone().upcast()),
+                .property("vadjustment", vadjustment.as_ref().clone()),
         }
     }
 
@@ -1097,7 +1107,7 @@ impl ScrolledWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/search_bar.rs b/gtk4/src/auto/search_bar.rs
index 6651886ca537..dba077afcf95 100644
--- a/gtk4/src/auto/search_bar.rs
+++ b/gtk4/src/auto/search_bar.rs
@@ -84,22 +84,22 @@ impl SearchBar {
 
     #[doc(alias = "gtk_search_bar_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_search_bar_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_search_bar_set_key_capture_widget")]
     #[doc(alias = "key-capture-widget")]
-    pub fn set_key_capture_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    pub fn set_key_capture_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_search_bar_set_key_capture_widget(
                 self.to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -246,7 +246,7 @@ impl SearchBarBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -254,7 +254,7 @@ impl SearchBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("key-capture-widget", key_capture_widget.clone().upcast()),
+                .property("key-capture-widget", key_capture_widget.as_ref().clone()),
         }
     }
 
@@ -350,7 +350,7 @@ impl SearchBarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/search_entry.rs b/gtk4/src/auto/search_entry.rs
index 9b353e4201a0..d44d4c3274b1 100644
--- a/gtk4/src/auto/search_entry.rs
+++ b/gtk4/src/auto/search_entry.rs
@@ -102,11 +102,11 @@ impl SearchEntry {
     }
 
     #[doc(alias = "gtk_search_entry_set_key_capture_widget")]
-    pub fn set_key_capture_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    pub fn set_key_capture_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_search_entry_set_key_capture_widget(
                 self.to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -137,8 +137,8 @@ impl SearchEntry {
     }
 
     #[doc(alias = "placeholder-text")]
-    pub fn set_placeholder_text(&self, placeholder_text: Option<&str>) {
-        ObjectExt::set_property(self, "placeholder-text", placeholder_text)
+    pub fn set_placeholder_text<'a>(&self, placeholder_text: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "placeholder-text", placeholder_text.into())
     }
 
     #[doc(alias = "activate")]
@@ -552,7 +552,7 @@ impl SearchEntryBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/selection_filter_model.rs b/gtk4/src/auto/selection_filter_model.rs
index fbb29d2e865e..15b2ac1e5c2a 100644
--- a/gtk4/src/auto/selection_filter_model.rs
+++ b/gtk4/src/auto/selection_filter_model.rs
@@ -21,11 +21,13 @@ glib::wrapper! {
 
 impl SelectionFilterModel {
     #[doc(alias = "gtk_selection_filter_model_new")]
-    pub fn new(model: Option<&impl IsA<SelectionModel>>) -> SelectionFilterModel {
+    pub fn new<'a, P: IsA<SelectionModel>>(
+        model: impl Into<Option<&'a P>>,
+    ) -> SelectionFilterModel {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_selection_filter_model_new(
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -42,11 +44,11 @@ impl SelectionFilterModel {
 
     #[doc(alias = "gtk_selection_filter_model_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<SelectionModel>>) {
+    pub fn set_model<'a, P: IsA<SelectionModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_selection_filter_model_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/separator.rs b/gtk4/src/auto/separator.rs
index 4b2ba6261061..7943c6236e93 100644
--- a/gtk4/src/auto/separator.rs
+++ b/gtk4/src/auto/separator.rs
@@ -133,7 +133,7 @@ impl SeparatorBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/settings.rs b/gtk4/src/auto/settings.rs
index 73731cd1e916..8fa1ae5baf2c 100644
--- a/gtk4/src/auto/settings.rs
+++ b/gtk4/src/auto/settings.rs
@@ -126,8 +126,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-cursor-theme-name")]
-    pub fn set_gtk_cursor_theme_name(&self, gtk_cursor_theme_name: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-cursor-theme-name", gtk_cursor_theme_name)
+    pub fn set_gtk_cursor_theme_name<'a>(&self, gtk_cursor_theme_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-cursor-theme-name", gtk_cursor_theme_name.into())
     }
 
     #[doc(alias = "gtk-cursor-theme-size")]
@@ -146,8 +146,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-decoration-layout")]
-    pub fn set_gtk_decoration_layout(&self, gtk_decoration_layout: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-decoration-layout", gtk_decoration_layout)
+    pub fn set_gtk_decoration_layout<'a>(&self, gtk_decoration_layout: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-decoration-layout", gtk_decoration_layout.into())
     }
 
     #[doc(alias = "gtk-dialogs-use-header")]
@@ -284,8 +284,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-font-name")]
-    pub fn set_gtk_font_name(&self, gtk_font_name: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-font-name", gtk_font_name)
+    pub fn set_gtk_font_name<'a>(&self, gtk_font_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-font-name", gtk_font_name.into())
     }
 
     #[cfg(feature = "v4_16")]
@@ -332,8 +332,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-icon-theme-name")]
-    pub fn set_gtk_icon_theme_name(&self, gtk_icon_theme_name: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-icon-theme-name", gtk_icon_theme_name)
+    pub fn set_gtk_icon_theme_name<'a>(&self, gtk_icon_theme_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-icon-theme-name", gtk_icon_theme_name.into())
     }
 
     #[doc(alias = "gtk-im-module")]
@@ -342,8 +342,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-im-module")]
-    pub fn set_gtk_im_module(&self, gtk_im_module: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-im-module", gtk_im_module)
+    pub fn set_gtk_im_module<'a>(&self, gtk_im_module: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-im-module", gtk_im_module.into())
     }
 
     #[doc(alias = "gtk-keynav-use-caret")]
@@ -406,8 +406,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-print-backends")]
-    pub fn set_gtk_print_backends(&self, gtk_print_backends: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-print-backends", gtk_print_backends)
+    pub fn set_gtk_print_backends<'a>(&self, gtk_print_backends: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-print-backends", gtk_print_backends.into())
     }
 
     #[doc(alias = "gtk-print-preview-command")]
@@ -416,8 +416,15 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-print-preview-command")]
-    pub fn set_gtk_print_preview_command(&self, gtk_print_preview_command: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-print-preview-command", gtk_print_preview_command)
+    pub fn set_gtk_print_preview_command<'a>(
+        &self,
+        gtk_print_preview_command: impl Into<Option<&'a str>>,
+    ) {
+        ObjectExt::set_property(
+            self,
+            "gtk-print-preview-command",
+            gtk_print_preview_command.into(),
+        )
     }
 
     #[doc(alias = "gtk-recent-files-enabled")]
@@ -490,8 +497,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-sound-theme-name")]
-    pub fn set_gtk_sound_theme_name(&self, gtk_sound_theme_name: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-sound-theme-name", gtk_sound_theme_name)
+    pub fn set_gtk_sound_theme_name<'a>(&self, gtk_sound_theme_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-sound-theme-name", gtk_sound_theme_name.into())
     }
 
     #[doc(alias = "gtk-split-cursor")]
@@ -510,8 +517,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-theme-name")]
-    pub fn set_gtk_theme_name(&self, gtk_theme_name: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-theme-name", gtk_theme_name)
+    pub fn set_gtk_theme_name<'a>(&self, gtk_theme_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-theme-name", gtk_theme_name.into())
     }
 
     #[doc(alias = "gtk-titlebar-double-click")]
@@ -520,8 +527,15 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-titlebar-double-click")]
-    pub fn set_gtk_titlebar_double_click(&self, gtk_titlebar_double_click: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-titlebar-double-click", gtk_titlebar_double_click)
+    pub fn set_gtk_titlebar_double_click<'a>(
+        &self,
+        gtk_titlebar_double_click: impl Into<Option<&'a str>>,
+    ) {
+        ObjectExt::set_property(
+            self,
+            "gtk-titlebar-double-click",
+            gtk_titlebar_double_click.into(),
+        )
     }
 
     #[doc(alias = "gtk-titlebar-middle-click")]
@@ -530,8 +544,15 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-titlebar-middle-click")]
-    pub fn set_gtk_titlebar_middle_click(&self, gtk_titlebar_middle_click: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-titlebar-middle-click", gtk_titlebar_middle_click)
+    pub fn set_gtk_titlebar_middle_click<'a>(
+        &self,
+        gtk_titlebar_middle_click: impl Into<Option<&'a str>>,
+    ) {
+        ObjectExt::set_property(
+            self,
+            "gtk-titlebar-middle-click",
+            gtk_titlebar_middle_click.into(),
+        )
     }
 
     #[doc(alias = "gtk-titlebar-right-click")]
@@ -540,8 +561,15 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-titlebar-right-click")]
-    pub fn set_gtk_titlebar_right_click(&self, gtk_titlebar_right_click: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-titlebar-right-click", gtk_titlebar_right_click)
+    pub fn set_gtk_titlebar_right_click<'a>(
+        &self,
+        gtk_titlebar_right_click: impl Into<Option<&'a str>>,
+    ) {
+        ObjectExt::set_property(
+            self,
+            "gtk-titlebar-right-click",
+            gtk_titlebar_right_click.into(),
+        )
     }
 
     #[doc(alias = "gtk-xft-antialias")]
@@ -580,8 +608,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-xft-hintstyle")]
-    pub fn set_gtk_xft_hintstyle(&self, gtk_xft_hintstyle: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-xft-hintstyle", gtk_xft_hintstyle)
+    pub fn set_gtk_xft_hintstyle<'a>(&self, gtk_xft_hintstyle: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-xft-hintstyle", gtk_xft_hintstyle.into())
     }
 
     #[doc(alias = "gtk-xft-rgba")]
@@ -590,8 +618,8 @@ impl Settings {
     }
 
     #[doc(alias = "gtk-xft-rgba")]
-    pub fn set_gtk_xft_rgba(&self, gtk_xft_rgba: Option<&str>) {
-        ObjectExt::set_property(self, "gtk-xft-rgba", gtk_xft_rgba)
+    pub fn set_gtk_xft_rgba<'a>(&self, gtk_xft_rgba: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "gtk-xft-rgba", gtk_xft_rgba.into())
     }
 
     #[doc(alias = "gtk_settings_get_default")]
diff --git a/gtk4/src/auto/shortcut.rs b/gtk4/src/auto/shortcut.rs
index 557daf2e185f..e2bd5f547862 100644
--- a/gtk4/src/auto/shortcut.rs
+++ b/gtk4/src/auto/shortcut.rs
@@ -73,9 +73,9 @@ impl Shortcut {
 
     #[doc(alias = "gtk_shortcut_set_arguments")]
     #[doc(alias = "arguments")]
-    pub fn set_arguments(&self, args: Option<&glib::Variant>) {
+    pub fn set_arguments<'a>(&self, args: impl Into<Option<&'a glib::Variant>>) {
         unsafe {
-            ffi::gtk_shortcut_set_arguments(self.to_glib_none().0, args.to_glib_none().0);
+            ffi::gtk_shortcut_set_arguments(self.to_glib_none().0, args.into().to_glib_none().0);
         }
     }
 
@@ -184,7 +184,7 @@ impl ShortcutBuilder {
 
     pub fn action(self, action: &impl IsA<ShortcutAction>) -> Self {
         Self {
-            builder: self.builder.property("action", action.clone().upcast()),
+            builder: self.builder.property("action", action.as_ref().clone()),
         }
     }
 
@@ -196,7 +196,7 @@ impl ShortcutBuilder {
 
     pub fn trigger(self, trigger: &impl IsA<ShortcutTrigger>) -> Self {
         Self {
-            builder: self.builder.property("trigger", trigger.clone().upcast()),
+            builder: self.builder.property("trigger", trigger.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/shortcut_action.rs b/gtk4/src/auto/shortcut_action.rs
index be452776e845..5180b6dcb8b8 100644
--- a/gtk4/src/auto/shortcut_action.rs
+++ b/gtk4/src/auto/shortcut_action.rs
@@ -37,18 +37,18 @@ impl std::fmt::Display for ShortcutAction {
 
 pub trait ShortcutActionExt: IsA<ShortcutAction> + 'static {
     #[doc(alias = "gtk_shortcut_action_activate")]
-    fn activate(
+    fn activate<'a>(
         &self,
         flags: ShortcutActionFlags,
         widget: &impl IsA<Widget>,
-        args: Option<&glib::Variant>,
+        args: impl Into<Option<&'a glib::Variant>>,
     ) -> bool {
         unsafe {
             from_glib(ffi::gtk_shortcut_action_activate(
                 self.as_ref().to_glib_none().0,
                 flags.into_glib(),
                 widget.as_ref().to_glib_none().0,
-                args.to_glib_none().0,
+                args.into().to_glib_none().0,
             ))
         }
     }
diff --git a/gtk4/src/auto/shortcut_label.rs b/gtk4/src/auto/shortcut_label.rs
index aada08f35b15..7e412d44bc05 100644
--- a/gtk4/src/auto/shortcut_label.rs
+++ b/gtk4/src/auto/shortcut_label.rs
@@ -240,7 +240,7 @@ impl ShortcutLabelBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/shortcuts_group.rs b/gtk4/src/auto/shortcuts_group.rs
index 35bb06b8f6ed..f46b036fe3e0 100644
--- a/gtk4/src/auto/shortcuts_group.rs
+++ b/gtk4/src/auto/shortcuts_group.rs
@@ -44,8 +44,8 @@ impl ShortcutsGroup {
     }
 
     #[doc(alias = "accel-size-group")]
-    pub fn set_accel_size_group(&self, accel_size_group: Option<&SizeGroup>) {
-        ObjectExt::set_property(self, "accel-size-group", accel_size_group)
+    pub fn set_accel_size_group<'a>(&self, accel_size_group: impl Into<Option<&'a SizeGroup>>) {
+        ObjectExt::set_property(self, "accel-size-group", accel_size_group.into())
     }
 
     pub fn height(&self) -> u32 {
@@ -56,21 +56,21 @@ impl ShortcutsGroup {
         ObjectExt::property(self, "title")
     }
 
-    pub fn set_title(&self, title: Option<&str>) {
-        ObjectExt::set_property(self, "title", title)
+    pub fn set_title<'a>(&self, title: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "title", title.into())
     }
 
     #[doc(alias = "title-size-group")]
-    pub fn set_title_size_group(&self, title_size_group: Option<&SizeGroup>) {
-        ObjectExt::set_property(self, "title-size-group", title_size_group)
+    pub fn set_title_size_group<'a>(&self, title_size_group: impl Into<Option<&'a SizeGroup>>) {
+        ObjectExt::set_property(self, "title-size-group", title_size_group.into())
     }
 
     pub fn view(&self) -> Option<glib::GString> {
         ObjectExt::property(self, "view")
     }
 
-    pub fn set_view(&self, view: Option<&str>) {
-        ObjectExt::set_property(self, "view", view)
+    pub fn set_view<'a>(&self, view: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "view", view.into())
     }
 
     #[doc(alias = "accel-size-group")]
@@ -341,7 +341,7 @@ impl ShortcutsGroupBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/shortcuts_section.rs b/gtk4/src/auto/shortcuts_section.rs
index 475a97a34bd7..3a367435f592 100644
--- a/gtk4/src/auto/shortcuts_section.rs
+++ b/gtk4/src/auto/shortcuts_section.rs
@@ -59,16 +59,16 @@ impl ShortcutsSection {
     }
 
     #[doc(alias = "section-name")]
-    pub fn set_section_name(&self, section_name: Option<&str>) {
-        ObjectExt::set_property(self, "section-name", section_name)
+    pub fn set_section_name<'a>(&self, section_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "section-name", section_name.into())
     }
 
     pub fn title(&self) -> Option<glib::GString> {
         ObjectExt::property(self, "title")
     }
 
-    pub fn set_title(&self, title: Option<&str>) {
-        ObjectExt::set_property(self, "title", title)
+    pub fn set_title<'a>(&self, title: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "title", title.into())
     }
 
     #[doc(alias = "view-name")]
@@ -77,8 +77,8 @@ impl ShortcutsSection {
     }
 
     #[doc(alias = "view-name")]
-    pub fn set_view_name(&self, view_name: Option<&str>) {
-        ObjectExt::set_property(self, "view-name", view_name)
+    pub fn set_view_name<'a>(&self, view_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "view-name", view_name.into())
     }
 
     #[doc(alias = "max-height")]
@@ -318,7 +318,7 @@ impl ShortcutsSectionBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/shortcuts_shortcut.rs b/gtk4/src/auto/shortcuts_shortcut.rs
index 7196bce20334..1cce7723e027 100644
--- a/gtk4/src/auto/shortcuts_shortcut.rs
+++ b/gtk4/src/auto/shortcuts_shortcut.rs
@@ -32,16 +32,16 @@ impl ShortcutsShortcut {
     }
 
     #[doc(alias = "accel-size-group")]
-    pub fn set_accel_size_group(&self, accel_size_group: Option<&SizeGroup>) {
-        ObjectExt::set_property(self, "accel-size-group", accel_size_group)
+    pub fn set_accel_size_group<'a>(&self, accel_size_group: impl Into<Option<&'a SizeGroup>>) {
+        ObjectExt::set_property(self, "accel-size-group", accel_size_group.into())
     }
 
     pub fn accelerator(&self) -> Option<glib::GString> {
         ObjectExt::property(self, "accelerator")
     }
 
-    pub fn set_accelerator(&self, accelerator: Option<&str>) {
-        ObjectExt::set_property(self, "accelerator", accelerator)
+    pub fn set_accelerator<'a>(&self, accelerator: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "accelerator", accelerator.into())
     }
 
     #[doc(alias = "action-name")]
@@ -50,16 +50,16 @@ impl ShortcutsShortcut {
     }
 
     #[doc(alias = "action-name")]
-    pub fn set_action_name(&self, action_name: Option<&str>) {
-        ObjectExt::set_property(self, "action-name", action_name)
+    pub fn set_action_name<'a>(&self, action_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "action-name", action_name.into())
     }
 
     pub fn icon(&self) -> Option<gio::Icon> {
         ObjectExt::property(self, "icon")
     }
 
-    pub fn set_icon<P: IsA<gio::Icon>>(&self, icon: Option<&P>) {
-        ObjectExt::set_property(self, "icon", icon)
+    pub fn set_icon<'a, P: IsA<gio::Icon>>(&self, icon: impl Into<Option<&'a P>>) {
+        ObjectExt::set_property(self, "icon", icon.into().as_ref().map(|p| p.as_ref()))
     }
 
     #[doc(alias = "icon-set")]
@@ -81,8 +81,8 @@ impl ShortcutsShortcut {
         ObjectExt::property(self, "subtitle")
     }
 
-    pub fn set_subtitle(&self, subtitle: Option<&str>) {
-        ObjectExt::set_property(self, "subtitle", subtitle)
+    pub fn set_subtitle<'a>(&self, subtitle: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "subtitle", subtitle.into())
     }
 
     #[doc(alias = "subtitle-set")]
@@ -94,13 +94,13 @@ impl ShortcutsShortcut {
         ObjectExt::property(self, "title")
     }
 
-    pub fn set_title(&self, title: Option<&str>) {
-        ObjectExt::set_property(self, "title", title)
+    pub fn set_title<'a>(&self, title: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "title", title.into())
     }
 
     #[doc(alias = "title-size-group")]
-    pub fn set_title_size_group(&self, title_size_group: Option<&SizeGroup>) {
-        ObjectExt::set_property(self, "title-size-group", title_size_group)
+    pub fn set_title_size_group<'a>(&self, title_size_group: impl Into<Option<&'a SizeGroup>>) {
+        ObjectExt::set_property(self, "title-size-group", title_size_group.into())
     }
 
     #[doc(alias = "accel-size-group")]
@@ -407,7 +407,7 @@ impl ShortcutsShortcutBuilder {
 
     pub fn icon(self, icon: &impl IsA<gio::Icon>) -> Self {
         Self {
-            builder: self.builder.property("icon", icon.clone().upcast()),
+            builder: self.builder.property("icon", icon.as_ref().clone()),
         }
     }
 
@@ -525,7 +525,7 @@ impl ShortcutsShortcutBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/shortcuts_window.rs b/gtk4/src/auto/shortcuts_window.rs
index 716de80eeaa2..18fdc90d3bcb 100644
--- a/gtk4/src/auto/shortcuts_window.rs
+++ b/gtk4/src/auto/shortcuts_window.rs
@@ -49,8 +49,8 @@ impl ShortcutsWindow {
     }
 
     #[doc(alias = "section-name")]
-    pub fn set_section_name(&self, section_name: Option<&str>) {
-        ObjectExt::set_property(self, "section-name", section_name)
+    pub fn set_section_name<'a>(&self, section_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "section-name", section_name.into())
     }
 
     #[doc(alias = "view-name")]
@@ -59,8 +59,8 @@ impl ShortcutsWindow {
     }
 
     #[doc(alias = "view-name")]
-    pub fn set_view_name(&self, view_name: Option<&str>) {
-        ObjectExt::set_property(self, "view-name", view_name)
+    pub fn set_view_name<'a>(&self, view_name: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "view-name", view_name.into())
     }
 
     #[doc(alias = "close")]
@@ -194,13 +194,13 @@ impl ShortcutsWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -220,7 +220,7 @@ impl ShortcutsWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -246,7 +246,7 @@ impl ShortcutsWindowBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -260,7 +260,7 @@ impl ShortcutsWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -334,7 +334,7 @@ impl ShortcutsWindowBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -342,7 +342,7 @@ impl ShortcutsWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -422,7 +422,7 @@ impl ShortcutsWindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/single_selection.rs b/gtk4/src/auto/single_selection.rs
index 3e7d633ba961..472635bdb503 100644
--- a/gtk4/src/auto/single_selection.rs
+++ b/gtk4/src/auto/single_selection.rs
@@ -119,11 +119,11 @@ impl SingleSelection {
 
     #[doc(alias = "gtk_single_selection_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_single_selection_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -288,7 +288,7 @@ impl SingleSelectionBuilder {
 
     pub fn model(self, model: &impl IsA<gio::ListModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/slice_list_model.rs b/gtk4/src/auto/slice_list_model.rs
index 42a96b6f9143..e7cd5aab9dc2 100644
--- a/gtk4/src/auto/slice_list_model.rs
+++ b/gtk4/src/auto/slice_list_model.rs
@@ -75,11 +75,11 @@ impl SliceListModel {
 
     #[doc(alias = "gtk_slice_list_model_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_slice_list_model_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -194,7 +194,7 @@ impl SliceListModelBuilder {
 
     pub fn model(self, model: &impl IsA<gio::ListModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/snapshot.rs b/gtk4/src/auto/snapshot.rs
index 66b3e879ddac..bb15ea1f5acd 100644
--- a/gtk4/src/auto/snapshot.rs
+++ b/gtk4/src/auto/snapshot.rs
@@ -406,12 +406,16 @@ pub trait SnapshotExt: IsA<Snapshot> + 'static {
     }
 
     #[doc(alias = "gtk_snapshot_push_repeat")]
-    fn push_repeat(&self, bounds: &graphene::Rect, child_bounds: Option<&graphene::Rect>) {
+    fn push_repeat<'a>(
+        &self,
+        bounds: &graphene::Rect,
+        child_bounds: impl Into<Option<&'a graphene::Rect>>,
+    ) {
         unsafe {
             ffi::gtk_snapshot_push_repeat(
                 self.as_ref().to_glib_none().0,
                 bounds.to_glib_none().0,
-                child_bounds.to_glib_none().0,
+                child_bounds.into().to_glib_none().0,
             );
         }
     }
@@ -623,19 +627,25 @@ pub trait SnapshotExt: IsA<Snapshot> + 'static {
     }
 
     #[doc(alias = "gtk_snapshot_to_paintable")]
-    fn to_paintable(self, size: Option<&graphene::Size>) -> Option<gdk::Paintable> {
+    fn to_paintable<'a>(
+        self,
+        size: impl Into<Option<&'a graphene::Size>>,
+    ) -> Option<gdk::Paintable> {
         unsafe {
             from_glib_full(ffi::gtk_snapshot_to_paintable(
                 self.upcast().into_glib_ptr(),
-                size.to_glib_none().0,
+                size.into().to_glib_none().0,
             ))
         }
     }
 
     #[doc(alias = "gtk_snapshot_transform")]
-    fn transform(&self, transform: Option<&gsk::Transform>) {
+    fn transform<'a>(&self, transform: impl Into<Option<&'a gsk::Transform>>) {
         unsafe {
-            ffi::gtk_snapshot_transform(self.as_ref().to_glib_none().0, transform.to_glib_none().0);
+            ffi::gtk_snapshot_transform(
+                self.as_ref().to_glib_none().0,
+                transform.into().to_glib_none().0,
+            );
         }
     }
 
diff --git a/gtk4/src/auto/sort_list_model.rs b/gtk4/src/auto/sort_list_model.rs
index 55a4ea38e114..ad17b827686f 100644
--- a/gtk4/src/auto/sort_list_model.rs
+++ b/gtk4/src/auto/sort_list_model.rs
@@ -112,11 +112,11 @@ impl SortListModel {
 
     #[doc(alias = "gtk_sort_list_model_set_model")]
     #[doc(alias = "model")]
-    pub fn set_model(&self, model: Option<&impl IsA<gio::ListModel>>) {
+    pub fn set_model<'a, P: IsA<gio::ListModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_sort_list_model_set_model(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -125,22 +125,22 @@ impl SortListModel {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_sort_list_model_set_section_sorter")]
     #[doc(alias = "section-sorter")]
-    pub fn set_section_sorter(&self, sorter: Option<&impl IsA<Sorter>>) {
+    pub fn set_section_sorter<'a, P: IsA<Sorter>>(&self, sorter: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_sort_list_model_set_section_sorter(
                 self.to_glib_none().0,
-                sorter.map(|p| p.as_ref()).to_glib_none().0,
+                sorter.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_sort_list_model_set_sorter")]
     #[doc(alias = "sorter")]
-    pub fn set_sorter(&self, sorter: Option<&impl IsA<Sorter>>) {
+    pub fn set_sorter<'a, P: IsA<Sorter>>(&self, sorter: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_sort_list_model_set_sorter(
                 self.to_glib_none().0,
-                sorter.map(|p| p.as_ref()).to_glib_none().0,
+                sorter.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -293,7 +293,7 @@ impl SortListModelBuilder {
 
     pub fn model(self, model: &impl IsA<gio::ListModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -303,13 +303,13 @@ impl SortListModelBuilder {
         Self {
             builder: self
                 .builder
-                .property("section-sorter", section_sorter.clone().upcast()),
+                .property("section-sorter", section_sorter.as_ref().clone()),
         }
     }
 
     pub fn sorter(self, sorter: &impl IsA<Sorter>) -> Self {
         Self {
-            builder: self.builder.property("sorter", sorter.clone().upcast()),
+            builder: self.builder.property("sorter", sorter.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/spin_button.rs b/gtk4/src/auto/spin_button.rs
index 8251a2caee58..2e523fc5ec57 100644
--- a/gtk4/src/auto/spin_button.rs
+++ b/gtk4/src/auto/spin_button.rs
@@ -40,15 +40,20 @@ glib::wrapper! {
 
 impl SpinButton {
     #[doc(alias = "gtk_spin_button_new")]
-    pub fn new(
-        adjustment: Option<&impl IsA<Adjustment>>,
+    pub fn new<'a, P: IsA<Adjustment>>(
+        adjustment: impl Into<Option<&'a P>>,
         climb_rate: f64,
         digits: u32,
     ) -> SpinButton {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_spin_button_new(
-                adjustment.map(|p| p.as_ref()).to_glib_none().0,
+                adjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 climb_rate,
                 digits,
             ))
@@ -75,16 +80,21 @@ impl SpinButton {
     }
 
     #[doc(alias = "gtk_spin_button_configure")]
-    pub fn configure(
+    pub fn configure<'a, P: IsA<Adjustment>>(
         &self,
-        adjustment: Option<&impl IsA<Adjustment>>,
+        adjustment: impl Into<Option<&'a P>>,
         climb_rate: f64,
         digits: u32,
     ) {
         unsafe {
             ffi::gtk_spin_button_configure(
                 self.to_glib_none().0,
-                adjustment.map(|p| p.as_ref()).to_glib_none().0,
+                adjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 climb_rate,
                 digits,
             );
@@ -692,7 +702,7 @@ impl SpinButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("adjustment", adjustment.clone().upcast()),
+                .property("adjustment", adjustment.as_ref().clone()),
         }
     }
 
@@ -814,7 +824,7 @@ impl SpinButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/spinner.rs b/gtk4/src/auto/spinner.rs
index 36820a9764b1..d6e9b8a3d5ca 100644
--- a/gtk4/src/auto/spinner.rs
+++ b/gtk4/src/auto/spinner.rs
@@ -194,7 +194,7 @@ impl SpinnerBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/stack.rs b/gtk4/src/auto/stack.rs
index 029d7d6f73a3..0930f75f73cd 100644
--- a/gtk4/src/auto/stack.rs
+++ b/gtk4/src/auto/stack.rs
@@ -48,28 +48,32 @@ impl Stack {
     }
 
     #[doc(alias = "gtk_stack_add_named")]
-    pub fn add_named(&self, child: &impl IsA<Widget>, name: Option<&str>) -> StackPage {
+    pub fn add_named<'a>(
+        &self,
+        child: &impl IsA<Widget>,
+        name: impl Into<Option<&'a str>>,
+    ) -> StackPage {
         unsafe {
             from_glib_none(ffi::gtk_stack_add_named(
                 self.to_glib_none().0,
                 child.as_ref().to_glib_none().0,
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
             ))
         }
     }
 
     #[doc(alias = "gtk_stack_add_titled")]
-    pub fn add_titled(
+    pub fn add_titled<'a>(
         &self,
         child: &impl IsA<Widget>,
-        name: Option<&str>,
+        name: impl Into<Option<&'a str>>,
         title: &str,
     ) -> StackPage {
         unsafe {
             from_glib_none(ffi::gtk_stack_add_titled(
                 self.to_glib_none().0,
                 child.as_ref().to_glib_none().0,
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
                 title.to_glib_none().0,
             ))
         }
@@ -514,7 +518,7 @@ impl StackBuilder {
         Self {
             builder: self
                 .builder
-                .property("visible-child", visible_child.clone().upcast()),
+                .property("visible-child", visible_child.as_ref().clone()),
         }
     }
 
@@ -602,7 +606,7 @@ impl StackBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/stack_sidebar.rs b/gtk4/src/auto/stack_sidebar.rs
index c11464b85250..15ee114e4bed 100644
--- a/gtk4/src/auto/stack_sidebar.rs
+++ b/gtk4/src/auto/stack_sidebar.rs
@@ -179,7 +179,7 @@ impl StackSidebarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/stack_switcher.rs b/gtk4/src/auto/stack_switcher.rs
index 753a7fec0175..3d86e617fd83 100644
--- a/gtk4/src/auto/stack_switcher.rs
+++ b/gtk4/src/auto/stack_switcher.rs
@@ -45,9 +45,9 @@ impl StackSwitcher {
 
     #[doc(alias = "gtk_stack_switcher_set_stack")]
     #[doc(alias = "stack")]
-    pub fn set_stack(&self, stack: Option<&Stack>) {
+    pub fn set_stack<'a>(&self, stack: impl Into<Option<&'a Stack>>) {
         unsafe {
-            ffi::gtk_stack_switcher_set_stack(self.to_glib_none().0, stack.to_glib_none().0);
+            ffi::gtk_stack_switcher_set_stack(self.to_glib_none().0, stack.into().to_glib_none().0);
         }
     }
 
@@ -179,7 +179,7 @@ impl StackSwitcherBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/statusbar.rs b/gtk4/src/auto/statusbar.rs
index 1213a24a2942..8896a2961c8c 100644
--- a/gtk4/src/auto/statusbar.rs
+++ b/gtk4/src/auto/statusbar.rs
@@ -244,7 +244,7 @@ impl StatusbarBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/string_filter.rs b/gtk4/src/auto/string_filter.rs
index b9e67e008d3c..66f426b4af14 100644
--- a/gtk4/src/auto/string_filter.rs
+++ b/gtk4/src/auto/string_filter.rs
@@ -99,9 +99,12 @@ impl StringFilter {
 
     #[doc(alias = "gtk_string_filter_set_search")]
     #[doc(alias = "search")]
-    pub fn set_search(&self, search: Option<&str>) {
+    pub fn set_search<'a>(&self, search: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_string_filter_set_search(self.to_glib_none().0, search.to_glib_none().0);
+            ffi::gtk_string_filter_set_search(
+                self.to_glib_none().0,
+                search.into().to_glib_none().0,
+            );
         }
     }
 
diff --git a/gtk4/src/auto/switch.rs b/gtk4/src/auto/switch.rs
index 75dac6580831..ac989c9a0950 100644
--- a/gtk4/src/auto/switch.rs
+++ b/gtk4/src/auto/switch.rs
@@ -277,7 +277,7 @@ impl SwitchBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/text.rs b/gtk4/src/auto/text.rs
index 9447d22e0d54..306c7cde509e 100644
--- a/gtk4/src/auto/text.rs
+++ b/gtk4/src/auto/text.rs
@@ -219,9 +219,9 @@ impl Text {
 
     #[doc(alias = "gtk_text_set_attributes")]
     #[doc(alias = "attributes")]
-    pub fn set_attributes(&self, attrs: Option<&pango::AttrList>) {
+    pub fn set_attributes<'a>(&self, attrs: impl Into<Option<&'a pango::AttrList>>) {
         unsafe {
-            ffi::gtk_text_set_attributes(self.to_glib_none().0, attrs.to_glib_none().0);
+            ffi::gtk_text_set_attributes(self.to_glib_none().0, attrs.into().to_glib_none().0);
         }
     }
 
@@ -246,11 +246,11 @@ impl Text {
 
     #[doc(alias = "gtk_text_set_extra_menu")]
     #[doc(alias = "extra-menu")]
-    pub fn set_extra_menu(&self, model: Option<&impl IsA<gio::MenuModel>>) {
+    pub fn set_extra_menu<'a, P: IsA<gio::MenuModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_text_set_extra_menu(
                 self.to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -297,9 +297,9 @@ impl Text {
 
     #[doc(alias = "gtk_text_set_placeholder_text")]
     #[doc(alias = "placeholder-text")]
-    pub fn set_placeholder_text(&self, text: Option<&str>) {
+    pub fn set_placeholder_text<'a>(&self, text: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_text_set_placeholder_text(self.to_glib_none().0, text.to_glib_none().0);
+            ffi::gtk_text_set_placeholder_text(self.to_glib_none().0, text.into().to_glib_none().0);
         }
     }
 
@@ -316,9 +316,12 @@ impl Text {
 
     #[doc(alias = "gtk_text_set_tabs")]
     #[doc(alias = "tabs")]
-    pub fn set_tabs(&self, tabs: Option<&pango::TabArray>) {
+    pub fn set_tabs<'a>(&self, tabs: impl Into<Option<&'a pango::TabArray>>) {
         unsafe {
-            ffi::gtk_text_set_tabs(self.to_glib_none().0, mut_override(tabs.to_glib_none().0));
+            ffi::gtk_text_set_tabs(
+                self.to_glib_none().0,
+                mut_override(tabs.into().to_glib_none().0),
+            );
         }
     }
 
@@ -354,8 +357,8 @@ impl Text {
     }
 
     #[doc(alias = "im-module")]
-    pub fn set_im_module(&self, im_module: Option<&str>) {
-        ObjectExt::set_property(self, "im-module", im_module)
+    pub fn set_im_module<'a>(&self, im_module: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self, "im-module", im_module.into())
     }
 
     #[doc(alias = "invisible-char-set")]
@@ -836,7 +839,7 @@ impl TextBuilder {
 
     pub fn buffer(self, buffer: &impl IsA<EntryBuffer>) -> Self {
         Self {
-            builder: self.builder.property("buffer", buffer.clone().upcast()),
+            builder: self.builder.property("buffer", buffer.as_ref().clone()),
         }
     }
 
@@ -852,7 +855,7 @@ impl TextBuilder {
         Self {
             builder: self
                 .builder
-                .property("extra-menu", extra_menu.clone().upcast()),
+                .property("extra-menu", extra_menu.as_ref().clone()),
         }
     }
 
@@ -1012,7 +1015,7 @@ impl TextBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/text_buffer.rs b/gtk4/src/auto/text_buffer.rs
index d7b46d5cb5ef..402d81456045 100644
--- a/gtk4/src/auto/text_buffer.rs
+++ b/gtk4/src/auto/text_buffer.rs
@@ -23,9 +23,9 @@ impl TextBuffer {
     pub const NONE: Option<&'static TextBuffer> = None;
 
     #[doc(alias = "gtk_text_buffer_new")]
-    pub fn new(table: Option<&TextTagTable>) -> TextBuffer {
+    pub fn new<'a>(table: impl Into<Option<&'a TextTagTable>>) -> TextBuffer {
         assert_initialized_main_thread!();
-        unsafe { from_glib_full(ffi::gtk_text_buffer_new(table.to_glib_none().0)) }
+        unsafe { from_glib_full(ffi::gtk_text_buffer_new(table.into().to_glib_none().0)) }
     }
 
     // rustdoc-stripper-ignore-next
@@ -179,16 +179,16 @@ pub trait TextBufferExt: IsA<TextBuffer> + 'static {
     }
 
     #[doc(alias = "gtk_text_buffer_create_mark")]
-    fn create_mark(
+    fn create_mark<'a>(
         &self,
-        mark_name: Option<&str>,
+        mark_name: impl Into<Option<&'a str>>,
         where_: &TextIter,
         left_gravity: bool,
     ) -> TextMark {
         unsafe {
             from_glib_none(ffi::gtk_text_buffer_create_mark(
                 self.as_ref().to_glib_none().0,
-                mark_name.to_glib_none().0,
+                mark_name.into().to_glib_none().0,
                 where_.to_glib_none().0,
                 left_gravity.into_glib(),
             ))
@@ -727,17 +727,17 @@ pub trait TextBufferExt: IsA<TextBuffer> + 'static {
     }
 
     #[doc(alias = "gtk_text_buffer_paste_clipboard")]
-    fn paste_clipboard(
+    fn paste_clipboard<'a>(
         &self,
         clipboard: &gdk::Clipboard,
-        override_location: Option<&TextIter>,
+        override_location: impl Into<Option<&'a TextIter>>,
         default_editable: bool,
     ) {
         unsafe {
             ffi::gtk_text_buffer_paste_clipboard(
                 self.as_ref().to_glib_none().0,
                 clipboard.to_glib_none().0,
-                mut_override(override_location.to_glib_none().0),
+                mut_override(override_location.into().to_glib_none().0),
                 default_editable.into_glib(),
             );
         }
diff --git a/gtk4/src/auto/text_iter.rs b/gtk4/src/auto/text_iter.rs
index 56c7a1c1b5f3..4aa6dc061983 100644
--- a/gtk4/src/auto/text_iter.rs
+++ b/gtk4/src/auto/text_iter.rs
@@ -59,10 +59,10 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_backward_find_char")]
-    pub fn backward_find_char<P: FnMut(char) -> bool>(
+    pub fn backward_find_char<'a, P: FnMut(char) -> bool>(
         &mut self,
         pred: P,
-        limit: Option<&TextIter>,
+        limit: impl Into<Option<&'a TextIter>>,
     ) -> bool {
         let mut pred_data: P = pred;
         unsafe extern "C" fn pred_func<P: FnMut(char) -> bool>(
@@ -81,7 +81,7 @@ impl TextIter {
                 self.to_glib_none_mut().0,
                 pred,
                 super_callback0 as *mut _ as *mut _,
-                limit.to_glib_none().0,
+                limit.into().to_glib_none().0,
             ))
         }
     }
@@ -102,11 +102,11 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_backward_search")]
-    pub fn backward_search(
+    pub fn backward_search<'a>(
         &self,
         str: &str,
         flags: TextSearchFlags,
-        limit: Option<&TextIter>,
+        limit: impl Into<Option<&'a TextIter>>,
     ) -> Option<(TextIter, TextIter)> {
         unsafe {
             let mut match_start = TextIter::uninitialized();
@@ -117,7 +117,7 @@ impl TextIter {
                 flags.into_glib(),
                 match_start.to_glib_none_mut().0,
                 match_end.to_glib_none_mut().0,
-                limit.to_glib_none().0,
+                limit.into().to_glib_none().0,
             ));
             if ret {
                 Some((match_start, match_end))
@@ -147,11 +147,14 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_backward_to_tag_toggle")]
-    pub fn backward_to_tag_toggle(&mut self, tag: Option<&impl IsA<TextTag>>) -> bool {
+    pub fn backward_to_tag_toggle<'a, P: IsA<TextTag>>(
+        &mut self,
+        tag: impl Into<Option<&'a P>>,
+    ) -> bool {
         unsafe {
             from_glib(ffi::gtk_text_iter_backward_to_tag_toggle(
                 self.to_glib_none_mut().0,
-                tag.map(|p| p.as_ref()).to_glib_none().0,
+                tag.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -268,11 +271,11 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_ends_tag")]
-    pub fn ends_tag(&self, tag: Option<&impl IsA<TextTag>>) -> bool {
+    pub fn ends_tag<'a, P: IsA<TextTag>>(&self, tag: impl Into<Option<&'a P>>) -> bool {
         unsafe {
             from_glib(ffi::gtk_text_iter_ends_tag(
                 self.to_glib_none().0,
-                tag.map(|p| p.as_ref()).to_glib_none().0,
+                tag.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -327,10 +330,10 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_forward_find_char")]
-    pub fn forward_find_char<P: FnMut(char) -> bool>(
+    pub fn forward_find_char<'a, P: FnMut(char) -> bool>(
         &mut self,
         pred: P,
-        limit: Option<&TextIter>,
+        limit: impl Into<Option<&'a TextIter>>,
     ) -> bool {
         let mut pred_data: P = pred;
         unsafe extern "C" fn pred_func<P: FnMut(char) -> bool>(
@@ -349,7 +352,7 @@ impl TextIter {
                 self.to_glib_none_mut().0,
                 pred,
                 super_callback0 as *mut _ as *mut _,
-                limit.to_glib_none().0,
+                limit.into().to_glib_none().0,
             ))
         }
     }
@@ -370,11 +373,11 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_forward_search")]
-    pub fn forward_search(
+    pub fn forward_search<'a>(
         &self,
         str: &str,
         flags: TextSearchFlags,
-        limit: Option<&TextIter>,
+        limit: impl Into<Option<&'a TextIter>>,
     ) -> Option<(TextIter, TextIter)> {
         unsafe {
             let mut match_start = TextIter::uninitialized();
@@ -385,7 +388,7 @@ impl TextIter {
                 flags.into_glib(),
                 match_start.to_glib_none_mut().0,
                 match_end.to_glib_none_mut().0,
-                limit.to_glib_none().0,
+                limit.into().to_glib_none().0,
             ));
             if ret {
                 Some((match_start, match_end))
@@ -431,11 +434,14 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_forward_to_tag_toggle")]
-    pub fn forward_to_tag_toggle(&mut self, tag: Option<&impl IsA<TextTag>>) -> bool {
+    pub fn forward_to_tag_toggle<'a, P: IsA<TextTag>>(
+        &mut self,
+        tag: impl Into<Option<&'a P>>,
+    ) -> bool {
         unsafe {
             from_glib(ffi::gtk_text_iter_forward_to_tag_toggle(
                 self.to_glib_none_mut().0,
-                tag.map(|p| p.as_ref()).to_glib_none().0,
+                tag.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -778,11 +784,11 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_starts_tag")]
-    pub fn starts_tag(&self, tag: Option<&impl IsA<TextTag>>) -> bool {
+    pub fn starts_tag<'a, P: IsA<TextTag>>(&self, tag: impl Into<Option<&'a P>>) -> bool {
         unsafe {
             from_glib(ffi::gtk_text_iter_starts_tag(
                 self.to_glib_none().0,
-                tag.map(|p| p.as_ref()).to_glib_none().0,
+                tag.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -793,11 +799,11 @@ impl TextIter {
     }
 
     #[doc(alias = "gtk_text_iter_toggles_tag")]
-    pub fn toggles_tag(&self, tag: Option<&impl IsA<TextTag>>) -> bool {
+    pub fn toggles_tag<'a, P: IsA<TextTag>>(&self, tag: impl Into<Option<&'a P>>) -> bool {
         unsafe {
             from_glib(ffi::gtk_text_iter_toggles_tag(
                 self.to_glib_none().0,
-                tag.map(|p| p.as_ref()).to_glib_none().0,
+                tag.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
diff --git a/gtk4/src/auto/text_mark.rs b/gtk4/src/auto/text_mark.rs
index 8f6f4c1f5fbf..0136047d8da3 100644
--- a/gtk4/src/auto/text_mark.rs
+++ b/gtk4/src/auto/text_mark.rs
@@ -18,11 +18,11 @@ impl TextMark {
     pub const NONE: Option<&'static TextMark> = None;
 
     #[doc(alias = "gtk_text_mark_new")]
-    pub fn new(name: Option<&str>, left_gravity: bool) -> TextMark {
+    pub fn new<'a>(name: impl Into<Option<&'a str>>, left_gravity: bool) -> TextMark {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_text_mark_new(
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
                 left_gravity.into_glib(),
             ))
         }
diff --git a/gtk4/src/auto/text_tag.rs b/gtk4/src/auto/text_tag.rs
index ec263ce61d9d..753bb283d668 100644
--- a/gtk4/src/auto/text_tag.rs
+++ b/gtk4/src/auto/text_tag.rs
@@ -23,9 +23,9 @@ impl TextTag {
     pub const NONE: Option<&'static TextTag> = None;
 
     #[doc(alias = "gtk_text_tag_new")]
-    pub fn new(name: Option<&str>) -> TextTag {
+    pub fn new<'a>(name: impl Into<Option<&'a str>>) -> TextTag {
         assert_initialized_main_thread!();
-        unsafe { from_glib_full(ffi::gtk_text_tag_new(name.to_glib_none().0)) }
+        unsafe { from_glib_full(ffi::gtk_text_tag_new(name.into().to_glib_none().0)) }
     }
 
     // rustdoc-stripper-ignore-next
@@ -708,8 +708,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
         ObjectExt::property(self.as_ref(), "allow-breaks-set")
     }
 
-    fn set_background(&self, background: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "background", background)
+    fn set_background<'a>(&self, background: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "background", background.into())
     }
 
     #[doc(alias = "background-full-height")]
@@ -737,8 +737,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "background-rgba")]
-    fn set_background_rgba(&self, background_rgba: Option<&gdk::RGBA>) {
-        ObjectExt::set_property(self.as_ref(), "background-rgba", background_rgba)
+    fn set_background_rgba<'a>(&self, background_rgba: impl Into<Option<&'a gdk::RGBA>>) {
+        ObjectExt::set_property(self.as_ref(), "background-rgba", background_rgba.into())
     }
 
     #[doc(alias = "background-set")]
@@ -784,8 +784,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
         ObjectExt::property(self.as_ref(), "family")
     }
 
-    fn set_family(&self, family: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "family", family)
+    fn set_family<'a>(&self, family: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "family", family.into())
     }
 
     #[doc(alias = "family-set")]
@@ -797,8 +797,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
         ObjectExt::property(self.as_ref(), "font")
     }
 
-    fn set_font(&self, font: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "font", font)
+    fn set_font<'a>(&self, font: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "font", font.into())
     }
 
     #[doc(alias = "font-desc")]
@@ -807,8 +807,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "font-desc")]
-    fn set_font_desc(&self, font_desc: Option<&pango::FontDescription>) {
-        ObjectExt::set_property(self.as_ref(), "font-desc", font_desc)
+    fn set_font_desc<'a>(&self, font_desc: impl Into<Option<&'a pango::FontDescription>>) {
+        ObjectExt::set_property(self.as_ref(), "font-desc", font_desc.into())
     }
 
     #[doc(alias = "font-features")]
@@ -817,8 +817,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "font-features")]
-    fn set_font_features(&self, font_features: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "font-features", font_features)
+    fn set_font_features<'a>(&self, font_features: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "font-features", font_features.into())
     }
 
     #[doc(alias = "font-features-set")]
@@ -826,8 +826,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
         ObjectExt::property(self.as_ref(), "font-features-set")
     }
 
-    fn set_foreground(&self, foreground: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "foreground", foreground)
+    fn set_foreground<'a>(&self, foreground: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "foreground", foreground.into())
     }
 
     #[doc(alias = "foreground-rgba")]
@@ -836,8 +836,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "foreground-rgba")]
-    fn set_foreground_rgba(&self, foreground_rgba: Option<&gdk::RGBA>) {
-        ObjectExt::set_property(self.as_ref(), "foreground-rgba", foreground_rgba)
+    fn set_foreground_rgba<'a>(&self, foreground_rgba: impl Into<Option<&'a gdk::RGBA>>) {
+        ObjectExt::set_property(self.as_ref(), "foreground-rgba", foreground_rgba.into())
     }
 
     #[doc(alias = "foreground-set")]
@@ -903,8 +903,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
         ObjectExt::property(self.as_ref(), "language")
     }
 
-    fn set_language(&self, language: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "language", language)
+    fn set_language<'a>(&self, language: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "language", language.into())
     }
 
     #[doc(alias = "language-set")]
@@ -981,8 +981,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "overline-rgba")]
-    fn set_overline_rgba(&self, overline_rgba: Option<&gdk::RGBA>) {
-        ObjectExt::set_property(self.as_ref(), "overline-rgba", overline_rgba)
+    fn set_overline_rgba<'a>(&self, overline_rgba: impl Into<Option<&'a gdk::RGBA>>) {
+        ObjectExt::set_property(self.as_ref(), "overline-rgba", overline_rgba.into())
     }
 
     #[doc(alias = "overline-rgba-set")]
@@ -996,8 +996,12 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "paragraph-background")]
-    fn set_paragraph_background(&self, paragraph_background: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "paragraph-background", paragraph_background)
+    fn set_paragraph_background<'a>(&self, paragraph_background: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(
+            self.as_ref(),
+            "paragraph-background",
+            paragraph_background.into(),
+        )
     }
 
     #[doc(alias = "paragraph-background-rgba")]
@@ -1006,11 +1010,14 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "paragraph-background-rgba")]
-    fn set_paragraph_background_rgba(&self, paragraph_background_rgba: Option<&gdk::RGBA>) {
+    fn set_paragraph_background_rgba<'a>(
+        &self,
+        paragraph_background_rgba: impl Into<Option<&'a gdk::RGBA>>,
+    ) {
         ObjectExt::set_property(
             self.as_ref(),
             "paragraph-background-rgba",
-            paragraph_background_rgba,
+            paragraph_background_rgba.into(),
         )
     }
 
@@ -1189,8 +1196,12 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "strikethrough-rgba")]
-    fn set_strikethrough_rgba(&self, strikethrough_rgba: Option<&gdk::RGBA>) {
-        ObjectExt::set_property(self.as_ref(), "strikethrough-rgba", strikethrough_rgba)
+    fn set_strikethrough_rgba<'a>(&self, strikethrough_rgba: impl Into<Option<&'a gdk::RGBA>>) {
+        ObjectExt::set_property(
+            self.as_ref(),
+            "strikethrough-rgba",
+            strikethrough_rgba.into(),
+        )
     }
 
     #[doc(alias = "strikethrough-rgba-set")]
@@ -1220,8 +1231,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
         ObjectExt::property(self.as_ref(), "tabs")
     }
 
-    fn set_tabs(&self, tabs: Option<&pango::TabArray>) {
-        ObjectExt::set_property(self.as_ref(), "tabs", tabs)
+    fn set_tabs<'a>(&self, tabs: impl Into<Option<&'a pango::TabArray>>) {
+        ObjectExt::set_property(self.as_ref(), "tabs", tabs.into())
     }
 
     #[doc(alias = "tabs-set")]
@@ -1264,8 +1275,8 @@ pub trait TextTagExt: IsA<TextTag> + 'static {
     }
 
     #[doc(alias = "underline-rgba")]
-    fn set_underline_rgba(&self, underline_rgba: Option<&gdk::RGBA>) {
-        ObjectExt::set_property(self.as_ref(), "underline-rgba", underline_rgba)
+    fn set_underline_rgba<'a>(&self, underline_rgba: impl Into<Option<&'a gdk::RGBA>>) {
+        ObjectExt::set_property(self.as_ref(), "underline-rgba", underline_rgba.into())
     }
 
     #[doc(alias = "underline-rgba-set")]
diff --git a/gtk4/src/auto/text_view.rs b/gtk4/src/auto/text_view.rs
index a5382622db98..03c958ead520 100644
--- a/gtk4/src/auto/text_view.rs
+++ b/gtk4/src/auto/text_view.rs
@@ -105,7 +105,7 @@ impl TextViewBuilder {
 
     pub fn buffer(self, buffer: &impl IsA<TextBuffer>) -> Self {
         Self {
-            builder: self.builder.property("buffer", buffer.clone().upcast()),
+            builder: self.builder.property("buffer", buffer.as_ref().clone()),
         }
     }
 
@@ -125,7 +125,7 @@ impl TextViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("extra-menu", extra_menu.clone().upcast()),
+                .property("extra-menu", extra_menu.as_ref().clone()),
         }
     }
 
@@ -301,7 +301,7 @@ impl TextViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -413,7 +413,7 @@ impl TextViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("hadjustment", hadjustment.clone().upcast()),
+                .property("hadjustment", hadjustment.as_ref().clone()),
         }
     }
 
@@ -427,7 +427,7 @@ impl TextViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("vadjustment", vadjustment.clone().upcast()),
+                .property("vadjustment", vadjustment.as_ref().clone()),
         }
     }
 
@@ -562,13 +562,16 @@ pub trait TextViewExt: IsA<TextView> + 'static {
 
     #[doc(alias = "gtk_text_view_get_cursor_locations")]
     #[doc(alias = "get_cursor_locations")]
-    fn cursor_locations(&self, iter: Option<&TextIter>) -> (gdk::Rectangle, gdk::Rectangle) {
+    fn cursor_locations<'a>(
+        &self,
+        iter: impl Into<Option<&'a TextIter>>,
+    ) -> (gdk::Rectangle, gdk::Rectangle) {
         unsafe {
             let mut strong = gdk::Rectangle::uninitialized();
             let mut weak = gdk::Rectangle::uninitialized();
             ffi::gtk_text_view_get_cursor_locations(
                 self.as_ref().to_glib_none().0,
-                iter.to_glib_none().0,
+                iter.into().to_glib_none().0,
                 strong.to_glib_none_mut().0,
                 weak.to_glib_none_mut().0,
             );
@@ -1028,11 +1031,11 @@ pub trait TextViewExt: IsA<TextView> + 'static {
 
     #[doc(alias = "gtk_text_view_set_buffer")]
     #[doc(alias = "buffer")]
-    fn set_buffer(&self, buffer: Option<&impl IsA<TextBuffer>>) {
+    fn set_buffer<'a, P: IsA<TextBuffer>>(&self, buffer: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_text_view_set_buffer(
                 self.as_ref().to_glib_none().0,
-                buffer.map(|p| p.as_ref()).to_glib_none().0,
+                buffer.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -1058,22 +1061,26 @@ pub trait TextViewExt: IsA<TextView> + 'static {
 
     #[doc(alias = "gtk_text_view_set_extra_menu")]
     #[doc(alias = "extra-menu")]
-    fn set_extra_menu(&self, model: Option<&impl IsA<gio::MenuModel>>) {
+    fn set_extra_menu<'a, P: IsA<gio::MenuModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_text_view_set_extra_menu(
                 self.as_ref().to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_text_view_set_gutter")]
-    fn set_gutter(&self, win: TextWindowType, widget: Option<&impl IsA<Widget>>) {
+    fn set_gutter<'a, P: IsA<Widget>>(
+        &self,
+        win: TextWindowType,
+        widget: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_text_view_set_gutter(
                 self.as_ref().to_glib_none().0,
                 win.into_glib(),
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -1246,8 +1253,8 @@ pub trait TextViewExt: IsA<TextView> + 'static {
     }
 
     #[doc(alias = "im-module")]
-    fn set_im_module(&self, im_module: Option<&str>) {
-        ObjectExt::set_property(self.as_ref(), "im-module", im_module)
+    fn set_im_module<'a>(&self, im_module: impl Into<Option<&'a str>>) {
+        ObjectExt::set_property(self.as_ref(), "im-module", im_module.into())
     }
 
     #[doc(alias = "backspace")]
diff --git a/gtk4/src/auto/toggle_button.rs b/gtk4/src/auto/toggle_button.rs
index 2e6e37f8a484..3652ac72b30b 100644
--- a/gtk4/src/auto/toggle_button.rs
+++ b/gtk4/src/auto/toggle_button.rs
@@ -95,7 +95,7 @@ impl ToggleButtonBuilder {
 
     pub fn group(self, group: &impl IsA<ToggleButton>) -> Self {
         Self {
-            builder: self.builder.property("group", group.clone().upcast()),
+            builder: self.builder.property("group", group.as_ref().clone()),
         }
     }
 
@@ -109,7 +109,7 @@ impl ToggleButtonBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -213,7 +213,7 @@ impl ToggleButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -369,11 +369,11 @@ pub trait ToggleButtonExt: IsA<ToggleButton> + 'static {
 
     #[doc(alias = "gtk_toggle_button_set_group")]
     #[doc(alias = "group")]
-    fn set_group(&self, group: Option<&impl IsA<ToggleButton>>) {
+    fn set_group<'a, P: IsA<ToggleButton>>(&self, group: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_toggle_button_set_group(
                 self.as_ref().to_glib_none().0,
-                group.map(|p| p.as_ref()).to_glib_none().0,
+                group.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/tooltip.rs b/gtk4/src/auto/tooltip.rs
index a3c3f2c2aca4..4b06af91146d 100644
--- a/gtk4/src/auto/tooltip.rs
+++ b/gtk4/src/auto/tooltip.rs
@@ -16,56 +16,66 @@ glib::wrapper! {
 
 impl Tooltip {
     #[doc(alias = "gtk_tooltip_set_custom")]
-    pub fn set_custom(&self, custom_widget: Option<&impl IsA<Widget>>) {
+    pub fn set_custom<'a, P: IsA<Widget>>(&self, custom_widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_tooltip_set_custom(
                 self.to_glib_none().0,
-                custom_widget.map(|p| p.as_ref()).to_glib_none().0,
+                custom_widget
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
 
     #[doc(alias = "gtk_tooltip_set_icon")]
-    pub fn set_icon(&self, paintable: Option<&impl IsA<gdk::Paintable>>) {
+    pub fn set_icon<'a, P: IsA<gdk::Paintable>>(&self, paintable: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_tooltip_set_icon(
                 self.to_glib_none().0,
-                paintable.map(|p| p.as_ref()).to_glib_none().0,
+                paintable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
 
     #[doc(alias = "gtk_tooltip_set_icon_from_gicon")]
-    pub fn set_icon_from_gicon(&self, gicon: Option<&impl IsA<gio::Icon>>) {
+    pub fn set_icon_from_gicon<'a, P: IsA<gio::Icon>>(&self, gicon: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_tooltip_set_icon_from_gicon(
                 self.to_glib_none().0,
-                gicon.map(|p| p.as_ref()).to_glib_none().0,
+                gicon.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_tooltip_set_icon_from_icon_name")]
-    pub fn set_icon_from_icon_name(&self, icon_name: Option<&str>) {
+    pub fn set_icon_from_icon_name<'a>(&self, icon_name: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_tooltip_set_icon_from_icon_name(
                 self.to_glib_none().0,
-                icon_name.to_glib_none().0,
+                icon_name.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_tooltip_set_markup")]
-    pub fn set_markup(&self, markup: Option<&str>) {
+    pub fn set_markup<'a>(&self, markup: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_tooltip_set_markup(self.to_glib_none().0, markup.to_glib_none().0);
+            ffi::gtk_tooltip_set_markup(self.to_glib_none().0, markup.into().to_glib_none().0);
         }
     }
 
     #[doc(alias = "gtk_tooltip_set_text")]
-    pub fn set_text(&self, text: Option<&str>) {
+    pub fn set_text<'a>(&self, text: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_tooltip_set_text(self.to_glib_none().0, text.to_glib_none().0);
+            ffi::gtk_tooltip_set_text(self.to_glib_none().0, text.into().to_glib_none().0);
         }
     }
 
diff --git a/gtk4/src/auto/tree_expander.rs b/gtk4/src/auto/tree_expander.rs
index 9f2875707e03..7ebd7d884e8c 100644
--- a/gtk4/src/auto/tree_expander.rs
+++ b/gtk4/src/auto/tree_expander.rs
@@ -97,11 +97,11 @@ impl TreeExpander {
 
     #[doc(alias = "gtk_tree_expander_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_tree_expander_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -147,9 +147,12 @@ impl TreeExpander {
 
     #[doc(alias = "gtk_tree_expander_set_list_row")]
     #[doc(alias = "list-row")]
-    pub fn set_list_row(&self, list_row: Option<&TreeListRow>) {
+    pub fn set_list_row<'a>(&self, list_row: impl Into<Option<&'a TreeListRow>>) {
         unsafe {
-            ffi::gtk_tree_expander_set_list_row(self.to_glib_none().0, list_row.to_glib_none().0);
+            ffi::gtk_tree_expander_set_list_row(
+                self.to_glib_none().0,
+                list_row.into().to_glib_none().0,
+            );
         }
     }
 
@@ -322,7 +325,7 @@ impl TreeExpanderBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -432,7 +435,7 @@ impl TreeExpanderBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/tree_list_row_sorter.rs b/gtk4/src/auto/tree_list_row_sorter.rs
index 047a85c56f6c..db20c3ca8788 100644
--- a/gtk4/src/auto/tree_list_row_sorter.rs
+++ b/gtk4/src/auto/tree_list_row_sorter.rs
@@ -42,11 +42,11 @@ impl TreeListRowSorter {
 
     #[doc(alias = "gtk_tree_list_row_sorter_set_sorter")]
     #[doc(alias = "sorter")]
-    pub fn set_sorter(&self, sorter: Option<&impl IsA<Sorter>>) {
+    pub fn set_sorter<'a, P: IsA<Sorter>>(&self, sorter: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_tree_list_row_sorter_set_sorter(
                 self.to_glib_none().0,
-                sorter.map(|p| p.as_ref()).to_glib_none().0,
+                sorter.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/tree_model.rs b/gtk4/src/auto/tree_model.rs
index 8deae398d223..c3620d1e323a 100644
--- a/gtk4/src/auto/tree_model.rs
+++ b/gtk4/src/auto/tree_model.rs
@@ -174,13 +174,13 @@ pub trait TreeModelExt: IsA<TreeModel> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_model_iter_children")]
-    fn iter_children(&self, parent: Option<&TreeIter>) -> Option<TreeIter> {
+    fn iter_children<'a>(&self, parent: impl Into<Option<&'a TreeIter>>) -> Option<TreeIter> {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             let ret = from_glib(ffi::gtk_tree_model_iter_children(
                 self.as_ref().to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(parent.to_glib_none().0),
+                mut_override(parent.into().to_glib_none().0),
             ));
             if ret {
                 Some(iter)
@@ -205,11 +205,11 @@ pub trait TreeModelExt: IsA<TreeModel> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_model_iter_n_children")]
-    fn iter_n_children(&self, iter: Option<&TreeIter>) -> i32 {
+    fn iter_n_children<'a>(&self, iter: impl Into<Option<&'a TreeIter>>) -> i32 {
         unsafe {
             ffi::gtk_tree_model_iter_n_children(
                 self.as_ref().to_glib_none().0,
-                mut_override(iter.to_glib_none().0),
+                mut_override(iter.into().to_glib_none().0),
             )
         }
     }
@@ -229,13 +229,17 @@ pub trait TreeModelExt: IsA<TreeModel> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_model_iter_nth_child")]
-    fn iter_nth_child(&self, parent: Option<&TreeIter>, n: i32) -> Option<TreeIter> {
+    fn iter_nth_child<'a>(
+        &self,
+        parent: impl Into<Option<&'a TreeIter>>,
+        n: i32,
+    ) -> Option<TreeIter> {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             let ret = from_glib(ffi::gtk_tree_model_iter_nth_child(
                 self.as_ref().to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(parent.to_glib_none().0),
+                mut_override(parent.into().to_glib_none().0),
                 n,
             ));
             if ret {
diff --git a/gtk4/src/auto/tree_store.rs b/gtk4/src/auto/tree_store.rs
index 22a12e72077e..25c9b26d1bc7 100644
--- a/gtk4/src/auto/tree_store.rs
+++ b/gtk4/src/auto/tree_store.rs
@@ -19,13 +19,13 @@ impl TreeStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_store_append")]
-    pub fn append(&self, parent: Option<&TreeIter>) -> TreeIter {
+    pub fn append<'a>(&self, parent: impl Into<Option<&'a TreeIter>>) -> TreeIter {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             ffi::gtk_tree_store_append(
                 self.to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(parent.to_glib_none().0),
+                mut_override(parent.into().to_glib_none().0),
             );
             iter
         }
@@ -43,13 +43,13 @@ impl TreeStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_store_insert")]
-    pub fn insert(&self, parent: Option<&TreeIter>, position: i32) -> TreeIter {
+    pub fn insert<'a>(&self, parent: impl Into<Option<&'a TreeIter>>, position: i32) -> TreeIter {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             ffi::gtk_tree_store_insert(
                 self.to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(parent.to_glib_none().0),
+                mut_override(parent.into().to_glib_none().0),
                 position,
             );
             iter
@@ -59,14 +59,18 @@ impl TreeStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_store_insert_after")]
-    pub fn insert_after(&self, parent: Option<&TreeIter>, sibling: Option<&TreeIter>) -> TreeIter {
+    pub fn insert_after<'a>(
+        &self,
+        parent: impl Into<Option<&'a TreeIter>>,
+        sibling: impl Into<Option<&'a TreeIter>>,
+    ) -> TreeIter {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             ffi::gtk_tree_store_insert_after(
                 self.to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(parent.to_glib_none().0),
-                mut_override(sibling.to_glib_none().0),
+                mut_override(parent.into().to_glib_none().0),
+                mut_override(sibling.into().to_glib_none().0),
             );
             iter
         }
@@ -75,14 +79,18 @@ impl TreeStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_store_insert_before")]
-    pub fn insert_before(&self, parent: Option<&TreeIter>, sibling: Option<&TreeIter>) -> TreeIter {
+    pub fn insert_before<'a>(
+        &self,
+        parent: impl Into<Option<&'a TreeIter>>,
+        sibling: impl Into<Option<&'a TreeIter>>,
+    ) -> TreeIter {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             ffi::gtk_tree_store_insert_before(
                 self.to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(parent.to_glib_none().0),
-                mut_override(sibling.to_glib_none().0),
+                mut_override(parent.into().to_glib_none().0),
+                mut_override(sibling.into().to_glib_none().0),
             );
             iter
         }
@@ -128,12 +136,12 @@ impl TreeStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_store_move_after")]
-    pub fn move_after(&self, iter: &TreeIter, position: Option<&TreeIter>) {
+    pub fn move_after<'a>(&self, iter: &TreeIter, position: impl Into<Option<&'a TreeIter>>) {
         unsafe {
             ffi::gtk_tree_store_move_after(
                 self.to_glib_none().0,
                 mut_override(iter.to_glib_none().0),
-                mut_override(position.to_glib_none().0),
+                mut_override(position.into().to_glib_none().0),
             );
         }
     }
@@ -141,12 +149,12 @@ impl TreeStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_store_move_before")]
-    pub fn move_before(&self, iter: &TreeIter, position: Option<&TreeIter>) {
+    pub fn move_before<'a>(&self, iter: &TreeIter, position: impl Into<Option<&'a TreeIter>>) {
         unsafe {
             ffi::gtk_tree_store_move_before(
                 self.to_glib_none().0,
                 mut_override(iter.to_glib_none().0),
-                mut_override(position.to_glib_none().0),
+                mut_override(position.into().to_glib_none().0),
             );
         }
     }
@@ -154,13 +162,13 @@ impl TreeStore {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_store_prepend")]
-    pub fn prepend(&self, parent: Option<&TreeIter>) -> TreeIter {
+    pub fn prepend<'a>(&self, parent: impl Into<Option<&'a TreeIter>>) -> TreeIter {
         unsafe {
             let mut iter = TreeIter::uninitialized();
             ffi::gtk_tree_store_prepend(
                 self.to_glib_none().0,
                 iter.to_glib_none_mut().0,
-                mut_override(parent.to_glib_none().0),
+                mut_override(parent.into().to_glib_none().0),
             );
             iter
         }
diff --git a/gtk4/src/auto/tree_view.rs b/gtk4/src/auto/tree_view.rs
index be42decf1035..152db85e8164 100644
--- a/gtk4/src/auto/tree_view.rs
+++ b/gtk4/src/auto/tree_view.rs
@@ -163,7 +163,7 @@ impl TreeViewBuilder {
 
     pub fn model(self, model: &impl IsA<TreeModel>) -> Self {
         Self {
-            builder: self.builder.property("model", model.clone().upcast()),
+            builder: self.builder.property("model", model.as_ref().clone()),
         }
     }
 
@@ -273,7 +273,7 @@ impl TreeViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -385,7 +385,7 @@ impl TreeViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("hadjustment", hadjustment.clone().upcast()),
+                .property("hadjustment", hadjustment.as_ref().clone()),
         }
     }
 
@@ -399,7 +399,7 @@ impl TreeViewBuilder {
         Self {
             builder: self
                 .builder
-                .property("vadjustment", vadjustment.clone().upcast()),
+                .property("vadjustment", vadjustment.as_ref().clone()),
         }
     }
 
@@ -664,17 +664,17 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_get_background_area")]
     #[doc(alias = "get_background_area")]
-    fn background_area(
+    fn background_area<'a>(
         &self,
-        path: Option<&TreePath>,
-        column: Option<&TreeViewColumn>,
+        path: impl Into<Option<&'a TreePath>>,
+        column: impl Into<Option<&'a TreeViewColumn>>,
     ) -> gdk::Rectangle {
         unsafe {
             let mut rect = gdk::Rectangle::uninitialized();
             ffi::gtk_tree_view_get_background_area(
                 self.as_ref().to_glib_none().0,
-                mut_override(path.to_glib_none().0),
-                column.to_glib_none().0,
+                mut_override(path.into().to_glib_none().0),
+                column.into().to_glib_none().0,
                 rect.to_glib_none_mut().0,
             );
             rect
@@ -685,17 +685,17 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_get_cell_area")]
     #[doc(alias = "get_cell_area")]
-    fn cell_area(
+    fn cell_area<'a>(
         &self,
-        path: Option<&TreePath>,
-        column: Option<&TreeViewColumn>,
+        path: impl Into<Option<&'a TreePath>>,
+        column: impl Into<Option<&'a TreeViewColumn>>,
     ) -> gdk::Rectangle {
         unsafe {
             let mut rect = gdk::Rectangle::uninitialized();
             ffi::gtk_tree_view_get_cell_area(
                 self.as_ref().to_glib_none().0,
-                mut_override(path.to_glib_none().0),
-                column.to_glib_none().0,
+                mut_override(path.into().to_glib_none().0),
+                column.into().to_glib_none().0,
                 rect.to_glib_none_mut().0,
             );
             rect
@@ -1253,12 +1253,16 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_move_column_after")]
-    fn move_column_after(&self, column: &TreeViewColumn, base_column: Option<&TreeViewColumn>) {
+    fn move_column_after<'a>(
+        &self,
+        column: &TreeViewColumn,
+        base_column: impl Into<Option<&'a TreeViewColumn>>,
+    ) {
         unsafe {
             ffi::gtk_tree_view_move_column_after(
                 self.as_ref().to_glib_none().0,
                 column.to_glib_none().0,
-                base_column.to_glib_none().0,
+                base_column.into().to_glib_none().0,
             );
         }
     }
@@ -1278,12 +1282,12 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_row_activated")]
-    fn row_activated(&self, path: &TreePath, column: Option<&TreeViewColumn>) {
+    fn row_activated<'a>(&self, path: &TreePath, column: impl Into<Option<&'a TreeViewColumn>>) {
         unsafe {
             ffi::gtk_tree_view_row_activated(
                 self.as_ref().to_glib_none().0,
                 mut_override(path.to_glib_none().0),
-                column.to_glib_none().0,
+                column.into().to_glib_none().0,
             );
         }
     }
@@ -1303,10 +1307,10 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_scroll_to_cell")]
-    fn scroll_to_cell(
+    fn scroll_to_cell<'a>(
         &self,
-        path: Option<&TreePath>,
-        column: Option<&TreeViewColumn>,
+        path: impl Into<Option<&'a TreePath>>,
+        column: impl Into<Option<&'a TreeViewColumn>>,
         use_align: bool,
         row_align: f32,
         col_align: f32,
@@ -1314,8 +1318,8 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
         unsafe {
             ffi::gtk_tree_view_scroll_to_cell(
                 self.as_ref().to_glib_none().0,
-                mut_override(path.to_glib_none().0),
-                column.to_glib_none().0,
+                mut_override(path.into().to_glib_none().0),
+                column.into().to_glib_none().0,
                 use_align.into_glib(),
                 row_align,
                 col_align,
@@ -1426,17 +1430,17 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_set_cursor")]
-    fn set_cursor(
+    fn set_cursor<'a>(
         &self,
         path: &TreePath,
-        focus_column: Option<&TreeViewColumn>,
+        focus_column: impl Into<Option<&'a TreeViewColumn>>,
         start_editing: bool,
     ) {
         unsafe {
             ffi::gtk_tree_view_set_cursor(
                 self.as_ref().to_glib_none().0,
                 mut_override(path.to_glib_none().0),
-                focus_column.to_glib_none().0,
+                focus_column.into().to_glib_none().0,
                 start_editing.into_glib(),
             );
         }
@@ -1445,19 +1449,24 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_set_cursor_on_cell")]
-    fn set_cursor_on_cell(
+    fn set_cursor_on_cell<'a, P: IsA<CellRenderer>>(
         &self,
         path: &TreePath,
-        focus_column: Option<&TreeViewColumn>,
-        focus_cell: Option<&impl IsA<CellRenderer>>,
+        focus_column: impl Into<Option<&'a TreeViewColumn>>,
+        focus_cell: impl Into<Option<&'a P>>,
         start_editing: bool,
     ) {
         unsafe {
             ffi::gtk_tree_view_set_cursor_on_cell(
                 self.as_ref().to_glib_none().0,
                 mut_override(path.to_glib_none().0),
-                focus_column.to_glib_none().0,
-                focus_cell.map(|p| p.as_ref()).to_glib_none().0,
+                focus_column.into().to_glib_none().0,
+                focus_cell
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 start_editing.into_glib(),
             );
         }
@@ -1466,11 +1475,15 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_set_drag_dest_row")]
-    fn set_drag_dest_row(&self, path: Option<&TreePath>, pos: TreeViewDropPosition) {
+    fn set_drag_dest_row<'a>(
+        &self,
+        path: impl Into<Option<&'a TreePath>>,
+        pos: TreeViewDropPosition,
+    ) {
         unsafe {
             ffi::gtk_tree_view_set_drag_dest_row(
                 self.as_ref().to_glib_none().0,
-                mut_override(path.to_glib_none().0),
+                mut_override(path.into().to_glib_none().0),
                 pos.into_glib(),
             );
         }
@@ -1506,11 +1519,11 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_set_expander_column")]
     #[doc(alias = "expander-column")]
-    fn set_expander_column(&self, column: Option<&TreeViewColumn>) {
+    fn set_expander_column<'a>(&self, column: impl Into<Option<&'a TreeViewColumn>>) {
         unsafe {
             ffi::gtk_tree_view_set_expander_column(
                 self.as_ref().to_glib_none().0,
-                column.to_glib_none().0,
+                column.into().to_glib_none().0,
             );
         }
     }
@@ -1603,11 +1616,11 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_set_model")]
     #[doc(alias = "model")]
-    fn set_model(&self, model: Option<&impl IsA<TreeModel>>) {
+    fn set_model<'a, P: IsA<TreeModel>>(&self, model: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_tree_view_set_model(
                 self.as_ref().to_glib_none().0,
-                model.map(|p| p.as_ref()).to_glib_none().0,
+                model.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -1684,11 +1697,11 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_set_search_entry")]
-    fn set_search_entry(&self, entry: Option<&impl IsA<Editable>>) {
+    fn set_search_entry<'a, P: IsA<Editable>>(&self, entry: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_tree_view_set_search_entry(
                 self.as_ref().to_glib_none().0,
-                entry.map(|p| p.as_ref()).to_glib_none().0,
+                entry.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -1752,20 +1765,20 @@ pub trait TreeViewExt: IsA<TreeView> + 'static {
     #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_set_tooltip_cell")]
-    fn set_tooltip_cell(
+    fn set_tooltip_cell<'a, P: IsA<CellRenderer>>(
         &self,
         tooltip: &Tooltip,
-        path: Option<&TreePath>,
-        column: Option<&TreeViewColumn>,
-        cell: Option<&impl IsA<CellRenderer>>,
+        path: impl Into<Option<&'a TreePath>>,
+        column: impl Into<Option<&'a TreeViewColumn>>,
+        cell: impl Into<Option<&'a P>>,
     ) {
         unsafe {
             ffi::gtk_tree_view_set_tooltip_cell(
                 self.as_ref().to_glib_none().0,
                 tooltip.to_glib_none().0,
-                mut_override(path.to_glib_none().0),
-                column.to_glib_none().0,
-                cell.map(|p| p.as_ref()).to_glib_none().0,
+                mut_override(path.into().to_glib_none().0),
+                column.into().to_glib_none().0,
+                cell.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/tree_view_column.rs b/gtk4/src/auto/tree_view_column.rs
index 9f0aca1d6fbf..bc20d0e2d08c 100644
--- a/gtk4/src/auto/tree_view_column.rs
+++ b/gtk4/src/auto/tree_view_column.rs
@@ -631,11 +631,11 @@ impl TreeViewColumn {
     #[allow(deprecated)]
     #[doc(alias = "gtk_tree_view_column_set_widget")]
     #[doc(alias = "widget")]
-    pub fn set_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    pub fn set_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_tree_view_column_set_widget(
                 self.to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -1114,7 +1114,7 @@ impl TreeViewColumnBuilder {
         Self {
             builder: self
                 .builder
-                .property("cell-area", cell_area.clone().upcast()),
+                .property("cell-area", cell_area.as_ref().clone()),
         }
     }
 
@@ -1204,7 +1204,7 @@ impl TreeViewColumnBuilder {
 
     pub fn widget(self, widget: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("widget", widget.clone().upcast()),
+            builder: self.builder.property("widget", widget.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/uri_launcher.rs b/gtk4/src/auto/uri_launcher.rs
index c828fafc0667..200f237ba11e 100644
--- a/gtk4/src/auto/uri_launcher.rs
+++ b/gtk4/src/auto/uri_launcher.rs
@@ -41,11 +41,16 @@ impl UriLauncher {
     }
 
     #[doc(alias = "gtk_uri_launcher_launch")]
-    pub fn launch<P: FnOnce(Result<(), glib::Error>) + 'static>(
+    pub fn launch<
+        'a,
+        P: IsA<Window>,
+        Q: IsA<gio::Cancellable>,
+        R: FnOnce(Result<(), glib::Error>) + 'static,
+    >(
         &self,
-        parent: Option<&impl IsA<Window>>,
-        cancellable: Option<&impl IsA<gio::Cancellable>>,
-        callback: P,
+        parent: impl Into<Option<&'a P>>,
+        cancellable: impl Into<Option<&'a Q>>,
+        callback: R,
     ) {
         let main_context = glib::MainContext::ref_thread_default();
         let is_main_context_owner = main_context.is_owner();
@@ -57,9 +62,9 @@ impl UriLauncher {
             "Async operations only allowed if the thread is owning the MainContext"
         );
 
-        let user_data: Box_<glib::thread_guard::ThreadGuard<P>> =
+        let user_data: Box_<glib::thread_guard::ThreadGuard<R>> =
             Box_::new(glib::thread_guard::ThreadGuard::new(callback));
-        unsafe extern "C" fn launch_trampoline<P: FnOnce(Result<(), glib::Error>) + 'static>(
+        unsafe extern "C" fn launch_trampoline<R: FnOnce(Result<(), glib::Error>) + 'static>(
             _source_object: *mut glib::gobject_ffi::GObject,
             res: *mut gio::ffi::GAsyncResult,
             user_data: glib::ffi::gpointer,
@@ -71,28 +76,33 @@ impl UriLauncher {
             } else {
                 Err(from_glib_full(error))
             };
-            let callback: Box_<glib::thread_guard::ThreadGuard<P>> =
+            let callback: Box_<glib::thread_guard::ThreadGuard<R>> =
                 Box_::from_raw(user_data as *mut _);
-            let callback: P = callback.into_inner();
+            let callback: R = callback.into_inner();
             callback(result);
         }
-        let callback = launch_trampoline::<P>;
+        let callback = launch_trampoline::<R>;
         unsafe {
             ffi::gtk_uri_launcher_launch(
                 self.to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
-                cancellable.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
+                cancellable
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
                 Some(callback),
                 Box_::into_raw(user_data) as *mut _,
             );
         }
     }
 
-    pub fn launch_future(
+    pub fn launch_future<'a, P: IsA<Window> + Clone + 'static>(
         &self,
-        parent: Option<&(impl IsA<Window> + Clone + 'static)>,
+        parent: impl Into<Option<&'a P>>,
     ) -> Pin<Box_<dyn std::future::Future<Output = Result<(), glib::Error>> + 'static>> {
-        let parent = parent.map(ToOwned::to_owned);
+        let parent = parent.into().map(ToOwned::to_owned);
         Box_::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             obj.launch(
                 parent.as_ref().map(::std::borrow::Borrow::borrow),
@@ -106,9 +116,9 @@ impl UriLauncher {
 
     #[doc(alias = "gtk_uri_launcher_set_uri")]
     #[doc(alias = "uri")]
-    pub fn set_uri(&self, uri: Option<&str>) {
+    pub fn set_uri<'a>(&self, uri: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_uri_launcher_set_uri(self.to_glib_none().0, uri.to_glib_none().0);
+            ffi::gtk_uri_launcher_set_uri(self.to_glib_none().0, uri.into().to_glib_none().0);
         }
     }
 
diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gtk4/src/auto/versions.txt
+++ b/gtk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)
diff --git a/gtk4/src/auto/video.rs b/gtk4/src/auto/video.rs
index 81c2b783b2a4..f9487760584e 100644
--- a/gtk4/src/auto/video.rs
+++ b/gtk4/src/auto/video.rs
@@ -34,11 +34,11 @@ impl Video {
 
     #[doc(alias = "gtk_video_new_for_file")]
     #[doc(alias = "new_for_file")]
-    pub fn for_file(file: Option<&impl IsA<gio::File>>) -> Video {
+    pub fn for_file<'a, P: IsA<gio::File>>(file: impl Into<Option<&'a P>>) -> Video {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_video_new_for_file(
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -58,11 +58,11 @@ impl Video {
 
     #[doc(alias = "gtk_video_new_for_media_stream")]
     #[doc(alias = "new_for_media_stream")]
-    pub fn for_media_stream(stream: Option<&impl IsA<MediaStream>>) -> Video {
+    pub fn for_media_stream<'a, P: IsA<MediaStream>>(stream: impl Into<Option<&'a P>>) -> Video {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_video_new_for_media_stream(
-                stream.map(|p| p.as_ref()).to_glib_none().0,
+                stream.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -70,11 +70,11 @@ impl Video {
 
     #[doc(alias = "gtk_video_new_for_resource")]
     #[doc(alias = "new_for_resource")]
-    pub fn for_resource(resource_path: Option<&str>) -> Video {
+    pub fn for_resource<'a>(resource_path: impl Into<Option<&'a str>>) -> Video {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_video_new_for_resource(
-                resource_path.to_glib_none().0,
+                resource_path.into().to_glib_none().0,
             ))
             .unsafe_cast()
         }
@@ -134,11 +134,11 @@ impl Video {
 
     #[doc(alias = "gtk_video_set_file")]
     #[doc(alias = "file")]
-    pub fn set_file(&self, file: Option<&impl IsA<gio::File>>) {
+    pub fn set_file<'a, P: IsA<gio::File>>(&self, file: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_video_set_file(
                 self.to_glib_none().0,
-                file.map(|p| p.as_ref()).to_glib_none().0,
+                file.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -173,19 +173,22 @@ impl Video {
 
     #[doc(alias = "gtk_video_set_media_stream")]
     #[doc(alias = "media-stream")]
-    pub fn set_media_stream(&self, stream: Option<&impl IsA<MediaStream>>) {
+    pub fn set_media_stream<'a, P: IsA<MediaStream>>(&self, stream: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_video_set_media_stream(
                 self.to_glib_none().0,
-                stream.map(|p| p.as_ref()).to_glib_none().0,
+                stream.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_video_set_resource")]
-    pub fn set_resource(&self, resource_path: Option<&str>) {
+    pub fn set_resource<'a>(&self, resource_path: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_video_set_resource(self.to_glib_none().0, resource_path.to_glib_none().0);
+            ffi::gtk_video_set_resource(
+                self.to_glib_none().0,
+                resource_path.into().to_glib_none().0,
+            );
         }
     }
 
@@ -337,7 +340,7 @@ impl VideoBuilder {
 
     pub fn file(self, file: &impl IsA<gio::File>) -> Self {
         Self {
-            builder: self.builder.property("file", file.clone().upcast()),
+            builder: self.builder.property("file", file.as_ref().clone()),
         }
     }
 
@@ -359,7 +362,7 @@ impl VideoBuilder {
         Self {
             builder: self
                 .builder
-                .property("media-stream", media_stream.clone().upcast()),
+                .property("media-stream", media_stream.as_ref().clone()),
         }
     }
 
@@ -439,7 +442,7 @@ impl VideoBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/viewport.rs b/gtk4/src/auto/viewport.rs
index 9cccb0e0d6fa..c1d728c5693c 100644
--- a/gtk4/src/auto/viewport.rs
+++ b/gtk4/src/auto/viewport.rs
@@ -27,15 +27,25 @@ glib::wrapper! {
 
 impl Viewport {
     #[doc(alias = "gtk_viewport_new")]
-    pub fn new(
-        hadjustment: Option<&impl IsA<Adjustment>>,
-        vadjustment: Option<&impl IsA<Adjustment>>,
+    pub fn new<'a, P: IsA<Adjustment>, Q: IsA<Adjustment>>(
+        hadjustment: impl Into<Option<&'a P>>,
+        vadjustment: impl Into<Option<&'a Q>>,
     ) -> Viewport {
         assert_initialized_main_thread!();
         unsafe {
             Widget::from_glib_none(ffi::gtk_viewport_new(
-                hadjustment.map(|p| p.as_ref()).to_glib_none().0,
-                vadjustment.map(|p| p.as_ref()).to_glib_none().0,
+                hadjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
+                vadjustment
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             ))
             .unsafe_cast()
         }
@@ -65,23 +75,23 @@ impl Viewport {
     #[cfg(feature = "v4_12")]
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
     #[doc(alias = "gtk_viewport_scroll_to")]
-    pub fn scroll_to(&self, descendant: &impl IsA<Widget>, scroll: Option<ScrollInfo>) {
+    pub fn scroll_to(&self, descendant: &impl IsA<Widget>, scroll: impl Into<Option<ScrollInfo>>) {
         unsafe {
             ffi::gtk_viewport_scroll_to(
                 self.to_glib_none().0,
                 descendant.as_ref().to_glib_none().0,
-                scroll.into_glib_ptr(),
+                scroll.into().into_glib_ptr(),
             );
         }
     }
 
     #[doc(alias = "gtk_viewport_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_viewport_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -168,7 +178,7 @@ impl ViewportBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -254,7 +264,7 @@ impl ViewportBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -366,7 +376,7 @@ impl ViewportBuilder {
         Self {
             builder: self
                 .builder
-                .property("hadjustment", hadjustment.clone().upcast()),
+                .property("hadjustment", hadjustment.as_ref().clone()),
         }
     }
 
@@ -380,7 +390,7 @@ impl ViewportBuilder {
         Self {
             builder: self
                 .builder
-                .property("vadjustment", vadjustment.clone().upcast()),
+                .property("vadjustment", vadjustment.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/volume_button.rs b/gtk4/src/auto/volume_button.rs
index 5d96feccd0bb..3ca78cf237eb 100644
--- a/gtk4/src/auto/volume_button.rs
+++ b/gtk4/src/auto/volume_button.rs
@@ -125,7 +125,7 @@ impl VolumeButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("adjustment", adjustment.clone().upcast()),
+                .property("adjustment", adjustment.as_ref().clone()),
         }
     }
 
@@ -225,7 +225,7 @@ impl VolumeButtonBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/widget.rs b/gtk4/src/auto/widget.rs
index 0d225957fbde..dfb2deb7e532 100644
--- a/gtk4/src/auto/widget.rs
+++ b/gtk4/src/auto/widget.rs
@@ -69,17 +69,17 @@ pub trait WidgetExt: IsA<Widget> + 'static {
 
     #[doc(alias = "gtk_widget_activate_action_variant")]
     #[doc(alias = "activate_action_variant")]
-    fn activate_action(
+    fn activate_action<'a>(
         &self,
         name: &str,
-        args: Option<&glib::Variant>,
+        args: impl Into<Option<&'a glib::Variant>>,
     ) -> Result<(), glib::error::BoolError> {
         unsafe {
             glib::result_from_gboolean!(
                 ffi::gtk_widget_activate_action_variant(
                     self.as_ref().to_glib_none().0,
                     name.to_glib_none().0,
-                    args.to_glib_none().0
+                    args.into().to_glib_none().0
                 ),
                 "Action does not exist"
             )
@@ -124,14 +124,20 @@ pub trait WidgetExt: IsA<Widget> + 'static {
     }
 
     #[doc(alias = "gtk_widget_allocate")]
-    fn allocate(&self, width: i32, height: i32, baseline: i32, transform: Option<gsk::Transform>) {
+    fn allocate(
+        &self,
+        width: i32,
+        height: i32,
+        baseline: i32,
+        transform: impl Into<Option<gsk::Transform>>,
+    ) {
         unsafe {
             ffi::gtk_widget_allocate(
                 self.as_ref().to_glib_none().0,
                 width,
                 height,
                 baseline,
-                transform.into_glib_ptr(),
+                transform.into().into_glib_ptr(),
             );
         }
     }
@@ -233,11 +239,11 @@ pub trait WidgetExt: IsA<Widget> + 'static {
     }
 
     #[doc(alias = "gtk_widget_create_pango_layout")]
-    fn create_pango_layout(&self, text: Option<&str>) -> pango::Layout {
+    fn create_pango_layout<'a>(&self, text: impl Into<Option<&'a str>>) -> pango::Layout {
         unsafe {
             from_glib_full(ffi::gtk_widget_create_pango_layout(
                 self.as_ref().to_glib_none().0,
-                text.to_glib_none().0,
+                text.into().to_glib_none().0,
             ))
         }
     }
@@ -891,34 +897,56 @@ pub trait WidgetExt: IsA<Widget> + 'static {
     }
 
     #[doc(alias = "gtk_widget_insert_action_group")]
-    fn insert_action_group(&self, name: &str, group: Option<&impl IsA<gio::ActionGroup>>) {
+    fn insert_action_group<'a, P: IsA<gio::ActionGroup>>(
+        &self,
+        name: &str,
+        group: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_widget_insert_action_group(
                 self.as_ref().to_glib_none().0,
                 name.to_glib_none().0,
-                group.map(|p| p.as_ref()).to_glib_none().0,
+                group.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_widget_insert_after")]
-    fn insert_after(&self, parent: &impl IsA<Widget>, previous_sibling: Option<&impl IsA<Widget>>) {
+    fn insert_after<'a, P: IsA<Widget>>(
+        &self,
+        parent: &impl IsA<Widget>,
+        previous_sibling: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_widget_insert_after(
                 self.as_ref().to_glib_none().0,
                 parent.as_ref().to_glib_none().0,
-                previous_sibling.map(|p| p.as_ref()).to_glib_none().0,
+                previous_sibling
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
 
     #[doc(alias = "gtk_widget_insert_before")]
-    fn insert_before(&self, parent: &impl IsA<Widget>, next_sibling: Option<&impl IsA<Widget>>) {
+    fn insert_before<'a, P: IsA<Widget>>(
+        &self,
+        parent: &impl IsA<Widget>,
+        next_sibling: impl Into<Option<&'a P>>,
+    ) {
         unsafe {
             ffi::gtk_widget_insert_before(
                 self.as_ref().to_glib_none().0,
                 parent.as_ref().to_glib_none().0,
-                next_sibling.map(|p| p.as_ref()).to_glib_none().0,
+                next_sibling
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -1144,18 +1172,21 @@ pub trait WidgetExt: IsA<Widget> + 'static {
 
     #[doc(alias = "gtk_widget_set_cursor")]
     #[doc(alias = "cursor")]
-    fn set_cursor(&self, cursor: Option<&gdk::Cursor>) {
+    fn set_cursor<'a>(&self, cursor: impl Into<Option<&'a gdk::Cursor>>) {
         unsafe {
-            ffi::gtk_widget_set_cursor(self.as_ref().to_glib_none().0, cursor.to_glib_none().0);
+            ffi::gtk_widget_set_cursor(
+                self.as_ref().to_glib_none().0,
+                cursor.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_widget_set_cursor_from_name")]
-    fn set_cursor_from_name(&self, name: Option<&str>) {
+    fn set_cursor_from_name<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_widget_set_cursor_from_name(
                 self.as_ref().to_glib_none().0,
-                name.to_glib_none().0,
+                name.into().to_glib_none().0,
             );
         }
     }
@@ -1168,11 +1199,11 @@ pub trait WidgetExt: IsA<Widget> + 'static {
     }
 
     #[doc(alias = "gtk_widget_set_focus_child")]
-    fn set_focus_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_focus_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_widget_set_focus_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -1197,11 +1228,16 @@ pub trait WidgetExt: IsA<Widget> + 'static {
     }
 
     #[doc(alias = "gtk_widget_set_font_map")]
-    fn set_font_map(&self, font_map: Option<&impl IsA<pango::FontMap>>) {
+    fn set_font_map<'a, P: IsA<pango::FontMap>>(&self, font_map: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_widget_set_font_map(
                 self.as_ref().to_glib_none().0,
-                font_map.map(|p| p.as_ref()).to_glib_none().0,
+                font_map
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -1209,11 +1245,11 @@ pub trait WidgetExt: IsA<Widget> + 'static {
     #[cfg_attr(feature = "v4_16", deprecated = "Since 4.16")]
     #[allow(deprecated)]
     #[doc(alias = "gtk_widget_set_font_options")]
-    fn set_font_options(&self, options: Option<&cairo::FontOptions>) {
+    fn set_font_options<'a>(&self, options: impl Into<Option<&'a cairo::FontOptions>>) {
         unsafe {
             ffi::gtk_widget_set_font_options(
                 self.as_ref().to_glib_none().0,
-                options.to_glib_none().0,
+                options.into().to_glib_none().0,
             );
         }
     }
@@ -1370,20 +1406,23 @@ pub trait WidgetExt: IsA<Widget> + 'static {
 
     #[doc(alias = "gtk_widget_set_tooltip_markup")]
     #[doc(alias = "tooltip-markup")]
-    fn set_tooltip_markup(&self, markup: Option<&str>) {
+    fn set_tooltip_markup<'a>(&self, markup: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_widget_set_tooltip_markup(
                 self.as_ref().to_glib_none().0,
-                markup.to_glib_none().0,
+                markup.into().to_glib_none().0,
             );
         }
     }
 
     #[doc(alias = "gtk_widget_set_tooltip_text")]
     #[doc(alias = "tooltip-text")]
-    fn set_tooltip_text(&self, text: Option<&str>) {
+    fn set_tooltip_text<'a>(&self, text: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_widget_set_tooltip_text(self.as_ref().to_glib_none().0, text.to_glib_none().0);
+            ffi::gtk_widget_set_tooltip_text(
+                self.as_ref().to_glib_none().0,
+                text.into().to_glib_none().0,
+            );
         }
     }
 
diff --git a/gtk4/src/auto/widget_paintable.rs b/gtk4/src/auto/widget_paintable.rs
index 27bc0a1b7d7b..a1fb76f81570 100644
--- a/gtk4/src/auto/widget_paintable.rs
+++ b/gtk4/src/auto/widget_paintable.rs
@@ -21,11 +21,11 @@ glib::wrapper! {
 
 impl WidgetPaintable {
     #[doc(alias = "gtk_widget_paintable_new")]
-    pub fn new(widget: Option<&impl IsA<Widget>>) -> WidgetPaintable {
+    pub fn new<'a, P: IsA<Widget>>(widget: impl Into<Option<&'a P>>) -> WidgetPaintable {
         assert_initialized_main_thread!();
         unsafe {
             from_glib_full(ffi::gtk_widget_paintable_new(
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             ))
         }
     }
@@ -38,11 +38,11 @@ impl WidgetPaintable {
 
     #[doc(alias = "gtk_widget_paintable_set_widget")]
     #[doc(alias = "widget")]
-    pub fn set_widget(&self, widget: Option<&impl IsA<Widget>>) {
+    pub fn set_widget<'a, P: IsA<Widget>>(&self, widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_widget_paintable_set_widget(
                 self.to_glib_none().0,
-                widget.map(|p| p.as_ref()).to_glib_none().0,
+                widget.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/window.rs b/gtk4/src/auto/window.rs
index 93eb66320ad6..aa627ab7edaa 100644
--- a/gtk4/src/auto/window.rs
+++ b/gtk4/src/auto/window.rs
@@ -111,13 +111,13 @@ impl WindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("application", application.clone().upcast()),
+                .property("application", application.as_ref().clone()),
         }
     }
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -137,7 +137,7 @@ impl WindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("default-widget", default_widget.clone().upcast()),
+                .property("default-widget", default_widget.as_ref().clone()),
         }
     }
 
@@ -163,7 +163,7 @@ impl WindowBuilder {
 
     pub fn display(self, display: &impl IsA<gdk::Display>) -> Self {
         Self {
-            builder: self.builder.property("display", display.clone().upcast()),
+            builder: self.builder.property("display", display.as_ref().clone()),
         }
     }
 
@@ -177,7 +177,7 @@ impl WindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("focus-widget", focus_widget.clone().upcast()),
+                .property("focus-widget", focus_widget.as_ref().clone()),
         }
     }
 
@@ -251,7 +251,7 @@ impl WindowBuilder {
     #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))]
     pub fn titlebar(self, titlebar: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("titlebar", titlebar.clone().upcast()),
+            builder: self.builder.property("titlebar", titlebar.as_ref().clone()),
         }
     }
 
@@ -259,7 +259,7 @@ impl WindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("transient-for", transient_for.clone().upcast()),
+                .property("transient-for", transient_for.as_ref().clone()),
         }
     }
 
@@ -339,7 +339,7 @@ impl WindowBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
@@ -742,22 +742,27 @@ pub trait GtkWindowExt: IsA<Window> + 'static {
 
     #[doc(alias = "gtk_window_set_application")]
     #[doc(alias = "application")]
-    fn set_application(&self, application: Option<&impl IsA<Application>>) {
+    fn set_application<'a, P: IsA<Application>>(&self, application: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_window_set_application(
                 self.as_ref().to_glib_none().0,
-                application.map(|p| p.as_ref()).to_glib_none().0,
+                application
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
 
     #[doc(alias = "gtk_window_set_child")]
     #[doc(alias = "child")]
-    fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_window_set_child(
                 self.as_ref().to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -779,11 +784,16 @@ pub trait GtkWindowExt: IsA<Window> + 'static {
 
     #[doc(alias = "gtk_window_set_default_widget")]
     #[doc(alias = "default-widget")]
-    fn set_default_widget(&self, default_widget: Option<&impl IsA<Widget>>) {
+    fn set_default_widget<'a, P: IsA<Widget>>(&self, default_widget: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_window_set_default_widget(
                 self.as_ref().to_glib_none().0,
-                default_widget.map(|p| p.as_ref()).to_glib_none().0,
+                default_widget
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
@@ -820,11 +830,11 @@ pub trait GtkWindowExt: IsA<Window> + 'static {
 
     #[doc(alias = "gtk_window_set_focus")]
     #[doc(alias = "focus-widget")]
-    fn set_focus(&self, focus: Option<&impl IsA<Widget>>) {
+    fn set_focus<'a, P: IsA<Widget>>(&self, focus: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_window_set_focus(
                 self.as_ref().to_glib_none().0,
-                focus.map(|p| p.as_ref()).to_glib_none().0,
+                focus.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -860,9 +870,12 @@ pub trait GtkWindowExt: IsA<Window> + 'static {
 
     #[doc(alias = "gtk_window_set_icon_name")]
     #[doc(alias = "icon-name")]
-    fn set_icon_name(&self, name: Option<&str>) {
+    fn set_icon_name<'a>(&self, name: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_window_set_icon_name(self.as_ref().to_glib_none().0, name.to_glib_none().0);
+            ffi::gtk_window_set_icon_name(
+                self.as_ref().to_glib_none().0,
+                name.into().to_glib_none().0,
+            );
         }
     }
 
@@ -906,30 +919,38 @@ pub trait GtkWindowExt: IsA<Window> + 'static {
 
     #[doc(alias = "gtk_window_set_title")]
     #[doc(alias = "title")]
-    fn set_title(&self, title: Option<&str>) {
+    fn set_title<'a>(&self, title: impl Into<Option<&'a str>>) {
         unsafe {
-            ffi::gtk_window_set_title(self.as_ref().to_glib_none().0, title.to_glib_none().0);
+            ffi::gtk_window_set_title(
+                self.as_ref().to_glib_none().0,
+                title.into().to_glib_none().0,
+            );
         }
     }
 
     #[doc(alias = "gtk_window_set_titlebar")]
     #[doc(alias = "titlebar")]
-    fn set_titlebar(&self, titlebar: Option<&impl IsA<Widget>>) {
+    fn set_titlebar<'a, P: IsA<Widget>>(&self, titlebar: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_window_set_titlebar(
                 self.as_ref().to_glib_none().0,
-                titlebar.map(|p| p.as_ref()).to_glib_none().0,
+                titlebar
+                    .into()
+                    .as_ref()
+                    .map(|p| p.as_ref())
+                    .to_glib_none()
+                    .0,
             );
         }
     }
 
     #[doc(alias = "gtk_window_set_transient_for")]
     #[doc(alias = "transient-for")]
-    fn set_transient_for(&self, parent: Option<&impl IsA<Window>>) {
+    fn set_transient_for<'a, P: IsA<Window>>(&self, parent: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_window_set_transient_for(
                 self.as_ref().to_glib_none().0,
-                parent.map(|p| p.as_ref()).to_glib_none().0,
+                parent.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
diff --git a/gtk4/src/auto/window_controls.rs b/gtk4/src/auto/window_controls.rs
index 81c6082997b3..2ea8d17f3a88 100644
--- a/gtk4/src/auto/window_controls.rs
+++ b/gtk4/src/auto/window_controls.rs
@@ -65,11 +65,11 @@ impl WindowControls {
 
     #[doc(alias = "gtk_window_controls_set_decoration_layout")]
     #[doc(alias = "decoration-layout")]
-    pub fn set_decoration_layout(&self, layout: Option<&str>) {
+    pub fn set_decoration_layout<'a>(&self, layout: impl Into<Option<&'a str>>) {
         unsafe {
             ffi::gtk_window_controls_set_decoration_layout(
                 self.to_glib_none().0,
-                layout.to_glib_none().0,
+                layout.into().to_glib_none().0,
             );
         }
     }
@@ -269,7 +269,7 @@ impl WindowControlsBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/src/auto/window_handle.rs b/gtk4/src/auto/window_handle.rs
index 27793f11c48e..e4ddae609157 100644
--- a/gtk4/src/auto/window_handle.rs
+++ b/gtk4/src/auto/window_handle.rs
@@ -45,11 +45,11 @@ impl WindowHandle {
 
     #[doc(alias = "gtk_window_handle_set_child")]
     #[doc(alias = "child")]
-    pub fn set_child(&self, child: Option<&impl IsA<Widget>>) {
+    pub fn set_child<'a, P: IsA<Widget>>(&self, child: impl Into<Option<&'a P>>) {
         unsafe {
             ffi::gtk_window_handle_set_child(
                 self.to_glib_none().0,
-                child.map(|p| p.as_ref()).to_glib_none().0,
+                child.into().as_ref().map(|p| p.as_ref()).to_glib_none().0,
             );
         }
     }
@@ -102,7 +102,7 @@ impl WindowHandleBuilder {
 
     pub fn child(self, child: &impl IsA<Widget>) -> Self {
         Self {
-            builder: self.builder.property("child", child.clone().upcast()),
+            builder: self.builder.property("child", child.as_ref().clone()),
         }
     }
 
@@ -182,7 +182,7 @@ impl WindowHandleBuilder {
         Self {
             builder: self
                 .builder
-                .property("layout-manager", layout_manager.clone().upcast()),
+                .property("layout-manager", layout_manager.as_ref().clone()),
         }
     }
 
diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt
index 91ca6c1fea0b..05686e1c6652 100644
--- a/gtk4/sys/versions.txt
+++ b/gtk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 03ab3b39fbaf)
+Generated by gir (https://github.com/gtk-rs/gir @ d65f5843ca8a)
 from gir-files (https://github.com/gtk-rs/gir-files @ c05f5cc23cb7)