diff --git a/libgimp/gimpimagecombobox.c b/libgimp/gimpimagecombobox.c
index de048dcb2b..6e434cad7a 100644
--- a/libgimp/gimpimagecombobox.c
+++ b/libgimp/gimpimagecombobox.c
@@ -120,8 +120,9 @@ gimp_image_combo_box_finalize (GObject *object)
 
 /**
  * gimp_image_combo_box_new:
- * @constraint: (nullable):       A #GimpImageConstraintFunc or %NULL
- * @data: (closure constraint):   A pointer that is passed to @constraint
+ * @constraint: (nullable) (closure data):
+ *                                A #GimpImageConstraintFunc or %NULL
+ * @data:                         A pointer that is passed to @constraint
  * @data_destroy: (destroy data): Destroy function for @data.
  *
  * Creates a new #GimpIntComboBox filled with all currently opened
diff --git a/libgimp/gimpitemcombobox.c b/libgimp/gimpitemcombobox.c
index c132dd8829..d5ccbbd1b1 100644
--- a/libgimp/gimpitemcombobox.c
+++ b/libgimp/gimpitemcombobox.c
@@ -167,8 +167,9 @@ gimp_drawable_combo_box_init (GimpDrawableComboBox *combo_box)
 
 /**
  * gimp_drawable_combo_box_new:
- * @constraint: (nullable):       A #GimpItemConstraintFunc or %NULL
- * @data: (closure constraint):   A pointer that is passed to @constraint
+ * @constraint: (nullable) (closure data):
+ *                                A #GimpItemConstraintFunc or %NULL
+ * @data:                         A pointer that is passed to @constraint
  * @data_destroy: (destroy data): Destroy function for @data
  *
  * Creates a new #GimpIntComboBox filled with all currently opened
@@ -223,9 +224,9 @@ gimp_channel_combo_box_init (GimpChannelComboBox *combo_box)
 
 /**
  * gimp_channel_combo_box_new:
- * @constraint: (nullable):       A #GimpItemConstraintFunc or %NULL
- * @data: (closure constraint):   A pointer that is passed to @constraint
- * @data_destroy: (destroy data): Destroy function for @data
+ * @constraint: (nullable) (closure data): A #GimpItemConstraintFunc or %NULL
+ * @data:                                  A pointer that is passed to @constraint
+ * @data_destroy: (destroy data):          Destroy function for @data
  *
  * Creates a new #GimpIntComboBox filled with all currently opened
  * channels. See gimp_drawable_combo_box_new() for more information.
@@ -272,9 +273,9 @@ gimp_layer_combo_box_init (GimpLayerComboBox *combo_box)
 
 /**
  * gimp_layer_combo_box_new:
- * @constraint: (nullable):       A #GimpItemConstraintFunc or %NULL
- * @data: (closure constraint):   A pointer that is passed to @constraint
- * @data_destroy: (destroy data): Destroy function for @data
+ * @constraint: (nullable) (closure data): A #GimpItemConstraintFunc or %NULL
+ * @data:                                  A pointer that is passed to @constraint
+ * @data_destroy: (destroy data):          Destroy function for @data
  *
  * Creates a new #GimpIntComboBox filled with all currently opened
  * layers. See gimp_drawable_combo_box_new() for more information.
@@ -322,9 +323,9 @@ gimp_path_combo_box_init (GimpPathComboBox *combo_box)
 
 /**
  * gimp_path_combo_box_new:
- * @constraint: (nullable):       A #GimpItemConstraintFunc or %NULL
- * @data: (closure constraint):   A pointer that is passed to @constraint
- * @data_destroy: (destroy data): Destroy function for @data
+ * @constraint: (nullable) (closure data): A #GimpItemConstraintFunc or %NULL
+ * @data:                                  A pointer that is passed to @constraint
+ * @data_destroy: (destroy data):          Destroy function for @data
  *
  * Creates a new #GimpIntComboBox filled with all currently opened
  * path objects. If a @constraint function is specified, it is called for
diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c
index 0435ee6f4a..7647c035c5 100644
--- a/libgimpwidgets/gimpwidgets.c
+++ b/libgimpwidgets/gimpwidgets.c
@@ -51,9 +51,10 @@
  * @frame_title: (nullable):
  *                         The title of the Frame or %NULL if you don't want a
  *                         title.
- * @radio_button_callback: (scope notified): The callback each button's
+ * @radio_button_callback: (scope notified) (closure radio_button_callback_data):
+ *                         The callback each button's
  *                         "toggled" signal will be connected with.
- * @radio_button_callback_data: (closure radio_button_callback):
+ * @radio_button_callback_data:
  *                         The data which will be passed to g_signal_connect().
  * @radio_button_callback_destroy: (destroy radio_button_callback_data):
  * @initial:               The @item_data of the initially pressed radio button.