--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/template/ActualParameter.java	Mon Apr 08 18:28:41 2013 +0200
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/template/ActualParameter.java	Mon Apr 15 18:50:19 2013 +0200
@@ -29,15 +29,17 @@
 public class ActualParameter {
 
     private final ParameterSpec specification;
-    private final TypeMirror actualType;
+    private TypeData typeSystemType;
     private TemplateMethod method;
     private final String localName;
     private final int index;
     private final boolean implicit;
+    private final TypeMirror type;
 
     public ActualParameter(ParameterSpec specification, TypeMirror actualType, int index, boolean implicit) {
         this.specification = specification;
-        this.actualType = actualType;
+        this.type = actualType;
+        this.typeSystemType = null;
 
         this.index = index;
         this.implicit = implicit;
@@ -49,7 +51,12 @@
         this.localName = valueName;
     }
 
-    public ActualParameter(ActualParameter parameter, TypeMirror otherType) {
+    public ActualParameter(ParameterSpec specification, TypeData actualType, int index, boolean implicit) {
+        this(specification, actualType.getPrimitiveType(), index, implicit);
+        this.typeSystemType = actualType;
+    }
+
+    public ActualParameter(ActualParameter parameter, TypeData otherType) {
         this(parameter.specification, otherType, parameter.index, parameter.implicit);
     }
 
@@ -77,12 +84,12 @@
         return method;
     }
 
-    public TypeMirror getActualType() {
-        return actualType;
+    public TypeMirror getType() {
+        return type;
     }
 
-    public TypeData getActualTypeData(TypeSystemData typeSystem) {
-        return typeSystem.findTypeData(actualType);
+    public TypeData getTypeSystemType() {
+        return typeSystemType;
     }
 
     public ActualParameter getPreviousParameter() {