diff --git a/Sources/Gtk/Application.swift b/Sources/Gtk/Application.swift
index eb5b649cba5..eb25ec93ec7 100644
--- a/Sources/Gtk/Application.swift
+++ b/Sources/Gtk/Application.swift
@@ -58,7 +58,7 @@ public class Application: GObject, GActionMap {
 
         addSignal(name: "open", handler: gCallback(handler1)) {
             [weak self] (files: UnsafeMutablePointer<OpaquePointer>, nFiles: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             var uris: [URL] = []
             for i in 0..<nFiles {
                 uris.append(
diff --git a/Sources/Gtk/Generated/Button.swift b/Sources/Gtk/Generated/Button.swift
index b67ba671279..27877a0c5c4 100644
--- a/Sources/Gtk/Generated/Button.swift
+++ b/Sources/Gtk/Generated/Button.swift
@@ -80,12 +80,12 @@ open class Button: Widget, Actionable {
         super.didMoveToParent()
 
         addSignal(name: "activate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activate?(self)
         }
 
         addSignal(name: "clicked") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.clicked?(self)
         }
 
@@ -97,7 +97,7 @@ open class Button: Widget, Actionable {
 
         addSignal(name: "notify::can-shrink", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCanShrink?(self, param0)
         }
 
@@ -109,7 +109,7 @@ open class Button: Widget, Actionable {
 
         addSignal(name: "notify::child", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyChild?(self, param0)
         }
 
@@ -121,7 +121,7 @@ open class Button: Widget, Actionable {
 
         addSignal(name: "notify::has-frame", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasFrame?(self, param0)
         }
 
@@ -133,7 +133,7 @@ open class Button: Widget, Actionable {
 
         addSignal(name: "notify::icon-name", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIconName?(self, param0)
         }
 
@@ -145,7 +145,7 @@ open class Button: Widget, Actionable {
 
         addSignal(name: "notify::label", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLabel?(self, param0)
         }
 
@@ -157,7 +157,7 @@ open class Button: Widget, Actionable {
 
         addSignal(name: "notify::use-underline", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseUnderline?(self, param0)
         }
 
@@ -169,7 +169,7 @@ open class Button: Widget, Actionable {
 
         addSignal(name: "notify::action-name", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActionName?(self, param0)
         }
 
@@ -181,7 +181,7 @@ open class Button: Widget, Actionable {
 
         addSignal(name: "notify::action-target", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActionTarget?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/CheckButton.swift b/Sources/Gtk/Generated/CheckButton.swift
index 1a2c80f5a30..810f795c8b1 100644
--- a/Sources/Gtk/Generated/CheckButton.swift
+++ b/Sources/Gtk/Generated/CheckButton.swift
@@ -89,12 +89,12 @@ open class CheckButton: Widget, Actionable {
         super.didMoveToParent()
 
         addSignal(name: "activate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activate?(self)
         }
 
         addSignal(name: "toggled") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggled?(self)
         }
 
@@ -106,7 +106,7 @@ open class CheckButton: Widget, Actionable {
 
         addSignal(name: "notify::active", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActive?(self, param0)
         }
 
@@ -118,7 +118,7 @@ open class CheckButton: Widget, Actionable {
 
         addSignal(name: "notify::child", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyChild?(self, param0)
         }
 
@@ -130,7 +130,7 @@ open class CheckButton: Widget, Actionable {
 
         addSignal(name: "notify::group", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyGroup?(self, param0)
         }
 
@@ -142,7 +142,7 @@ open class CheckButton: Widget, Actionable {
 
         addSignal(name: "notify::inconsistent", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInconsistent?(self, param0)
         }
 
@@ -154,7 +154,7 @@ open class CheckButton: Widget, Actionable {
 
         addSignal(name: "notify::label", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLabel?(self, param0)
         }
 
@@ -166,7 +166,7 @@ open class CheckButton: Widget, Actionable {
 
         addSignal(name: "notify::use-underline", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseUnderline?(self, param0)
         }
 
@@ -178,7 +178,7 @@ open class CheckButton: Widget, Actionable {
 
         addSignal(name: "notify::action-name", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActionName?(self, param0)
         }
 
@@ -190,7 +190,7 @@ open class CheckButton: Widget, Actionable {
 
         addSignal(name: "notify::action-target", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActionTarget?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/DrawingArea.swift b/Sources/Gtk/Generated/DrawingArea.swift
index 7e4b0abe0c1..a5be4eda983 100644
--- a/Sources/Gtk/Generated/DrawingArea.swift
+++ b/Sources/Gtk/Generated/DrawingArea.swift
@@ -97,7 +97,7 @@ open class DrawingArea: Widget {
 
         addSignal(name: "resize", handler: gCallback(handler0)) {
             [weak self] (param0: Int, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.resize?(self, param0, param1)
         }
 
@@ -109,7 +109,7 @@ open class DrawingArea: Widget {
 
         addSignal(name: "notify::content-height", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyContentHeight?(self, param0)
         }
 
@@ -121,7 +121,7 @@ open class DrawingArea: Widget {
 
         addSignal(name: "notify::content-width", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyContentWidth?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/DropDown.swift b/Sources/Gtk/Generated/DropDown.swift
index ffa69800d69..d01dcb544c8 100644
--- a/Sources/Gtk/Generated/DropDown.swift
+++ b/Sources/Gtk/Generated/DropDown.swift
@@ -62,7 +62,7 @@ open class DropDown: Widget {
         super.didMoveToParent()
 
         addSignal(name: "activate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activate?(self)
         }
 
@@ -74,7 +74,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::enable-search", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEnableSearch?(self, param0)
         }
 
@@ -86,7 +86,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::expression", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyExpression?(self, param0)
         }
 
@@ -98,7 +98,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::factory", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFactory?(self, param0)
         }
 
@@ -110,7 +110,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::header-factory", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHeaderFactory?(self, param0)
         }
 
@@ -122,7 +122,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::list-factory", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyListFactory?(self, param0)
         }
 
@@ -134,7 +134,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::model", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyModel?(self, param0)
         }
 
@@ -146,7 +146,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::search-match-mode", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySearchMatchMode?(self, param0)
         }
 
@@ -158,7 +158,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::selected", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelected?(self, param0)
         }
 
@@ -170,7 +170,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::selected-item", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectedItem?(self, param0)
         }
 
@@ -182,7 +182,7 @@ open class DropDown: Widget {
 
         addSignal(name: "notify::show-arrow", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowArrow?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Entry.swift b/Sources/Gtk/Generated/Entry.swift
index 7f1b0ef2df1..1f2dd532424 100644
--- a/Sources/Gtk/Generated/Entry.swift
+++ b/Sources/Gtk/Generated/Entry.swift
@@ -101,7 +101,7 @@ open class Entry: Widget, CellEditable, Editable {
         super.didMoveToParent()
 
         addSignal(name: "activate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activate?(self)
         }
 
@@ -114,7 +114,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "icon-press", handler: gCallback(handler1)) {
             [weak self] (param0: GtkEntryIconPosition) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.iconPress?(self, param0)
         }
 
@@ -127,22 +127,22 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "icon-release", handler: gCallback(handler2)) {
             [weak self] (param0: GtkEntryIconPosition) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.iconRelease?(self, param0)
         }
 
         addSignal(name: "editing-done") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.editingDone?(self)
         }
 
         addSignal(name: "remove-widget") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.removeWidget?(self)
         }
 
         addSignal(name: "changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.changed?(self)
         }
 
@@ -154,7 +154,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "delete-text", handler: gCallback(handler6)) {
             [weak self] (param0: Int, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.deleteText?(self, param0, param1)
         }
 
@@ -170,7 +170,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "insert-text", handler: gCallback(handler7)) {
             [weak self] (param0: UnsafePointer<CChar>, param1: Int, param2: gpointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insertText?(self, param0, param1, param2)
         }
 
@@ -182,7 +182,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::activates-default", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActivatesDefault?(self, param0)
         }
 
@@ -194,7 +194,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::attributes", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAttributes?(self, param0)
         }
 
@@ -206,7 +206,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::buffer", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyBuffer?(self, param0)
         }
 
@@ -218,7 +218,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::completion", handler: gCallback(handler11)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCompletion?(self, param0)
         }
 
@@ -230,7 +230,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::enable-emoji-completion", handler: gCallback(handler12)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEnableEmojiCompletion?(self, param0)
         }
 
@@ -242,7 +242,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::extra-menu", handler: gCallback(handler13)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyExtraMenu?(self, param0)
         }
 
@@ -254,7 +254,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::has-frame", handler: gCallback(handler14)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasFrame?(self, param0)
         }
 
@@ -266,7 +266,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::im-module", handler: gCallback(handler15)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyImModule?(self, param0)
         }
 
@@ -278,7 +278,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::input-hints", handler: gCallback(handler16)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInputHints?(self, param0)
         }
 
@@ -290,7 +290,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::input-purpose", handler: gCallback(handler17)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInputPurpose?(self, param0)
         }
 
@@ -302,7 +302,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::invisible-char", handler: gCallback(handler18)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInvisibleCharacter?(self, param0)
         }
 
@@ -314,7 +314,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::invisible-char-set", handler: gCallback(handler19)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInvisibleCharacterSet?(self, param0)
         }
 
@@ -326,7 +326,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::max-length", handler: gCallback(handler20)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMaxLength?(self, param0)
         }
 
@@ -338,7 +338,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::overwrite-mode", handler: gCallback(handler21)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyOverwriteMode?(self, param0)
         }
 
@@ -350,7 +350,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::placeholder-text", handler: gCallback(handler22)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPlaceholderText?(self, param0)
         }
 
@@ -362,7 +362,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-activatable", handler: gCallback(handler23)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconActivatable?(self, param0)
         }
 
@@ -374,7 +374,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-gicon", handler: gCallback(handler24)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconGicon?(self, param0)
         }
 
@@ -386,7 +386,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-name", handler: gCallback(handler25)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconName?(self, param0)
         }
 
@@ -398,7 +398,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-paintable", handler: gCallback(handler26)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconPaintable?(self, param0)
         }
 
@@ -410,7 +410,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-sensitive", handler: gCallback(handler27)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconSensitive?(self, param0)
         }
 
@@ -422,7 +422,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-storage-type", handler: gCallback(handler28)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconStorageType?(self, param0)
         }
 
@@ -434,7 +434,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-tooltip-markup", handler: gCallback(handler29)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconTooltipMarkup?(self, param0)
         }
 
@@ -446,7 +446,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-tooltip-text", handler: gCallback(handler30)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconTooltipText?(self, param0)
         }
 
@@ -458,7 +458,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::progress-fraction", handler: gCallback(handler31)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyProgressFraction?(self, param0)
         }
 
@@ -470,7 +470,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::progress-pulse-step", handler: gCallback(handler32)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyProgressPulseStep?(self, param0)
         }
 
@@ -482,7 +482,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::scroll-offset", handler: gCallback(handler33)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyScrollOffset?(self, param0)
         }
 
@@ -494,7 +494,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-activatable", handler: gCallback(handler34)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconActivatable?(self, param0)
         }
 
@@ -506,7 +506,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-gicon", handler: gCallback(handler35)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconGicon?(self, param0)
         }
 
@@ -518,7 +518,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-name", handler: gCallback(handler36)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconName?(self, param0)
         }
 
@@ -530,7 +530,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-paintable", handler: gCallback(handler37)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconPaintable?(self, param0)
         }
 
@@ -542,7 +542,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-sensitive", handler: gCallback(handler38)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconSensitive?(self, param0)
         }
 
@@ -554,7 +554,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-storage-type", handler: gCallback(handler39)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconStorageType?(self, param0)
         }
 
@@ -566,7 +566,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-tooltip-markup", handler: gCallback(handler40)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconTooltipMarkup?(self, param0)
         }
 
@@ -578,7 +578,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-tooltip-text", handler: gCallback(handler41)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconTooltipText?(self, param0)
         }
 
@@ -590,7 +590,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::show-emoji-icon", handler: gCallback(handler42)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowEmojiIcon?(self, param0)
         }
 
@@ -602,7 +602,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::tabs", handler: gCallback(handler43)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTabs?(self, param0)
         }
 
@@ -614,7 +614,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::text-length", handler: gCallback(handler44)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTextLength?(self, param0)
         }
 
@@ -626,7 +626,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::truncate-multiline", handler: gCallback(handler45)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTruncateMultiline?(self, param0)
         }
 
@@ -638,7 +638,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::visibility", handler: gCallback(handler46)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVisibility?(self, param0)
         }
 
@@ -650,7 +650,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::editing-canceled", handler: gCallback(handler47)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEditingCanceled?(self, param0)
         }
 
@@ -662,7 +662,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::cursor-position", handler: gCallback(handler48)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCursorPosition?(self, param0)
         }
 
@@ -674,7 +674,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::editable", handler: gCallback(handler49)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEditable?(self, param0)
         }
 
@@ -686,7 +686,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::enable-undo", handler: gCallback(handler50)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEnableUndo?(self, param0)
         }
 
@@ -698,7 +698,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::max-width-chars", handler: gCallback(handler51)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMaxWidthChars?(self, param0)
         }
 
@@ -710,7 +710,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::selection-bound", handler: gCallback(handler52)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectionBound?(self, param0)
         }
 
@@ -722,7 +722,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::text", handler: gCallback(handler53)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyText?(self, param0)
         }
 
@@ -734,7 +734,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::width-chars", handler: gCallback(handler54)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWidthChars?(self, param0)
         }
 
