diff --git a/src/main/java/com/mysema/codegen/model/TypeExtends.java b/src/main/java/com/mysema/codegen/model/TypeExtends.java
index eb630a1bc..7ce9bfe5b 100644
--- a/src/main/java/com/mysema/codegen/model/TypeExtends.java
+++ b/src/main/java/com/mysema/codegen/model/TypeExtends.java
@@ -5,6 +5,7 @@
  */
 package com.mysema.codegen.model;
 
+import java.util.Collections;
 import java.util.Set;
 
 import javax.annotation.Nullable;
@@ -30,11 +31,7 @@ public class TypeExtends extends TypeAdapter{
     
     @Override
     public String getGenericName(boolean asArgType){
-        if (!asArgType){
-            return "? extends " + super.getGenericName(true);
-        }else{
-            return super.getGenericName(asArgType);
-        }
+        return getGenericName(asArgType, Collections.<String>emptySet(),Collections.<String>emptySet());
     }
 
     @Override
diff --git a/src/main/java/com/mysema/codegen/model/TypeSuper.java b/src/main/java/com/mysema/codegen/model/TypeSuper.java
index c4805e501..08e3eac14 100644
--- a/src/main/java/com/mysema/codegen/model/TypeSuper.java
+++ b/src/main/java/com/mysema/codegen/model/TypeSuper.java
@@ -5,6 +5,7 @@
  */
 package com.mysema.codegen.model;
 
+import java.util.Collections;
 import java.util.Set;
 
 import javax.annotation.Nullable;
@@ -37,11 +38,7 @@ public class TypeSuper extends TypeAdapter{
     
     @Override
     public String getGenericName(boolean asArgType){
-        if (!asArgType){
-            return "? super " + superType.getGenericName(true);
-        }else{
-            return super.getGenericName(asArgType);
-        }
+        return getGenericName(asArgType, Collections.<String>emptySet(),Collections.<String>emptySet());
     }
 
     @Override
diff --git a/src/main/java/com/mysema/codegen/model/Types.java b/src/main/java/com/mysema/codegen/model/Types.java
index 2b3b8434d..12f759322 100644
--- a/src/main/java/com/mysema/codegen/model/Types.java
+++ b/src/main/java/com/mysema/codegen/model/Types.java
@@ -18,6 +18,7 @@ import java.util.Set;
  * @author tiwe
  *
  */
+@SuppressWarnings("unchecked")
 public final class Types {
 
     public static final ClassType<Object> OBJECT = new ClassType<Object>(TypeCategory.SIMPLE,Object.class);
@@ -33,7 +34,7 @@ public final class Types {
     public static final ClassType<Byte> BYTE = new ClassType<Byte>(TypeCategory.NUMERIC,Byte.class, byte.class);
     
     public static final ClassType<Character> CHAR = new ClassType<Character>(TypeCategory.COMPARABLE,Character.class, char.class);
-
+    
     public static final ClassType<Collection> COLLECTION = new ClassType<Collection>(TypeCategory.COLLECTION, Collection.class, OBJECT);
 
     public static final ClassType<Double> DOUBLE = new ClassType<Double>(TypeCategory.NUMERIC,Double.class, double.class);
@@ -62,4 +63,4 @@ public final class Types {
     
     private Types(){}
     
-}
\ No newline at end of file
+}