diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
index 8b13dc5d9d..a6aa5a45c2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java
@@ -53,10 +53,16 @@ import static org.jooq.SQLDialect.YUGABYTE;
 import static org.jooq.impl.DSL.condition;
 import static org.jooq.impl.DSL.one;
 import static org.jooq.impl.DSL.zero;
+import static org.jooq.impl.Keywords.K_DENSE_RANK;
 import static org.jooq.impl.Keywords.K_DISTINCT;
 import static org.jooq.impl.Keywords.K_FILTER;
+import static org.jooq.impl.Keywords.K_FIRST;
+import static org.jooq.impl.Keywords.K_KEEP;
+import static org.jooq.impl.Keywords.K_LAST;
+import static org.jooq.impl.Keywords.K_NULL;
 import static org.jooq.impl.Keywords.K_ORDER_BY;
 import static org.jooq.impl.Keywords.K_WHERE;
+import static org.jooq.impl.Keywords.K_WITHIN_GROUP;
 import static org.jooq.impl.Names.*;
 import static org.jooq.impl.QueryPartCollectionView.wrap;
 import static org.jooq.impl.SQLDataType.DOUBLE;
@@ -113,6 +119,19 @@ implements
     SortFieldList                 keepDenseRankOrderBy;
     boolean                       first;
 