@@ -746,7 +746,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::xalign", handler: gCallback(handler55)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyXalign?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/EventController.swift b/Sources/Gtk/Generated/EventController.swift
index 77009b50586..d07067f874a 100644
--- a/Sources/Gtk/Generated/EventController.swift
+++ b/Sources/Gtk/Generated/EventController.swift
@@ -25,7 +25,7 @@ open class EventController: GObject {
 
         addSignal(name: "notify::name", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyName?(self, param0)
         }
 
@@ -37,7 +37,7 @@ open class EventController: GObject {
 
         addSignal(name: "notify::propagation-limit", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPropagationLimit?(self, param0)
         }
 
@@ -49,7 +49,7 @@ open class EventController: GObject {
 
         addSignal(name: "notify::propagation-phase", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPropagationPhase?(self, param0)
         }
 
@@ -61,7 +61,7 @@ open class EventController: GObject {
 
         addSignal(name: "notify::widget", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWidget?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/EventControllerKey.swift b/Sources/Gtk/Generated/EventControllerKey.swift
index 759ed79694d..0a2c91b0e5c 100644
--- a/Sources/Gtk/Generated/EventControllerKey.swift
+++ b/Sources/Gtk/Generated/EventControllerKey.swift
@@ -13,7 +13,7 @@ open class EventControllerKey: EventController {
         super.registerSignals()
 
         addSignal(name: "im-update") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.imUpdate?(self)
         }
 
@@ -27,7 +27,7 @@ open class EventControllerKey: EventController {
 
         addSignal(name: "key-pressed", handler: gCallback(handler1)) {
             [weak self] (param0: UInt, param1: UInt, param2: GdkModifierType) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.keyPressed?(self, param0, param1, param2)
         }
 
@@ -41,7 +41,7 @@ open class EventControllerKey: EventController {
 
         addSignal(name: "key-released", handler: gCallback(handler2)) {
             [weak self] (param0: UInt, param1: UInt, param2: GdkModifierType) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.keyReleased?(self, param0, param1, param2)
         }
 
@@ -54,7 +54,7 @@ open class EventControllerKey: EventController {
 
         addSignal(name: "modifiers", handler: gCallback(handler3)) {
             [weak self] (param0: GdkModifierType) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.modifiers?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/EventControllerMotion.swift b/Sources/Gtk/Generated/EventControllerMotion.swift
index 2e31c87d055..28d107ef5a5 100644
--- a/Sources/Gtk/Generated/EventControllerMotion.swift
+++ b/Sources/Gtk/Generated/EventControllerMotion.swift
@@ -28,12 +28,12 @@ open class EventControllerMotion: EventController {
 
         addSignal(name: "enter", handler: gCallback(handler0)) {
             [weak self] (param0: Double, param1: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.enter?(self, param0, param1)
         }
 
         addSignal(name: "leave") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.leave?(self)
         }
 
@@ -46,7 +46,7 @@ open class EventControllerMotion: EventController {
 
         addSignal(name: "motion", handler: gCallback(handler2)) {
             [weak self] (param0: Double, param1: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.motion?(self, param0, param1)
         }
 
@@ -58,7 +58,7 @@ open class EventControllerMotion: EventController {
 
         addSignal(name: "notify::contains-pointer", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyContainsPointer?(self, param0)
         }
 
@@ -70,7 +70,7 @@ open class EventControllerMotion: EventController {
 
         addSignal(name: "notify::is-pointer", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIsPointer?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/FileChooserNative.swift b/Sources/Gtk/Generated/FileChooserNative.swift
index 4e6560b21ab..99a98c5b8ef 100644
--- a/Sources/Gtk/Generated/FileChooserNative.swift
+++ b/Sources/Gtk/Generated/FileChooserNative.swift
@@ -168,7 +168,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::accept-label", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAcceptLabel?(self, param0)
         }
 
@@ -180,7 +180,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::cancel-label", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCancelLabel?(self, param0)
         }
 
@@ -192,7 +192,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::action", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAction?(self, param0)
         }
 
@@ -204,7 +204,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::create-folders", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCreateFolders?(self, param0)
         }
 
@@ -216,7 +216,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::filter", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFilter?(self, param0)
         }
 
@@ -228,7 +228,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::filters", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFilters?(self, param0)
         }
 
@@ -240,7 +240,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::select-multiple", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectMultiple?(self, param0)
         }
 
@@ -252,7 +252,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::shortcut-folders", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShortcutFolders?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/GLArea.swift b/Sources/Gtk/Generated/GLArea.swift
index e22ffbf9afd..9cdf7ef9c6e 100644
--- a/Sources/Gtk/Generated/GLArea.swift
+++ b/Sources/Gtk/Generated/GLArea.swift
@@ -118,7 +118,7 @@ open class GLArea: Widget {
         super.didMoveToParent()
 
         addSignal(name: "create-context") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.createContext?(self)
         }
 
@@ -130,7 +130,7 @@ open class GLArea: Widget {
 
         addSignal(name: "render", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.render?(self, param0)
         }
 
@@ -142,7 +142,7 @@ open class GLArea: Widget {
 
         addSignal(name: "resize", handler: gCallback(handler2)) {
             [weak self] (param0: Int, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.resize?(self, param0, param1)
         }
 
@@ -154,7 +154,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::allowed-apis", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAllowedApis?(self, param0)
         }
 
@@ -166,7 +166,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::api", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyApi?(self, param0)
         }
 
@@ -178,7 +178,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::auto-render", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAutoRender?(self, param0)
         }
 
@@ -190,7 +190,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::context", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyContext?(self, param0)
         }
 
@@ -202,7 +202,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::has-depth-buffer", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasDepthBuffer?(self, param0)
         }
 
@@ -214,7 +214,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::has-stencil-buffer", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasStencilBuffer?(self, param0)
         }
 
@@ -226,7 +226,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::use-es", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseEs?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Gesture.swift b/Sources/Gtk/Generated/Gesture.swift
index 7eb196783d7..db2c8c855c4 100644
--- a/Sources/Gtk/Generated/Gesture.swift
+++ b/Sources/Gtk/Generated/Gesture.swift
@@ -102,7 +102,7 @@ open class Gesture: EventController {
 
         addSignal(name: "begin", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.begin?(self, param0)
         }
 
@@ -114,7 +114,7 @@ open class Gesture: EventController {
 
         addSignal(name: "cancel", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cancel?(self, param0)
         }
 
@@ -126,7 +126,7 @@ open class Gesture: EventController {
 
         addSignal(name: "end", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.end?(self, param0)
         }
 
@@ -141,7 +141,7 @@ open class Gesture: EventController {
 
         addSignal(name: "sequence-state-changed", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer, param1: GtkEventSequenceState) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.sequenceStateChanged?(self, param0, param1)
         }
 
@@ -153,7 +153,7 @@ open class Gesture: EventController {
 
         addSignal(name: "update", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.update?(self, param0)
         }
 
@@ -165,7 +165,7 @@ open class Gesture: EventController {
 
         addSignal(name: "notify::n-points", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyNPoints?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/GestureClick.swift b/Sources/Gtk/Generated/GestureClick.swift
index be3e7d36cca..677b97596e6 100644
--- a/Sources/Gtk/Generated/GestureClick.swift
+++ b/Sources/Gtk/Generated/GestureClick.swift
@@ -28,7 +28,7 @@ open class GestureClick: GestureSingle {
 
         addSignal(name: "pressed", handler: gCallback(handler0)) {
             [weak self] (param0: Int, param1: Double, param2: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.pressed?(self, param0, param1, param2)
         }
 
@@ -41,12 +41,12 @@ open class GestureClick: GestureSingle {
 
         addSignal(name: "released", handler: gCallback(handler1)) {
             [weak self] (param0: Int, param1: Double, param2: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.released?(self, param0, param1, param2)
         }
 
         addSignal(name: "stopped") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.stopped?(self)
         }
 
@@ -62,7 +62,7 @@ open class GestureClick: GestureSingle {
 
         addSignal(name: "unpaired-release", handler: gCallback(handler3)) {
             [weak self] (param0: Double, param1: Double, param2: UInt, param3: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.unpairedRelease?(self, param0, param1, param2, param3)
         }
     }
diff --git a/Sources/Gtk/Generated/GestureLongPress.swift b/Sources/Gtk/Generated/GestureLongPress.swift
index 2a412ad8012..9db8bd0ccfc 100644
--- a/Sources/Gtk/Generated/GestureLongPress.swift
+++ b/Sources/Gtk/Generated/GestureLongPress.swift
@@ -27,7 +27,7 @@ open class GestureLongPress: GestureSingle {
         super.registerSignals()
 
         addSignal(name: "cancelled") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cancelled?(self)
         }
 
@@ -40,7 +40,7 @@ open class GestureLongPress: GestureSingle {
 
         addSignal(name: "pressed", handler: gCallback(handler1)) {
             [weak self] (param0: Double, param1: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.pressed?(self, param0, param1)
         }
 
@@ -52,7 +52,7 @@ open class GestureLongPress: GestureSingle {
 
         addSignal(name: "notify::delay-factor", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyDelayFactor?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/GestureSingle.swift b/Sources/Gtk/Generated/GestureSingle.swift
index 2c9f0a009c5..1f9c6c6e1ea 100644
--- a/Sources/Gtk/Generated/GestureSingle.swift
+++ b/Sources/Gtk/Generated/GestureSingle.swift
@@ -26,7 +26,7 @@ open class GestureSingle: Gesture {
 
         addSignal(name: "notify::button", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyButton?(self, param0)
         }
 
@@ -38,7 +38,7 @@ open class GestureSingle: Gesture {
 
         addSignal(name: "notify::exclusive", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyExclusive?(self, param0)
         }
 
@@ -50,7 +50,7 @@ open class GestureSingle: Gesture {
 
         addSignal(name: "notify::touch-only", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTouchOnly?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Image.swift b/Sources/Gtk/Generated/Image.swift
index f0325ce114e..f8ed737010d 100644
--- a/Sources/Gtk/Generated/Image.swift
+++ b/Sources/Gtk/Generated/Image.swift
@@ -132,7 +132,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::file", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFile?(self, param0)
         }
 
@@ -144,7 +144,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::gicon", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyGicon?(self, param0)
         }
 
@@ -156,7 +156,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::icon-name", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIconName?(self, param0)
         }
 
@@ -168,7 +168,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::icon-size", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIconSize?(self, param0)
         }
 
@@ -180,7 +180,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::paintable", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPaintable?(self, param0)
         }
 
@@ -192,7 +192,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::pixel-size", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixelSize?(self, param0)
         }
 
@@ -204,7 +204,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::resource", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyResource?(self, param0)
         }
 
@@ -216,7 +216,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::storage-type", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyStorageType?(self, param0)
         }
 
@@ -228,7 +228,7 @@ open class Image: Widget {
 
         addSignal(name: "notify::use-fallback", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseFallback?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Label.swift b/Sources/Gtk/Generated/Label.swift
index 576c3885974..29d2ca10442 100644
--- a/Sources/Gtk/Generated/Label.swift
+++ b/Sources/Gtk/Generated/Label.swift
@@ -242,7 +242,7 @@ open class Label: Widget {
         super.didMoveToParent()
 
         addSignal(name: "activate-current-link") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activateCurrentLink?(self)
         }
 
@@ -255,12 +255,12 @@ open class Label: Widget {
 
         addSignal(name: "activate-link", handler: gCallback(handler1)) {
             [weak self] (param0: UnsafePointer<CChar>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activateLink?(self, param0)
         }
 
         addSignal(name: "copy-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.copyClipboard?(self)
         }
 
@@ -274,7 +274,7 @@ open class Label: Widget {
 
         addSignal(name: "move-cursor", handler: gCallback(handler3)) {
             [weak self] (param0: GtkMovementStep, param1: Int, param2: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveCursor?(self, param0, param1, param2)
         }
 
@@ -286,7 +286,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::attributes", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAttributes?(self, param0)
         }
 
@@ -298,7 +298,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::ellipsize", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEllipsize?(self, param0)
         }
 
@@ -310,7 +310,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::extra-menu", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyExtraMenu?(self, param0)
         }
 
@@ -322,7 +322,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::justify", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyJustify?(self, param0)
         }
 
@@ -334,7 +334,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::label", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLabel?(self, param0)
         }
 
@@ -346,7 +346,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::lines", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLines?(self, param0)
         }
 
@@ -358,7 +358,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::max-width-chars", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMaxWidthChars?(self, param0)
         }
 
@@ -370,7 +370,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::mnemonic-keyval", handler: gCallback(handler11)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMnemonicKeyval?(self, param0)
         }
 
@@ -382,7 +382,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::natural-wrap-mode", handler: gCallback(handler12)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyNaturalWrapMode?(self, param0)
         }
 
@@ -394,7 +394,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::selectable", handler: gCallback(handler13)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectable?(self, param0)
         }
 
@@ -406,7 +406,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::single-line-mode", handler: gCallback(handler14)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySingleLineMode?(self, param0)
         }
 
@@ -418,7 +418,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::tabs", handler: gCallback(handler15)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTabs?(self, param0)
         }
 
@@ -430,7 +430,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::use-markup", handler: gCallback(handler16)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseMarkup?(self, param0)
         }
 
@@ -442,7 +442,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::use-underline", handler: gCallback(handler17)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseUnderline?(self, param0)
         }
 
@@ -454,7 +454,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::width-chars", handler: gCallback(handler18)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWidthChars?(self, param0)
         }
 
@@ -466,7 +466,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::wrap", handler: gCallback(handler19)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWrap?(self, param0)
         }
 
@@ -478,7 +478,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::wrap-mode", handler: gCallback(handler20)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWrapMode?(self, param0)
         }
 
@@ -490,7 +490,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::xalign", handler: gCallback(handler21)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyXalign?(self, param0)
         }
 
@@ -502,7 +502,7 @@ open class Label: Widget {
 
         addSignal(name: "notify::yalign", handler: gCallback(handler22)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyYalign?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/ListBox.swift b/Sources/Gtk/Generated/ListBox.swift
index 2f9baae1b25..8f7a7ea2a63 100644
--- a/Sources/Gtk/Generated/ListBox.swift
+++ b/Sources/Gtk/Generated/ListBox.swift
@@ -76,7 +76,7 @@ open class ListBox: Widget {
         super.didMoveToParent()
 
         addSignal(name: "activate-cursor-row") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activateCursorRow?(self)
         }
 
@@ -91,7 +91,7 @@ open class ListBox: Widget {
 
         addSignal(name: "move-cursor", handler: gCallback(handler1)) {
             [weak self] (param0: GtkMovementStep, param1: Int, param2: Bool, param3: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveCursor?(self, param0, param1, param2, param3)
         }
 
@@ -106,7 +106,7 @@ open class ListBox: Widget {
 
         addSignal(name: "row-activated", handler: gCallback(handler2)) {
             [weak self] (param0: UnsafeMutablePointer<GtkListBoxRow>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.rowActivated?(self, param0)
         }
 
@@ -121,17 +121,17 @@ open class ListBox: Widget {
 
         addSignal(name: "row-selected", handler: gCallback(handler3)) {
             [weak self] (param0: UnsafeMutablePointer<GtkListBoxRow>?) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.rowSelected?(self, param0)
         }
 
         addSignal(name: "selected-rows-changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.selectedRowsChanged?(self)
         }
 
         addSignal(name: "toggle-cursor-row") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggleCursorRow?(self)
         }
 
@@ -143,7 +143,7 @@ open class ListBox: Widget {
 
         addSignal(name: "notify::accept-unpaired-release", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAcceptUnpairedRelease?(self, param0)
         }
 
@@ -155,7 +155,7 @@ open class ListBox: Widget {
 
         addSignal(name: "notify::activate-on-single-click", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActivateOnSingleClick?(self, param0)
         }
 
@@ -167,7 +167,7 @@ open class ListBox: Widget {
 
         addSignal(name: "notify::selection-mode", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectionMode?(self, param0)
         }
 
@@ -179,7 +179,7 @@ open class ListBox: Widget {
 
         addSignal(name: "notify::show-separators", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowSeparators?(self, param0)
         }
 
@@ -191,7 +191,7 @@ open class ListBox: Widget {
 
         addSignal(name: "notify::tab-behavior", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTabBehavior?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/NativeDialog.swift b/Sources/Gtk/Generated/NativeDialog.swift
index 2e77c0795a3..3af8e6001db 100644
--- a/Sources/Gtk/Generated/NativeDialog.swift
+++ b/Sources/Gtk/Generated/NativeDialog.swift
@@ -29,7 +29,7 @@ open class NativeDialog: GObject {
                 }
 
         addSignal(name: "response", handler: gCallback(handler0)) { [weak self] (param0: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.response?(self, param0)
         }
 
@@ -41,7 +41,7 @@ open class NativeDialog: GObject {
 
         addSignal(name: "notify::modal", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyModal?(self, param0)
         }
 
@@ -53,7 +53,7 @@ open class NativeDialog: GObject {
 
         addSignal(name: "notify::title", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTitle?(self, param0)
         }
 
@@ -65,7 +65,7 @@ open class NativeDialog: GObject {
 
         addSignal(name: "notify::transient-for", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTransientFor?(self, param0)
         }
 
@@ -77,7 +77,7 @@ open class NativeDialog: GObject {
 
         addSignal(name: "notify::visible", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVisible?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Picture.swift b/Sources/Gtk/Generated/Picture.swift
index fd211b5a2d6..0f9a6990c9e 100644
--- a/Sources/Gtk/Generated/Picture.swift
+++ b/Sources/Gtk/Generated/Picture.swift
@@ -95,7 +95,7 @@ open class Picture: Widget {
 
         addSignal(name: "notify::alternative-text", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAlternativeText?(self, param0)
         }
 
@@ -107,7 +107,7 @@ open class Picture: Widget {
 
         addSignal(name: "notify::can-shrink", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCanShrink?(self, param0)
         }
 
@@ -119,7 +119,7 @@ open class Picture: Widget {
 
         addSignal(name: "notify::content-fit", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyContentFit?(self, param0)
         }
 
@@ -131,7 +131,7 @@ open class Picture: Widget {
 
         addSignal(name: "notify::file", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFile?(self, param0)
         }
 
@@ -143,7 +143,7 @@ open class Picture: Widget {
 
         addSignal(name: "notify::keep-aspect-ratio", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyKeepAspectRatio?(self, param0)
         }
 
@@ -155,7 +155,7 @@ open class Picture: Widget {
 
         addSignal(name: "notify::paintable", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPaintable?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Popover.swift b/Sources/Gtk/Generated/Popover.swift
index ab97f6ca02a..e2e98a69000 100644
--- a/Sources/Gtk/Generated/Popover.swift
+++ b/Sources/Gtk/Generated/Popover.swift
@@ -83,12 +83,12 @@ open class Popover: Widget, Native, ShortcutManager {
         super.didMoveToParent()
 
         addSignal(name: "activate-default") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activateDefault?(self)
         }
 
         addSignal(name: "closed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.closed?(self)
         }
 
@@ -100,7 +100,7 @@ open class Popover: Widget, Native, ShortcutManager {
 
         addSignal(name: "notify::autohide", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAutohide?(self, param0)
         }
 
@@ -112,7 +112,7 @@ open class Popover: Widget, Native, ShortcutManager {
 
         addSignal(name: "notify::cascade-popdown", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCascadePopdown?(self, param0)
         }
 
@@ -124,7 +124,7 @@ open class Popover: Widget, Native, ShortcutManager {
 
         addSignal(name: "notify::child", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyChild?(self, param0)
         }
 
@@ -136,7 +136,7 @@ open class Popover: Widget, Native, ShortcutManager {
 
         addSignal(name: "notify::default-widget", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyDefaultWidget?(self, param0)
         }
 
@@ -148,7 +148,7 @@ open class Popover: Widget, Native, ShortcutManager {
 
         addSignal(name: "notify::has-arrow", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasArrow?(self, param0)
         }
 
@@ -160,7 +160,7 @@ open class Popover: Widget, Native, ShortcutManager {
 
         addSignal(name: "notify::mnemonics-visible", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMnemonicsVisible?(self, param0)
         }
 
@@ -172,7 +172,7 @@ open class Popover: Widget, Native, ShortcutManager {
 
         addSignal(name: "notify::pointing-to", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPointingTo?(self, param0)
         }
 
@@ -184,7 +184,7 @@ open class Popover: Widget, Native, ShortcutManager {
 
         addSignal(name: "notify::position", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPosition?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/ProgressBar.swift b/Sources/Gtk/Generated/ProgressBar.swift
index 6634e8bf4fb..8b5b67607bc 100644
--- a/Sources/Gtk/Generated/ProgressBar.swift
+++ b/Sources/Gtk/Generated/ProgressBar.swift
@@ -64,7 +64,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::ellipsize", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEllipsize?(self, param0)
         }
 
@@ -76,7 +76,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::fraction", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFraction?(self, param0)
         }
 
@@ -88,7 +88,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::inverted", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInverted?(self, param0)
         }
 
@@ -100,7 +100,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::pulse-step", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPulseStep?(self, param0)
         }
 
@@ -112,7 +112,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::show-text", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowText?(self, param0)
         }
 
@@ -124,7 +124,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::text", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyText?(self, param0)
         }
 
@@ -136,7 +136,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::orientation", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyOrientation?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Range.swift b/Sources/Gtk/Generated/Range.swift
index 270bf988883..e2702bfa4d6 100644
--- a/Sources/Gtk/Generated/Range.swift
+++ b/Sources/Gtk/Generated/Range.swift
@@ -27,7 +27,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "adjust-bounds", handler: gCallback(handler0)) {
             [weak self] (param0: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.adjustBounds?(self, param0)
         }
 
@@ -40,7 +40,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "change-value", handler: gCallback(handler1)) {
             [weak self] (param0: GtkScrollType, param1: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.changeValue?(self, param0, param1)
         }
 
@@ -52,12 +52,12 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "move-slider", handler: gCallback(handler2)) {
             [weak self] (param0: GtkScrollType) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveSlider?(self, param0)
         }
 
         addSignal(name: "value-changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.valueChanged?(self)
         }
 
@@ -69,7 +69,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::adjustment", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAdjustment?(self, param0)
         }
 
@@ -81,7 +81,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::fill-level", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFillLevel?(self, param0)
         }
 
@@ -93,7 +93,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::inverted", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInverted?(self, param0)
         }
 
@@ -105,7 +105,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::restrict-to-fill-level", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRestrictToFillLevel?(self, param0)
         }
 
@@ -117,7 +117,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::round-digits", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRoundDigits?(self, param0)
         }
 
@@ -129,7 +129,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::show-fill-level", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowFillLevel?(self, param0)
         }
 
@@ -141,7 +141,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::orientation", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyOrientation?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Scale.swift b/Sources/Gtk/Generated/Scale.swift
index 5451bc69505..1485c923260 100644
--- a/Sources/Gtk/Generated/Scale.swift
+++ b/Sources/Gtk/Generated/Scale.swift
@@ -129,7 +129,7 @@ open class Scale: Range {
 
         addSignal(name: "notify::digits", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyDigits?(self, param0)
         }
 
@@ -141,7 +141,7 @@ open class Scale: Range {
 
         addSignal(name: "notify::draw-value", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyDrawValue?(self, param0)
         }
 
@@ -153,7 +153,7 @@ open class Scale: Range {
 
         addSignal(name: "notify::has-origin", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasOrigin?(self, param0)
         }
 
@@ -165,7 +165,7 @@ open class Scale: Range {
 
         addSignal(name: "notify::value-pos", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyValuePos?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Spinner.swift b/Sources/Gtk/Generated/Spinner.swift
index 968c619a7d4..72499fc2d26 100644
--- a/Sources/Gtk/Generated/Spinner.swift
+++ b/Sources/Gtk/Generated/Spinner.swift
@@ -34,7 +34,7 @@ open class Spinner: Widget {
 
         addSignal(name: "notify::spinning", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySpinning?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Generated/Switch.swift b/Sources/Gtk/Generated/Switch.swift
index d953218c162..5c960ff7998 100644
--- a/Sources/Gtk/Generated/Switch.swift
+++ b/Sources/Gtk/Generated/Switch.swift
@@ -49,7 +49,7 @@ open class Switch: Widget, Actionable {
         super.didMoveToParent()
 
         addSignal(name: "activate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activate?(self)
         }
 
@@ -60,7 +60,7 @@ open class Switch: Widget, Actionable {
                 }
 
         addSignal(name: "state-set", handler: gCallback(handler1)) { [weak self] (param0: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.stateSet?(self, param0)
         }
 
@@ -72,7 +72,7 @@ open class Switch: Widget, Actionable {
 
         addSignal(name: "notify::active", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActive?(self, param0)
         }
 
@@ -84,7 +84,7 @@ open class Switch: Widget, Actionable {
 
         addSignal(name: "notify::state", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyState?(self, param0)
         }
 
@@ -96,7 +96,7 @@ open class Switch: Widget, Actionable {
 
         addSignal(name: "notify::action-name", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActionName?(self, param0)
         }
 
@@ -108,7 +108,7 @@ open class Switch: Widget, Actionable {
 
         addSignal(name: "notify::action-target", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActionTarget?(self, param0)
         }
     }
diff --git a/Sources/Gtk/GtkError.swift b/Sources/Gtk/GtkError.swift
index a85fdde06b4..3649727662f 100644
--- a/Sources/Gtk/GtkError.swift
+++ b/Sources/Gtk/GtkError.swift
@@ -26,7 +26,7 @@ public func withGtkError<R>(
     var errorPointer: UnsafeMutablePointer<GError>? = nil
     let result = action(&errorPointer)
 
-    if let errorPointer = errorPointer {
+    if let errorPointer {
         throw GtkError(from: errorPointer.pointee)
     } else {
         return result
diff --git a/Sources/Gtk/Utility/TextBuffer.swift b/Sources/Gtk/Utility/TextBuffer.swift
index f06741f999a..07264816144 100644
--- a/Sources/Gtk/Utility/TextBuffer.swift
+++ b/Sources/Gtk/Utility/TextBuffer.swift
@@ -39,17 +39,17 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "apply-tag", handler: gCallback(handler0)) {
         //     [weak self] (param0: GtkTextTag, param1: GtkTextIter, param2: GtkTextIter) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.applyTag?(self, param0, param1, param2)
         // }
 
         // addSignal(name: "begin-user-action") { [weak self] () in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.beginUserAction?(self)
         // }
 
         addSignal(name: "changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.changed?(self)
         }
 
@@ -63,12 +63,12 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "delete-range", handler: gCallback(handler3)) {
         //     [weak self] (param0: GtkTextIter, param1: GtkTextIter) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.deleteRange?(self, param0, param1)
         // }
 
         // addSignal(name: "end-user-action") { [weak self] () in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.endUserAction?(self)
         // }
 
@@ -82,7 +82,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "insert-child-anchor", handler: gCallback(handler5)) {
         //     [weak self] (param0: GtkTextIter, param1: GtkTextChildAnchor) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.insertChildAnchor?(self, param0, param1)
         // }
 
@@ -96,7 +96,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "insert-paintable", handler: gCallback(handler6)) {
         //     [weak self] (param0: GtkTextIter, param1: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.insertPaintable?(self, param0, param1)
         // }
 
@@ -112,7 +112,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "insert-text", handler: gCallback(handler7)) {
         //     [weak self] (param0: GtkTextIter, param1: UnsafePointer<CChar>, param2: Int) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.insertText?(self, param0, param1, param2)
         // }
 
@@ -124,7 +124,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "mark-deleted", handler: gCallback(handler8)) {
         //     [weak self] (param0: GtkTextMark) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.markDeleted?(self, param0)
         // }
 
@@ -138,12 +138,12 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "mark-set", handler: gCallback(handler9)) {
         //     [weak self] (param0: UnsafeMutablePointer<GtkTextIter>, param1: UnsafeMutablePointer<GtkTextMark>) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.markSet?(self, param0, param1)
         // }
 
         // addSignal(name: "modified-changed") { [weak self] () in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.modifiedChanged?(self)
         // }
 
@@ -155,12 +155,12 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "paste-done", handler: gCallback(handler11)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.pasteDone?(self, param0)
         // }
 
         // addSignal(name: "redo") { [weak self] () in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.redo?(self)
         // }
 
@@ -176,12 +176,12 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "remove-tag", handler: gCallback(handler13)) {
         //     [weak self] (param0: GtkTextTag, param1: GtkTextIter, param2: GtkTextIter) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.removeTag?(self, param0, param1, param2)
         // }
 
         // addSignal(name: "undo") { [weak self] () in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.undo?(self)
         // }
 
@@ -193,7 +193,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::can-redo", handler: gCallback(handler15)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyCanRedo?(self, param0)
         // }
 
@@ -205,7 +205,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::can-undo", handler: gCallback(handler16)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyCanUndo?(self, param0)
         // }
 
@@ -217,7 +217,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::cursor-position", handler: gCallback(handler17)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyCursorPosition?(self, param0)
         // }
 
@@ -229,7 +229,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::enable-undo", handler: gCallback(handler18)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyEnableUndo?(self, param0)
         // }
 
@@ -241,7 +241,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::has-selection", handler: gCallback(handler19)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyHasSelection?(self, param0)
         // }
 
@@ -253,7 +253,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::tag-table", handler: gCallback(handler20)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyTagTable?(self, param0)
         // }
 
@@ -265,7 +265,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::text", handler: gCallback(handler21)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyText?(self, param0)
         // }
     }
diff --git a/Sources/Gtk/Widgets/Dialog.swift b/Sources/Gtk/Widgets/Dialog.swift
index 780b36e0870..51ed462d9fa 100644
--- a/Sources/Gtk/Widgets/Dialog.swift
+++ b/Sources/Gtk/Widgets/Dialog.swift
@@ -127,7 +127,7 @@ open class Dialog: Window {
         super.didMoveToParent()
 
         addSignal(name: "close") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.close?(self)
         }
 
@@ -138,7 +138,7 @@ open class Dialog: Window {
                 }
 
         addSignal(name: "response", handler: gCallback(handler1)) { [weak self] (responseId: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.response?(self, responseId)
         }
 
@@ -150,7 +150,7 @@ open class Dialog: Window {
 
         addSignal(name: "notify::use-header-bar", handler: gCallback(handler2)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseHeaderBar?(self)
         }
     }
diff --git a/Sources/Gtk/Widgets/MessageDialog.swift b/Sources/Gtk/Widgets/MessageDialog.swift
index ad1ceee22fd..c27ba8b9654 100644
--- a/Sources/Gtk/Widgets/MessageDialog.swift
+++ b/Sources/Gtk/Widgets/MessageDialog.swift
@@ -75,7 +75,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::buttons", handler: gCallback(handler0)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyButtons?(self)
         }
 
@@ -87,7 +87,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::message-area", handler: gCallback(handler1)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMessageArea?(self)
         }
 
@@ -99,7 +99,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::message-type", handler: gCallback(handler2)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMessageType?(self)
         }
 
@@ -111,7 +111,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::secondary-text", handler: gCallback(handler3)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryText?(self)
         }
 
@@ -123,7 +123,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::secondary-use-markup", handler: gCallback(handler4)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryUseMarkup?(self)
         }
 
@@ -135,7 +135,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::text", handler: gCallback(handler5)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyText?(self)
         }
 
@@ -147,7 +147,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::use-markup", handler: gCallback(handler6)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseMarkup?(self)
         }
     }
diff --git a/Sources/Gtk/Widgets/Paned.swift b/Sources/Gtk/Widgets/Paned.swift
index faa196e2ea7..9aa1676bbd9 100644
--- a/Sources/Gtk/Widgets/Paned.swift
+++ b/Sources/Gtk/Widgets/Paned.swift
@@ -33,7 +33,7 @@ open class Paned: Widget, Orientable {
 
         addSignal(name: "notify::position", handler: gCallback(handler)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPosition?(self)
         }
     }
diff --git a/Sources/Gtk/Widgets/PopoverMenu.swift b/Sources/Gtk/Widgets/PopoverMenu.swift
index 66ceb724f73..a23281e26f0 100644
--- a/Sources/Gtk/Widgets/PopoverMenu.swift
+++ b/Sources/Gtk/Widgets/PopoverMenu.swift
@@ -201,7 +201,7 @@ public class PopoverMenu: Popover {
 
         addSignal(name: "notify::flags", handler: gCallback(handler0)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFlags?(self)
         }
 
@@ -213,7 +213,7 @@ public class PopoverMenu: Popover {
 
         addSignal(name: "notify::menu-model", handler: gCallback(handler1)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMenuModel?(self)
         }
 
@@ -225,7 +225,7 @@ public class PopoverMenu: Popover {
 
         addSignal(name: "notify::visible-submenu", handler: gCallback(handler2)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVisibleSubmenu?(self)
         }
     }
diff --git a/Sources/Gtk/Widgets/TextView.swift b/Sources/Gtk/Widgets/TextView.swift
index 7fb353ba2b5..d9fb7ba1f52 100644
--- a/Sources/Gtk/Widgets/TextView.swift
+++ b/Sources/Gtk/Widgets/TextView.swift
@@ -94,17 +94,17 @@ open class TextView: Widget, Scrollable {
         super.didMoveToParent()
 
         addSignal(name: "backspace") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.backspace?(self)
         }
 
         addSignal(name: "copy-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.copyClipboard?(self)
         }
 
         addSignal(name: "cut-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cutClipboard?(self)
         }
 
@@ -117,7 +117,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "delete-from-cursor", handler: gCallback(handler3)) {
             [weak self] (param0: GtkDeleteType, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.deleteFromCursor?(self, param0, param1)
         }
 
@@ -137,7 +137,7 @@ open class TextView: Widget, Scrollable {
                 param0: GtkTextExtendSelection, param1: GtkTextIter, param2: GtkTextIter,
                 param3: GtkTextIter
             ) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.extendSelection?(self, param0, param1, param2, param3)
         }
 
@@ -150,12 +150,12 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "insert-at-cursor", handler: gCallback(handler5)) {
             [weak self] (param0: UnsafePointer<CChar>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insertAtCursor?(self, param0)
         }
 
         addSignal(name: "insert-emoji") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insertEmoji?(self)
         }
 
@@ -169,7 +169,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "move-cursor", handler: gCallback(handler7)) {
             [weak self] (param0: GtkMovementStep, param1: Int, param2: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveCursor?(self, param0, param1, param2)
         }
 
@@ -182,12 +182,12 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "move-viewport", handler: gCallback(handler8)) {
             [weak self] (param0: GtkScrollStep, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveViewport?(self, param0, param1)
         }
 
         addSignal(name: "paste-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.pasteClipboard?(self)
         }
 
@@ -200,22 +200,22 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "preedit-changed", handler: gCallback(handler10)) {
             [weak self] (param0: UnsafePointer<CChar>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.preeditChanged?(self, param0)
         }
 
         addSignal(name: "set-anchor") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.setAnchor?(self)
         }
 
         addSignal(name: "toggle-cursor-visible") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggleCursorVisible?(self)
         }
 
         addSignal(name: "toggle-overwrite") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggleOverwrite?(self)
         }
 
@@ -227,7 +227,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::accepts-tab", handler: gCallback(handler14)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAcceptsTab?(self, param0)
         }
 
@@ -239,7 +239,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::bottom-margin", handler: gCallback(handler15)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyBottomMargin?(self, param0)
         }
 
@@ -251,7 +251,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::buffer", handler: gCallback(handler16)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyBuffer?(self, param0)
         }
 
@@ -263,7 +263,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::cursor-visible", handler: gCallback(handler17)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCursorVisible?(self, param0)
         }
 
@@ -275,7 +275,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::editable", handler: gCallback(handler18)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEditable?(self, param0)
         }
 
@@ -287,7 +287,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::extra-menu", handler: gCallback(handler19)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyExtraMenu?(self, param0)
         }
 
@@ -299,7 +299,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::im-module", handler: gCallback(handler20)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyImModule?(self, param0)
         }
 
@@ -311,7 +311,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::indent", handler: gCallback(handler21)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIndent?(self, param0)
         }
 
@@ -323,7 +323,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::input-hints", handler: gCallback(handler22)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInputHints?(self, param0)
         }
 
@@ -335,7 +335,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::input-purpose", handler: gCallback(handler23)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInputPurpose?(self, param0)
         }
 
@@ -347,7 +347,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::justification", handler: gCallback(handler24)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyJustification?(self, param0)
         }
 
@@ -359,7 +359,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::left-margin", handler: gCallback(handler25)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLeftMargin?(self, param0)
         }
 
@@ -371,7 +371,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::monospace", handler: gCallback(handler26)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMonospace?(self, param0)
         }
 
@@ -383,7 +383,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::overwrite", handler: gCallback(handler27)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyOverwrite?(self, param0)
         }
 
@@ -395,7 +395,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::pixels-above-lines", handler: gCallback(handler28)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixelsAboveLines?(self, param0)
         }
 
@@ -407,7 +407,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::pixels-below-lines", handler: gCallback(handler29)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixelsBelowLines?(self, param0)
         }
 
@@ -419,7 +419,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::pixels-inside-wrap", handler: gCallback(handler30)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixelsInsideWrap?(self, param0)
         }
 
@@ -431,7 +431,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::right-margin", handler: gCallback(handler31)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRightMargin?(self, param0)
         }
 
@@ -443,7 +443,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::tabs", handler: gCallback(handler32)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTabs?(self, param0)
         }
 
@@ -455,7 +455,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::top-margin", handler: gCallback(handler33)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTopMargin?(self, param0)
         }
 
@@ -467,7 +467,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::wrap-mode", handler: gCallback(handler34)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWrapMode?(self, param0)
         }
 
@@ -479,7 +479,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::hadjustment", handler: gCallback(handler35)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHadjustment?(self, param0)
         }
 
@@ -491,7 +491,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::hscroll-policy", handler: gCallback(handler36)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHscrollPolicy?(self, param0)
         }
 
@@ -503,7 +503,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::vadjustment", handler: gCallback(handler37)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVadjustment?(self, param0)
         }
 
@@ -515,7 +515,7 @@ open class TextView: Widget, Scrollable {
 
         addSignal(name: "notify::vscroll-policy", handler: gCallback(handler38)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVscrollPolicy?(self, param0)
         }
     }
diff --git a/Sources/Gtk/Widgets/ToggleButton.swift b/Sources/Gtk/Widgets/ToggleButton.swift
index c168c908b65..820ac4a5acf 100644
--- a/Sources/Gtk/Widgets/ToggleButton.swift
+++ b/Sources/Gtk/Widgets/ToggleButton.swift
@@ -23,7 +23,7 @@ public class ToggleButton: Button {
         super.didMoveToParent()
 
         addSignal(name: "toggled") { [weak self] in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggled?(self)
         }
     }
diff --git a/Sources/Gtk/Widgets/Window.swift b/Sources/Gtk/Widgets/Window.swift
index c3ffd89aeee..210ca9a740a 100644
--- a/Sources/Gtk/Widgets/Window.swift
+++ b/Sources/Gtk/Widgets/Window.swift
@@ -85,12 +85,12 @@ open class Window: Widget {
         gtk_window_present(castedPointer())
 
         addSignal(name: "close-request") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.onCloseRequest?(self)
         }
 
         addSignal(name: "destroy") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.onDestroy?(self)
         }
     }
diff --git a/Sources/Gtk3/Application.swift b/Sources/Gtk3/Application.swift
index afaf8066878..d7af0dbb87f 100644
--- a/Sources/Gtk3/Application.swift
+++ b/Sources/Gtk3/Application.swift
@@ -58,7 +58,7 @@ public class Application: GObject, GActionMap {
 
         addSignal(name: "open", handler: gCallback(handler1)) {
             [weak self] (files: UnsafeMutablePointer<OpaquePointer>, nFiles: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             var uris: [URL] = []
             for i in 0..<nFiles {
                 uris.append(
diff --git a/Sources/Gtk3/Generated/Button.swift b/Sources/Gtk3/Generated/Button.swift
index 671e3315511..9cf723a0f52 100644
--- a/Sources/Gtk3/Generated/Button.swift
+++ b/Sources/Gtk3/Generated/Button.swift
@@ -69,32 +69,32 @@ open class Button: Bin, Activatable {
         super.didMoveToParent()
 
         addSignal(name: "activate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activate?(self)
         }
 
         addSignal(name: "clicked") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.clicked?(self)
         }
 
         addSignal(name: "enter") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.enter?(self)
         }
 
         addSignal(name: "leave") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.leave?(self)
         }
 
         addSignal(name: "pressed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.pressed?(self)
         }
 
         addSignal(name: "released") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.released?(self)
         }
 
@@ -106,7 +106,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::always-show-image", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAlwaysShowImage?(self, param0)
         }
 
@@ -118,7 +118,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::image", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyImage?(self, param0)
         }
 
@@ -130,7 +130,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::image-position", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyImagePosition?(self, param0)
         }
 
@@ -142,7 +142,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::label", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLabel?(self, param0)
         }
 
