diff --git a/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java b/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java
index 23effd56ba..7f88615c3c 100644
--- a/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java
+++ b/jOOQ/src/main/java/org/jooq/ContinueWhenStep.java
@@ -63,5 +63,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/Declaration.java b/jOOQ/src/main/java/org/jooq/Declaration.java
index 9c5f2cf2b7..01ed93fc8e 100644
--- a/jOOQ/src/main/java/org/jooq/Declaration.java
+++ b/jOOQ/src/main/java/org/jooq/Declaration.java
@@ -119,5 +119,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/ExitWhenStep.java b/jOOQ/src/main/java/org/jooq/ExitWhenStep.java
index 23effd56ba..7f88615c3c 100644
--- a/jOOQ/src/main/java/org/jooq/ExitWhenStep.java
+++ b/jOOQ/src/main/java/org/jooq/ExitWhenStep.java
@@ -63,5 +63,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/ForByStep.java b/jOOQ/src/main/java/org/jooq/ForByStep.java
index 8017dfe66e..a568ea2570 100644
--- a/jOOQ/src/main/java/org/jooq/ForByStep.java
+++ b/jOOQ/src/main/java/org/jooq/ForByStep.java
@@ -69,5 +69,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/ForInStep.java b/jOOQ/src/main/java/org/jooq/ForInStep.java
index d912f8b72e..54746d480c 100644
--- a/jOOQ/src/main/java/org/jooq/ForInStep.java
+++ b/jOOQ/src/main/java/org/jooq/ForInStep.java
@@ -105,5 +105,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/IfElseStep.java b/jOOQ/src/main/java/org/jooq/IfElseStep.java
index 6312365c62..f982dfb0d6 100644
--- a/jOOQ/src/main/java/org/jooq/IfElseStep.java
+++ b/jOOQ/src/main/java/org/jooq/IfElseStep.java
@@ -76,5 +76,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/IfThenStep.java b/jOOQ/src/main/java/org/jooq/IfThenStep.java
index a568ea2570..9fb7d0dbc0 100644
--- a/jOOQ/src/main/java/org/jooq/IfThenStep.java
+++ b/jOOQ/src/main/java/org/jooq/IfThenStep.java
@@ -70,5 +70,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/Label.java b/jOOQ/src/main/java/org/jooq/Label.java
index 37c207aebc..8cf25d7367 100644
--- a/jOOQ/src/main/java/org/jooq/Label.java
+++ b/jOOQ/src/main/java/org/jooq/Label.java
@@ -89,5 +89,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/LoopStep.java b/jOOQ/src/main/java/org/jooq/LoopStep.java
index a568ea2570..9fb7d0dbc0 100644
--- a/jOOQ/src/main/java/org/jooq/LoopStep.java
+++ b/jOOQ/src/main/java/org/jooq/LoopStep.java
@@ -70,5 +70,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/RepeatUntilStep.java b/jOOQ/src/main/java/org/jooq/RepeatUntilStep.java
index f3c70106c6..23effd56ba 100644
--- a/jOOQ/src/main/java/org/jooq/RepeatUntilStep.java
+++ b/jOOQ/src/main/java/org/jooq/RepeatUntilStep.java
@@ -62,5 +62,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/Variable.java b/jOOQ/src/main/java/org/jooq/Variable.java
index 54746d480c..af8cbb6271 100644
--- a/jOOQ/src/main/java/org/jooq/Variable.java
+++ b/jOOQ/src/main/java/org/jooq/Variable.java
@@ -106,5 +106,6 @@ package org.jooq;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Assignment.java b/jOOQ/src/main/java/org/jooq/impl/Assignment.java
index 5c67ffdde7..83d3dab8f2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Assignment.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Assignment.java
@@ -137,6 +137,10 @@ package org.jooq.impl;
 
 
 
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
index e8fde6e1de..5dedd3cc49 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
@@ -121,7 +121,7 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
             case FIREBIRD: {
                 if (increment(ctx.data(), DATA_BLOCK_NESTING)) {
                     ctx.paramType(INLINED)
-                       .visit(K_EXECUTE_BLOCK).sql(' ').visit(K_AS).sql(' ')
+                       .visit(K_EXECUTE_BLOCK).sql(' ').visit(K_AS)
                        .formatSeparator();
 
                     ctx.data(DATA_FORCE_STATIC_STATEMENT, true);
@@ -285,6 +285,10 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
 
 
 
+
+
+
+
 
 
 
@@ -317,6 +321,10 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
 
 
 
+
+
+
+
 
             ctx.sql(';');
     }
@@ -324,6 +332,20 @@ final class BlockImpl extends AbstractRowCountQuery implements Block {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeclarationImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeclarationImpl.java
index 1754e8e650..1b9d60eb5c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeclarationImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeclarationImpl.java
@@ -37,6 +37,13 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.SQLDialect.FIREBIRD;
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Exit.java b/jOOQ/src/main/java/org/jooq/impl/Exit.java
index b012b5fa2d..86dabacded 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Exit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Exit.java
@@ -127,5 +127,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/IfImpl.java b/jOOQ/src/main/java/org/jooq/impl/IfImpl.java
index fcabb1a158..cbb98aeac4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IfImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IfImpl.java
@@ -206,6 +206,14 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java b/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java
index bbac169a49..d31ef5257a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java
@@ -85,5 +85,6 @@ package org.jooq.impl;
 
 
 
+
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/LoopImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoopImpl.java
index e55e08b0b8..f5f8eeb78f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LoopImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LoopImpl.java
@@ -291,6 +291,18 @@ package org.jooq.impl;
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Return.java b/jOOQ/src/main/java/org/jooq/impl/Return.java
index c7f70190f7..afa226b9be 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Return.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Return.java
@@ -37,6 +37,17 @@
  */
 package org.jooq.impl;
 
+import static org.jooq.impl.Keywords.K_EXIT;
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/VariableImpl.java b/jOOQ/src/main/java/org/jooq/impl/VariableImpl.java
index 92a67ac8bc..2d870d65b2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VariableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VariableImpl.java
@@ -112,6 +112,10 @@ package org.jooq.impl;
 
 
 
+
+
+
+