+
+    AbstractAggregateFunction(String name, DataType<T> type, Field<?>... arguments) {
+        this(false, name, type, arguments);
+    }
+
+    AbstractAggregateFunction(Name name, DataType<T> type, Field<?>... arguments) {
+        this(false, name, type, arguments);
+    }
+
+    AbstractAggregateFunction(boolean distinct, String name, DataType<T> type, Field<?>... arguments) {
+        this(distinct, DSL.unquotedName(name), type, arguments);
+    }
+
     AbstractAggregateFunction(boolean distinct, Name name, DataType<T> type, Field<?>... arguments) {
         super(name, type);
 
@@ -124,6 +143,77 @@ implements
     // XXX QueryPart API
     // -------------------------------------------------------------------------
 
+    @Override
+    public /* final */ void accept(Context<?> ctx) {
+        toSQLArguments(ctx);
+        acceptKeepDenseRankOrderByClause(ctx);
+        acceptWithinGroupClause(ctx);
+        acceptFilterClause(ctx);
+        acceptOverClause(ctx);
+    }
+
+    /**
+     * Render <code>KEEP (DENSE_RANK [FIRST | LAST] ORDER BY {...})</code> clause
+     */
+    private final void acceptKeepDenseRankOrderByClause(Context<?> ctx) {
+        if (!Tools.isEmpty(keepDenseRankOrderBy)) {
+
+            switch (ctx.family()) {
+
+
+
+
+
+
+                default:
+                    ctx.sql(' ').visit(K_KEEP)
+                       .sql(" (").visit(K_DENSE_RANK)
+                       .sql(' ').visit(first ? K_FIRST : K_LAST)
+                       .sql(' ').visit(K_ORDER_BY)
+                       .sql(' ').visit(keepDenseRankOrderBy)
+                       .sql(')');
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Render <code>WITHIN GROUP (ORDER BY ..)</code> clause
+     */
+    final void acceptWithinGroupClause(Context<?> ctx) {
+        if (withinGroupOrderBy != null) {
+            switch (ctx.family()) {
+
+
+
+
+
+
+                default:
+                    ctx.sql(' ').visit(K_WITHIN_GROUP)
+                       .sql(" (").visit(K_ORDER_BY).sql(' ');
+
+                    if (withinGroupOrderBy.isEmpty())
+                        ctx.visit(K_NULL);
+                    else
+                        ctx.visit(withinGroupOrderBy);
+
+                    ctx.sql(')');
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Render function arguments and argument modifiers
+     */
+    private final void toSQLArguments(Context<?> ctx) {
+        acceptFunctionName(ctx);
+        ctx.sql('(');
+        acceptArguments0(ctx);
+        ctx.sql(')');
+    }
+
     /* non-final */ void acceptFunctionName(Context<?> ctx) {
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AnyValue.java b/jOOQ/src/main/java/org/jooq/impl/AnyValue.java
index 41c2a58698..a8dc53dfbf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AnyValue.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AnyValue.java
@@ -63,7 +63,7 @@ import java.util.*;
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })
 final class AnyValue<T>
 extends
-    DefaultAggregateFunction<T>
+    AbstractAggregateFunction<T>
 {
 
     AnyValue(
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java b/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java
index 576ed84664..a341f4acfa 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayAgg.java
@@ -45,7 +45,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-final class ArrayAgg<T> extends DefaultAggregateFunction<T[]> {
+final class ArrayAgg<T> extends AbstractAggregateFunction<T[]> {
 
     ArrayAgg(boolean distinct, Field<T> arg) {
         super(distinct, N_ARRAY_AGG, arg.getDataType().getArrayDataType(), arg);
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
index 861293582c..13741b5734 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
@@ -65,7 +65,7 @@ import java.util.stream.*;
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })
 final class BitAndAgg<T extends Number>
 extends
-    DefaultAggregateFunction<T>
+    AbstractAggregateFunction<T>
 {
 
     BitAndAgg(
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
index 37443d4f74..74c0ab74f6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
@@ -65,7 +65,7 @@ import java.util.stream.*;
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })
 final class BitOrAgg<T extends Number>
 extends
-    DefaultAggregateFunction<T>
+    AbstractAggregateFunction<T>
 {
 
     BitOrAgg(
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
index 89d65a4d04..fca2818742 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
@@ -65,7 +65,7 @@ import java.util.stream.*;
 @SuppressWarnings({ "rawtypes", "unchecked", "unused" })
 final class BitXorAgg<T extends Number>
 extends
-    DefaultAggregateFunction<T>
+    AbstractAggregateFunction<T>
 {
 
     BitXorAgg(
diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
index 9aea243483..0c31579324 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
@@ -51,7 +51,7 @@ import org.jooq.SQLDialect;
 /**
  * @author Lukas Eder
  */
-final class BoolAnd extends DefaultAggregateFunction<Boolean> {
+final class BoolAnd extends AbstractAggregateFunction<Boolean> {
     private static final Set<SQLDialect> EMULATE          = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE);
 
     private final Condition              condition;
diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
index bbceb24763..c27e07c1e6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
@@ -75,7 +75,7 @@ import org.jooq.SQLDialect;
 /**
  * @author Lukas Eder
  */
-final class BoolOr extends DefaultAggregateFunction<Boolean> {
+final class BoolOr extends AbstractAggregateFunction<Boolean> {
     private static final Set<SQLDialect> EMULATE          = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE);
 
     private final Condition              condition;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Corr.java b/jOOQ/src/main/java/org/jooq/impl/Corr.java
index 078a344401..934e0936da 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Corr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Corr.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class Corr
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     Corr(
diff --git a/jOOQ/src/main/java/org/jooq/impl/CountTable.java b/jOOQ/src/main/java/org/jooq/impl/CountTable.java
index 76ac85837f..03b8e18295 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CountTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CountTable.java
@@ -44,7 +44,7 @@ import org.jooq.UniqueKey;
 /**
  * @author Lukas Eder
  */
-final class CountTable extends DefaultAggregateFunction<Integer> {
+final class CountTable extends AbstractAggregateFunction<Integer> {
 
     private final Table<?>    table;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
index 85597d8a76..b4762f3c8d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class CovarPop
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     CovarPop(
diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
index a7cb308f9a..2f66d63279 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class CovarSamp
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     CovarSamp(
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java
index 670c3859b6..1a39257255 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java
@@ -38,17 +38,6 @@
 
 package org.jooq.impl;
 
-import static org.jooq.impl.Keywords.K_DENSE_RANK;
-import static org.jooq.impl.Keywords.K_FILTER;
-import static org.jooq.impl.Keywords.K_FIRST;
-import static org.jooq.impl.Keywords.K_KEEP;
-import static org.jooq.impl.Keywords.K_LAST;
-import static org.jooq.impl.Keywords.K_NULL;
-import static org.jooq.impl.Keywords.K_ORDER_BY;
-import static org.jooq.impl.Keywords.K_WHERE;
-import static org.jooq.impl.Keywords.K_WITHIN_GROUP;
-
-import org.jooq.Context;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.Name;
@@ -59,100 +48,25 @@ import org.jooq.Name;
  *
  * @author Lukas Eder
  */
-class DefaultAggregateFunction<T> extends AbstractAggregateFunction<T> {
+final class DefaultAggregateFunction<T> extends AbstractAggregateFunction<T> {
 
     // -------------------------------------------------------------------------
     // XXX Constructors
     // -------------------------------------------------------------------------
 
     DefaultAggregateFunction(String name, DataType<T> type, Field<?>... arguments) {
-        this(false, name, type, arguments);
+        super(name, type, arguments);
     }
 
     DefaultAggregateFunction(Name name, DataType<T> type, Field<?>... arguments) {
-        this(false, name, type, arguments);
+        super(name, type, arguments);
     }
 
     DefaultAggregateFunction(boolean distinct, String name, DataType<T> type, Field<?>... arguments) {
-        this(distinct, DSL.unquotedName(name), type, arguments);
+        super(distinct, name, type, arguments);
     }
 
     DefaultAggregateFunction(boolean distinct, Name name, DataType<T> type, Field<?>... arguments) {
         super(distinct, name, type, arguments);
     }
-
-    // -------------------------------------------------------------------------
-    // XXX QueryPart API
-    // -------------------------------------------------------------------------
-
-    @Override
-    public /* final */ void accept(Context<?> ctx) {
-        toSQLArguments(ctx);
-        acceptKeepDenseRankOrderByClause(ctx);
-        acceptWithinGroupClause(ctx);
-        acceptFilterClause(ctx);
-        acceptOverClause(ctx);
-    }
-
-    /**
-     * Render <code>KEEP (DENSE_RANK [FIRST | LAST] ORDER BY {...})</code> clause
-     */
-    private final void acceptKeepDenseRankOrderByClause(Context<?> ctx) {
-        if (!Tools.isEmpty(keepDenseRankOrderBy)) {
-
-            switch (ctx.family()) {
-
-
-
-
-
-
-                default:
-                    ctx.sql(' ').visit(K_KEEP)
-                       .sql(" (").visit(K_DENSE_RANK)
-                       .sql(' ').visit(first ? K_FIRST : K_LAST)
-                       .sql(' ').visit(K_ORDER_BY)
-                       .sql(' ').visit(keepDenseRankOrderBy)
-                       .sql(')');
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Render <code>WITHIN GROUP (ORDER BY ..)</code> clause
-     */
-    final void acceptWithinGroupClause(Context<?> ctx) {
-        if (withinGroupOrderBy != null) {
-            switch (ctx.family()) {
-
-
-
-
-
-
-                default:
-                    ctx.sql(' ').visit(K_WITHIN_GROUP)
-                       .sql(" (").visit(K_ORDER_BY).sql(' ');
-
-                    if (withinGroupOrderBy.isEmpty())
-                        ctx.visit(K_NULL);
-                    else
-                        ctx.visit(withinGroupOrderBy);
-
-                    ctx.sql(')');
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Render function arguments and argument modifiers
-     */
-    private final void toSQLArguments(Context<?> ctx) {
-        acceptFunctionName(ctx);
-        ctx.sql('(');
-        acceptArguments0(ctx);
-        ctx.sql(')');
-    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
index 7c7d5aafe4..ad33d7ed81 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ListAgg.java
@@ -86,7 +86,7 @@ import org.jooq.SQLDialect;
 /**
  * @author Lukas Eder
  */
-final class ListAgg extends DefaultAggregateFunction<String> {
+final class ListAgg extends AbstractAggregateFunction<String> {
     private static final Set<SQLDialect> SET_GROUP_CONCAT_MAX_LEN     = SQLDialect.supportedBy(MARIADB, MYSQL);
     private static final Set<SQLDialect> SUPPORT_GROUP_CONCAT         = SQLDialect.supportedBy(CUBRID, H2, HSQLDB, MARIADB, MYSQL, SQLITE);
     private static final Set<SQLDialect> SUPPORT_STRING_AGG           = SQLDialect.supportedBy(POSTGRES);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Median.java b/jOOQ/src/main/java/org/jooq/impl/Median.java
index 6c71a950d5..0406113579 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Median.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Median.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class Median
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     Median(
diff --git a/jOOQ/src/main/java/org/jooq/impl/Mode.java b/jOOQ/src/main/java/org/jooq/impl/Mode.java
index f6b54eee03..1db4faf0d5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Mode.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Mode.java
@@ -56,7 +56,7 @@ import org.jooq.SQLDialect;
 /**
  * @author Lukas Eder
  */
-final class Mode<T> extends DefaultAggregateFunction<T> {
+final class Mode<T> extends AbstractAggregateFunction<T> {
     private static final Set<SQLDialect> EMULATE_AS_ORDERED_SET_AGG = SQLDialect.supportedBy(H2, POSTGRES, YUGABYTE);
 
     Mode(Field<T> arg) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java b/jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java
index 50b619f91b..cf6cdeaab2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java
@@ -69,7 +69,7 @@ import org.jooq.XMLAggOrderByStep;
 /**
  * @author Lukas Eder
  */
-final class MultisetAgg<R extends Record> extends DefaultAggregateFunction<Result<R>> {
+final class MultisetAgg<R extends Record> extends AbstractAggregateFunction<Result<R>> {
 
     private final AbstractRow<R> row;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RatioToReport.java b/jOOQ/src/main/java/org/jooq/impl/RatioToReport.java
index db7189f4b2..8d8ba395bd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RatioToReport.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RatioToReport.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-final class RatioToReport extends DefaultAggregateFunction<BigDecimal> {
+final class RatioToReport extends AbstractAggregateFunction<BigDecimal> {
     private final Field<? extends Number> field;
 
     RatioToReport(Field<? extends Number> field) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
index 0e8b97a99b..ec45344b2b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrAvgx
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrAvgx(
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
index 4a99203189..e1377a1302 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrAvgy
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrAvgy(
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
index 3eb7f8fbe3..4e096e9968 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrCount
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrCount(
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
index 61f7313268..03b9cfe3b8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrIntercept
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrIntercept(
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
index be3d413356..5080780376 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrR2
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrR2(
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
index 70e14bc7a6..96b7e5eb9c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrSlope
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrSlope(
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
index 4c7454044d..71e1d98d0d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrSxx
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrSxx(
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
index d6ed7c7d23..968e8a4639 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrSxy
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrSxy(
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
index 1a4febd256..cd9f229034 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class RegrSyy
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     RegrSyy(
diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
index df4b4f1e8b..f7c800e897 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class StddevPop
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     StddevPop(
diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
index ee720b1e34..58da3b3a09 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class StddevSamp
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     StddevSamp(
diff --git a/jOOQ/src/main/java/org/jooq/impl/VarPop.java b/jOOQ/src/main/java/org/jooq/impl/VarPop.java
index 52877c075a..14afb18eff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VarPop.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class VarPop
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     VarPop(
diff --git a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
index 1a1a310581..9bc1e9f1b8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
@@ -66,7 +66,7 @@ import java.math.BigDecimal;
 @SuppressWarnings({ "rawtypes", "unused" })
 final class VarSamp
 extends
-    DefaultAggregateFunction<BigDecimal>
+    AbstractAggregateFunction<BigDecimal>
 {
 
     VarSamp(