@@ -154,7 +154,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::relief", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRelief?(self, param0)
         }
 
@@ -166,7 +166,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::use-stock", handler: gCallback(handler11)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseStock?(self, param0)
         }
 
@@ -178,7 +178,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::use-underline", handler: gCallback(handler12)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseUnderline?(self, param0)
         }
 
@@ -190,7 +190,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::xalign", handler: gCallback(handler13)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyXalign?(self, param0)
         }
 
@@ -202,7 +202,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::yalign", handler: gCallback(handler14)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyYalign?(self, param0)
         }
 
@@ -214,7 +214,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::related-action", handler: gCallback(handler15)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRelatedAction?(self, param0)
         }
 
@@ -226,7 +226,7 @@ open class Button: Bin, Activatable {
 
         addSignal(name: "notify::use-action-appearance", handler: gCallback(handler16)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseActionAppearance?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/Entry.swift b/Sources/Gtk3/Generated/Entry.swift
index 4faa7a2cb6b..b90ec468989 100644
--- a/Sources/Gtk3/Generated/Entry.swift
+++ b/Sources/Gtk3/Generated/Entry.swift
@@ -91,22 +91,22 @@ open class Entry: Widget, CellEditable, Editable {
         super.didMoveToParent()
 
         addSignal(name: "activate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activate?(self)
         }
 
         addSignal(name: "backspace") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.backspace?(self)
         }
 
         addSignal(name: "copy-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.copyClipboard?(self)
         }
 
         addSignal(name: "cut-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cutClipboard?(self)
         }
 
@@ -119,7 +119,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "delete-from-cursor", handler: gCallback(handler4)) {
             [weak self] (param0: GtkDeleteType, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.deleteFromCursor?(self, param0, param1)
         }
 
@@ -133,7 +133,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "icon-press", handler: gCallback(handler5)) {
             [weak self] (param0: GtkEntryIconPosition, param1: GdkEvent) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.iconPress?(self, param0, param1)
         }
 
@@ -147,7 +147,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "icon-release", handler: gCallback(handler6)) {
             [weak self] (param0: GtkEntryIconPosition, param1: GdkEvent) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.iconRelease?(self, param0, param1)
         }
 
