diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainDropConstraintCascadeStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainDropConstraintCascadeStep.java
index b867165627..2406b04baf 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDomainDropConstraintCascadeStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDomainDropConstraintCascadeStep.java
@@ -74,6 +74,6 @@ public interface AlterDomainDropConstraintCascadeStep extends AlterDomainFinalSt
     /**
      * Add the <code>RESTRICT</code> clause to the <code>ALTER DOMAIN</code> statement.
      */
-    @Support({ FIREBIRD, H2, POSTGRES })
+    @Support({ FIREBIRD, POSTGRES })
     AlterDomainFinalStep restrict();
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
index c86604e8ba..e9f0a7f309 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -37,39 +37,14 @@
  */
 package org.jooq.impl;
 
-// ...
-import static org.jooq.SQLDialect.FIREBIRD;
-import static org.jooq.SQLDialect.POSTGRES;
-import static org.jooq.impl.DSL.check;
-import static org.jooq.impl.Keywords.K_ADD;
-import static org.jooq.impl.Keywords.K_ALTER;
-import static org.jooq.impl.Keywords.K_CASCADE;
-import static org.jooq.impl.Keywords.K_DOMAIN;
-import static org.jooq.impl.Keywords.K_DROP_CONSTRAINT;
-import static org.jooq.impl.Keywords.K_DROP_DEFAULT;
-import static org.jooq.impl.Keywords.K_DROP_NOT_NULL;
-import static org.jooq.impl.Keywords.K_IF_EXISTS;
-import static org.jooq.impl.Keywords.K_RENAME_CONSTRAINT;
-import static org.jooq.impl.Keywords.K_RENAME_TO;
-import static org.jooq.impl.Keywords.K_RESTRICT;
-import static org.jooq.impl.Keywords.K_SET_DEFAULT;
-import static org.jooq.impl.Keywords.K_SET_NOT_NULL;
-import static org.jooq.impl.Keywords.K_TO;
-import static org.jooq.impl.Tools.BooleanDataKey.DATA_CONSTRAINT_REFERENCE;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
 
-import java.util.Set;
+import org.jooq.*;
+import org.jooq.impl.*;
 
-import org.jooq.AlterDomainDropConstraintCascadeStep;
-import org.jooq.AlterDomainFinalStep;
-import org.jooq.AlterDomainRenameConstraintStep;
-import org.jooq.AlterDomainStep;
-import org.jooq.Configuration;
-import org.jooq.Constraint;
-import org.jooq.Context;
-import org.jooq.Domain;
-import org.jooq.Field;
-import org.jooq.Name;
-import org.jooq.SQLDialect;
+import java.util.*;
 
 /**
  * The <code>ALTER DOMAIN IF EXISTS</code> statement.
@@ -101,7 +76,7 @@ implements
     private       boolean    dropNotNull;
     private       Boolean    cascade;
     private       Constraint renameConstraintTo;
-
+    
     AlterDomainImpl(
         Configuration configuration,
         Domain domain,
@@ -179,7 +154,7 @@ implements
     // -------------------------------------------------------------------------
     // XXX: DSL API
     // -------------------------------------------------------------------------
-
+    
     @Override
     public final AlterDomainImpl<T> add(Constraint addConstraint) {
         this.addConstraint = addConstraint;
@@ -367,7 +342,7 @@ implements
 
         if (addConstraint != null) {
             if (ctx.family() == FIREBIRD)
-                ctx.visit(K_ADD).sql(' ').visit(check(((ConstraintImpl) addConstraint).$check()));
+                ctx.visit(K_ADD).sql(' ').visit(DSL.check(((ConstraintImpl) addConstraint).$check()));
             else
                 ctx.visit(K_ADD).sql(' ').visit(addConstraint);
         }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
index f4a13a3c54..ffbc61ad3f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -37,38 +37,14 @@
  */
 package org.jooq.impl;
 
