diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
index d9ada22917..f8efcbcb56 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
@@ -49,6 +49,8 @@ import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
+// ...
+// ...
 import static org.jooq.conf.ParamType.INLINED;
 import static org.jooq.impl.Keywords.K_ALIAS;
 import static org.jooq.impl.Keywords.K_AS;
@@ -116,6 +118,8 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
 
 
 
+
+
     final Collection<? extends Statement> statements;
     final boolean                         alwaysWrapInBeginEnd;
 
@@ -135,11 +139,9 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
                        .visit(K_EXECUTE_BLOCK).sql(' ').visit(K_AS).formatSeparator();
 
                     ctx.data(DATA_FORCE_STATIC_STATEMENT, true);
-                    scopeDeclarations(ctx, c -> accept0(c));
                 }
-                else
-                    accept0(ctx);
 
+                accept0(ctx);
                 decrement(ctx.data(), DATA_BLOCK_NESTING);
                 break;
             }
@@ -194,7 +196,6 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
 
 
 
-
             case MYSQL: {
                 String name = randomName();
 
@@ -350,6 +351,15 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
index bb910b3bbc..ee7c36b292 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
@@ -280,6 +280,10 @@ package org.jooq.impl;
 
 
 
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowAssignment.java b/jOOQ/src/main/java/org/jooq/impl/RowAssignment.java
index 86dabacded..6c13e16cb3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowAssignment.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowAssignment.java
@@ -128,5 +128,6 @@ package org.jooq.impl;
 
 
 
+