@@ -160,12 +160,12 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "insert-at-cursor", handler: gCallback(handler7)) {
             [weak self] (param0: UnsafePointer<CChar>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insertAtCursor?(self, param0)
         }
 
         addSignal(name: "insert-emoji") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insertEmoji?(self)
         }
 
@@ -179,12 +179,12 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "move-cursor", handler: gCallback(handler9)) {
             [weak self] (param0: GtkMovementStep, param1: Int, param2: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveCursor?(self, param0, param1, param2)
         }
 
         addSignal(name: "paste-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.pasteClipboard?(self)
         }
 
@@ -197,27 +197,27 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "preedit-changed", handler: gCallback(handler11)) {
             [weak self] (param0: UnsafePointer<CChar>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.preeditChanged?(self, param0)
         }
 
         addSignal(name: "toggle-overwrite") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggleOverwrite?(self)
         }
 
         addSignal(name: "editing-done") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.editingDone?(self)
         }
 
         addSignal(name: "remove-widget") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.removeWidget?(self)
         }
 
         addSignal(name: "changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.changed?(self)
         }
 
@@ -229,7 +229,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "delete-text", handler: gCallback(handler16)) {
             [weak self] (param0: Int, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.deleteText?(self, param0, param1)
         }
 
@@ -245,7 +245,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "insert-text", handler: gCallback(handler17)) {
             [weak self] (param0: UnsafePointer<CChar>, param1: Int, param2: gpointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insertText?(self, param0, param1, param2)
         }
 
@@ -257,7 +257,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::activates-default", handler: gCallback(handler18)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActivatesDefault?(self, param0)
         }
 
@@ -269,7 +269,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::attributes", handler: gCallback(handler19)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAttributes?(self, param0)
         }
 
@@ -281,7 +281,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::buffer", handler: gCallback(handler20)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyBuffer?(self, param0)
         }
 
@@ -293,7 +293,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::caps-lock-warning", handler: gCallback(handler21)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCapsLockWarning?(self, param0)
         }
 
@@ -305,7 +305,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::completion", handler: gCallback(handler22)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCompletion?(self, param0)
         }
 
@@ -317,7 +317,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::cursor-position", handler: gCallback(handler23)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCursorPosition?(self, param0)
         }
 
@@ -329,7 +329,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::editable", handler: gCallback(handler24)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEditable?(self, param0)
         }
 
@@ -341,7 +341,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::enable-emoji-completion", handler: gCallback(handler25)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEnableEmojiCompletion?(self, param0)
         }
 
@@ -353,7 +353,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::has-frame", handler: gCallback(handler26)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasFrame?(self, param0)
         }
 
@@ -365,7 +365,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::im-module", handler: gCallback(handler27)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyImModule?(self, param0)
         }
 
@@ -377,7 +377,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::inner-border", handler: gCallback(handler28)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInnerBorder?(self, param0)
         }
 
@@ -389,7 +389,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::input-hints", handler: gCallback(handler29)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInputHints?(self, param0)
         }
 
@@ -401,7 +401,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::input-purpose", handler: gCallback(handler30)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInputPurpose?(self, param0)
         }
 
@@ -413,7 +413,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::invisible-char", handler: gCallback(handler31)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInvisibleCharacter?(self, param0)
         }
 
@@ -425,7 +425,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::invisible-char-set", handler: gCallback(handler32)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInvisibleCharacterSet?(self, param0)
         }
 
@@ -437,7 +437,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::max-length", handler: gCallback(handler33)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMaxLength?(self, param0)
         }
 
@@ -449,7 +449,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::max-width-chars", handler: gCallback(handler34)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMaxWidthChars?(self, param0)
         }
 
@@ -461,7 +461,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::overwrite-mode", handler: gCallback(handler35)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyOverwriteMode?(self, param0)
         }
 
@@ -473,7 +473,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::placeholder-text", handler: gCallback(handler36)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPlaceholderText?(self, param0)
         }
 
@@ -485,7 +485,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::populate-all", handler: gCallback(handler37)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPopulateAll?(self, param0)
         }
 
@@ -497,7 +497,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-activatable", handler: gCallback(handler38)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconActivatable?(self, param0)
         }
 
@@ -509,7 +509,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-gicon", handler: gCallback(handler39)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconGicon?(self, param0)
         }
 
@@ -521,7 +521,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-name", handler: gCallback(handler40)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconName?(self, param0)
         }
 
@@ -533,7 +533,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-pixbuf", handler: gCallback(handler41)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconPixbuf?(self, param0)
         }
 
@@ -545,7 +545,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-sensitive", handler: gCallback(handler42)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconSensitive?(self, param0)
         }
 
@@ -557,7 +557,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-stock", handler: gCallback(handler43)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconStock?(self, param0)
         }
 
@@ -569,7 +569,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-storage-type", handler: gCallback(handler44)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconStorageType?(self, param0)
         }
 