-// ...
-import static org.jooq.SQLDialect.FIREBIRD;
-import static org.jooq.SQLDialect.POSTGRES;
-// ...
-import static org.jooq.impl.DSL.and;
-import static org.jooq.impl.DSL.check;
-import static org.jooq.impl.Keywords.K_AS;
-import static org.jooq.impl.Keywords.K_CREATE;
-import static org.jooq.impl.Keywords.K_DEFAULT;
-import static org.jooq.impl.Keywords.K_DOMAIN;
-import static org.jooq.impl.Keywords.K_FROM;
-import static org.jooq.impl.Keywords.K_IF_NOT_EXISTS;
-import static org.jooq.impl.Keywords.K_TYPE;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import org.jooq.*;
+import org.jooq.impl.*;
 
-import org.jooq.Condition;
-import org.jooq.Configuration;
-import org.jooq.Constraint;
-import org.jooq.Context;
-import org.jooq.CreateDomainAsStep;
-import org.jooq.CreateDomainConstraintStep;
-import org.jooq.CreateDomainDefaultStep;
-import org.jooq.CreateDomainFinalStep;
-import org.jooq.DataType;
-import org.jooq.Domain;
-import org.jooq.Field;
-import org.jooq.SQLDialect;
+import java.util.*;
 
 /**
  * The <code>CREATE DOMAIN IF NOT EXISTS</code> statement.
@@ -91,7 +67,7 @@ implements
     private       DataType<T>                      dataType;
     private       Field<T>                         default_;
     private       Collection<? extends Constraint> constraints;
-
+    
     CreateDomainImpl(
         Configuration configuration,
         Domain domain,
@@ -133,7 +109,7 @@ implements
     // -------------------------------------------------------------------------
     // XXX: DSL API
     // -------------------------------------------------------------------------
-
+    
     @Override
     public final <T> CreateDomainImpl<T> as(Class<T> dataType) {
         return as(DefaultDataType.getDataType(null, dataType));
@@ -218,7 +194,7 @@ implements
                 for (Constraint constraint : constraints)
                     conditions.add(((ConstraintImpl) constraint).$check());
 
-                ctx.formatSeparator().visit(check(and(conditions)));
+                ctx.formatSeparator().visit(DSL.check(DSL.and(conditions)));
             }
             else {
                 for (Constraint constraint : constraints)
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
index f65d1cf3f7..74b3b833a9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@@ -37,22 +37,14 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.SQLDialect.FIREBIRD;
-import static org.jooq.impl.Keywords.K_CASCADE;
-import static org.jooq.impl.Keywords.K_DOMAIN;
-import static org.jooq.impl.Keywords.K_DROP;
-import static org.jooq.impl.Keywords.K_IF_EXISTS;
-import static org.jooq.impl.Keywords.K_RESTRICT;
-import static org.jooq.impl.Keywords.K_TYPE;
+import static org.jooq.impl.Keywords.*;
+import static org.jooq.impl.Tools.BooleanDataKey.*;
+import static org.jooq.SQLDialect.*;
 
-import java.util.Set;
+import org.jooq.*;
+import org.jooq.impl.*;
 
-import org.jooq.Configuration;
-import org.jooq.Context;
-import org.jooq.Domain;
-import org.jooq.DropDomainCascadeStep;
-import org.jooq.DropDomainFinalStep;
-import org.jooq.SQLDialect;
+import java.util.*;
 
 /**
  * The <code>DROP DOMAIN IF EXISTS</code> statement.
@@ -71,7 +63,7 @@ implements
     private final Domain<?> domain;
     private final boolean   dropDomainIfExists;
     private       Boolean   cascade;
-
+    
     DropDomainImpl(
         Configuration configuration,
         Domain domain,
@@ -105,7 +97,7 @@ implements
     // -------------------------------------------------------------------------
     // XXX: DSL API
     // -------------------------------------------------------------------------
-
+    
     @Override
     public final DropDomainImpl cascade() {
         this.cascade = true;