diff --git a/gstreamer-app/Gir.toml b/gstreamer-app/Gir.toml
index 285140fcf..1a6df5e95 100644
--- a/gstreamer-app/Gir.toml
+++ b/gstreamer-app/Gir.toml
@@ -24,10 +24,18 @@ manual = [
     "Gst.Object",
     "Gst.Element",
     "Gst.URIHandler",
-    "Gst.FlowReturn",
     "Gst.Format",
 ]
 
+[[object]]
+name = "Gst.FlowReturn"
+status = "manual"
+must_use = true
+    [object.conversion_type]
+    variant = "Result"
+    ok_type = "gst::FlowSuccess"
+    err_type = "gst::FlowError"
+
 [[object]]
 name = "GstApp.AppSink"
 status = "generate"
@@ -53,16 +61,6 @@ final_type = true
     # Action signal
     ignore = true
 
-    [[object.signal]]
-    name = "new-sample"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
-    [[object.signal]]
-    name = "new-preroll"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
     [[object.signal]]
     name = "eos"
     concurrency = "send"
@@ -118,16 +116,6 @@ final_type = true
     # Action signal
     ignore = true
 
-    [[object.function]]
-    name = "end_of_stream"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
-    [[object.function]]
-    name = "push_sample"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
     [[object.function]]
     name = "set_latency"
     # ClockTime