@@ -581,7 +581,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-tooltip-markup", handler: gCallback(handler45)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconTooltipMarkup?(self, param0)
         }
 
@@ -593,7 +593,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::primary-icon-tooltip-text", handler: gCallback(handler46)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPrimaryIconTooltipText?(self, param0)
         }
 
@@ -605,7 +605,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::progress-fraction", handler: gCallback(handler47)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyProgressFraction?(self, param0)
         }
 
@@ -617,7 +617,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::progress-pulse-step", handler: gCallback(handler48)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyProgressPulseStep?(self, param0)
         }
 
@@ -629,7 +629,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::scroll-offset", handler: gCallback(handler49)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyScrollOffset?(self, param0)
         }
 
@@ -641,7 +641,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-activatable", handler: gCallback(handler50)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconActivatable?(self, param0)
         }
 
@@ -653,7 +653,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-gicon", handler: gCallback(handler51)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconGicon?(self, param0)
         }
 
@@ -665,7 +665,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-name", handler: gCallback(handler52)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconName?(self, param0)
         }
 
@@ -677,7 +677,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-pixbuf", handler: gCallback(handler53)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconPixbuf?(self, param0)
         }
 
@@ -689,7 +689,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-sensitive", handler: gCallback(handler54)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconSensitive?(self, param0)
         }
 
@@ -701,7 +701,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-stock", handler: gCallback(handler55)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconStock?(self, param0)
         }
 
@@ -713,7 +713,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-storage-type", handler: gCallback(handler56)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconStorageType?(self, param0)
         }
 
@@ -725,7 +725,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-tooltip-markup", handler: gCallback(handler57)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconTooltipMarkup?(self, param0)
         }
 
@@ -737,7 +737,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::secondary-icon-tooltip-text", handler: gCallback(handler58)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryIconTooltipText?(self, param0)
         }
 
@@ -749,7 +749,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::selection-bound", handler: gCallback(handler59)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectionBound?(self, param0)
         }
 
@@ -761,7 +761,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::shadow-type", handler: gCallback(handler60)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShadowType?(self, param0)
         }
 
@@ -773,7 +773,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::show-emoji-icon", handler: gCallback(handler61)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowEmojiIcon?(self, param0)
         }
 
@@ -785,7 +785,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::tabs", handler: gCallback(handler62)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTabs?(self, param0)
         }
 
@@ -797,7 +797,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::text", handler: gCallback(handler63)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyText?(self, param0)
         }
 
@@ -809,7 +809,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::text-length", handler: gCallback(handler64)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTextLength?(self, param0)
         }
 
@@ -821,7 +821,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::truncate-multiline", handler: gCallback(handler65)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTruncateMultiline?(self, param0)
         }
 
@@ -833,7 +833,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::visibility", handler: gCallback(handler66)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVisibility?(self, param0)
         }
 
@@ -845,7 +845,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::width-chars", handler: gCallback(handler67)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWidthChars?(self, param0)
         }
 
@@ -857,7 +857,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::xalign", handler: gCallback(handler68)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyXalign?(self, param0)
         }
 
@@ -869,7 +869,7 @@ open class Entry: Widget, CellEditable, Editable {
 
         addSignal(name: "notify::editing-canceled", handler: gCallback(handler69)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEditingCanceled?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/EventBox.swift b/Sources/Gtk3/Generated/EventBox.swift
index 2a38117b020..40d0a86684e 100644
--- a/Sources/Gtk3/Generated/EventBox.swift
+++ b/Sources/Gtk3/Generated/EventBox.swift
@@ -22,7 +22,7 @@ open class EventBox: Bin {
 
         addSignal(name: "notify::above-child", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAboveChild?(self, param0)
         }
 
@@ -34,7 +34,7 @@ open class EventBox: Bin {
 
         addSignal(name: "notify::visible-window", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVisibleWindow?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/EventController.swift b/Sources/Gtk3/Generated/EventController.swift
index 748ae26332d..67d217e7025 100644
--- a/Sources/Gtk3/Generated/EventController.swift
+++ b/Sources/Gtk3/Generated/EventController.swift
@@ -16,7 +16,7 @@ open class EventController: GObject {
 
         addSignal(name: "notify::propagation-phase", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPropagationPhase?(self, param0)
         }
 
@@ -28,7 +28,7 @@ open class EventController: GObject {
 
         addSignal(name: "notify::widget", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWidget?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/FileChooserNative.swift b/Sources/Gtk3/Generated/FileChooserNative.swift
index 014ff736a04..e14e27c51be 100644
--- a/Sources/Gtk3/Generated/FileChooserNative.swift
+++ b/Sources/Gtk3/Generated/FileChooserNative.swift
@@ -171,27 +171,27 @@ open class FileChooserNative: NativeDialog, FileChooser {
         super.registerSignals()
 
         addSignal(name: "confirm-overwrite") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.confirmOverwrite?(self)
         }
 
         addSignal(name: "current-folder-changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.currentFolderChanged?(self)
         }
 
         addSignal(name: "file-activated") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.fileActivated?(self)
         }
 
         addSignal(name: "selection-changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.selectionChanged?(self)
         }
 
         addSignal(name: "update-preview") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.updatePreview?(self)
         }
 
@@ -203,7 +203,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::accept-label", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAcceptLabel?(self, param0)
         }
 
@@ -215,7 +215,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::cancel-label", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCancelLabel?(self, param0)
         }
 
@@ -227,7 +227,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::action", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAction?(self, param0)
         }
 
@@ -239,7 +239,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::create-folders", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCreateFolders?(self, param0)
         }
 
@@ -251,7 +251,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::do-overwrite-confirmation", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyDoOverwriteConfirmation?(self, param0)
         }
 
@@ -263,7 +263,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::extra-widget", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyExtraWidget?(self, param0)
         }
 
@@ -275,7 +275,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::filter", handler: gCallback(handler11)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFilter?(self, param0)
         }
 
@@ -287,7 +287,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::local-only", handler: gCallback(handler12)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLocalOnly?(self, param0)
         }
 
@@ -299,7 +299,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::preview-widget", handler: gCallback(handler13)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPreviewWidget?(self, param0)
         }
 
@@ -311,7 +311,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::preview-widget-active", handler: gCallback(handler14)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPreviewWidgetActive?(self, param0)
         }
 
@@ -323,7 +323,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::select-multiple", handler: gCallback(handler15)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectMultiple?(self, param0)
         }
 
@@ -335,7 +335,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::show-hidden", handler: gCallback(handler16)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowHidden?(self, param0)
         }
 
@@ -347,7 +347,7 @@ open class FileChooserNative: NativeDialog, FileChooser {
 
         addSignal(name: "notify::use-preview-label", handler: gCallback(handler17)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUsePreviewLabel?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/GLArea.swift b/Sources/Gtk3/Generated/GLArea.swift
index 7378d9f0378..fde39deed06 100644
--- a/Sources/Gtk3/Generated/GLArea.swift
+++ b/Sources/Gtk3/Generated/GLArea.swift
@@ -111,7 +111,7 @@ open class GLArea: Widget {
         super.didMoveToParent()
 
         addSignal(name: "create-context") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.createContext?(self)
         }
 
@@ -123,7 +123,7 @@ open class GLArea: Widget {
 
         addSignal(name: "render", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.render?(self, param0)
         }
 
@@ -135,7 +135,7 @@ open class GLArea: Widget {
 
         addSignal(name: "resize", handler: gCallback(handler2)) {
             [weak self] (param0: Int, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.resize?(self, param0, param1)
         }
 
@@ -147,7 +147,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::auto-render", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAutoRender?(self, param0)
         }
 
@@ -159,7 +159,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::context", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyContext?(self, param0)
         }
 
@@ -171,7 +171,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::has-alpha", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasAlpha?(self, param0)
         }
 
@@ -183,7 +183,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::has-depth-buffer", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasDepthBuffer?(self, param0)
         }
 
@@ -195,7 +195,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::has-stencil-buffer", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasStencilBuffer?(self, param0)
         }
 
@@ -207,7 +207,7 @@ open class GLArea: Widget {
 
         addSignal(name: "notify::use-es", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseEs?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/Gesture.swift b/Sources/Gtk3/Generated/Gesture.swift
index 991de668c8f..c1b5603a600 100644
--- a/Sources/Gtk3/Generated/Gesture.swift
+++ b/Sources/Gtk3/Generated/Gesture.swift
@@ -102,7 +102,7 @@ open class Gesture: EventController {
 
         addSignal(name: "begin", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.begin?(self, param0)
         }
 
@@ -114,7 +114,7 @@ open class Gesture: EventController {
 
         addSignal(name: "cancel", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cancel?(self, param0)
         }
 
@@ -126,7 +126,7 @@ open class Gesture: EventController {
 
         addSignal(name: "end", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.end?(self, param0)
         }
 
@@ -141,7 +141,7 @@ open class Gesture: EventController {
 
         addSignal(name: "sequence-state-changed", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer, param1: GtkEventSequenceState) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.sequenceStateChanged?(self, param0, param1)
         }
 
@@ -153,7 +153,7 @@ open class Gesture: EventController {
 
         addSignal(name: "update", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.update?(self, param0)
         }
 
@@ -165,7 +165,7 @@ open class Gesture: EventController {
 
         addSignal(name: "notify::n-points", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyNPoints?(self, param0)
         }
 
@@ -177,7 +177,7 @@ open class Gesture: EventController {
 
         addSignal(name: "notify::window", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWindow?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/GestureLongPress.swift b/Sources/Gtk3/Generated/GestureLongPress.swift
index 38c84a63db7..d2afa3fab39 100644
--- a/Sources/Gtk3/Generated/GestureLongPress.swift
+++ b/Sources/Gtk3/Generated/GestureLongPress.swift
@@ -19,7 +19,7 @@ open class GestureLongPress: GestureSingle {
         super.registerSignals()
 
         addSignal(name: "cancelled") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cancelled?(self)
         }
 
@@ -32,7 +32,7 @@ open class GestureLongPress: GestureSingle {
 
         addSignal(name: "pressed", handler: gCallback(handler1)) {
             [weak self] (param0: Double, param1: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.pressed?(self, param0, param1)
         }
 
@@ -44,7 +44,7 @@ open class GestureLongPress: GestureSingle {
 
         addSignal(name: "notify::delay-factor", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyDelayFactor?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/GestureSingle.swift b/Sources/Gtk3/Generated/GestureSingle.swift
index 09dc1cb6eba..248e877cdb9 100644
--- a/Sources/Gtk3/Generated/GestureSingle.swift
+++ b/Sources/Gtk3/Generated/GestureSingle.swift
@@ -25,7 +25,7 @@ open class GestureSingle: Gesture {
 
         addSignal(name: "notify::button", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyButton?(self, param0)
         }
 
@@ -37,7 +37,7 @@ open class GestureSingle: Gesture {
 
         addSignal(name: "notify::exclusive", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyExclusive?(self, param0)
         }
 
@@ -49,7 +49,7 @@ open class GestureSingle: Gesture {
 
         addSignal(name: "notify::touch-only", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTouchOnly?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/Image.swift b/Sources/Gtk3/Generated/Image.swift
index 201930f3c60..3090e51a03c 100644
--- a/Sources/Gtk3/Generated/Image.swift
+++ b/Sources/Gtk3/Generated/Image.swift
@@ -167,7 +167,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::file", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFile?(self, param0)
         }
 
@@ -179,7 +179,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::gicon", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyGicon?(self, param0)
         }
 
@@ -191,7 +191,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::icon-name", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIconName?(self, param0)
         }
 
@@ -203,7 +203,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::icon-set", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIconSet?(self, param0)
         }
 
@@ -215,7 +215,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::icon-size", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIconSize?(self, param0)
         }
 
@@ -227,7 +227,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::pixbuf", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixbuf?(self, param0)
         }
 
@@ -239,7 +239,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::pixbuf-animation", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixbufAnimation?(self, param0)
         }
 
@@ -251,7 +251,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::pixel-size", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixelSize?(self, param0)
         }
 
@@ -263,7 +263,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::resource", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyResource?(self, param0)
         }
 
@@ -275,7 +275,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::stock", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyStock?(self, param0)
         }
 
@@ -287,7 +287,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::storage-type", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyStorageType?(self, param0)
         }
 
@@ -299,7 +299,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::surface", handler: gCallback(handler11)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySurface?(self, param0)
         }
 
@@ -311,7 +311,7 @@ open class Image: Misc {
 
         addSignal(name: "notify::use-fallback", handler: gCallback(handler12)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseFallback?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/Label.swift b/Sources/Gtk3/Generated/Label.swift
index 1f2f556b7cd..2542bbf0753 100644
--- a/Sources/Gtk3/Generated/Label.swift
+++ b/Sources/Gtk3/Generated/Label.swift
@@ -204,7 +204,7 @@ open class Label: Misc {
         super.didMoveToParent()
 
         addSignal(name: "activate-current-link") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activateCurrentLink?(self)
         }
 
@@ -217,12 +217,12 @@ open class Label: Misc {
 
         addSignal(name: "activate-link", handler: gCallback(handler1)) {
             [weak self] (param0: UnsafePointer<CChar>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activateLink?(self, param0)
         }
 
         addSignal(name: "copy-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.copyClipboard?(self)
         }
 
@@ -236,7 +236,7 @@ open class Label: Misc {
 
         addSignal(name: "move-cursor", handler: gCallback(handler3)) {
             [weak self] (param0: GtkMovementStep, param1: Int, param2: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveCursor?(self, param0, param1, param2)
         }
 
@@ -248,7 +248,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::angle", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAngle?(self, param0)
         }
 
@@ -260,7 +260,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::attributes", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAttributes?(self, param0)
         }
 
@@ -272,7 +272,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::cursor-position", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCursorPosition?(self, param0)
         }
 
@@ -284,7 +284,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::ellipsize", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEllipsize?(self, param0)
         }
 
@@ -296,7 +296,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::justify", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyJustify?(self, param0)
         }
 
@@ -308,7 +308,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::label", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLabel?(self, param0)
         }
 
@@ -320,7 +320,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::lines", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLines?(self, param0)
         }
 
@@ -332,7 +332,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::max-width-chars", handler: gCallback(handler11)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMaxWidthChars?(self, param0)
         }
 
@@ -344,7 +344,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::mnemonic-keyval", handler: gCallback(handler12)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMnemonicKeyval?(self, param0)
         }
 
@@ -356,7 +356,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::pattern", handler: gCallback(handler13)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPattern?(self, param0)
         }
 
@@ -368,7 +368,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::selectable", handler: gCallback(handler14)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectable?(self, param0)
         }
 
@@ -380,7 +380,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::selection-bound", handler: gCallback(handler15)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectionBound?(self, param0)
         }
 
@@ -392,7 +392,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::single-line-mode", handler: gCallback(handler16)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySingleLineMode?(self, param0)
         }
 
@@ -404,7 +404,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::track-visited-links", handler: gCallback(handler17)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTrackVisitedLinks?(self, param0)
         }
 
@@ -416,7 +416,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::use-markup", handler: gCallback(handler18)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseMarkup?(self, param0)
         }
 
@@ -428,7 +428,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::use-underline", handler: gCallback(handler19)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseUnderline?(self, param0)
         }
 
@@ -440,7 +440,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::width-chars", handler: gCallback(handler20)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWidthChars?(self, param0)
         }
 
@@ -452,7 +452,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::wrap", handler: gCallback(handler21)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWrap?(self, param0)
         }
 
