diff --git a/docs/lib/snippets/modular/custom_types/drift_table.drift.dart b/docs/lib/snippets/modular/custom_types/drift_table.drift.dart
index db590906..ec98429e 100644
--- a/docs/lib/snippets/modular/custom_types/drift_table.drift.dart
+++ b/docs/lib/snippets/modular/custom_types/drift_table.drift.dart
@@ -96,7 +96,8 @@ class PeriodicReminder extends i0.DataClass
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
     final map = <String, i0.Expression>{};
     map['id'] = i0.Variable<int>(id);
-    map['frequency'] = i0.Variable<Duration>(frequency);
+    map['frequency'] =
+        i0.Variable<Duration>(frequency, const i2.DurationType());
     map['reminder'] = i0.Variable<String>(reminder);
     return map;
   }
diff --git a/docs/lib/snippets/modular/custom_types/table.drift.dart b/docs/lib/snippets/modular/custom_types/table.drift.dart
index 2e3239e1..a0a0b647 100644
--- a/docs/lib/snippets/modular/custom_types/table.drift.dart
+++ b/docs/lib/snippets/modular/custom_types/table.drift.dart
@@ -95,7 +95,8 @@ class PeriodicReminder extends i0.DataClass
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
     final map = <String, i0.Expression>{};
     map['id'] = i0.Variable<int>(id);
-    map['frequency'] = i0.Variable<Duration>(frequency);
+    map['frequency'] =
+        i0.Variable<Duration>(frequency, const i2.DurationType());
     map['reminder'] = i0.Variable<String>(reminder);
     return map;
   }
diff --git a/docs/lib/snippets/modular/many_to_many/json.drift.dart b/docs/lib/snippets/modular/many_to_many/json.drift.dart
index 57ddbccf..a7bdd538 100644
--- a/docs/lib/snippets/modular/many_to_many/json.drift.dart
+++ b/docs/lib/snippets/modular/many_to_many/json.drift.dart
@@ -94,8 +94,8 @@ class ShoppingCart extends i0.DataClass
     final map = <String, i0.Expression>{};
     map['id'] = i0.Variable<int>(id);
     {
-      final converter = i2.$ShoppingCartsTable.$converterentries;
-      map['entries'] = i0.Variable<String>(converter.toSql(entries));
+      map['entries'] = i0.Variable<String>(
+          i2.$ShoppingCartsTable.$converterentries.toSql(entries));
     }
     return map;
   }
@@ -186,9 +186,8 @@ class ShoppingCartsCompanion extends i0.UpdateCompanion<i2.ShoppingCart> {
       map['id'] = i0.Variable<int>(id.value);
     }
     if (entries.present) {
-      final converter = i2.$ShoppingCartsTable.$converterentries;
-
-      map['entries'] = i0.Variable<String>(converter.toSql(entries.value));
+      map['entries'] = i0.Variable<String>(
+          i2.$ShoppingCartsTable.$converterentries.toSql(entries.value));
     }
     return map;
   }
diff --git a/examples/app/lib/database/database.g.dart b/examples/app/lib/database/database.g.dart
index bf280bcd..f4db5a9a 100644
--- a/examples/app/lib/database/database.g.dart
+++ b/examples/app/lib/database/database.g.dart
@@ -89,8 +89,8 @@ class Category extends DataClass implements Insertable<Category> {
     map['id'] = Variable<int>(id);
     map['name'] = Variable<String>(name);
     {
-      final converter = $CategoriesTable.$convertercolor;
-      map['color'] = Variable<int>(converter.toSql(color));
+      map['color'] =
+          Variable<int>($CategoriesTable.$convertercolor.toSql(color));
     }
     return map;
   }
@@ -194,9 +194,8 @@ class CategoriesCompanion extends UpdateCompanion<Category> {
       map['name'] = Variable<String>(name.value);
     }
     if (color.present) {
-      final converter = $CategoriesTable.$convertercolor;
-
-      map['color'] = Variable<int>(converter.toSql(color.value));
+      map['color'] =
+          Variable<int>($CategoriesTable.$convertercolor.toSql(color.value));
     }
     return map;
   }
diff --git a/examples/modular/lib/src/users.drift.dart b/examples/modular/lib/src/users.drift.dart
index f76dc728..ccacf892 100644
--- a/examples/modular/lib/src/users.drift.dart
+++ b/examples/modular/lib/src/users.drift.dart
@@ -135,8 +135,8 @@ class User extends i0.DataClass implements i0.Insertable<i1.User> {
       map['biography'] = i0.Variable<String>(biography);
     }
     if (!nullToAbsent || preferences != null) {
-      final converter = i1.Users.$converterpreferencesn;
-      map['preferences'] = i0.Variable<String>(converter.toSql(preferences));
+      map['preferences'] = i0.Variable<String>(
+          i1.Users.$converterpreferencesn.toSql(preferences));
     }
     if (!nullToAbsent || profilePicture != null) {
       map['profile_picture'] = i0.Variable<i3.Uint8List>(profilePicture);
@@ -291,10 +291,8 @@ class UsersCompanion extends i0.UpdateCompanion<i1.User> {
       map['biography'] = i0.Variable<String>(biography.value);
     }
     if (preferences.present) {
-      final converter = i1.Users.$converterpreferencesn;
-
-      map['preferences'] =
-          i0.Variable<String>(converter.toSql(preferences.value));
+      map['preferences'] = i0.Variable<String>(
+          i1.Users.$converterpreferencesn.toSql(preferences.value));
     }
     if (profilePicture.present) {
       map['profile_picture'] = i0.Variable<i3.Uint8List>(profilePicture.value);
diff --git a/extras/integration_tests/drift_testcases/lib/database/database.g.dart b/extras/integration_tests/drift_testcases/lib/database/database.g.dart
index 0f25f1a7..b1107a3d 100644
--- a/extras/integration_tests/drift_testcases/lib/database/database.g.dart
+++ b/extras/integration_tests/drift_testcases/lib/database/database.g.dart
@@ -138,8 +138,8 @@ class User extends DataClass implements Insertable<User> {
       map['profile_picture'] = Variable<Uint8List>(profilePicture);
     }
     if (!nullToAbsent || preferences != null) {
-      final converter = $UsersTable.$converterpreferences;
-      map['preferences'] = Variable<String>(converter.toSql(preferences));
+      map['preferences'] = Variable<String>(
+          $UsersTable.$converterpreferences.toSql(preferences));
     }
     return map;
   }
@@ -294,9 +294,8 @@ class UsersCompanion extends UpdateCompanion<User> {
       map['profile_picture'] = Variable<Uint8List>(profilePicture.value);
     }
     if (preferences.present) {
-      final converter = $UsersTable.$converterpreferences;
-
-      map['preferences'] = Variable<String>(converter.toSql(preferences.value));
+      map['preferences'] = Variable<String>(
+          $UsersTable.$converterpreferences.toSql(preferences.value));
     }
     return map;
   }