diff --git a/gstreamer-base/Gir.toml b/gstreamer-base/Gir.toml
index 4c678b425..daf1ea16b 100644
--- a/gstreamer-base/Gir.toml
+++ b/gstreamer-base/Gir.toml
@@ -28,8 +28,6 @@ manual = [
     "Gst.Element",
     "Gst.BufferPool",
     "Gst.ClockTimeDiff",
-    "Gst.ClockReturn",
-    "Gst.FlowReturn",
     "Gst.Format",
     "Gst.Pad",
     "Gst.TypeFindProbability",
@@ -37,6 +35,24 @@ manual = [
     "GstBase.BaseParseFrame",
 ]
 
+[[object]]
+name = "Gst.ClockReturn"
+status = "manual"
+must_use = true
+    [object.conversion_type]
+    variant = "Result"
+    ok_type = "gst::ClockSuccess"
+    err_type = "gst::ClockError"
+
+[[object]]
+name = "Gst.FlowReturn"
+status = "manual"
+must_use = true
+    [object.conversion_type]
+    variant = "Result"
+    ok_type = "gst::FlowSuccess"
+    err_type = "gst::FlowError"
+
 [[object]]
 name = "GstBase.Adapter"
 status = "generate"
@@ -94,21 +110,6 @@ name = "GstBase.BaseSink"
 status = "generate"
 manual_traits = ["BaseSinkExtManual"]
 
-    [[object.function]]
-    name = "wait"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
-    [[object.function]]
-    name = "wait_preroll"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
-    [[object.function]]
-    name = "wait_clock"
-    # Use Result<ClockSuccess, ClockError>
-    manual = true
-
     [[object.function]]
     name = "query_latency"
     # Use Result
@@ -124,26 +125,11 @@ manual_traits = ["BaseSrcExtManual"]
         [object.function.return]
         bool_return_is_error = "Failed to set caps"
 
-    [[object.function]]
-    name = "start_complete"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
-    [[object.function]]
-    name = "start_wait"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
     [[object.function]]
     name = "submit_buffer_list"
     # Pass by value, to be added manually
     ignore = true
 
-    [[object.function]]
-    name = "wait_playing"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
     [[object.function]]
     name = "query_latency"
     # Use Result
diff --git a/gstreamer-rtsp-server/Gir.toml b/gstreamer-rtsp-server/Gir.toml
index 1d1809d9e..05085f8ef 100644
--- a/gstreamer-rtsp-server/Gir.toml
+++ b/gstreamer-rtsp-server/Gir.toml
@@ -53,7 +53,6 @@ manual = [
     "Gst.Pipeline",
     "Gst.Pad",
     "Gst.Bin",
-    "Gst.FlowReturn",
     "GstRtsp.RTSPAuthMethod",
     "GstRtsp.RTSPUrl",
     "GstRtsp.RTSPResult",
@@ -63,6 +62,15 @@ manual = [
     "GstRtsp.RTSPLowerTrans"
 ]
 
+[[object]]
+name = "Gst.FlowReturn"
+status = "manual"
+must_use = true
+    [object.conversion_type]
+    variant = "Result"
+    ok_type = "gst::FlowSuccess"
+    err_type = "gst::FlowError"
+
 [[object]]
 name = "Gst.Object"
 # For renaming the trait...
@@ -140,17 +148,6 @@ manual_traits = ["RTSPClientExtManual"]
 [[object]]
 name = "GstRtspServer.RTSPStream"
 status = "generate"
-manual_traits = ["RTSPStreamExtManual"]
-
-    [[object.function]]
-    name = "recv_rtcp"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
-    [[object.function]]
-    name = "recv_rtp"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
 
     [[object.function]]
     name = "query_position"
@@ -204,12 +201,6 @@ concurrency = "send"
 name = "GstRtspServer.RTSPStreamTransport"
 status = "generate"
 concurrency = "none"
-manual_traits = ["RTSPStreamTransportExtManual"]
-
-    [[object.function]]
-    name = "recv_data"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
 
     [[object.function]]
     name = "send_rtcp"
diff --git a/gstreamer-video/Gir.toml b/gstreamer-video/Gir.toml
index e351d222f..772574ce4 100644
--- a/gstreamer-video/Gir.toml
+++ b/gstreamer-video/Gir.toml
@@ -128,10 +128,6 @@ manual_traits = ["VideoDecoderExtManual"]
     name = "drop_frame"
     manual = true
 
-    [[object.function]]
-    name = "have_frame"
-    manual = true
-
     [[object.function]]
     name = "set_latency"
     manual = true
diff --git a/gstreamer/Gir.toml b/gstreamer/Gir.toml
index b8c9815c6..81d64bddb 100644
--- a/gstreamer/Gir.toml
+++ b/gstreamer/Gir.toml
@@ -599,26 +599,6 @@ manual_traits = ["ElementExtManual"]
         [object.function.return]
         bool_return_is_error = "Failed to sync state with parent"
 
-    [[object.function]]
-    name = "change_state"
-    # Use Result<StateChangeSuccess, StateChangeError>
-    manual = true
-
-    [[object.function]]
-    name = "continue_state"
-    # Use Result<StateChangeSuccess, StateChangeError>
-    manual = true
-
-    [[object.function]]
-    name = "get_state"
-    # Use Result<StateChangeSuccess, StateChangeError>
-    manual = true
-
-    [[object.function]]
-    name = "set_state"
-    # Use Result<StateChangeSuccess, StateChangeError>
-    manual = true
-
     [[object.function]]
     name = "query"
     # correct mutability
@@ -931,7 +911,7 @@ manual_traits = ["PadExtManual"]
     [[object.function]]
     name = "get_last_flow_return"
     # Use Result<FlowSuccess, FlowError>
-    manual = true
+    rename = "last_flow_result"
 
     [[object.function]]
     name = "query"
@@ -973,21 +953,6 @@ manual_traits = ["PadExtManual"]
     # Pass by value
     manual = true
 
-    [[object.function]]
-    name = "link"
-    # Use Result<PadLinkSuccess, PadLinkError>
-    manual = true
-
-    [[object.function]]
-    name = "link_full"
-    # Use Result<PadLinkSuccess, PadLinkError>
-    manual = true
-
-    [[object.function]]
-    name = "store_sticky_event"
-    # Use Result<FlowSuccess, FlowError>
-    manual = true
-
     [[object.function]]
     name = "new"
     # Builder
@@ -1661,21 +1626,37 @@ status = "generate"
 name = "Gst.StateChangeReturn"
 status = "generate"
 must_use = true
+    [object.conversion_type]
+    variant = "Result"
+    ok_type = "StateChangeSuccess"
+    err_type = "StateChangeError"
 
 [[object]]
 name = "Gst.FlowReturn"
 status = "generate"
 must_use = true
+    [object.conversion_type]
+    variant = "Result"
+    ok_type = "FlowSuccess"
+    err_type = "FlowError"
 
 [[object]]
 name = "Gst.PadLinkReturn"
 status = "generate"
 must_use = true
+    [object.conversion_type]
+    variant = "Result"
+    ok_type = "PadLinkSuccess"
+    err_type = "PadLinkError"
 
 [[object]]
 name = "Gst.ClockReturn"
 status = "generate"
 must_use = true
+    [object.conversion_type]
+    variant = "Result"
+    ok_type = "ClockSuccess"
+    err_type = "ClockError"
 
 [[object]]
 name = "Gst.DateTime"