diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
index f09338ce82..20e2bdfc26 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
@@ -147,9 +147,20 @@ implements
 
     @Override
     public final void accept(Context<?> ctx) {
-        ctx.visit(K_CREATE).sql(' ').visit(K_TYPE).sql(' ')
-           .visit(type).sql(' ')
-           .visit(K_AS).sql(' ');
+        ctx.visit(K_CREATE).sql(' ');
+
+
+
+
+
+
+        ctx.visit(K_TYPE).sql(' ')
+           .visit(type).sql(' ');
+
+
+
+
+        ctx.visit(K_AS).sql(' ');
 
         if (!values.isEmpty()) {
             ctx.visit(K_ENUM).sql(" (")
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
index 94665bef84..89400494bc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
@@ -156,7 +156,14 @@ implements
     }
 
     private final void accept1(Context<?> ctx) {
-        ctx.visit(K_DROP).sql(' ').visit(K_TYPE);
+        ctx.visit(K_DROP).sql(' ');
+
+
+
+
+
+
+        ctx.visit(K_TYPE);
 
         if (ifExists && supportsIfExists(ctx))
             ctx.sql(' ').visit(K_IF_EXISTS);
@@ -167,6 +174,11 @@ implements
             ctx.sql(' ').visit(K_CASCADE);
         else if (cascade == Cascade.RESTRICT)
             ctx.sql(' ').visit(K_RESTRICT);
+
+
+
+
+
     }