diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 2e02dd6287..2bab7b2344 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -14935,6 +14935,60 @@ public static Field<String> left(Field<String> string, Field<? extends Number> l
         return new Left(string, length);
     }
 
+    /**
+     * The <code>LTRIM</code> function.
+     */
+    @NotNull
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> ltrim(String string, String characters) {
+        return new LTrim(Tools.field(string), Tools.field(characters));
+    }
+
+    /**
+     * The <code>LTRIM</code> function.
+     */
+    @NotNull
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> ltrim(String string, Field<String> characters) {
+        return new LTrim(Tools.field(string), characters);
+    }
+
+    /**
+     * The <code>LTRIM</code> function.
+     */
+    @NotNull
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> ltrim(Field<String> string, String characters) {
+        return new LTrim(string, Tools.field(characters));
+    }
+
+    /**
+     * The <code>LTRIM</code> function.
+     */
+    @NotNull
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> ltrim(Field<String> string, Field<String> characters) {
+        return new LTrim(string, characters);
+    }
+
+    /**
+     * The <code>LTRIM</code> function.
+     */
+    @NotNull
+    @Support
+    public static Field<String> ltrim(String string) {
+        return new LTrim(Tools.field(string));
+    }
+
+    /**
+     * The <code>LTRIM</code> function.
+     */
+    @NotNull
+    @Support
+    public static Field<String> ltrim(Field<String> string) {
+        return new LTrim(string);
+    }
+
     /**
      * The <code>REPEAT</code> function.
      */
@@ -15025,6 +15079,60 @@ public static Field<String> right(Field<String> string, Field<? extends Number>
         return new Right(string, length);
     }
 
+    /**
+     * The <code>RTRIM</code> function.
+     */
+    @NotNull
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> rtrim(String string, String characters) {
+        return new RTrim(Tools.field(string), Tools.field(characters));
+    }
+
+    /**
+     * The <code>RTRIM</code> function.
+     */
+    @NotNull
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> rtrim(String string, Field<String> characters) {
+        return new RTrim(Tools.field(string), characters);
+    }
+
+    /**
+     * The <code>RTRIM</code> function.
+     */
+    @NotNull
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> rtrim(Field<String> string, String characters) {
+        return new RTrim(string, Tools.field(characters));
+    }
+
+    /**
+     * The <code>RTRIM</code> function.
+     */
+    @NotNull
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> rtrim(Field<String> string, Field<String> characters) {
+        return new RTrim(string, characters);
+    }
+
+    /**
+     * The <code>RTRIM</code> function.
+     */
+    @NotNull
+    @Support
+    public static Field<String> rtrim(String string) {
+        return new RTrim(Tools.field(string));
+    }
+
+    /**
+     * The <code>RTRIM</code> function.
+     */
+    @NotNull
+    @Support
+    public static Field<String> rtrim(Field<String> string) {
+        return new RTrim(string);
+    }
+
     /**
      * The <code>SIGN</code> function.
      */
@@ -15151,198 +15259,106 @@ public static Field<String> substring(Field<String> string, Field<? extends Numb
         return new Substring(string, startingPosition);
     }
 
-
-
-    /**
-     * Get the upper(field) function.
-     *
-     * @see #upper(Field)
-     */
-    @NotNull
-    @Support
-    public static Field<String> upper(String value) {
-        return upper(Tools.field(value));
-    }
-
     /**
-     * Get the upper(field) function.
-     * <p>
-     * This renders the upper function in all dialects:
-     * <code><pre>upper([field])</pre></code>
+     * The <code>TRIM</code> function.
      */
     @NotNull