@@ -464,7 +464,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::wrap-mode", handler: gCallback(handler22)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWrapMode?(self, param0)
         }
 
@@ -476,7 +476,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::xalign", handler: gCallback(handler23)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyXalign?(self, param0)
         }
 
@@ -488,7 +488,7 @@ open class Label: Misc {
 
         addSignal(name: "notify::yalign", handler: gCallback(handler24)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyYalign?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/MenuShell.swift b/Sources/Gtk3/Generated/MenuShell.swift
index 26c8b535a57..a17befd9b82 100644
--- a/Sources/Gtk3/Generated/MenuShell.swift
+++ b/Sources/Gtk3/Generated/MenuShell.swift
@@ -40,12 +40,12 @@ open class MenuShell: Container {
 
         addSignal(name: "activate-current", handler: gCallback(handler0)) {
             [weak self] (param0: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activateCurrent?(self, param0)
         }
 
         addSignal(name: "cancel") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cancel?(self)
         }
 
@@ -58,12 +58,12 @@ open class MenuShell: Container {
 
         addSignal(name: "cycle-focus", handler: gCallback(handler2)) {
             [weak self] (param0: GtkDirectionType) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cycleFocus?(self, param0)
         }
 
         addSignal(name: "deactivate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.deactivate?(self)
         }
 
@@ -76,7 +76,7 @@ open class MenuShell: Container {
 
         addSignal(name: "insert", handler: gCallback(handler4)) {
             [weak self] (param0: GtkWidget, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insert?(self, param0, param1)
         }
 
@@ -89,7 +89,7 @@ open class MenuShell: Container {
 
         addSignal(name: "move-current", handler: gCallback(handler5)) {
             [weak self] (param0: GtkMenuDirectionType) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveCurrent?(self, param0)
         }
 
@@ -101,12 +101,12 @@ open class MenuShell: Container {
 
         addSignal(name: "move-selected", handler: gCallback(handler6)) {
             [weak self] (param0: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveSelected?(self, param0)
         }
 
         addSignal(name: "selection-done") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.selectionDone?(self)
         }
 
@@ -118,7 +118,7 @@ open class MenuShell: Container {
 
         addSignal(name: "notify::take-focus", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTakeFocus?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/NativeDialog.swift b/Sources/Gtk3/Generated/NativeDialog.swift
index 752473ee9e9..72452763298 100644
--- a/Sources/Gtk3/Generated/NativeDialog.swift
+++ b/Sources/Gtk3/Generated/NativeDialog.swift
@@ -27,7 +27,7 @@ open class NativeDialog: GObject {
                 }
 
         addSignal(name: "response", handler: gCallback(handler0)) { [weak self] (param0: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.response?(self, param0)
         }
 
@@ -39,7 +39,7 @@ open class NativeDialog: GObject {
 
         addSignal(name: "notify::modal", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyModal?(self, param0)
         }
 
@@ -51,7 +51,7 @@ open class NativeDialog: GObject {
 
         addSignal(name: "notify::title", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTitle?(self, param0)
         }
 
@@ -63,7 +63,7 @@ open class NativeDialog: GObject {
 
         addSignal(name: "notify::transient-for", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTransientFor?(self, param0)
         }
 
@@ -75,7 +75,7 @@ open class NativeDialog: GObject {
 
         addSignal(name: "notify::visible", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVisible?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/ProgressBar.swift b/Sources/Gtk3/Generated/ProgressBar.swift
index 3f3c6948928..e9e1a7683c6 100644
--- a/Sources/Gtk3/Generated/ProgressBar.swift
+++ b/Sources/Gtk3/Generated/ProgressBar.swift
@@ -58,7 +58,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::ellipsize", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEllipsize?(self, param0)
         }
 
@@ -70,7 +70,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::fraction", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFraction?(self, param0)
         }
 
@@ -82,7 +82,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::inverted", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInverted?(self, param0)
         }
 
@@ -94,7 +94,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::pulse-step", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPulseStep?(self, param0)
         }
 
@@ -106,7 +106,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::show-text", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowText?(self, param0)
         }
 
@@ -118,7 +118,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::text", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyText?(self, param0)
         }
 
@@ -130,7 +130,7 @@ open class ProgressBar: Widget, Orientable {
 
         addSignal(name: "notify::orientation", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyOrientation?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/Range.swift b/Sources/Gtk3/Generated/Range.swift
index cf558bb830b..435a4eb21e6 100644
--- a/Sources/Gtk3/Generated/Range.swift
+++ b/Sources/Gtk3/Generated/Range.swift
@@ -20,7 +20,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "adjust-bounds", handler: gCallback(handler0)) {
             [weak self] (param0: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.adjustBounds?(self, param0)
         }
 
@@ -33,7 +33,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "change-value", handler: gCallback(handler1)) {
             [weak self] (param0: GtkScrollType, param1: Double) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.changeValue?(self, param0, param1)
         }
 
@@ -45,12 +45,12 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "move-slider", handler: gCallback(handler2)) {
             [weak self] (param0: GtkScrollType) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveSlider?(self, param0)
         }
 
         addSignal(name: "value-changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.valueChanged?(self)
         }
 
@@ -62,7 +62,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::adjustment", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAdjustment?(self, param0)
         }
 
@@ -74,7 +74,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::fill-level", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyFillLevel?(self, param0)
         }
 
@@ -86,7 +86,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::inverted", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInverted?(self, param0)
         }
 
@@ -98,7 +98,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::lower-stepper-sensitivity", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLowerStepperSensitivity?(self, param0)
         }
 
@@ -110,7 +110,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::restrict-to-fill-level", handler: gCallback(handler8)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRestrictToFillLevel?(self, param0)
         }
 
@@ -122,7 +122,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::round-digits", handler: gCallback(handler9)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRoundDigits?(self, param0)
         }
 
@@ -134,7 +134,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::show-fill-level", handler: gCallback(handler10)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyShowFillLevel?(self, param0)
         }
 
@@ -146,7 +146,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::upper-stepper-sensitivity", handler: gCallback(handler11)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUpperStepperSensitivity?(self, param0)
         }
 
@@ -158,7 +158,7 @@ open class Range: Widget, Orientable {
 
         addSignal(name: "notify::orientation", handler: gCallback(handler12)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyOrientation?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/Scale.swift b/Sources/Gtk3/Generated/Scale.swift
index e1f3fcfe623..69321f86988 100644
--- a/Sources/Gtk3/Generated/Scale.swift
+++ b/Sources/Gtk3/Generated/Scale.swift
@@ -110,7 +110,7 @@ open class Scale: Range {
 
         addSignal(name: "notify::digits", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyDigits?(self, param0)
         }
 
@@ -122,7 +122,7 @@ open class Scale: Range {
 
         addSignal(name: "notify::draw-value", handler: gCallback(handler1)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyDrawValue?(self, param0)
         }
 
@@ -134,7 +134,7 @@ open class Scale: Range {
 
         addSignal(name: "notify::has-origin", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHasOrigin?(self, param0)
         }
 
@@ -146,7 +146,7 @@ open class Scale: Range {
 
         addSignal(name: "notify::value-pos", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyValuePos?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/Spinner.swift b/Sources/Gtk3/Generated/Spinner.swift
index 48c6878ea90..208d978c0dd 100644
--- a/Sources/Gtk3/Generated/Spinner.swift
+++ b/Sources/Gtk3/Generated/Spinner.swift
@@ -30,7 +30,7 @@ open class Spinner: Widget {
 
         addSignal(name: "notify::active", handler: gCallback(handler0)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActive?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Generated/Switch.swift b/Sources/Gtk3/Generated/Switch.swift
index d93fa5d4a7a..019ae53413a 100644
--- a/Sources/Gtk3/Generated/Switch.swift
+++ b/Sources/Gtk3/Generated/Switch.swift
@@ -28,7 +28,7 @@ open class Switch: Widget, Activatable {
         super.didMoveToParent()
 
         addSignal(name: "activate") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activate?(self)
         }
 
@@ -39,7 +39,7 @@ open class Switch: Widget, Activatable {
                 }
 
         addSignal(name: "state-set", handler: gCallback(handler1)) { [weak self] (param0: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.stateSet?(self, param0)
         }
 
@@ -51,7 +51,7 @@ open class Switch: Widget, Activatable {
 
         addSignal(name: "notify::active", handler: gCallback(handler2)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActive?(self, param0)
         }
 
@@ -63,7 +63,7 @@ open class Switch: Widget, Activatable {
 
         addSignal(name: "notify::state", handler: gCallback(handler3)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyState?(self, param0)
         }
 
@@ -75,7 +75,7 @@ open class Switch: Widget, Activatable {
 
         addSignal(name: "notify::related-action", handler: gCallback(handler4)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRelatedAction?(self, param0)
         }
 
@@ -87,7 +87,7 @@ open class Switch: Widget, Activatable {
 
         addSignal(name: "notify::use-action-appearance", handler: gCallback(handler5)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseActionAppearance?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/GtkError.swift b/Sources/Gtk3/GtkError.swift
index e509b046ffe..27e3b7ddf37 100644
--- a/Sources/Gtk3/GtkError.swift
+++ b/Sources/Gtk3/GtkError.swift
@@ -26,7 +26,7 @@ public func withGtkError<R>(
     var errorPointer: UnsafeMutablePointer<GError>? = nil
     let result = action(&errorPointer)
 
-    if let errorPointer = errorPointer {
+    if let errorPointer {
         throw GtkError(from: errorPointer.pointee)
     } else {
         return result
diff --git a/Sources/Gtk3/Utility/TextBuffer.swift b/Sources/Gtk3/Utility/TextBuffer.swift
index c59e3c65f41..9639697c1e9 100644
--- a/Sources/Gtk3/Utility/TextBuffer.swift
+++ b/Sources/Gtk3/Utility/TextBuffer.swift
@@ -34,17 +34,17 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "apply-tag", handler: gCallback(handler0)) {
         //     [weak self] (param0: GtkTextTag, param1: GtkTextIter, param2: GtkTextIter) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.applyTag?(self, param0, param1, param2)
         // }
 
         // addSignal(name: "begin-user-action") { [weak self] () in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.beginUserAction?(self)
         // }
 
         addSignal(name: "changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.changed?(self)
         }
 
@@ -58,12 +58,12 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "delete-range", handler: gCallback(handler3)) {
         //     [weak self] (param0: GtkTextIter, param1: GtkTextIter) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.deleteRange?(self, param0, param1)
         // }
 
         // addSignal(name: "end-user-action") { [weak self] () in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.endUserAction?(self)
         // }
 
@@ -77,7 +77,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "insert-child-anchor", handler: gCallback(handler5)) {
         //     [weak self] (param0: GtkTextIter, param1: GtkTextChildAnchor) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.insertChildAnchor?(self, param0, param1)
         // }
 
@@ -91,7 +91,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "insert-pixbuf", handler: gCallback(handler6)) {
         //     [weak self] (param0: GtkTextIter, param1: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.insertPixbuf?(self, param0, param1)
         // }
 
@@ -107,7 +107,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "insert-text", handler: gCallback(handler7)) {
         //     [weak self] (param0: GtkTextIter, param1: UnsafePointer<CChar>, param2: Int) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.insertText?(self, param0, param1, param2)
         // }
 
@@ -119,7 +119,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "mark-deleted", handler: gCallback(handler8)) {
         //     [weak self] (param0: GtkTextMark) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.markDeleted?(self, param0)
         // }
 
@@ -133,12 +133,12 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "mark-set", handler: gCallback(handler9)) {
         //     [weak self] (param0: GtkTextIter, param1: GtkTextMark) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.markSet?(self, param0, param1)
         // }
 
         // addSignal(name: "modified-changed") { [weak self] () in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.modifiedChanged?(self)
         // }
 
@@ -150,7 +150,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "paste-done", handler: gCallback(handler11)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.pasteDone?(self, param0)
         // }
 
@@ -166,7 +166,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "remove-tag", handler: gCallback(handler12)) {
         //     [weak self] (param0: GtkTextTag, param1: GtkTextIter, param2: GtkTextIter) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.removeTag?(self, param0, param1, param2)
         // }
 
@@ -178,7 +178,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::copy-target-list", handler: gCallback(handler13)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyCopyTargetList?(self, param0)
         // }
 
@@ -190,7 +190,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::cursor-position", handler: gCallback(handler14)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyCursorPosition?(self, param0)
         // }
 
@@ -202,7 +202,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::has-selection", handler: gCallback(handler15)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyHasSelection?(self, param0)
         // }
 
@@ -214,7 +214,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::paste-target-list", handler: gCallback(handler16)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyPasteTargetList?(self, param0)
         // }
 
@@ -226,7 +226,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::tag-table", handler: gCallback(handler17)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyTagTable?(self, param0)
         // }
 
@@ -238,7 +238,7 @@ open class TextBuffer: GObject {
 
         // addSignal(name: "notify::text", handler: gCallback(handler18)) {
         //     [weak self] (param0: OpaquePointer) in
-        //     guard let self = self else { return }
+        //     guard let self else { return }
         //     self.notifyText?(self, param0)
         // }
     }
diff --git a/Sources/Gtk3/Widgets/ApplicationWindow.swift b/Sources/Gtk3/Widgets/ApplicationWindow.swift
index aae0b75469d..b5bb57dce70 100644
--- a/Sources/Gtk3/Widgets/ApplicationWindow.swift
+++ b/Sources/Gtk3/Widgets/ApplicationWindow.swift
@@ -23,7 +23,7 @@ public class ApplicationWindow: Window {
             name: "notify::scale-factor",
             handler: gCallback(handler2)
         ) { [weak self] (scaleFactor: gint) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyScaleFactor?(Int(scaleFactor))
         }
     }
diff --git a/Sources/Gtk3/Widgets/Dialog.swift b/Sources/Gtk3/Widgets/Dialog.swift
index 9dcd1607675..ca3e2718b09 100644
--- a/Sources/Gtk3/Widgets/Dialog.swift
+++ b/Sources/Gtk3/Widgets/Dialog.swift
@@ -129,7 +129,7 @@ open class Dialog: Window {
         //   super.didMoveToParent()
 
         addSignal(name: "close") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.close?(self)
         }
 
@@ -140,7 +140,7 @@ open class Dialog: Window {
                 }
 
         addSignal(name: "response", handler: gCallback(handler1)) { [weak self] (responseId: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.response?(self, responseId)
         }
 
@@ -152,7 +152,7 @@ open class Dialog: Window {
 
         addSignal(name: "notify::use-header-bar", handler: gCallback(handler2)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseHeaderBar?(self)
         }
     }
diff --git a/Sources/Gtk3/Widgets/ListBox.swift b/Sources/Gtk3/Widgets/ListBox.swift
index 0ec82a89c83..9c8addfe94b 100644
--- a/Sources/Gtk3/Widgets/ListBox.swift
+++ b/Sources/Gtk3/Widgets/ListBox.swift
@@ -50,7 +50,7 @@ open class ListBox: Container {
         super.didMoveToParent()
 
         addSignal(name: "activate-cursor-row") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.activateCursorRow?(self)
         }
 
@@ -63,7 +63,7 @@ open class ListBox: Container {
 
         addSignal(name: "move-cursor", handler: gCallback(handler1)) {
             [weak self] (param0: GtkMovementStep, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveCursor?(self, param0, param1)
         }
 
@@ -78,7 +78,7 @@ open class ListBox: Container {
 
         addSignal(name: "row-activated", handler: gCallback(handler2)) {
             [weak self] (param0: UnsafeMutablePointer<GtkListBoxRow>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.rowActivated?(self, param0)
         }
 
@@ -93,17 +93,17 @@ open class ListBox: Container {
 
         addSignal(name: "row-selected", handler: gCallback(handler3)) {
             [weak self] (param0: UnsafeMutablePointer<GtkListBoxRow>?) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.rowSelected?(self, param0)
         }
 
         addSignal(name: "selected-rows-changed") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.selectedRowsChanged?(self)
         }
 
         addSignal(name: "toggle-cursor-row") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggleCursorRow?(self)
         }
 
@@ -115,7 +115,7 @@ open class ListBox: Container {
 
         addSignal(name: "notify::activate-on-single-click", handler: gCallback(handler6)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActivateOnSingleClick?(self, param0)
         }
 
@@ -127,7 +127,7 @@ open class ListBox: Container {
 
         addSignal(name: "notify::selection-mode", handler: gCallback(handler7)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySelectionMode?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Widgets/Menu.swift b/Sources/Gtk3/Widgets/Menu.swift
index fcb6affd723..0600261c8aa 100644
--- a/Sources/Gtk3/Widgets/Menu.swift
+++ b/Sources/Gtk3/Widgets/Menu.swift
@@ -128,7 +128,7 @@ public class Menu: MenuShell {
 
     private func registerSignalHandlers() {
         addSignal(name: "hide") { [weak self] in
-            guard let self = self else { return }
+            guard let self else { return }
             self.onHide?()
         }
 
@@ -140,7 +140,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "move-scroll", handler: gCallback(handler0)) {
             [weak self] (_: GtkScrollType) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveScroll?(self)
         }
 
@@ -155,7 +155,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "popped-up", handler: gCallback(handler1)) {
             [weak self] (_: gpointer, _: gpointer, _: Bool, _: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.poppedUp?(self)
         }
 
@@ -167,7 +167,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::accel-group", handler: gCallback(handler2)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAccelGroup?(self)
         }
 
@@ -179,7 +179,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::accel-path", handler: gCallback(handler3)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAccelPath?(self)
         }
 
@@ -191,7 +191,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::active", handler: gCallback(handler4)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActive?(self)
         }
 
@@ -203,7 +203,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::anchor-hints", handler: gCallback(handler5)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAnchorHints?(self)
         }
 
@@ -215,7 +215,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::attach-widget", handler: gCallback(handler6)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAttachWidget?(self)
         }
 
@@ -227,7 +227,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::menu-type-hint", handler: gCallback(handler7)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMenuTypeHint?(self)
         }
 
@@ -239,7 +239,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::monitor", handler: gCallback(handler8)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMonitor?(self)
         }
 
@@ -251,7 +251,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::rect-anchor-dx", handler: gCallback(handler9)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRectAnchorDx?(self)
         }
 
@@ -263,7 +263,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::rect-anchor-dy", handler: gCallback(handler10)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRectAnchorDy?(self)
         }
 
@@ -275,7 +275,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::reserve-toggle-size", handler: gCallback(handler11)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyReserveToggleSize?(self)
         }
 
@@ -287,7 +287,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::tearoff-state", handler: gCallback(handler12)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTearoffState?(self)
         }
 
@@ -299,7 +299,7 @@ public class Menu: MenuShell {
 
         addSignal(name: "notify::tearoff-title", handler: gCallback(handler13)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTearoffTitle?(self)
         }
     }
diff --git a/Sources/Gtk3/Widgets/MessageDialog.swift b/Sources/Gtk3/Widgets/MessageDialog.swift
index 55d807c36de..c64337d5aeb 100644
--- a/Sources/Gtk3/Widgets/MessageDialog.swift
+++ b/Sources/Gtk3/Widgets/MessageDialog.swift
@@ -75,7 +75,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::buttons", handler: gCallback(handler0)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyButtons?(self)
         }
 
@@ -87,7 +87,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::message-area", handler: gCallback(handler1)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMessageArea?(self)
         }
 
@@ -99,7 +99,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::message-type", handler: gCallback(handler2)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMessageType?(self)
         }
 
@@ -111,7 +111,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::secondary-text", handler: gCallback(handler3)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryText?(self)
         }
 
@@ -123,7 +123,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::secondary-use-markup", handler: gCallback(handler4)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifySecondaryUseMarkup?(self)
         }
 
@@ -135,7 +135,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::text", handler: gCallback(handler5)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyText?(self)
         }
 
@@ -147,7 +147,7 @@ public class MessageDialog: Dialog {
 
         addSignal(name: "notify::use-markup", handler: gCallback(handler6)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyUseMarkup?(self)
         }
     }
diff --git a/Sources/Gtk3/Widgets/Paned.swift b/Sources/Gtk3/Widgets/Paned.swift
index d9bd29ad5d0..2545395340b 100644
--- a/Sources/Gtk3/Widgets/Paned.swift
+++ b/Sources/Gtk3/Widgets/Paned.swift
@@ -41,7 +41,7 @@ open class Paned: Container, Orientable {
 
         addSignal(name: "notify::position", handler: gCallback(handler)) {
             [weak self] (_: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPosition?(self)
         }
     }
diff --git a/Sources/Gtk3/Widgets/TextView.swift b/Sources/Gtk3/Widgets/TextView.swift
index 1cff0a9e1d6..9acd0fc63cf 100644
--- a/Sources/Gtk3/Widgets/TextView.swift
+++ b/Sources/Gtk3/Widgets/TextView.swift
@@ -50,17 +50,17 @@ open class TextView: Container, Scrollable {
         super.didMoveToParent()
 
         addSignal(name: "backspace") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.backspace?(self)
         }
 
         addSignal(name: "copy-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.copyClipboard?(self)
         }
 
         addSignal(name: "cut-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.cutClipboard?(self)
         }
 
@@ -73,7 +73,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "delete-from-cursor", handler: gCallback(handler3)) {
             [weak self] (param0: GtkDeleteType, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.deleteFromCursor?(self, param0, param1)
         }
 
@@ -93,7 +93,7 @@ open class TextView: Container, Scrollable {
                 param0: GtkTextExtendSelection, param1: GtkTextIter, param2: GtkTextIter,
                 param3: GtkTextIter
             ) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.extendSelection?(self, param0, param1, param2, param3)
         }
 
@@ -106,12 +106,12 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "insert-at-cursor", handler: gCallback(handler5)) {
             [weak self] (param0: UnsafePointer<CChar>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insertAtCursor?(self, param0)
         }
 
         addSignal(name: "insert-emoji") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.insertEmoji?(self)
         }
 
@@ -125,7 +125,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "move-cursor", handler: gCallback(handler7)) {
             [weak self] (param0: GtkMovementStep, param1: Int, param2: Bool) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveCursor?(self, param0, param1, param2)
         }
 
@@ -138,12 +138,12 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "move-viewport", handler: gCallback(handler8)) {
             [weak self] (param0: GtkScrollStep, param1: Int) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.moveViewport?(self, param0, param1)
         }
 
         addSignal(name: "paste-clipboard") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.pasteClipboard?(self)
         }
 
@@ -156,22 +156,22 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "preedit-changed", handler: gCallback(handler10)) {
             [weak self] (param0: UnsafePointer<CChar>) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.preeditChanged?(self, param0)
         }
 
         addSignal(name: "set-anchor") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.setAnchor?(self)
         }
 
         addSignal(name: "toggle-cursor-visible") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggleCursorVisible?(self)
         }
 
         addSignal(name: "toggle-overwrite") { [weak self] () in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggleOverwrite?(self)
         }
 
@@ -183,7 +183,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::accepts-tab", handler: gCallback(handler14)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyAcceptsTab?(self, param0)
         }
 
@@ -195,7 +195,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::bottom-margin", handler: gCallback(handler15)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyBottomMargin?(self, param0)
         }
 
@@ -207,7 +207,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::buffer", handler: gCallback(handler16)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyBuffer?(self, param0)
         }
 
