diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java
index 98c763298e..a2df35f530 100644
--- a/jOOQ/src/main/java/org/jooq/Constants.java
+++ b/jOOQ/src/main/java/org/jooq/Constants.java
@@ -105,14 +105,14 @@ public final class Constants {
      */
     public static final String NS_CODEGEN     = "http://www.jooq.org/xsd/" + XSD_CODEGEN;
 
-    // [jooq-tools] START [max-row-degree]
+
 
     /**
      * The maximum degree of {@link Row} and {@link Record} subtypes
      */
     public static final int    MAX_ROW_DEGREE = 22;
 
-    // [jooq-tools] END [max-row-degree]
+
 
     /**
      * No further instances
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java b/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java
index 483dd5db3f..f9308a7469 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java
@@ -119,7 +119,7 @@ public interface ConstraintTypeStep extends ConstraintFinalStep {
     @Support
     ConstraintForeignKeyReferencesStepN foreignKey(Field<?>... fields);
 
-    // [jooq-tools] START [foreignKey]
+
 
     /**
      * Add a <code>FOREIGN KEY</code> clause to the <code>CONSTRAINT</code>.
@@ -517,7 +517,7 @@ public interface ConstraintTypeStep extends ConstraintFinalStep {
     @Support
     ConstraintForeignKeyReferencesStep22<?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?> foreignKey(String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16, String field17, String field18, String field19, String field20, String field21, String field22);
 
-    // [jooq-tools] END [foreignKey]
+
 
     /**
      * Create a <code>UNIQUE</code> constraint.
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 53bf96f1ce..6faac95a7c 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -3918,7 +3918,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     WithAsStep with(String alias, BiFunction<? super Field<?>, ? super Integer, ? extends String> fieldNameFunction);
 
 
-    // [jooq-tools] START [with]
+
 
     /**
      * Create a <code>WITH</code> clause to supply subsequent
@@ -4624,7 +4624,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     WithAsStep22 with(Name alias, Name fieldAlias1, Name fieldAlias2, Name fieldAlias3, Name fieldAlias4, Name fieldAlias5, Name fieldAlias6, Name fieldAlias7, Name fieldAlias8, Name fieldAlias9, Name fieldAlias10, Name fieldAlias11, Name fieldAlias12, Name fieldAlias13, Name fieldAlias14, Name fieldAlias15, Name fieldAlias16, Name fieldAlias17, Name fieldAlias18, Name fieldAlias19, Name fieldAlias20, Name fieldAlias21, Name fieldAlias22);
 
-    // [jooq-tools] END [with]
+
 
     /**
      * Create a <code>WITH</code> clause to supply subsequent
@@ -4756,7 +4756,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     WithAsStep withRecursive(String alias, BiFunction<? super Field<?>, ? super Integer, ? extends String> fieldNameFunction);
 
 
-    // [jooq-tools] START [with-recursive]
+
 
     /**
      * Create a <code>WITH</code> clause to supply subsequent
@@ -5462,7 +5462,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     WithAsStep22 withRecursive(Name alias, Name fieldAlias1, Name fieldAlias2, Name fieldAlias3, Name fieldAlias4, Name fieldAlias5, Name fieldAlias6, Name fieldAlias7, Name fieldAlias8, Name fieldAlias9, Name fieldAlias10, Name fieldAlias11, Name fieldAlias12, Name fieldAlias13, Name fieldAlias14, Name fieldAlias15, Name fieldAlias16, Name fieldAlias17, Name fieldAlias18, Name fieldAlias19, Name fieldAlias20, Name fieldAlias21, Name fieldAlias22);
 
-    // [jooq-tools] END [with-recursive]
+
 
     /**
      * Create a <code>WITH</code> clause to supply subsequent
@@ -5656,7 +5656,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support
     SelectSelectStep<Record> select(SelectFieldOrAsterisk... fields);
 
-    // [jooq-tools] START [select]
+
 
     /**
      * Create a new DSL select statement.
@@ -6296,7 +6296,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> SelectSelectStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> select(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);
 
-    // [jooq-tools] END [select]
+
 
     /**
      * Create a new DSL select statement.
@@ -6364,7 +6364,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support
     SelectSelectStep<Record> selectDistinct(SelectFieldOrAsterisk... fields);
 
-    // [jooq-tools] START [selectDistinct]
+
 
     /**
      * Create a new DSL select statement.
@@ -7004,7 +7004,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> SelectSelectStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> selectDistinct(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);
 
-    // [jooq-tools] END [selectDistinct]
+
 
     /**
      * Create a new DSL select statement for a constant <code>0</code> literal.
@@ -7128,7 +7128,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support
     <R extends Record> InsertSetStep<R> insertInto(Table<R> into);
 
-    // [jooq-tools] START [insert]
+
 
     /**
      * Create a new DSL insert statement.
@@ -7504,7 +7504,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support
     <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> InsertValuesStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> insertInto(Table<R> into, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [insert]
+
 
     /**
      * Create a new DSL insert statement.
@@ -7654,7 +7654,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
     <R extends Record> MergeUsingStep<R> mergeInto(Table<R> table);
 
-    // [jooq-tools] START [merge]
+
 
     /**
      * Create a new DSL UPSERT statement ({@link SQLDialect#H2}
@@ -7854,7 +7854,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
     <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> MergeKeyStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [merge]
+
 
     /**
      * Create a new DSL UPSERT statement ({@link SQLDialect#H2}
@@ -10164,7 +10164,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      */
     Record newRecord(Collection<? extends Field<?>> fields);
 
-    // [jooq-tools] START [newRecord]
+
 
     /**
      * Create a new empty {@link Record}.
@@ -10408,7 +10408,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      */
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> newRecord(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [newRecord]
+
 
     /**
      * Create a new empty {@link Result}.
@@ -10446,7 +10446,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      */
     Result<Record> newResult(Collection<? extends Field<?>> fields);
 
-    // [jooq-tools] START [newResult]
+
 
     /**
      * Create a new empty {@link Result}.
@@ -10690,7 +10690,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      */
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Result<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> newResult(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [newResult]
+
 
     // -------------------------------------------------------------------------
     // XXX Executing queries
@@ -11315,7 +11315,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support
     Record fetchSingle(Collection<? extends SelectField<?>> fields) throws DataAccessException;
 
-    // [jooq-tools] START [fetch-single]
+
 
     /**
      * Execute and return exactly one record for
@@ -11691,7 +11691,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     @Support
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> fetchSingle(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22) throws DataAccessException;
 
-    // [jooq-tools] END [fetch-single]
+
 
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
index 2dc0a2f48a..fa02968c42 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
@@ -157,7 +157,7 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
     @Support({ FIREBIRD, POSTGRES })
     DeleteResultStep<Record> returningResult(Collection<? extends SelectFieldOrAsterisk> fields);
 
-    // [jooq-tools] START [returning]
+
 
     /**
      * Configure the <code>DELETE</code> statement to return a list of fields in
@@ -401,6 +401,6 @@ public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R
     @Support
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> DeleteResultStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);
 
-    // [jooq-tools] END [returning]
+
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
index a9a3791501..d6c5b8a263 100644
--- a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
@@ -169,7 +169,7 @@ public interface InsertReturningStep<R extends Record> extends InsertFinalStep<R
     @Support
     InsertResultStep<Record> returningResult(Collection<? extends SelectFieldOrAsterisk> fields);
 
-    // [jooq-tools] START [returning]
+
 
     /**
      * Configure the <code>INSERT</code> statement to return a list of fields in
@@ -435,6 +435,6 @@ public interface InsertReturningStep<R extends Record> extends InsertFinalStep<R
     @Support
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> InsertResultStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);
 
-    // [jooq-tools] END [returning]
+
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertSetStep.java b/jOOQ/src/main/java/org/jooq/InsertSetStep.java
index 3f688bfb22..564a9b128f 100644
--- a/jOOQ/src/main/java/org/jooq/InsertSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertSetStep.java
@@ -112,7 +112,7 @@ public interface InsertSetStep<R extends Record> {
     @Support
     InsertValuesStepN<R> columns(Collection<? extends Field<?>> fields);
 
-    // [jooq-tools] START [columns]
+
 
     /**
      * Set the columns for insert.
@@ -246,7 +246,7 @@ public interface InsertSetStep<R extends Record> {
     @Support
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> InsertValuesStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> columns(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [columns]
+
 
     /**
      * Set a value for a field in the <code>INSERT</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
index 7e10886dc3..2c792c1cd1 100644
--- a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
@@ -161,7 +161,7 @@ public interface MergeUsingStep<R extends Record> extends MergeKeyStepN<R> {
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL })
     MergeKeyStepN<R> columns(Collection<? extends Field<?>> fields);
 
-    // [jooq-tools] START [columns]
+
 
     /**
      * Create a new DSL UPSERT statement ({@link SQLDialect#H2}
@@ -361,6 +361,6 @@ public interface MergeUsingStep<R extends Record> extends MergeKeyStepN<R> {
     @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> MergeKeyStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> columns(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [columns]
+
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/Name.java b/jOOQ/src/main/java/org/jooq/Name.java
index 3627f604d4..78346e9e0b 100644
--- a/jOOQ/src/main/java/org/jooq/Name.java
+++ b/jOOQ/src/main/java/org/jooq/Name.java
@@ -276,7 +276,7 @@ public interface Name extends QueryPart {
     DerivedColumnList fields(BiFunction<? super Field<?>, ? super Integer, ? extends String> fieldNameFunction);
 
 
-    // [jooq-tools] START [fields]
+
 
     /**
      * Add a list of fields to this name to make this name a
@@ -762,7 +762,7 @@ public interface Name extends QueryPart {
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     DerivedColumnList22 fields(Name fieldName1, Name fieldName2, Name fieldName3, Name fieldName4, Name fieldName5, Name fieldName6, Name fieldName7, Name fieldName8, Name fieldName9, Name fieldName10, Name fieldName11, Name fieldName12, Name fieldName13, Name fieldName14, Name fieldName15, Name fieldName16, Name fieldName17, Name fieldName18, Name fieldName19, Name fieldName20, Name fieldName21, Name fieldName22);
 
-    // [jooq-tools] END [fields]
+
 
     @Override
     boolean equals(Object other);
diff --git a/jOOQ/src/main/java/org/jooq/Record.java b/jOOQ/src/main/java/org/jooq/Record.java
index f6d2e79803..742326942b 100644
--- a/jOOQ/src/main/java/org/jooq/Record.java
+++ b/jOOQ/src/main/java/org/jooq/Record.java
@@ -725,7 +725,7 @@ public interface Record extends Attachable, Comparable<Record>, Formattable {
      */
     Record into(Field<?>... fields);
 
-    // [jooq-tools] START [into-fields]
+
 
     /**
      * Copy this record into a new record holding only a subset of the previous
@@ -925,7 +925,7 @@ public interface Record extends Attachable, Comparable<Record>, Formattable {
      */
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [into-fields]
+
 
     /**
      * Map resulting records onto a custom type.
diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java
index 4a23b0ff0a..c35931aab4 100644
--- a/jOOQ/src/main/java/org/jooq/Result.java
+++ b/jOOQ/src/main/java/org/jooq/Result.java
@@ -2482,7 +2482,7 @@ public interface Result<R extends Record> extends List<R>, Attachable, Formattab
      */
     Result<Record> into(Field<?>... fields);
 
-    // [jooq-tools] START [into-fields]
+
 
     /**
      * Copy all records from this result into a new result with new records
@@ -2660,7 +2660,7 @@ public interface Result<R extends Record> extends List<R>, Attachable, Formattab
      */
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Result<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [into-fields]
+
 
     /**
      * Map resulting records onto a custom type.
diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java
index 50f5f3841d..31b161995a 100644
--- a/jOOQ/src/main/java/org/jooq/ResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java
@@ -3939,7 +3939,7 @@ extends
      */
     ResultQuery<Record> coerce(Collection<? extends Field<?>> fields);
 
-    // [jooq-tools] START [coerce]
+
 
     /**
      * Coerce the result record type of this query to that of a set of fields.
@@ -4051,6 +4051,6 @@ extends
      */
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> ResultQuery<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> coerce(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [coerce]
+
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java b/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java
index 62a79fac0f..7629c4609d 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java
@@ -105,7 +105,7 @@ import java.util.Collection;
  */
 public interface SelectOrderByStep<R extends Record> extends SelectLimitStep<R> {
 
-    // [jooq-tools] START [order-by-orderfield-array]
+
 
     /**
      * Add an <code>ORDER BY</code> clause to the query.
@@ -239,7 +239,7 @@ public interface SelectOrderByStep<R extends Record> extends SelectLimitStep<R>
     @Support
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> SelectSeekStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> orderBy(OrderField<T1> field1, OrderField<T2> field2, OrderField<T3> field3, OrderField<T4> field4, OrderField<T5> field5, OrderField<T6> field6, OrderField<T7> field7, OrderField<T8> field8, OrderField<T9> field9, OrderField<T10> field10, OrderField<T11> field11, OrderField<T12> field12, OrderField<T13> field13, OrderField<T14> field14, OrderField<T15> field15, OrderField<T16> field16, OrderField<T17> field17, OrderField<T18> field18, OrderField<T19> field19, OrderField<T20> field20, OrderField<T21> field21, OrderField<T22> field22);
 
-    // [jooq-tools] END [order-by-orderfield-array]
+
 
     /**
      * Add an <code>ORDER BY</code> clause to the query
diff --git a/jOOQ/src/main/java/org/jooq/UpdateQuery.java b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
index 69c9e6fc64..9283dbfa44 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateQuery.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateQuery.java
@@ -68,7 +68,7 @@ import java.util.Collection;
 @SuppressWarnings("deprecation")
 public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionProvider, Update<R> {
 
-    // [jooq-tools] START [addValues]
+
 
     /**
      * Specify a multi-column set clause for the <code>UPDATE</code> statement.
@@ -346,7 +346,7 @@ public interface UpdateQuery<R extends Record> extends StoreQuery<R>, ConditionP
     @Support({ H2, HSQLDB })
     void addValues(RowN row, Select<?> select);
 
-    // [jooq-tools] END [addValues]
+
 
     /**
      * Add tables to the table product.
diff --git a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
index 2e82579f5a..18dcfa6305 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
@@ -165,7 +165,7 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
     @Support({ FIREBIRD, POSTGRES })
     UpdateResultStep<Record> returningResult(Collection<? extends SelectFieldOrAsterisk> fields);
 
-    // [jooq-tools] START [returning]
+
 
     /**
      * Configure the <code>UPDATE</code> statement to return a list of fields in
@@ -431,6 +431,6 @@ public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R
     @Support
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> UpdateResultStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> returningResult(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);
 
-    // [jooq-tools] END [returning]
+
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java
index 78259d0aa5..8b66fd0e14 100644
--- a/jOOQ/src/main/java/org/jooq/WithStep.java
+++ b/jOOQ/src/main/java/org/jooq/WithStep.java
@@ -148,7 +148,7 @@ public interface WithStep extends QueryPart {
     WithAsStep with(String alias, BiFunction<? super Field<?>, ? super Integer, ? extends String> fieldNameFunction);
 
 
-    // [jooq-tools] START [with]
+
 
     /**
      * Add another common table expression to the <code>WITH</code> clause.
@@ -414,7 +414,7 @@ public interface WithStep extends QueryPart {
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     WithAsStep22 with(Name alias, Name fieldAlias1, Name fieldAlias2, Name fieldAlias3, Name fieldAlias4, Name fieldAlias5, Name fieldAlias6, Name fieldAlias7, Name fieldAlias8, Name fieldAlias9, Name fieldAlias10, Name fieldAlias11, Name fieldAlias12, Name fieldAlias13, Name fieldAlias14, Name fieldAlias15, Name fieldAlias16, Name fieldAlias17, Name fieldAlias18, Name fieldAlias19, Name fieldAlias20, Name fieldAlias21, Name fieldAlias22);
 
-    // [jooq-tools] END [with]
+
 
     /**
      * Add another common table expression to the <code>WITH</code> clause.
@@ -584,7 +584,7 @@ public interface WithStep extends QueryPart {
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     SelectSelectStep<Record> select(SelectFieldOrAsterisk... fields);
 
-    // [jooq-tools] START [select]
+
 
     /**
      * Create a new DSL select statement.
@@ -1246,7 +1246,7 @@ public interface WithStep extends QueryPart {
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> SelectSelectStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> select(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);
 
-    // [jooq-tools] END [select]
+
 
     /**
      * Create a new DSL select statement.
@@ -1296,7 +1296,7 @@ public interface WithStep extends QueryPart {
     @Support({ FIREBIRD, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     SelectSelectStep<Record> selectDistinct(SelectFieldOrAsterisk... fields);
 
-    // [jooq-tools] START [selectDistinct]
+
 
     /**
      * Create a new DSL select statement.
@@ -1958,7 +1958,7 @@ public interface WithStep extends QueryPart {
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE })
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> SelectSelectStep<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> selectDistinct(SelectField<T1> field1, SelectField<T2> field2, SelectField<T3> field3, SelectField<T4> field4, SelectField<T5> field5, SelectField<T6> field6, SelectField<T7> field7, SelectField<T8> field8, SelectField<T9> field9, SelectField<T10> field10, SelectField<T11> field11, SelectField<T12> field12, SelectField<T13> field13, SelectField<T14> field14, SelectField<T15> field15, SelectField<T16> field16, SelectField<T17> field17, SelectField<T18> field18, SelectField<T19> field19, SelectField<T20> field20, SelectField<T21> field21, SelectField<T22> field22);
 
-    // [jooq-tools] END [selectDistinct]
+
 
     /**
      * Create a new DSL select statement for a constant <code>0</code> literal.
@@ -2058,7 +2058,7 @@ public interface WithStep extends QueryPart {
     @Support({ POSTGRES, SQLITE })
     <R extends Record> InsertSetStep<R> insertInto(Table<R> into);
 
-    // [jooq-tools] START [insert]
+
 
     /**
      * Create a new DSL insert statement.
@@ -2456,7 +2456,7 @@ public interface WithStep extends QueryPart {
     @Support({ POSTGRES, SQLITE })
     <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> InsertValuesStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> insertInto(Table<R> into, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [insert]
+
 
     /**
      * Create a new DSL insert statement.
@@ -2597,7 +2597,7 @@ public interface WithStep extends QueryPart {
     @Support({})
     <R extends Record> MergeUsingStep<R> mergeInto(Table<R> table);
 
-    // [jooq-tools] START [merge]
+
 
     /**
      * Create a new DSL merge statement (H2-specific syntax).
@@ -3105,7 +3105,7 @@ public interface WithStep extends QueryPart {
     @Support({})
     <R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> MergeKeyStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> mergeInto(Table<R> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 
-    // [jooq-tools] END [merge]
+
 
     /**
      * Create a new DSL merge statement (H2-specific syntax).
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractName.java b/jOOQ/src/main/java/org/jooq/impl/AbstractName.java
index 59260b143b..f062bd60e4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractName.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractName.java
@@ -120,7 +120,7 @@ abstract class AbstractName extends AbstractQueryPart implements Name {
 
 
 
-    // [jooq-tools] START [fields]
+
 
     @Override
     public final DerivedColumnListImpl fields(String fieldName1) {
@@ -342,7 +342,7 @@ abstract class AbstractName extends AbstractQueryPart implements Name {
         return fields(new Name[] { fieldName1, fieldName2, fieldName3, fieldName4, fieldName5, fieldName6, fieldName7, fieldName8, fieldName9, fieldName10, fieldName11, fieldName12, fieldName13, fieldName14, fieldName15, fieldName16, fieldName17, fieldName18, fieldName19, fieldName20, fieldName21, fieldName22 });
     }
 
-    // [jooq-tools] END [fields]
+
 
     // ------------------------------------------------------------------------
     // XXX: Object API
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
index bf1e13bab7..0aeb46ce54 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java
@@ -612,7 +612,7 @@ abstract class AbstractRecord extends AbstractStore implements Record {
         return Tools.newRecord(fetched, Record.class, f, configuration()).operate(new TransferRecordState<Record>(f));
     }
 
-    // [jooq-tools] START [into-fields]
+
 
     @Override
     public final <T1> Record1<T1> into(Field<T1> field1) {
@@ -724,7 +724,7 @@ abstract class AbstractRecord extends AbstractStore implements Record {
         return (Record22) into(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [into-fields]
+
 
     @Override
     public final <E> E into(Class<? extends E> type) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
index cda6512b90..f9dfe20e06 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
@@ -1605,7 +1605,7 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
         return (ResultQuery<Record>) this;
     }
 
-    // [jooq-tools] START [coerce]
+
 
     @Override
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -1739,6 +1739,6 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
         return (ResultQuery) coerce(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [coerce]
+
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
index 5d6484deea..ce7831a48d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
@@ -111,7 +111,7 @@ implements
   , ConstraintForeignKeyOnStep
   , ConstraintForeignKeyReferencesStepN
 
-// [jooq-tools] START [implements]
+
   , ConstraintForeignKeyReferencesStep1
   , ConstraintForeignKeyReferencesStep2
   , ConstraintForeignKeyReferencesStep3
@@ -135,7 +135,7 @@ implements
   , ConstraintForeignKeyReferencesStep21
   , ConstraintForeignKeyReferencesStep22
 
-// [jooq-tools] END [implements]
+
 
 {
 
@@ -436,7 +436,7 @@ implements
         return this;
     }
 
-    // [jooq-tools] START [foreignKey]
+
 
     @Override
     public final <T1> ConstraintImpl foreignKey(Field<T1> field1) {
@@ -1098,7 +1098,7 @@ implements
         return references(table, new String[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [foreignKey]
+
 
     enum Action {
         NO_ACTION("no action"),
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 277c5ccc44..c75bf4357c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -812,7 +812,7 @@ public class DSL {
     }
 
 
-    // [jooq-tools] START [with]
+
 
     /**
      * Create a <code>WITH</code> clause to supply subsequent
@@ -1606,7 +1606,7 @@ public class DSL {
         return new WithImpl(null, false).with(alias, fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22);
     }
 
-    // [jooq-tools] END [with]
+
 
     /**
      * Create a <code>WITH</code> clause to supply subsequent
@@ -1742,7 +1742,7 @@ public class DSL {
     }
 
 
-    // [jooq-tools] START [with-recursive]
+
 
     /**
      * Create a <code>WITH</code> clause to supply subsequent
@@ -2536,7 +2536,7 @@ public class DSL {
         return new WithImpl(null, true).with(alias, fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22);
     }
 
-    // [jooq-tools] END [with-recursive]
+
 
     /**
      * Create a <code>WITH</code> clause to supply subsequent
@@ -2814,7 +2814,7 @@ public class DSL {
         return dsl().select(fields);
     }
 
-    // [jooq-tools] START [select]
+
 
     /**
      * Create a new DSL subselect statement.
@@ -3630,7 +3630,7 @@ public class DSL {
         return (SelectSelectStep) select(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [select]
+
 
     /**
      * Create a new DSL subselect statement.
@@ -3712,7 +3712,7 @@ public class DSL {
         return dsl().selectDistinct(fields);
     }
 
-    // [jooq-tools] START [selectDistinct]
+
 
     /**
      * Create a new DSL subselect statement.
@@ -4528,7 +4528,7 @@ public class DSL {
         return (SelectSelectStep) selectDistinct(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [selectDistinct]
+
 
     /**
      * Create a new DSL subselect statement for a constant <code>0</code>
@@ -4661,7 +4661,7 @@ public class DSL {
         return dsl().insertInto(into);
     }
 
-    // [jooq-tools] START [insert]
+
 
     /**
      * Create a new DSL insert statement.
@@ -5257,7 +5257,7 @@ public class DSL {
         return (InsertValuesStep22) insertInto(into, new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [insert]
+
 
     /**
      * Create a new DSL insert statement.
@@ -5431,7 +5431,7 @@ public class DSL {
         return dsl().mergeInto(table);
     }
 
-    // [jooq-tools] START [merge]
+
 
     /**
      * Create a new DSL UPSERT statement ({@link SQLDialect#H2}
@@ -5675,7 +5675,7 @@ public class DSL {
         return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22);
     }
 
-    // [jooq-tools] END [merge]
+
 
     /**
      * Create a new DSL merge statement (H2-specific syntax).
@@ -5931,7 +5931,7 @@ public class DSL {
         return constraint().foreignKey(fields);
     }
 
-    // [jooq-tools] START [foreignKey]
+
 
     /**
      * Add an unnamed (system named) <code>FOREIGN KEY</code> clause to the <code>CONSTRAINT</code>.
@@ -6461,7 +6461,7 @@ public class DSL {
         return constraint().foreignKey(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22);
     }
 
-    // [jooq-tools] END [foreignKey]
+
 
     /**
      * Create an unnamed (system named) <code>UNIQUE</code> constraint.
@@ -11729,7 +11729,7 @@ public class DSL {
         return field instanceof Field ? (Field<T>) field : field("{0}", field.getDataType(), field);
     }
 
-    // [jooq-tools] START [row-field]
+
 
     /**
      * EXPERIMENTAL: Turn a row value expression of degree <code>1</code> into a {@code Field}.
@@ -11995,7 +11995,7 @@ public class DSL {
         return new RowField<Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>, Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>>(row);
     }
 
-    // [jooq-tools] END [row-field]
+
 
     /**
      * EXPERIMENTAL: Turn a row value expression of arbitrary degree into a {@code Field}.
@@ -20722,7 +20722,7 @@ public class DSL {
         return new Fields(fields);
     }
 
-    // [jooq-tools] START [record-type]
+
 
     /**
      * Create a {@link RecordType} of degree <code>1</code>.
@@ -20878,9 +20878,9 @@ public class DSL {
         return new Fields(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22);
     }
 
-    // [jooq-tools] END [record-type]
 
-    // [jooq-tools] START [row-value]
+
+
 
     /**
      * Create a row value expression of degree <code>1</code>.
@@ -21146,7 +21146,7 @@ public class DSL {
         return row(Tools.field(t1), Tools.field(t2), Tools.field(t3), Tools.field(t4), Tools.field(t5), Tools.field(t6), Tools.field(t7), Tools.field(t8), Tools.field(t9), Tools.field(t10), Tools.field(t11), Tools.field(t12), Tools.field(t13), Tools.field(t14), Tools.field(t15), Tools.field(t16), Tools.field(t17), Tools.field(t18), Tools.field(t19), Tools.field(t20), Tools.field(t21), Tools.field(t22));
     }
 
-    // [jooq-tools] END [row-value]
+
 
     /**
      * Create a row value expression of degree <code>N &gt; 22</code>.
@@ -21160,7 +21160,7 @@ public class DSL {
         return row(Tools.fields(values).toArray(EMPTY_FIELD));
     }
 
-    // [jooq-tools] START [row-expression]
+
 
     /**
      * Create a row value expression of degree <code>1</code>.
@@ -21426,7 +21426,7 @@ public class DSL {
         return new RowImpl(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22);
     }
 
-    // [jooq-tools] END [row-expression]
+
 
     /**
      * Create a row value expression of degree <code>N &gt; 22</code>.
@@ -21500,7 +21500,7 @@ public class DSL {
         return new Values<Record>(rows).as("v", columns);
     }
 
-    // [jooq-tools] START [values]
+
 
     /**
      * Create a <code>VALUES()</code> expression of degree <code>1</code>.
@@ -22250,7 +22250,7 @@ public class DSL {
         return new Values<Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16", "c17", "c18", "c19", "c20", "c21", "c22");
     }
 
-    // [jooq-tools] END [values]
+
 
     // -------------------------------------------------------------------------
     // XXX Literals
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index d24253a1e5..39ec35470c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -1579,7 +1579,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
     }
 
 
-    // [jooq-tools] START [with]
+
 
     @Override
     public WithAsStep1 with(String alias, String fieldAlias1) {
@@ -1801,7 +1801,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new WithImpl(configuration(), false).with(alias, fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22);
     }
 
-    // [jooq-tools] END [with]
+
 
     @Override
     public WithStep with(CommonTableExpression<?>... tables) {
@@ -1840,7 +1840,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
     }
 
 
-    // [jooq-tools] START [with-recursive]
+
 
     @Override
     public WithAsStep1 withRecursive(String alias, String fieldAlias1) {
@@ -2062,7 +2062,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new WithImpl(configuration(), true).with(alias, fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22);
     }
 
-    // [jooq-tools] END [with-recursive]
+
 
     @Override
     public WithStep withRecursive(CommonTableExpression<?>... tables) {
@@ -2109,7 +2109,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new SelectImpl(configuration(), null).select(fields);
     }
 
-    // [jooq-tools] START [select]
+
 
     @Override
     public <T1> SelectSelectStep<Record1<T1>> select(SelectField<T1> field1) {
@@ -2221,7 +2221,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return (SelectSelectStep) select(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [select]
+
 
     @Override
     public SelectSelectStep<Record> selectDistinct(Collection<? extends SelectFieldOrAsterisk> fields) {
@@ -2233,7 +2233,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new SelectImpl(configuration(), null, true).select(fields);
     }
 
-    // [jooq-tools] START [selectDistinct]
+
 
     @Override
     public <T1> SelectSelectStep<Record1<T1>> selectDistinct(SelectField<T1> field1) {
@@ -2345,7 +2345,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return (SelectSelectStep) selectDistinct(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [selectDistinct]
+
 
     @Override
     public SelectSelectStep<Record1<Integer>> selectZero() {
@@ -2382,7 +2382,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new InsertImpl(configuration(), null, into, Collections.<Field<?>>emptyList());
     }
 
-    // [jooq-tools] START [insert]
+
 
     @Override
     public <R extends Record, T1> InsertValuesStep1<R, T1> insertInto(Table<R> into, Field<T1> field1) {
@@ -2494,7 +2494,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new InsertImpl(configuration(), null, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }));
     }
 
-    // [jooq-tools] END [insert]
+
 
     @Override
     public <R extends Record> InsertValuesStepN<R> insertInto(Table<R> into, Field<?>... fields) {
@@ -2521,7 +2521,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new MergeImpl(configuration(), null, table);
     }
 
-    // [jooq-tools] START [merge]
+
 
     @Override
     public <R extends Record, T1> MergeKeyStep1<R, T1> mergeInto(Table<R> table, Field<T1> field1) {
@@ -2633,7 +2633,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22));
     }
 
-    // [jooq-tools] END [merge]
+
 
     @Override
     public <R extends Record> MergeKeyStepN<R> mergeInto(Table<R> table, Field<?>... fields) {
@@ -3804,7 +3804,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return newRecord(fields.toArray(EMPTY_FIELD));
     }
 
-    // [jooq-tools] START [newRecord]
+
 
     @Override
     public <T1> Record1<T1> newRecord(Field<T1> field1) {
@@ -3916,7 +3916,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return (Record22) newRecord(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [newRecord]
+
 
     @Override
     public <R extends UDTRecord<R>> R newRecord(UDT<R> type) {
@@ -3956,7 +3956,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return new ResultImpl<Record>(configuration(), fields);
     }
 
-    // [jooq-tools] START [newResult]
+
 
     @Override
     public <T1> Result<Record1<T1>> newResult(Field<T1> field1) {
@@ -4068,7 +4068,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return (Result) newResult(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [newResult]
+
 
     // -------------------------------------------------------------------------
     // XXX Executing queries
@@ -4398,7 +4398,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return fetchSingle(DSL.select(fields));
     }
 
-    // [jooq-tools] START [fetch-single]
+
 
     @Override
     public <T1> Record1<T1> fetchSingle(SelectField<T1> field1) {
@@ -4510,7 +4510,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
         return (Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>) fetchSingle(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [fetch-single]
+
 
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
index 6253244a84..1df3a8b326 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
@@ -354,7 +354,7 @@ final class DeleteImpl<R extends Record>
         return this;
     }
 
-    // [jooq-tools] START [returning]
+
 
     @Override
     public final <T1> DeleteResultStep<Record1<T1>> returningResult(SelectField<T1> field1) {
@@ -466,7 +466,7 @@ final class DeleteImpl<R extends Record>
         return returningResult(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [returning]
+
 
     @Override
     public final Result<R> fetch() {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
index 2e31dd22a7..d93b99bf3d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
@@ -75,7 +75,7 @@ import org.jooq.Select;
 final class DerivedColumnListImpl extends AbstractQueryPart
 implements
 
-    // [jooq-tools] START [implements-derived-column-list]
+
     DerivedColumnList1,
     DerivedColumnList2,
     DerivedColumnList3,
@@ -99,7 +99,7 @@ implements
     DerivedColumnList21,
     DerivedColumnList22,
 
-    // [jooq-tools] END [implements-derived-column-list]
+
 
     DerivedColumnList {
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index 4f9483f688..a76964c769 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -171,7 +171,7 @@ implements
     // Cascading interface implementations for Merge behaviour
     MergeUsingStep<R>,
 
-    // [jooq-tools] START [implementsKeyStep]
+
 
     MergeKeyStep1<R, T1>,
     MergeKeyStep2<R, T1, T2>,
@@ -196,7 +196,7 @@ implements
     MergeKeyStep21<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>,
     MergeKeyStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>,
 
-    // [jooq-tools] END [implementsKeyStep]
+
 
     MergeOnStep<R>,
     MergeOnConditionStep<R>,
@@ -204,7 +204,7 @@ implements
     MergeMatchedDeleteStep<R>,
     MergeNotMatchedSetMoreStep<R>,
 
-    // [jooq-tools] START [implementsNotMatchedValuesStep]
+
 
     MergeNotMatchedValuesStep1<R, T1>,
     MergeNotMatchedValuesStep2<R, T1, T2>,
@@ -229,7 +229,7 @@ implements
     MergeNotMatchedValuesStep21<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>,
     MergeNotMatchedValuesStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>,
 
-    // [jooq-tools] END [implementsNotMatchedValuesStep]
+
 
     MergeNotMatchedValuesStepN<R> {
 
@@ -317,7 +317,7 @@ implements
         return this;
     }
 
-    // [jooq-tools] START [columns]
+
 
     @Override
     @SuppressWarnings("hiding")
@@ -451,7 +451,7 @@ implements
         return columns(Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22));
     }
 
-    // [jooq-tools] END [columns]
+
 
     @Override
     public final MergeImpl select(Select select) {
@@ -476,7 +476,7 @@ implements
     // Shared MERGE API
     // -------------------------------------------------------------------------
 
-    // [jooq-tools] START [values]
+
 
     @Override
     public final MergeImpl values(T1 value1) {
@@ -699,7 +699,7 @@ implements
         return values(new Field[] { value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15, value16, value17, value18, value19, value20, value21, value22 });
     }
 
-    // [jooq-tools] END [values]
+
 
     @Override
     public final MergeImpl values(Object... values) {
@@ -974,7 +974,7 @@ implements
         return whenNotMatchedThenInsert(Collections.<Field<?>>emptyList());
     }
 
-    // [jooq-tools] START [whenNotMatchedThenInsert]
+
 
     @Override
     @SuppressWarnings("hiding")
@@ -1109,7 +1109,7 @@ implements
     }
 
 
-    // [jooq-tools] END [whenNotMatchedThenInsert]
+
 
     @Override
     public final MergeImpl whenNotMatchedThenInsert(Field<?>... fields) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
index 9b8a1413a4..4c7e76a440 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
@@ -1161,7 +1161,7 @@ final class ResultImpl<R extends Record> extends AbstractCursor<R> implements Re
         return result;
     }
 
-    // [jooq-tools] START [into-fields]
+
 
     @Override
     public final <T1> Result<Record1<T1>> into(Field<T1> field1) {
@@ -1273,7 +1273,7 @@ final class ResultImpl<R extends Record> extends AbstractCursor<R> implements Re
         return (Result) into(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [into-fields]
+
 
     @Override
     public final <E> List<E> into(Class<? extends E> type) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index 205273c5f1..7a69100177 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -173,7 +173,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     SelectHavingConditionStep<R>,
     SelectQualifyConditionStep<R>,
 
-    // [jooq-tools] START [implements-select-seek-step]
+
     SelectSeekStep1<R, T1>,
     SelectSeekStep2<R, T1, T2>,
     SelectSeekStep3<R, T1, T2, T3>,
@@ -197,7 +197,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     SelectSeekStep21<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>,
     SelectSeekStep22<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>,
 
-    // [jooq-tools] END [implements-select-seek-step]
+
 
     SelectSeekStepN<R>,
     SelectSeekLimitStep<R>,
@@ -718,7 +718,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
         return this;
     }
 
-    // [jooq-tools] START [order-by-orderfield-array]
+
 
     @Override
     public final SelectSeekStep1 orderBy(OrderField t1) {
@@ -830,7 +830,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
         return orderBy(new OrderField[] { t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22 });
     }
 
-    // [jooq-tools] END [order-by-orderfield-array]
+
 
     @Override
     public final SelectImpl orderBy(OrderField<?>... fields) {
@@ -871,7 +871,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
         return this;
     }
 
-    // [jooq-tools] START [seek]
+
 
     @Override
     public final SelectSeekLimitStep<R> seek(Object t1) {
@@ -1577,7 +1577,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
         return seekAfter(new Field[] { t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22 });
     }
 
-    // [jooq-tools] END [seek]
+
 
     private final List<? extends Field<?>> seekValues(Object[] values) {
         if (getQuery() instanceof SelectQueryImpl) {
@@ -3949,7 +3949,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
         return getDelegate().coerce(fields);
     }
 
-    // [jooq-tools] START [coerce]
+
 
     @Override
     @SuppressWarnings("hiding")
@@ -4083,7 +4083,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
         return getDelegate().coerce(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22);
     }
 
-    // [jooq-tools] END [coerce]
+
 
     /**
      * The {@link SelectImpl} current condition step
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
index be1a97f088..93a3f703a9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
@@ -178,7 +178,7 @@ final class UpdateImpl<R extends Record>
         return set(Tools.mapOfChangedValues(record));
     }
 
-    // [jooq-tools] START [set]
+
 
     @Override
     public final <T1> UpdateFromStep<R> set(Row1<T1> row, Row1<T1> value) {
@@ -456,7 +456,7 @@ final class UpdateImpl<R extends Record>
         return this;
     }
 
-    // [jooq-tools] END [set]
+
 
     @Override
     public final UpdateWhereStep<R> from(TableLike<?> table) {
@@ -747,7 +747,7 @@ final class UpdateImpl<R extends Record>
         return this;
     }
 
-    // [jooq-tools] START [returning]
+
 
     @Override
     public final <T1> UpdateResultStep<Record1<T1>> returningResult(SelectField<T1> field1) {
@@ -859,7 +859,7 @@ final class UpdateImpl<R extends Record>
         return returningResult(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [returning]
+
 
     @Override
     public final Result<R> fetch() {
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
index 1259b92aca..087e80c6aa 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
@@ -183,7 +183,7 @@ final class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
         return updateMap;
     }
 
-    // [jooq-tools] START [addValues]
+
 
     @Override
     public final <T1> void addValues(Row1<T1> row, Row1<T1> value) {
@@ -415,7 +415,7 @@ final class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
         addValues0(row, select);
     }
 
-    // [jooq-tools] END [addValues]
+
 
     private final void addValues0(Row row, Row value) {
         multiRow = row;
diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
index 571bd4a151..c6e311f76d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
@@ -132,7 +132,7 @@ final class WithImpl extends AbstractQueryPart
 implements
     WithAsStep,
 
-    // [jooq-tools] START [implements-with-as-step]
+
     WithAsStep1,
     WithAsStep2,
     WithAsStep3,
@@ -156,7 +156,7 @@ implements
     WithAsStep21,
     WithAsStep22,
 
-    // [jooq-tools] END [implements-with-as-step]
+
 
     WithStep
 {
@@ -293,7 +293,7 @@ implements
     }
 
 
-    // [jooq-tools] START [with]
+
 
     @Override
     public final WithImpl with(String a, String fieldAlias1) {
@@ -515,7 +515,7 @@ implements
         return with(a, new Name[] { fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22 });
     }
 
-    // [jooq-tools] END [with]
+
 
     @Override
     public final WithStep with(CommonTableExpression<?>... tables) {
@@ -565,7 +565,7 @@ implements
         return new SelectImpl(configuration, this).select(fields);
     }
 
-    // [jooq-tools] START [select]
+
 
     @Override
     public final <T1> SelectSelectStep<Record1<T1>> select(SelectField<T1> field1) {
@@ -677,7 +677,7 @@ implements
         return (SelectSelectStep) select(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [select]
+
 
     @Override
     public final SelectSelectStep<Record> selectDistinct(Collection<? extends SelectFieldOrAsterisk> fields) {
@@ -689,7 +689,7 @@ implements
         return new SelectImpl(configuration, this, true).select(fields);
     }
 
-    // [jooq-tools] START [selectDistinct]
+
 
     @Override
     public final <T1> SelectSelectStep<Record1<T1>> selectDistinct(SelectField<T1> field1) {
@@ -801,7 +801,7 @@ implements
         return (SelectSelectStep) selectDistinct(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 });
     }
 
-    // [jooq-tools] END [selectDistinct]
+
 
     @Override
     public final SelectSelectStep<Record1<Integer>> selectZero() {
@@ -823,7 +823,7 @@ implements
         return new InsertImpl(configuration, this, into);
     }
 
-    // [jooq-tools] START [insert]
+
 
     @Override
     public final <R extends Record, T1> InsertImpl insertInto(Table<R> into, Field<T1> field1) {
@@ -935,7 +935,7 @@ implements
         return insertInto(into, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22));
     }
 
-    // [jooq-tools] END [insert]
+
 
     @Override
     public final <R extends Record> InsertImpl insertInto(Table<R> into, Field<?>... fields) {
@@ -957,7 +957,7 @@ implements
         return new MergeImpl(configuration, this, table);
     }
 
-    // [jooq-tools] START [merge]
+
 
     @Override
     public final <R extends Record, T1> MergeImpl mergeInto(Table<R> table, Field<T1> field1) {
@@ -1069,7 +1069,7 @@ implements
         return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22));
     }
 
-    // [jooq-tools] END [merge]
+
 
     @Override
     public final <R extends Record> MergeImpl mergeInto(Table<R> table, Field<?>... fields) {