-    @Support
-    public static Field<String> upper(Field<String> field) {
-        return new Upper(Tools.nullSafe(field));
-    }
-
-    /**
-     * Get the lower(field) function.
-     *
-     * @see #lower(Field)
-     */
-    @NotNull
-    @Support
-    public static Field<String> lower(String value) {
-        return lower(Tools.field(value));
-    }
-
-    /**
-     * Get the lower(field) function.
-     * <p>
-     * This renders the lower function in all dialects:
-     * <code><pre>lower([field])</pre></code>
-     */
-    @NotNull
-    @Support
-    public static Field<String> lower(Field<String> field) {
-        return new Lower(Tools.nullSafe(field));
-    }
-
-    /**
-     * Get the trim(field) function.
-     *
-     * @see #trim(Field)
-     */
-    @NotNull
-    @Support
-    public static Field<String> trim(String value) {
-        return trim(Tools.field(value));
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> trim(String string, String characters) {
+        return new Trim(Tools.field(string), Tools.field(characters));
     }
 
     /**
-     * Get the trim(field) function.
-     * <p>
-     * This renders the trim function where available:
-     * <code><pre>trim([field])</pre></code> ... or emulates it elsewhere using
-     * rtrim and ltrim: <code><pre>ltrim(rtrim([field]))</pre></code>
+     * The <code>TRIM</code> function.
      */
     @NotNull
-    @Support
-    public static Field<String> trim(Field<String> field) {
-        return new Trim(Tools.nullSafe(field));
+    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
+    public static Field<String> trim(String string, Field<String> characters) {
+        return new Trim(Tools.field(string), characters);
     }
 
     /**
-     * Get the <code>trim(field, characters)</code> or
-     * <code>trim(both characters from field)</code> function.
-     *
-     * @see #trim(Field, Field)
+     * The <code>TRIM</code> function.
      */
     @NotNull
     @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    public static Field<String> trim(String value, String characters) {
-        return trim(Tools.field(value), Tools.field(characters));
+    public static Field<String> trim(Field<String> string, String characters) {
+        return new Trim(string, Tools.field(characters));
     }
 
     /**
-     * Get the <code>trim(field, characters)</code> or
-     * <code>trim(both characters from field)</code> function.
-     * <p>
-     * This renders the trim function where available:
-     * <code><pre>trim([field])</pre></code> ... or emulates it elsewhere using
-     * rtrim and ltrim: <code><pre>ltrim(rtrim([field]))</pre></code>
+     * The <code>TRIM</code> function.
      */
     @NotNull
     @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    public static Field<String> trim(Field<String> field, Field<String> characters) {
-        return new Trim(Tools.nullSafe(field), Tools.nullSafe(characters));
+    public static Field<String> trim(Field<String> string, Field<String> characters) {
+        return new Trim(string, characters);
     }
 
     /**
-     * Get the rtrim(field) function.
-     *
-     * @see #rtrim(Field)
+     * The <code>TRIM</code> function.
      */
     @NotNull
     @Support
-    public static Field<String> rtrim(String value) {
-        return rtrim(Tools.field(value));
+    public static Field<String> trim(String string) {
+        return new Trim(Tools.field(string));
     }
 
     /**
-     * Get the rtrim(field) function.
-     * <p>
-     * This renders the rtrim function in all dialects:
-     * <code><pre>rtrim([field])</pre></code>
+     * The <code>TRIM</code> function.
      */
     @NotNull
     @Support
-    public static Field<String> rtrim(Field<String> field) {
-        return new RTrim(Tools.nullSafe(field));
+    public static Field<String> trim(Field<String> string) {
+        return new Trim(string);
     }
 
-    /**
-     * Get the <code>rtrim(field, characters)</code> or
-     * <code>trim(trailing characters from field)</code> function.
-     *
-     * @see #rtrim(Field, Field)
-     */
-    @NotNull
-    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    public static Field<String> rtrim(String value, String characters) {
-        return rtrim(Tools.field(value), Tools.field(characters));
-    }
 
-    /**
-     * Get the <code>rtrim(field, characters)</code> or
-     * <code>trim(trailing characters from field)</code> function.
-     * <p>
-     * This renders the rtrim function in all dialects:
-     * <code><pre>rtrim([field])</pre></code>
-     */
-    @NotNull
-    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    public static Field<String> rtrim(Field<String> field, Field<String> characters) {
-        return new RTrim(Tools.nullSafe(field), Tools.nullSafe(characters));
-    }
 
     /**
-     * Get the ltrim(field) function.
+     * Get the upper(field) function.
      *
-     * @see #ltrim(Field)
+     * @see #upper(Field)
      */
     @NotNull
     @Support
-    public static Field<String> ltrim(String value) {
-        return ltrim(Tools.field(value));
+    public static Field<String> upper(String value) {
+        return upper(Tools.field(value));
     }
 
     /**
-     * Get the ltrim(field) function.
+     * Get the upper(field) function.
      * <p>
-     * This renders the ltrim function in all dialects:
-     * <code><pre>ltrim([field])</pre></code>
+     * This renders the upper function in all dialects:
+     * <code><pre>upper([field])</pre></code>
      */
     @NotNull
     @Support
-    public static Field<String> ltrim(Field<String> field) {
-        return new LTrim(Tools.nullSafe(field));
+    public static Field<String> upper(Field<String> field) {
+        return new Upper(Tools.nullSafe(field));
     }
 
     /**
-     * Get the <code>ltrim(field, characters)</code> or
-     * <code>trim(leading characters from field)</code> function.
+     * Get the lower(field) function.
      *
-     * @see #ltrim(Field, Field)
+     * @see #lower(Field)
      */
     @NotNull
-    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    public static Field<String> ltrim(String value, String characters) {
-        return ltrim(Tools.field(value), Tools.field(characters));
+    @Support
+    public static Field<String> lower(String value) {
+        return lower(Tools.field(value));
     }
 
     /**
-     * Get the <code>ltrim(field, characters)</code> or
-     * <code>trim(leading characters from field)</code> function.
+     * Get the lower(field) function.
      * <p>
-     * This renders the ltrim function in all dialects:
-     * <code><pre>ltrim([field])</pre></code>
+     * This renders the lower function in all dialects:
+     * <code><pre>lower([field])</pre></code>
      */
     @NotNull
-    @Support({ DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
-    public static Field<String> ltrim(Field<String> field, Field<String> characters) {
-        return new LTrim(Tools.nullSafe(field), Tools.nullSafe(characters));
+    @Support
+    public static Field<String> lower(Field<String> field) {
+        return new Lower(Tools.nullSafe(field));
     }
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
index d9e3e4cd65..3158b8ef89 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@@ -37,49 +37,69 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Keywords.K_FROM;
-import static org.jooq.impl.Keywords.K_LEADING;
-import static org.jooq.impl.Names.N_LTRIM;
-import static org.jooq.impl.Names.N_TRIM;
-import static org.jooq.impl.SQLDataType.VARCHAR;
+import static org.jooq.impl.DSL.*;
+import static org.jooq.impl.Internal.*;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
+import static org.jooq.impl.Tools.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
 
-import org.jooq.Context;
-import org.jooq.Field;
+import org.jooq.*;
+import org.jooq.impl.*;
+
+import java.util.*;
 
 /**
- * @author Lukas Eder
+ * The <code>LTRIM</code> statement.
  */
-final class LTrim extends AbstractField<String> {
+@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
+final class LTrim
+extends
+    AbstractField<String>
+{
 
-    /**
-     * Generated UID
-     */
-    private static final long   serialVersionUID = -7273879239726265322L;
+    private static final long serialVersionUID = 1L;
 
-    private final Field<String> argument;
+    private final Field<String> string;
     private final Field<String> characters;
 
-    LTrim(Field<String> argument) {
-        this(argument, null);
+    LTrim(
+        Field string
+    ) {
+        super(N_LTRIM, allNotNull(VARCHAR, string));
+
+        this.string = nullSafeNotNull(string, VARCHAR);
+        this.characters = null;
     }
 
-    LTrim(Field<String> argument, Field<String> characters) {
-        super(N_LTRIM, VARCHAR);
+    LTrim(
+        Field string,
+        Field characters
+    ) {
+        super(N_LTRIM, allNotNull(VARCHAR, string, characters));
 
-        this.argument = argument;
-        this.characters = characters;
+        this.string = nullSafeNotNull(string, VARCHAR);
+        this.characters = nullSafeNotNull(characters, VARCHAR);
     }
 
+    // -------------------------------------------------------------------------
+    // XXX: QueryPart API
+    // -------------------------------------------------------------------------
+
+
+
     @Override
     public final void accept(Context<?> ctx) {
         if (characters == null) {
             switch (ctx.family()) {
                 case FIREBIRD:
-                    ctx.visit(N_TRIM).sql('(').visit(K_LEADING).sql(' ').visit(K_FROM).sql(' ').visit(argument).sql(')');
+                    ctx.visit(N_TRIM).sql('(').visit(K_LEADING).sql(' ').visit(K_FROM).sql(' ').visit(string).sql(')');
                     break;
 
                 default:
-                    ctx.visit(N_LTRIM).sql('(').visit(argument).sql(')');
+                    ctx.visit(N_LTRIM).sql('(').visit(string).sql(')');
                     break;
             }
         }
@@ -91,13 +111,15 @@ public final void accept(Context<?> ctx) {
 
 
                 case SQLITE:
-                    ctx.visit(N_LTRIM).sql('(').visit(argument).sql(", ").visit(characters).sql(')');
+                    ctx.visit(N_LTRIM).sql('(').visit(string).sql(", ").visit(characters).sql(')');
                     break;
 
                 default:
-                    ctx.visit(N_TRIM).sql('(').visit(K_LEADING).sql(' ').visit(characters).sql(' ').visit(K_FROM).sql(' ').visit(argument).sql(')');
+                    ctx.visit(N_TRIM).sql('(').visit(K_LEADING).sql(' ').visit(characters).sql(' ').visit(K_FROM).sql(' ').visit(string).sql(')');
                     break;
             }
         }
     }
+
+
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
index d0dcab029a..cce41440e2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@@ -37,49 +37,69 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Keywords.K_FROM;
-import static org.jooq.impl.Keywords.K_TRAILING;
-import static org.jooq.impl.Names.N_RTRIM;
-import static org.jooq.impl.Names.N_TRIM;
-import static org.jooq.impl.SQLDataType.VARCHAR;
+import static org.jooq.impl.DSL.*;
+import static org.jooq.impl.Internal.*;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
+import static org.jooq.impl.Tools.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
 
-import org.jooq.Context;
-import org.jooq.Field;
+import org.jooq.*;
+import org.jooq.impl.*;
+
+import java.util.*;
 
 /**
- * @author Lukas Eder
+ * The <code>RTRIM</code> statement.
  */
-final class RTrim extends AbstractField<String> {
+@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
+final class RTrim
+extends
+    AbstractField<String>
+{
 
-    /**
-     * Generated UID
-     */
-    private static final long   serialVersionUID = -7273879239726265322L;
+    private static final long serialVersionUID = 1L;
 
-    private final Field<String> argument;
+    private final Field<String> string;
     private final Field<String> characters;
 
-    RTrim(Field<String> argument) {
-        this(argument, null);
+    RTrim(
+        Field string
+    ) {
+        super(N_RTRIM, allNotNull(VARCHAR, string));
+
+        this.string = nullSafeNotNull(string, VARCHAR);
+        this.characters = null;
     }
 
-    RTrim(Field<String> argument, Field<String> characters) {
-        super(N_RTRIM, VARCHAR);
+    RTrim(
+        Field string,
+        Field characters
+    ) {
+        super(N_RTRIM, allNotNull(VARCHAR, string, characters));
 
-        this.argument = argument;
-        this.characters = characters;
+        this.string = nullSafeNotNull(string, VARCHAR);
+        this.characters = nullSafeNotNull(characters, VARCHAR);
     }
 
+    // -------------------------------------------------------------------------
+    // XXX: QueryPart API
+    // -------------------------------------------------------------------------
+
+
+
     @Override
     public final void accept(Context<?> ctx) {
         if (characters == null) {
             switch (ctx.family()) {
                 case FIREBIRD:
-                    ctx.visit(N_TRIM).sql('(').visit(K_TRAILING).sql(' ').visit(K_FROM).sql(' ').visit(argument).sql(')');
+                    ctx.visit(N_TRIM).sql('(').visit(K_TRAILING).sql(' ').visit(K_FROM).sql(' ').visit(string).sql(')');
                     break;
 
                 default:
-                    ctx.visit(N_RTRIM).sql('(').visit(argument).sql(')');
+                    ctx.visit(N_RTRIM).sql('(').visit(string).sql(')');
                     break;
             }
         }
@@ -91,13 +111,15 @@ public final void accept(Context<?> ctx) {
 
 
                 case SQLITE:
-                    ctx.visit(N_RTRIM).sql('(').visit(argument).sql(", ").visit(characters).sql(')');
+                    ctx.visit(N_RTRIM).sql('(').visit(string).sql(", ").visit(characters).sql(')');
                     break;
 
                 default:
-                    ctx.visit(N_TRIM).sql('(').visit(K_TRAILING).sql(' ').visit(characters).sql(' ').visit(K_FROM).sql(' ').visit(argument).sql(')');
+                    ctx.visit(N_TRIM).sql('(').visit(K_TRAILING).sql(' ').visit(characters).sql(' ').visit(K_FROM).sql(' ').visit(string).sql(')');
                     break;
             }
         }
     }
+
+
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java
index e199467ee8..3abd56a49d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java
@@ -37,52 +37,63 @@
  */
 package org.jooq.impl;
 
-// ...
-// ...
-// ...
-import static org.jooq.SQLDialect.SQLITE;
-// ...
-// ...
-import static org.jooq.impl.Keywords.K_BOTH;
-import static org.jooq.impl.Keywords.K_FROM;
-import static org.jooq.impl.Names.N_TRIM;
-import static org.jooq.impl.SQLDataType.VARCHAR;
-
-import java.util.Set;
-
-import org.jooq.Context;
-import org.jooq.Field;
-// ...
-import org.jooq.SQLDialect;
+import static org.jooq.impl.DSL.*;
+import static org.jooq.impl.Internal.*;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Names.*;
+import static org.jooq.impl.SQLDataType.*;
+import static org.jooq.impl.Tools.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
+
+import org.jooq.*;
+import org.jooq.impl.*;
+
+import java.util.*;
 
 /**
- * @author Lukas Eder
+ * The <code>TRIM</code> statement.
  */
-final class Trim extends AbstractField<String> {
+@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
+final class Trim
+extends
+    AbstractField<String>
+{
 
-    /**
-     * Generated UID
-     */
-    private static final long            serialVersionUID                   = -7273879239726265322L;
+    private static final long serialVersionUID = 1L;
 
+    private final Field<String> string;
+    private final Field<String> characters;
 
+    Trim(
+        Field string
+    ) {
+        super(N_TRIM, allNotNull(VARCHAR, string));
+
+        this.string = nullSafeNotNull(string, VARCHAR);
+        this.characters = null;
+    }
+
+    Trim(
+        Field string,
+        Field characters
+    ) {
+        super(N_TRIM, allNotNull(VARCHAR, string, characters));
+
+        this.string = nullSafeNotNull(string, VARCHAR);
+        this.characters = nullSafeNotNull(characters, VARCHAR);
+    }
+
+    // -------------------------------------------------------------------------
+    // XXX: QueryPart API
+    // -------------------------------------------------------------------------
 
 
 
 
-    private final Field<String> argument;
-    private final Field<String> characters;
 
-    Trim(Field<String> argument) {
-        this(argument, null);
-    }
 
-    Trim(Field<String> argument, Field<String> characters) {
-        super(N_TRIM, VARCHAR);
 
-        this.argument = argument;
-        this.characters = characters;
-    }
 
     @Override
     public final void accept(Context<?> ctx) {
@@ -92,15 +103,17 @@ public final void accept(Context<?> ctx) {
 
 
 
-            ctx.visit(N_TRIM).sql('(').visit(argument).sql(')');
+            ctx.visit(N_TRIM).sql('(').visit(string).sql(')');
         }
         else if (ctx.family() == SQLITE)
-            ctx.visit(N_TRIM).sql('(').visit(argument).sql(", ").visit(characters).sql(')');
+            ctx.visit(N_TRIM).sql('(').visit(string).sql(", ").visit(characters).sql(')');
 
 
 
 
         else
-            ctx.visit(N_TRIM).sql('(').visit(K_BOTH).sql(' ').visit(characters).sql(' ').visit(K_FROM).sql(' ').visit(argument).sql(')');
+            ctx.visit(N_TRIM).sql('(').visit(K_BOTH).sql(' ').visit(characters).sql(' ').visit(K_FROM).sql(' ').visit(string).sql(')');
     }
+
+
 }