@@ -219,7 +219,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::cursor-visible", handler: gCallback(handler17)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyCursorVisible?(self, param0)
         }
 
@@ -231,7 +231,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::editable", handler: gCallback(handler18)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyEditable?(self, param0)
         }
 
@@ -243,7 +243,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::im-module", handler: gCallback(handler19)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyImModule?(self, param0)
         }
 
@@ -255,7 +255,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::indent", handler: gCallback(handler20)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyIndent?(self, param0)
         }
 
@@ -267,7 +267,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::input-hints", handler: gCallback(handler21)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInputHints?(self, param0)
         }
 
@@ -279,7 +279,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::input-purpose", handler: gCallback(handler22)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyInputPurpose?(self, param0)
         }
 
@@ -291,7 +291,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::justification", handler: gCallback(handler23)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyJustification?(self, param0)
         }
 
@@ -303,7 +303,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::left-margin", handler: gCallback(handler24)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyLeftMargin?(self, param0)
         }
 
@@ -315,7 +315,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::monospace", handler: gCallback(handler25)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyMonospace?(self, param0)
         }
 
@@ -327,7 +327,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::overwrite", handler: gCallback(handler26)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyOverwrite?(self, param0)
         }
 
@@ -339,7 +339,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::pixels-above-lines", handler: gCallback(handler27)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixelsAboveLines?(self, param0)
         }
 
@@ -351,7 +351,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::pixels-below-lines", handler: gCallback(handler28)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixelsBelowLines?(self, param0)
         }
 
@@ -363,7 +363,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::pixels-inside-wrap", handler: gCallback(handler29)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPixelsInsideWrap?(self, param0)
         }
 
@@ -375,7 +375,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::populate-all", handler: gCallback(handler30)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyPopulateAll?(self, param0)
         }
 
@@ -387,7 +387,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::right-margin", handler: gCallback(handler31)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyRightMargin?(self, param0)
         }
 
@@ -399,7 +399,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::tabs", handler: gCallback(handler32)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTabs?(self, param0)
         }
 
@@ -411,7 +411,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::top-margin", handler: gCallback(handler33)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyTopMargin?(self, param0)
         }
 
@@ -423,7 +423,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::wrap-mode", handler: gCallback(handler34)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyWrapMode?(self, param0)
         }
 
@@ -435,7 +435,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::hadjustment", handler: gCallback(handler35)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHadjustment?(self, param0)
         }
 
@@ -447,7 +447,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::hscroll-policy", handler: gCallback(handler36)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyHscrollPolicy?(self, param0)
         }
 
@@ -459,7 +459,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::vadjustment", handler: gCallback(handler37)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVadjustment?(self, param0)
         }
 
