diff --git a/jOOQ/src/main/java/org/jooq/impl/Alias.java b/jOOQ/src/main/java/org/jooq/impl/Alias.java
index 4f4b40bf63..7ec7b7b925 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Alias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Alias.java
@@ -75,7 +75,6 @@ import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.select;
 import static org.jooq.impl.Keywords.K_AS;
 import static org.jooq.impl.QueryPartListView.wrap;
-import static org.jooq.impl.Tools.renderUnqualifiedNames;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_AS_REQUIRED;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_UNALIAS_ALIASED_EXPRESSIONS;
 
@@ -261,13 +260,10 @@ final class Alias<Q extends QueryPart> extends AbstractQueryPart {
                         // The javac compiler doesn't like casting of generics
                         Object o = wrapped;
 
-                        if (context.declareTables() && o instanceof ArrayTable) {
-                            ArrayTable table = (ArrayTable) o;
-
-                            context.sql('(');
-                            renderUnqualifiedNames(context, table.fields());
-                            context.sql(')');
-                        }
+                        if (context.declareTables() && o instanceof ArrayTable)
+                            context.sql('(')
+                                   .visit(wrap(((ArrayTable) o).fields()).qualify(false).indentSize(0))
+                                   .sql(')');
 
                         break;
                     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index 1d2f2098bb..b0c8cc23b5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -76,9 +76,8 @@ import static org.jooq.impl.Keywords.K_VALUES;
 import static org.jooq.impl.Keywords.K_WHEN;
 import static org.jooq.impl.Keywords.K_WHERE;
 import static org.jooq.impl.Keywords.K_WITH_PRIMARY_KEY;
-import static org.jooq.impl.QueryPartCollectionView.wrap;
+import static org.jooq.impl.QueryPartListView.wrap;
 import static org.jooq.impl.Tools.EMPTY_FIELD;
-import static org.jooq.impl.Tools.renderUnqualifiedNames;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_WRAP_DERIVED_TABLES_IN_PARENTHESES;
 
 import java.util.ArrayList;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index d794c98bf5..7a4569eee2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -128,13 +128,13 @@ import static org.jooq.impl.Keywords.K_WINDOW;
 import static org.jooq.impl.Keywords.K_WITH_CHECK_OPTION;
 import static org.jooq.impl.Keywords.K_WITH_LOCK;
 import static org.jooq.impl.Keywords.K_WITH_READ_ONLY;
+import static org.jooq.impl.QueryPartCollectionView.wrap;
 import static org.jooq.impl.SQLDataType.VARCHAR;
 import static org.jooq.impl.ScopeMarkers.AFTER_LAST_TOP_LEVEL_CTE;
 import static org.jooq.impl.ScopeMarkers.BEFORE_FIRST_TOP_LEVEL_CTE;
 import static org.jooq.impl.Tools.EMPTY_FIELD;
 import static org.jooq.impl.Tools.fieldArray;
 import static org.jooq.impl.Tools.hasAmbiguousNames;
-import static org.jooq.impl.Tools.renderUnqualifiedNames;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_COLLECT_SEMI_ANTI_JOIN;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_INSERT_SELECT_WITHOUT_INSERT_COLUMN_LIST;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_NESTED_SET_OPERATIONS;
@@ -866,7 +866,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
                         // Render the OF [table-names] clause
                         default:
-                            renderUnqualifiedNames(context, forLockOfTables);
+                            context.visit(wrap(forLockOfTables).qualify(false).indentSize(0));
                             break;
                     }
                 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index faf5f22ba0..49ec366bfe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -230,7 +230,6 @@ import org.jooq.Field;
 import org.jooq.JSON;
 import org.jooq.JSONB;
 import org.jooq.Name;
-import org.jooq.Named;
 import org.jooq.OrderField;
 import org.jooq.Param;
 // ...
@@ -2753,36 +2752,6 @@ final class Tools {
         }
     }
 
-    /**
-     * Render a list of names of the <code>NamedQueryParts</code> contained in
-     * this list.
-     */
-    static final void renderUnqualifiedNames(Context<?> context, Fields<?> fields) {
-        renderUnqualifiedNames(context, list(fields.fields));
-    }
-
-    /**
-     * Render a list of names of the <code>NamedQueryParts</code> contained in
-     * this list.
-     */
-    static final void renderUnqualifiedNames(Context<?> context, Named... list) {
-        renderUnqualifiedNames(context, list(list));
-    }
-
-    /**
-     * Render a list of names of the <code>NamedQueryParts</code> contained in
-     * this list.
-     */
-    static final void renderUnqualifiedNames(Context<?> context, Collection<? extends Named> list) {
-        String separator = "";
-
-        for (Named named : list) {
-            context.sql(separator).visit(named.getUnqualifiedName());
-
-            separator = ", ";
-        }
-    }
-
     @SuppressWarnings("unchecked")
     static final <T> T[] combine(T[] array, T value) {
         T[] result = (T[]) java.lang.reflect.Array.newInstance(array.getClass().getComponentType(), array.length + 1);
diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
index 222212253c..b575c286fd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
@@ -196,7 +196,7 @@ implements
     @Override
     public final void accept(Context<?> ctx) {
         ctx.visit(K_WITH)
-           .sql(' ');
+           .separatorRequired(true);
 
         if (recursive
 
@@ -204,7 +204,7 @@ implements
 
         )
             ctx.visit(K_RECURSIVE)
-               .sql(' ');
+               .separatorRequired(true);
 
         CommonTableExpressionList c = cte;