diff --git a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
index 3e0735073e..35a909fea4 100644
--- a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
@@ -92,7 +92,7 @@ class Rows extends Generators {
                    «ENDFOR»
 
                 // ------------------------------------------------------------------------
-                // Row DSL API
+                // Comparison predicates
                 // ------------------------------------------------------------------------
 
                 /**
@@ -295,6 +295,10 @@ class Rows extends Generators {
                 @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
                 Condition ne(Select<? extends Record«degree»<«TN(degree)»>> select);
             
+                // ------------------------------------------------------------------------
+                // [NOT] IN predicates
+                // ------------------------------------------------------------------------
+            
                 /**
                  * Compare this row value expression with a set of row value expressions for
                  * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row1.java b/jOOQ/src/main/java/org/jooq/Row1.java
index e50f954da3..7319eb3db5 100644
--- a/jOOQ/src/main/java/org/jooq/Row1.java
+++ b/jOOQ/src/main/java/org/jooq/Row1.java
@@ -68,7 +68,7 @@ public interface Row1<T1> extends Row {
     Field<T1> field1();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -271,6 +271,10 @@ public interface Row1<T1> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record1<T1>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row10.java b/jOOQ/src/main/java/org/jooq/Row10.java
index d1a04bdff3..398dd682ad 100644
--- a/jOOQ/src/main/java/org/jooq/Row10.java
+++ b/jOOQ/src/main/java/org/jooq/Row10.java
@@ -113,7 +113,7 @@ public interface Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends Row {
     Field<T10> field10();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -316,6 +316,10 @@ public interface Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row11.java b/jOOQ/src/main/java/org/jooq/Row11.java
index d9ef76662d..815445e2b5 100644
--- a/jOOQ/src/main/java/org/jooq/Row11.java
+++ b/jOOQ/src/main/java/org/jooq/Row11.java
@@ -118,7 +118,7 @@ public interface Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends Row
     Field<T11> field11();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -321,6 +321,10 @@ public interface Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends Row
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row12.java b/jOOQ/src/main/java/org/jooq/Row12.java
index 44fb8f7b0c..e7be0de595 100644
--- a/jOOQ/src/main/java/org/jooq/Row12.java
+++ b/jOOQ/src/main/java/org/jooq/Row12.java
@@ -123,7 +123,7 @@ public interface Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extend
     Field<T12> field12();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -326,6 +326,10 @@ public interface Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extend
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row13.java b/jOOQ/src/main/java/org/jooq/Row13.java
index d94d58aa07..f0bef07ea8 100644
--- a/jOOQ/src/main/java/org/jooq/Row13.java
+++ b/jOOQ/src/main/java/org/jooq/Row13.java
@@ -128,7 +128,7 @@ public interface Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> e
     Field<T13> field13();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -331,6 +331,10 @@ public interface Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> e
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row14.java b/jOOQ/src/main/java/org/jooq/Row14.java
index 00c6490745..1d388bb1b3 100644
--- a/jOOQ/src/main/java/org/jooq/Row14.java
+++ b/jOOQ/src/main/java/org/jooq/Row14.java
@@ -133,7 +133,7 @@ public interface Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T14> field14();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -336,6 +336,10 @@ public interface Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row15.java b/jOOQ/src/main/java/org/jooq/Row15.java
index b803979145..08f672e9ac 100644
--- a/jOOQ/src/main/java/org/jooq/Row15.java
+++ b/jOOQ/src/main/java/org/jooq/Row15.java
@@ -138,7 +138,7 @@ public interface Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T15> field15();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -341,6 +341,10 @@ public interface Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row16.java b/jOOQ/src/main/java/org/jooq/Row16.java
index cae8be3541..0f0f71435b 100644
--- a/jOOQ/src/main/java/org/jooq/Row16.java
+++ b/jOOQ/src/main/java/org/jooq/Row16.java
@@ -143,7 +143,7 @@ public interface Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T16> field16();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -346,6 +346,10 @@ public interface Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row17.java b/jOOQ/src/main/java/org/jooq/Row17.java
index 3510787c7d..6a1775fc5c 100644
--- a/jOOQ/src/main/java/org/jooq/Row17.java
+++ b/jOOQ/src/main/java/org/jooq/Row17.java
@@ -148,7 +148,7 @@ public interface Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T17> field17();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -351,6 +351,10 @@ public interface Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row18.java b/jOOQ/src/main/java/org/jooq/Row18.java
index 77eef78b2d..0ba8308c32 100644
--- a/jOOQ/src/main/java/org/jooq/Row18.java
+++ b/jOOQ/src/main/java/org/jooq/Row18.java
@@ -153,7 +153,7 @@ public interface Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T18> field18();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -356,6 +356,10 @@ public interface Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row19.java b/jOOQ/src/main/java/org/jooq/Row19.java
index c61e08671a..4f3c497cb0 100644
--- a/jOOQ/src/main/java/org/jooq/Row19.java
+++ b/jOOQ/src/main/java/org/jooq/Row19.java
@@ -158,7 +158,7 @@ public interface Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T19> field19();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -361,6 +361,10 @@ public interface Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row2.java b/jOOQ/src/main/java/org/jooq/Row2.java
index 39fa8f815a..0d5315153a 100644
--- a/jOOQ/src/main/java/org/jooq/Row2.java
+++ b/jOOQ/src/main/java/org/jooq/Row2.java
@@ -73,7 +73,7 @@ public interface Row2<T1, T2> extends Row {
     Field<T2> field2();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -276,6 +276,10 @@ public interface Row2<T1, T2> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record2<T1, T2>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row20.java b/jOOQ/src/main/java/org/jooq/Row20.java
index de166935af..b6c9dcf95f 100644
--- a/jOOQ/src/main/java/org/jooq/Row20.java
+++ b/jOOQ/src/main/java/org/jooq/Row20.java
@@ -163,7 +163,7 @@ public interface Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T20> field20();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -366,6 +366,10 @@ public interface Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row21.java b/jOOQ/src/main/java/org/jooq/Row21.java
index e6b4ea2ce1..8dcfc5c169 100644
--- a/jOOQ/src/main/java/org/jooq/Row21.java
+++ b/jOOQ/src/main/java/org/jooq/Row21.java
@@ -168,7 +168,7 @@ public interface Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T21> field21();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -371,6 +371,10 @@ public interface Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row22.java b/jOOQ/src/main/java/org/jooq/Row22.java
index edfd700f31..d733350299 100644
--- a/jOOQ/src/main/java/org/jooq/Row22.java
+++ b/jOOQ/src/main/java/org/jooq/Row22.java
@@ -173,7 +173,7 @@ public interface Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     Field<T22> field22();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -376,6 +376,10 @@ public interface Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row3.java b/jOOQ/src/main/java/org/jooq/Row3.java
index c198fb270a..8a5d48fe5e 100644
--- a/jOOQ/src/main/java/org/jooq/Row3.java
+++ b/jOOQ/src/main/java/org/jooq/Row3.java
@@ -78,7 +78,7 @@ public interface Row3<T1, T2, T3> extends Row {
     Field<T3> field3();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -281,6 +281,10 @@ public interface Row3<T1, T2, T3> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record3<T1, T2, T3>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row4.java b/jOOQ/src/main/java/org/jooq/Row4.java
index 397267efea..597f992921 100644
--- a/jOOQ/src/main/java/org/jooq/Row4.java
+++ b/jOOQ/src/main/java/org/jooq/Row4.java
@@ -83,7 +83,7 @@ public interface Row4<T1, T2, T3, T4> extends Row {
     Field<T4> field4();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -286,6 +286,10 @@ public interface Row4<T1, T2, T3, T4> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record4<T1, T2, T3, T4>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row5.java b/jOOQ/src/main/java/org/jooq/Row5.java
index ce2f6815bf..7779a86152 100644
--- a/jOOQ/src/main/java/org/jooq/Row5.java
+++ b/jOOQ/src/main/java/org/jooq/Row5.java
@@ -88,7 +88,7 @@ public interface Row5<T1, T2, T3, T4, T5> extends Row {
     Field<T5> field5();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -291,6 +291,10 @@ public interface Row5<T1, T2, T3, T4, T5> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record5<T1, T2, T3, T4, T5>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row6.java b/jOOQ/src/main/java/org/jooq/Row6.java
index 81a2e712ac..3e74e4b7f5 100644
--- a/jOOQ/src/main/java/org/jooq/Row6.java
+++ b/jOOQ/src/main/java/org/jooq/Row6.java
@@ -93,7 +93,7 @@ public interface Row6<T1, T2, T3, T4, T5, T6> extends Row {
     Field<T6> field6();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -296,6 +296,10 @@ public interface Row6<T1, T2, T3, T4, T5, T6> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record6<T1, T2, T3, T4, T5, T6>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row7.java b/jOOQ/src/main/java/org/jooq/Row7.java
index cb7f5056e4..8c4ab378e3 100644
--- a/jOOQ/src/main/java/org/jooq/Row7.java
+++ b/jOOQ/src/main/java/org/jooq/Row7.java
@@ -98,7 +98,7 @@ public interface Row7<T1, T2, T3, T4, T5, T6, T7> extends Row {
     Field<T7> field7();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -301,6 +301,10 @@ public interface Row7<T1, T2, T3, T4, T5, T6, T7> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record7<T1, T2, T3, T4, T5, T6, T7>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row8.java b/jOOQ/src/main/java/org/jooq/Row8.java
index 1cef0f0954..3b76199711 100644
--- a/jOOQ/src/main/java/org/jooq/Row8.java
+++ b/jOOQ/src/main/java/org/jooq/Row8.java
@@ -103,7 +103,7 @@ public interface Row8<T1, T2, T3, T4, T5, T6, T7, T8> extends Row {
     Field<T8> field8();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -306,6 +306,10 @@ public interface Row8<T1, T2, T3, T4, T5, T6, T7, T8> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record8<T1, T2, T3, T4, T5, T6, T7, T8>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/Row9.java b/jOOQ/src/main/java/org/jooq/Row9.java
index 3a2df91383..791a1f00cf 100644
--- a/jOOQ/src/main/java/org/jooq/Row9.java
+++ b/jOOQ/src/main/java/org/jooq/Row9.java
@@ -108,7 +108,7 @@ public interface Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends Row {
     Field<T9> field9();
 
     // ------------------------------------------------------------------------
-    // Row DSL API
+    // Comparison predicates
     // ------------------------------------------------------------------------
 
     /**
@@ -311,6 +311,10 @@ public interface Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends Row {
     @Support({ CUBRID, HSQLDB, MYSQL, ORACLE, POSTGRES })
     Condition ne(Select<? extends Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> select);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality
diff --git a/jOOQ/src/main/java/org/jooq/RowN.java b/jOOQ/src/main/java/org/jooq/RowN.java
index 08f7dc91b1..5fac40192c 100644
--- a/jOOQ/src/main/java/org/jooq/RowN.java
+++ b/jOOQ/src/main/java/org/jooq/RowN.java
@@ -55,6 +55,10 @@ import java.util.Collection;
  */
 public interface RowN extends Row {
 
+    // ------------------------------------------------------------------------
+    // Comparison predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with another row value expression for
      * equality
@@ -231,6 +235,10 @@ public interface RowN extends Row {
     @Support
     Condition ne(Field<?>... values);
 
+    // ------------------------------------------------------------------------
+    // [NOT] IN predicates
+    // ------------------------------------------------------------------------
+
     /**
      * Compare this row value expression with a set of row value expressions for
      * equality