@@ -471,7 +471,7 @@ open class TextView: Container, Scrollable {
 
         addSignal(name: "notify::vscroll-policy", handler: gCallback(handler38)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyVscrollPolicy?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Widgets/ToggleButton.swift b/Sources/Gtk3/Widgets/ToggleButton.swift
index ed69749d6df..c92ad01a2d4 100644
--- a/Sources/Gtk3/Widgets/ToggleButton.swift
+++ b/Sources/Gtk3/Widgets/ToggleButton.swift
@@ -17,7 +17,7 @@ open class ToggleButton: Button {
         super.didMoveToParent()
 
         addSignal(name: "toggled") { [weak self] in
-            guard let self = self else { return }
+            guard let self else { return }
             self.toggled?(self)
         }
 
@@ -29,7 +29,7 @@ open class ToggleButton: Button {
 
         addSignal(name: "notify::active", handler: gCallback(handler)) {
             [weak self] (param0: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.notifyActive?(self, param0)
         }
     }
diff --git a/Sources/Gtk3/Widgets/Widget.swift b/Sources/Gtk3/Widgets/Widget.swift
index 881e9bbf6df..0f257b82744 100644
--- a/Sources/Gtk3/Widgets/Widget.swift
+++ b/Sources/Gtk3/Widgets/Widget.swift
@@ -45,7 +45,7 @@ open class Widget: GObject {
             name: "button-press-event",
             handler: gCallback(handler1)
         ) { [weak self] (buttonEvent: GdkEventButton) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.onButtonPress?(self, buttonEvent)
         }
 
@@ -64,7 +64,7 @@ open class Widget: GObject {
             name: "draw",
             handler: gCallback(handler2)
         ) { [weak self] (cairo: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.doDraw?(cairo)
         }
 
@@ -81,7 +81,7 @@ open class Widget: GObject {
             name: "screen-changed",
             handler: gCallback(handler3)
         ) { [weak self] (previousScreen: OpaquePointer) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.screenChanged?()
         }
 
@@ -97,7 +97,7 @@ open class Widget: GObject {
             name: "style-updated",
             handler: gCallback(handler4)
         ) { [weak self] (_: Void) in
-            guard let self = self else { return }
+            guard let self else { return }
             self.styleUpdated?()
         }
     }
diff --git a/Sources/Gtk3Backend/Gtk3Backend.swift b/Sources/Gtk3Backend/Gtk3Backend.swift
index d64d0234949..ede50cbc91c 100644
--- a/Sources/Gtk3Backend/Gtk3Backend.swift
+++ b/Sources/Gtk3Backend/Gtk3Backend.swift
@@ -136,7 +136,7 @@ public final class Gtk3Backend: AppBackend {
 
     public func createWindow(withDefaultSize defaultSize: SIMD2<Int>?) -> Window {
         let window: Gtk3.ApplicationWindow
-        if let precreatedWindow = precreatedWindow {
+        if let precreatedWindow {
             self.precreatedWindow = nil
             window = precreatedWindow
             window.setPosition(to: .center)
@@ -146,7 +146,7 @@ public final class Gtk3Backend: AppBackend {
 
         windows.append(window)
 
-        if let defaultSize = defaultSize {
+        if let defaultSize {
             window.defaultSize = Size(
                 width: defaultSize.x,
                 height: defaultSize.y
@@ -357,7 +357,7 @@ public final class Gtk3Backend: AppBackend {
         g_idle_add_full(
             0,
             { context in
-                guard let context = context else {
+                guard let context else {
                     fatalError("Gtk action callback called without context")
                 }
 
@@ -383,7 +383,7 @@ public final class Gtk3Backend: AppBackend {
             0,
             guint(max(0, delay)),
             { context in
-                guard let context = context else {
+                guard let context else {
                     fatalError("Gtk action callback called without context")
                 }
 
@@ -1281,7 +1281,7 @@ public final class Gtk3Backend: AppBackend {
         // a weak reference anyway.
         drawingArea.doDraw = { [weak self] cairo in
             let scaleFactor = path.scaleFactor
-            guard let self = self, let path = path.path else {
+            guard let self, let path = path.path else {
                 return
             }
 
diff --git a/Sources/GtkBackend/GtkBackend.swift b/Sources/GtkBackend/GtkBackend.swift
index 318b0e7e30b..964aeb359ce 100644
--- a/Sources/GtkBackend/GtkBackend.swift
+++ b/Sources/GtkBackend/GtkBackend.swift
@@ -124,7 +124,7 @@ public final class GtkBackend: AppBackend {
 
     public func createWindow(withDefaultSize defaultSize: SIMD2<Int>?) -> Window {
         let window: Gtk.ApplicationWindow
-        if let precreatedWindow = precreatedWindow {
+        if let precreatedWindow {
             self.precreatedWindow = nil
             window = precreatedWindow
         } else {
@@ -133,7 +133,7 @@ public final class GtkBackend: AppBackend {
 
         windows.append(window)
 
-        if let defaultSize = defaultSize {
+        if let defaultSize {
             window.defaultSize = Size(
                 width: defaultSize.x,
                 height: defaultSize.y
@@ -334,7 +334,7 @@ public final class GtkBackend: AppBackend {
         g_idle_add_full(
             0,
             { context in
-                guard let context = context else {
+                guard let context else {
                     fatalError("Gtk action callback called without context")
                 }
 
@@ -360,7 +360,7 @@ public final class GtkBackend: AppBackend {
             0,
             guint(max(delay, 0)),
             { context in
-                guard let context = context else {
+                guard let context else {
                     fatalError("Gtk action callback called without context")
                 }
 
@@ -1352,7 +1352,7 @@ public final class GtkBackend: AppBackend {
         // We don't actually care about leaking backends, but might as well use
         // a weak reference anyway.
         drawingArea.setDrawFunc { [weak self] cairo, _, _ in
-            guard let self = self, let path = path.path else {
+            guard let self, let path = path.path else {
                 return
             }
 
diff --git a/Sources/GtkCodeGen/GIR.swift b/Sources/GtkCodeGen/GIR.swift
index a96141c5729..39439756813 100644
--- a/Sources/GtkCodeGen/GIR.swift
+++ b/Sources/GtkCodeGen/GIR.swift
@@ -217,7 +217,7 @@ struct Class: Decodable, ClassLike {
         namespace: Namespace
     ) -> [(any ClassLike, T)] {
         guard
-            let parent = parent,
+            let parent,
             let parentClass = namespace.classes.first(where: { $0.name == parent })
         else {
             return []
@@ -262,7 +262,7 @@ struct Class: Decodable, ClassLike {
     /// namespace.
     func getParentClass(namespace: Namespace) -> Class? {
         guard
-            let parent = parent,
+            let parent,
             let parentClass = namespace.classes.first(where: { $0.name == parent })
         else {
             return nil
diff --git a/Sources/GtkCodeGen/GtkCodeGen.swift b/Sources/GtkCodeGen/GtkCodeGen.swift
index 12187dfd35b..dd87e435272 100644
--- a/Sources/GtkCodeGen/GtkCodeGen.swift
+++ b/Sources/GtkCodeGen/GtkCodeGen.swift
@@ -546,7 +546,7 @@ struct GtkCodeGen {
             let closure = ExprSyntax(
                 """
                 { [weak self] (\(raw: parameters)) in
-                    guard let self = self else { return }
+                    guard let self else { return }
                     self.\(raw: name)?(\(raw: arguments))
                 }
                 """
@@ -773,7 +773,7 @@ struct GtkCodeGen {
         // avoid ambiguity between certain initializers). E.g. `gtk_button_new_with_label` and
         // `gtk_button_new_with_mnemonic` both call their first parameter `label` which would be
         // ambiguous in Swift.
-        if let constructorName = constructorName, constructorName.contains("_with_") {
+        if let constructorName, constructorName.contains("_with_") {
             let label = convertCIdentifier(
                 String(constructorName.components(separatedBy: "_with_")[1])
             )
diff --git a/Sources/QtBackend/QtBackend.swift b/Sources/QtBackend/QtBackend.swift
index 59ed595bf09..bb2ef89ee20 100644
--- a/Sources/QtBackend/QtBackend.swift
+++ b/Sources/QtBackend/QtBackend.swift
@@ -129,9 +129,7 @@ public struct QtBackend: AppBackend {
         // Internal state is required to avoid multiple subsequent calls to setAction adding
         // new handlers instead of replacing the existing handler
         button.connectClicked(receiver: nil) { [weak internalState] in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
             internalState.buttonClickActions[ObjectIdentifier(button)]?()
         }
 
@@ -146,9 +144,7 @@ public struct QtBackend: AppBackend {
     public func createSlider() -> QWidget {
         let slider = QSlider(orientation: .Horizontal)
         slider.connectValueChanged(receiver: nil) { [weak internalState] val in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
             internalState.sliderChangeActions[ObjectIdentifier(slider)]?(Double(val))
         }
 
diff --git a/Sources/SwiftCrossUI/Scenes/WindowGroupNode.swift b/Sources/SwiftCrossUI/Scenes/WindowGroupNode.swift
index fad7cf42f58..8b99eb09055 100644
--- a/Sources/SwiftCrossUI/Scenes/WindowGroupNode.swift
+++ b/Sources/SwiftCrossUI/Scenes/WindowGroupNode.swift
@@ -139,7 +139,7 @@ public final class WindowGroupNode<Content: View>: SceneGraphNode {
 
         parentEnvironment = environment
 
-        if let newScene = newScene {
+        if let newScene {
             // Don't set default size even if it has changed. We only set that once
             // at window creation since some backends don't have a concept of
             // 'default' size which would mean that setting the default size every time
@@ -153,7 +153,7 @@ public final class WindowGroupNode<Content: View>: SceneGraphNode {
         let environment =
             backend.computeWindowEnvironment(window: window, rootEnvironment: environment)
             .with(\.onResize) { [weak self] _ in
-                guard let self = self else { return }
+                guard let self else { return }
                 // TODO: Figure out whether this would still work if we didn't recompute the
                 //   scene's body. I have a vague feeling that it wouldn't work in all cases?
                 //   But I don't have the time to come up with a counterexample right now.
diff --git a/Sources/SwiftCrossUI/State/Publisher.swift b/Sources/SwiftCrossUI/State/Publisher.swift
index 571f2b058c7..337478051d6 100644
--- a/Sources/SwiftCrossUI/State/Publisher.swift
+++ b/Sources/SwiftCrossUI/State/Publisher.swift
@@ -44,7 +44,7 @@ public class Publisher {
         nextObservationId += 1
 
         return Cancellable { [weak self] in
-            guard let self = self else { return }
+            guard let self else { return }
             self.observations[id] = nil
         }
         .tag(with: tag)
diff --git a/Sources/SwiftCrossUI/ViewGraph/ViewGraphNode.swift b/Sources/SwiftCrossUI/ViewGraph/ViewGraphNode.swift
index dcadae00366..b84caa1a568 100644
--- a/Sources/SwiftCrossUI/ViewGraph/ViewGraphNode.swift
+++ b/Sources/SwiftCrossUI/ViewGraph/ViewGraphNode.swift
@@ -126,7 +126,7 @@ public class ViewGraphNode<NodeView: View, Backend: AppBackend>: Sendable {
             cancellables.append(
                 value.didChange
                     .observeAsUIUpdater(backend: backend) { [weak self] in
-                        guard let self = self else { return }
+                        guard let self else { return }
                         self.bottomUpUpdate()
                     }
             )
@@ -156,7 +156,7 @@ public class ViewGraphNode<NodeView: View, Backend: AppBackend>: Sendable {
 
     private func updateEnvironment(_ environment: EnvironmentValues) -> EnvironmentValues {
         environment.with(\.onResize) { [weak self] _ in
-            guard let self = self else { return }
+            guard let self else { return }
             self.bottomUpUpdate()
         }
     }
diff --git a/Sources/SwiftCrossUI/Views/Modifiers/Handlers/OnChangeModifier.swift b/Sources/SwiftCrossUI/Views/Modifiers/Handlers/OnChangeModifier.swift
index fd5cf309888..eec1766b8b5 100644
--- a/Sources/SwiftCrossUI/Views/Modifiers/Handlers/OnChangeModifier.swift
+++ b/Sources/SwiftCrossUI/Views/Modifiers/Handlers/OnChangeModifier.swift
@@ -32,9 +32,9 @@ struct OnChangeModifier<Value: Equatable, Content: View>: View {
         environment: EnvironmentValues,
         backend: Backend
     ) -> ViewLayoutResult {
-        if let previousValue = previousValue, value != previousValue {
+        if let previousValue, value != previousValue {
             action()
-        } else if initial && previousValue == nil {
+        } else if initial, previousValue == nil {
             action()
         }
 
diff --git a/Sources/SwiftCrossUI/Views/Modifiers/SheetModifier.swift b/Sources/SwiftCrossUI/Views/Modifiers/SheetModifier.swift
index edfe1c577f8..ca92536521c 100644
--- a/Sources/SwiftCrossUI/Views/Modifiers/SheetModifier.swift
+++ b/Sources/SwiftCrossUI/Views/Modifiers/SheetModifier.swift
@@ -174,7 +174,7 @@ class SheetModifierViewChildren<Child: View, SheetContent: View>: ViewGraphNodeC
 
     var erasedNodes: [ErasedViewGraphNode] {
         var nodes: [ErasedViewGraphNode] = [ErasedViewGraphNode(wrapping: childNode)]
-        if let sheetContentNode = sheetContentNode {
+        if let sheetContentNode {
             nodes.append(ErasedViewGraphNode(wrapping: sheetContentNode))
         }
         return nodes
diff --git a/Sources/SwiftCrossUI/Views/OptionalView.swift b/Sources/SwiftCrossUI/Views/OptionalView.swift
index c39dfcbd6b6..21df00a799a 100644
--- a/Sources/SwiftCrossUI/Views/OptionalView.swift
+++ b/Sources/SwiftCrossUI/Views/OptionalView.swift
@@ -48,7 +48,7 @@ extension OptionalView: TypeSafeView {
     ) -> ViewLayoutResult {
         let hasToggled: Bool
         let result: ViewLayoutResult
-        if let view = view {
+        if let view {
             if let node = children.node {
                 result = node.computeLayout(
                     with: view,
@@ -116,7 +116,7 @@ class OptionalViewChildren<V: View>: ViewGraphNodeChildren {
     }
 
     var erasedNodes: [ErasedViewGraphNode] {
-        if let node = node {
+        if let node {
             [ErasedViewGraphNode(wrapping: node)]
         } else {
             []
@@ -131,7 +131,7 @@ class OptionalViewChildren<V: View>: ViewGraphNodeChildren {
         snapshot: ViewGraphSnapshotter.NodeSnapshot?,
         environment: EnvironmentValues
     ) {
-        if let view = view {
+        if let view {
             node = AnyViewGraphNode(
                 for: view,
                 backend: backend,
diff --git a/Sources/SwiftCrossUI/Views/Picker.swift b/Sources/SwiftCrossUI/Views/Picker.swift
index d7157fccb35..94f96fa516f 100644
--- a/Sources/SwiftCrossUI/Views/Picker.swift
+++ b/Sources/SwiftCrossUI/Views/Picker.swift
@@ -36,7 +36,7 @@ public struct Picker<Value: Equatable>: ElementaryView, View {
             environment: environment
         ) {
             selectedIndex in
-            guard let selectedIndex = selectedIndex else {
+            guard let selectedIndex else {
                 value.wrappedValue = nil
                 return
             }
diff --git a/Sources/SwiftCrossUI/Views/Slider.swift b/Sources/SwiftCrossUI/Views/Slider.swift
index a7bc029c87d..26567b35241 100644
--- a/Sources/SwiftCrossUI/Views/Slider.swift
+++ b/Sources/SwiftCrossUI/Views/Slider.swift
@@ -57,7 +57,7 @@ public struct Slider: ElementaryView, View {
 
     /// Creates a slider to select a value between a minimum and maximum value.
     public init<T: BinaryInteger>(_ value: Binding<T>? = nil, minimum: T, maximum: T) {
-        if let value = value {
+        if let value {
             self.value = Binding<Double>(
                 get: {
                     return Double(value.wrappedValue)
@@ -74,7 +74,7 @@ public struct Slider: ElementaryView, View {
 
     /// Creates a slider to select a value between a minimum and maximum value.
     public init<T: BinaryFloatingPoint>(_ value: Binding<T>? = nil, minimum: T, maximum: T) {
-        if let value = value {
+        if let value {
             self.value = Binding<Double>(
                 get: {
                     return Double(value.wrappedValue)
diff --git a/Sources/SwiftCrossUI/_App.swift b/Sources/SwiftCrossUI/_App.swift
index 7cccf22b1c7..3376c884a33 100644
--- a/Sources/SwiftCrossUI/_App.swift
+++ b/Sources/SwiftCrossUI/_App.swift
@@ -70,7 +70,7 @@ class _App<AppRoot: App> {
 
                 let cancellable = value.didChange.observeAsUIUpdater(backend: self.backend) {
                     [weak self] in
-                    guard let self = self else { return }
+                    guard let self else { return }
 
                     // TODO: Do we have to do this on state changes? Can probably get
                     //   away with only doing it when the root environment changes.
diff --git a/Sources/WinUIBackend/WinUIBackend.swift b/Sources/WinUIBackend/WinUIBackend.swift
index 295c6a641ff..0bd871004b4 100644
--- a/Sources/WinUIBackend/WinUIBackend.swift
+++ b/Sources/WinUIBackend/WinUIBackend.swift
@@ -638,9 +638,7 @@ public final class WinUIBackend: AppBackend {
     public func createButton() -> Widget {
         let button = Button()
         button.click.addHandler { [weak internalState] _, _ in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
             internalState.buttonClickActions[ObjectIdentifier(button)]?()
         }
         return button
@@ -799,9 +797,7 @@ public final class WinUIBackend: AppBackend {
     public func createSlider() -> Widget {
         let slider = Slider()
         slider.valueChanged.addHandler { [weak internalState] _, event in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
             internalState.sliderChangeActions[ObjectIdentifier(slider)]?(
                 Double(event?.newValue ?? 0))
         }
@@ -913,15 +909,11 @@ public final class WinUIBackend: AppBackend {
     public func createTextField() -> Widget {
         let textField = TextBox()
         textField.textChanged.addHandler { [weak internalState] _, _ in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
             internalState.textFieldChangeActions[ObjectIdentifier(textField)]?(textField.text)
         }
         textField.keyUp.addHandler { [weak internalState] _, event in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
 
             if event?.key == .enter {
                 internalState.textFieldSubmitActions[ObjectIdentifier(textField)]?()
@@ -957,9 +949,7 @@ public final class WinUIBackend: AppBackend {
     public func createTextEditor() -> Widget {
         let textEditor = TextBox()
         textEditor.textChanged.addHandler { [weak internalState] _, _ in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
             // Reuse this storage because it's the same widget type as a text field
             internalState.textFieldChangeActions[ObjectIdentifier(textEditor)]?(textEditor.text)
         }
@@ -1120,9 +1110,7 @@ public final class WinUIBackend: AppBackend {
     public func createToggle() -> Widget {
         let toggle = ToggleButton()
         toggle.click.addHandler { [weak internalState] _, _ in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
             internalState.toggleClickActions[ObjectIdentifier(toggle)]?(toggle.isChecked ?? false)
         }
         return toggle
@@ -1172,9 +1160,7 @@ public final class WinUIBackend: AppBackend {
         toggleSwitch.onContent = ""
         toggleSwitch.padding = Thickness(left: 0, top: 0, right: 0, bottom: 0)
         toggleSwitch.toggled.addHandler { [weak internalState] _, _ in
-            guard let internalState = internalState else {
-                return
-            }
+            guard let internalState else { return }
             internalState.switchClickActions[ObjectIdentifier(toggleSwitch)]?(toggleSwitch.isOn)
         }
         return toggleSwitch
@@ -1479,7 +1465,7 @@ public final class WinUIBackend: AppBackend {
         environment: EnvironmentValues
     ) {
         let progressBar = widget as! ProgressBar
-        if let progressFraction = progressFraction {
+        if let progressFraction {
             progressBar.isIndeterminate = false
             progressBar.value = progressBar.maximum * progressFraction
         } else {