diff --git a/src/widgets/image/input_handling.rs b/src/widgets/image/input_handling.rs
index 4cff0b0..47b82e4 100644
--- a/src/widgets/image/input_handling.rs
+++ b/src/widgets/image/input_handling.rs
@@ -73,8 +73,8 @@ impl imp::LpImage {
         scroll_controller.connect_scroll(glib::clone!(
             #[weak]
             obj,
-            #[upgrade_or_else]
-            || glib::Propagation::Proceed,
+            #[upgrade_or]
+            glib::Propagation::Proceed,
             move |event, _, y| {
                 let imp = obj.imp();
                 let state = event.current_event_state();
diff --git a/src/widgets/image/loading.rs b/src/widgets/image/loading.rs
index 109b095..44bfa68 100644
--- a/src/widgets/image/loading.rs
+++ b/src/widgets/image/loading.rs
@@ -120,8 +120,8 @@ impl imp::LpImage {
                     let callback_id = obj.add_tick_callback(glib::clone!(
                         #[weak(rename_to = obj)]
                         self,
-                        #[upgrade_or_else]
-                        || glib::ControlFlow::Break,
+                        #[upgrade_or]
+                        glib::ControlFlow::Break,
                         move |_, clock| obj.tick_callback(clock)
                     ));
                     self.tick_callback.replace(Some(callback_id));
diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs
index 2462748..b4a7098 100644
--- a/src/widgets/image_view.rs
+++ b/src/widgets/image_view.rs
@@ -190,8 +190,7 @@ mod imp {
             self.drag_source.connect_prepare(glib::clone!(
                 #[weak]
                 obj,
-                #[upgrade_or_else]
-                || None,
+                #[upgrade_or_default]
                 move |gesture, _, _| {
                     let is_scrollable = obj
                         .current_page()
diff --git a/src/widgets/properties_view.rs b/src/widgets/properties_view.rs
index 69a6917..3a7d14f 100644
--- a/src/widgets/properties_view.rs
+++ b/src/widgets/properties_view.rs
@@ -129,8 +129,7 @@ mod imp {
                 glib::clone!(
                     #[weak]
                     obj,
-                    #[upgrade_or_else]
-                    || None,
+                    #[upgrade_or_default]
                     move |_| {
                         obj.imp().update();
                         None
diff --git a/src/widgets/sliding_view.rs b/src/widgets/sliding_view.rs
index dc908c8..d20d916 100644
--- a/src/widgets/sliding_view.rs
+++ b/src/widgets/sliding_view.rs
@@ -195,8 +195,8 @@ mod imp {
             scroll_controller.connect_scroll(glib::clone!(
                 #[weak]
                 obj,
-                #[upgrade_or_else]
-                || glib::Propagation::Proceed,
+                #[upgrade_or]
+                glib::Propagation::Proceed,
                 move |_, x, _| {
                     let direction_sign = if obj.imp().is_rtl() { -1. } else { 1. };
 
diff --git a/src/window.rs b/src/window.rs
index c24daa9..3136fd2 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -279,8 +279,7 @@ mod imp {
                 glib::clone!(
                     #[weak]
                     obj,
-                    #[upgrade_or_else]
-                    || None,
+                    #[upgrade_or_default]
                     move |_| {
                         obj.update_title();
                         None
@@ -389,8 +388,8 @@ mod imp {
             self.drop_target.connect_accept(clone!(
                 #[weak]
                 obj,
-                #[upgrade_or_else]
-                || false,
+                #[upgrade_or]
+                false,
                 move |_drop_target, drop| {
                     // Only accept drops from external sources or different windows
                     let different_source = drop.drag().is_none()
@@ -409,8 +408,8 @@ mod imp {
             self.drop_target.connect_drop(clone!(
                 #[weak]
                 obj,
-                #[upgrade_or_else]
-                || false,
+                #[upgrade_or]
+                false,
                 move |_, value, _, _| {
                     // Here we use a GValue, which is a dynamic object that can hold different
                     // types, e.g. strings, numbers, or in this case objects. In