Removed TypeArgument and simplified type system a little

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/FormattingUtils.java

@@ -30,7 +30,7 @@ import org.openzen.zenscript.codemodel.statement.TryCatchStatement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.statement.WhileStatement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -128,7 +128,7 @@ public class FormattingUtils {
 			result.append("<");
 			
 			int index = 0;
-			for (TypeArgument typeArgument : arguments.typeArguments) {
+			for (StoredType typeArgument : arguments.typeArguments) {
 				if (index > 0)
 					result.append(", ");
 				result.append(typeFormatter.format(typeArgument));

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/TypeFormatter.java

@@ -13,7 +13,7 @@ import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
@@ -22,7 +22,6 @@ import org.openzen.zenscript.codemodel.type.IteratorTypeID;
 import org.openzen.zenscript.codemodel.type.RangeTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import stdlib.Chars;
 import org.openzen.zenscript.codemodel.type.TypeVisitor;
@@ -44,12 +43,8 @@ public class TypeFormatter implements TypeVisitor<String>, GenericParameterBound
 		return type.accept(this);
 	}
 	
-	public String format(TypeArgument type) {
-		return type.storage == null ? format(type.type) : format(type.stored());
-	}
-	
 	public String format(StoredType type) {
-		return type.type.accept(this) + "`" + type.storage.toString();
+		return type.type.accept(this) + (type.getSpecifiedStorage() == null ? "" : "`" + type.getSpecifiedStorage().toString());
 	}
 
 	@Override
@@ -102,7 +97,7 @@ public class TypeFormatter implements TypeVisitor<String>, GenericParameterBound
 		result.append(importedName);
 		result.append("<");
 		int index = 0;
-		for (TypeArgument typeParameter : definition.typeArguments) {
+		for (StoredType typeParameter : definition.typeArguments) {
 			if (index > 0)
 				result.append(", ");
 			
@@ -123,17 +118,8 @@ public class TypeFormatter implements TypeVisitor<String>, GenericParameterBound
 	}
 
 	@Override
-	public String visitModified(ModifiedTypeID type) {
-		StringBuilder result = new StringBuilder();
-		if (type.isConst())
-			result.append("const ");
-		if (type.isImmutable())
-			result.append("immutable ");
-		result.append(type.accept(this));
-		if (type.isOptional())
-			result.append("?");
-		
-		return result.toString();
+	public String visitOptional(OptionalTypeID type) {
+		return type.accept(this) + "?";
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/FunctionHeader.java

@@ -16,7 +16,6 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 
@@ -232,14 +231,14 @@ public class FunctionHeader {
 		return result.toString();
 	}
 	
-	public TypeArgument[] inferTypes(LocalMemberCache cache, CallArguments arguments, List<StoredType> resultHint) {
+	public StoredType[] inferTypes(LocalMemberCache cache, CallArguments arguments, List<StoredType> resultHint) {
 		if (arguments.arguments.length != this.parameters.length)
 			return null;
 		
-		Map<TypeParameter, TypeArgument> mapping = new HashMap<>();
+		Map<TypeParameter, StoredType> mapping = new HashMap<>();
 		if (!resultHint.isEmpty()) {
 			for (StoredType hint : resultHint) {
-				Map<TypeParameter, TypeArgument> temp = returnType.inferTypeParameters(cache, hint.asArgument());
+				Map<TypeParameter, StoredType> temp = returnType.inferTypeParameters(cache, hint);
 				if (temp != null) {
 					mapping = temp;
 					break;
@@ -249,7 +248,7 @@ public class FunctionHeader {
 		
 		// TODO: lambda header inference
 		for (int i = 0; i < parameters.length; i++) {
-			Map<TypeParameter, TypeArgument> forParameter = parameters[i].type.inferTypeParameters(cache, arguments.arguments[i].type.asArgument());
+			Map<TypeParameter, StoredType> forParameter = parameters[i].type.inferTypeParameters(cache, arguments.arguments[i].type);
 			if (forParameter == null)
 				return null;
 			
@@ -259,7 +258,7 @@ public class FunctionHeader {
 		if (mapping.size() > typeParameters.length)
 			return null;
 		
-		TypeArgument[] result = new TypeArgument[typeParameters.length];
+		StoredType[] result = new StoredType[typeParameters.length];
 		for (int i = 0; i < typeParameters.length; i++) {
 			TypeParameter typeParameter = typeParameters[i];
 			if (!mapping.containsKey(typeParameter)) {
@@ -366,7 +365,7 @@ public class FunctionHeader {
 	
 	public FunctionHeader instanceForCall(GlobalTypeRegistry registry, CallArguments arguments) {
 		if (arguments.getNumberOfTypeArguments() > 0) {
-			Map<TypeParameter, TypeArgument> typeParameters = TypeArgument.getMapping(this.typeParameters, arguments.typeArguments);
+			Map<TypeParameter, StoredType> typeParameters = StoredType.getMapping(this.typeParameters, arguments.typeArguments);
 			return withGenericArguments(
 					registry,
 					new GenericMapper(registry, typeParameters));
@@ -377,7 +376,7 @@ public class FunctionHeader {
 	
 	public FunctionHeader withGenericArguments(GlobalTypeRegistry registry, GenericMapper mapper) {
 		if (typeParameters.length > 0)
-			mapper = mapper.getInner(registry, TypeArgument.getSelfMapping(registry, typeParameters));
+			mapper = mapper.getInner(registry, StoredType.getSelfMapping(registry, typeParameters));
 		
 		StoredType returnType = this.returnType.instance(mapper);
 		FunctionParameter[] parameters = new FunctionParameter[this.parameters.length];
@@ -387,11 +386,11 @@ public class FunctionHeader {
 		return new FunctionHeader(typeParameters, returnType, thrownType == null ? null : thrownType.instance(mapper), storage, parameters);
 	}
 	
-	public FunctionHeader fillGenericArguments(GlobalTypeRegistry registry, TypeArgument[] arguments, GenericMapper typeParameterMapping) {
+	public FunctionHeader fillGenericArguments(GlobalTypeRegistry registry, StoredType[] arguments, GenericMapper typeParameterMapping) {
 		if (arguments == null || arguments.length == 0)
 			return this;
 		
-		Map<TypeParameter, TypeArgument> typeArguments = TypeArgument.getMapping(typeParameters, arguments);
+		Map<TypeParameter, StoredType> typeArguments = StoredType.getMapping(typeParameters, arguments);
 		GenericMapper mapper = typeParameterMapping.getInner(registry, typeArguments);
 		
 		StoredType returnType = this.returnType.instance(mapper);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/GenericMapper.java

@@ -13,8 +13,6 @@ import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
-import org.openzen.zenscript.codemodel.type.TypeID;
 
 /**
  *
@@ -24,19 +22,19 @@ public class GenericMapper {
 	public static final GenericMapper EMPTY = new GenericMapper(null, Collections.emptyMap());
 	
 	public final GlobalTypeRegistry registry;
-	private final Map<TypeParameter, TypeArgument> mapping;
+	private final Map<TypeParameter, StoredType> mapping;
 	
-	public GenericMapper(GlobalTypeRegistry registry, Map<TypeParameter, TypeArgument> mapping) {
+	public GenericMapper(GlobalTypeRegistry registry, Map<TypeParameter, StoredType> mapping) {
 		this.registry = registry;
 		this.mapping = mapping;
 	}
 	
-	public Map<TypeParameter, TypeArgument> getMapping() {
+	public Map<TypeParameter, StoredType> getMapping() {
 		return mapping;
 	}
 	
-	public TypeArgument map(CodePosition position, TypeArgument original) {
-		return mapping.isEmpty() ? original : original.instance(position, this, original.storage);
+	public StoredType map(CodePosition position, StoredType original) {
+		return mapping.isEmpty() ? original : original.instance(this);
 	}
 	
 	public StoredType[] map(StoredType[] original) {
@@ -49,27 +47,27 @@ public class GenericMapper {
 		return mapped;
 	}
 	
-	public TypeArgument map(GenericTypeID type) {
+	public StoredType map(GenericTypeID type) {
 		if (!mapping.containsKey(type.parameter))
 			throw new IllegalStateException("No mapping found for type " + type);
 		
-		return mapping.containsKey(type.parameter) ? mapping.get(type.parameter) : new TypeArgument(type, null);
+		return mapping.containsKey(type.parameter) ? mapping.get(type.parameter) : type.stored();
 	}
 	
 	public FunctionHeader map(FunctionHeader original) {
 		return mapping.isEmpty() ? original : original.withGenericArguments(registry, this);
 	}
 	
-	public GenericMapper getInner(GlobalTypeRegistry registry, Map<TypeParameter, TypeArgument> mapping) {
-		Map<TypeParameter, TypeArgument> resultMap = new HashMap<>(this.mapping);
+	public GenericMapper getInner(GlobalTypeRegistry registry, Map<TypeParameter, StoredType> mapping) {
+		Map<TypeParameter, StoredType> resultMap = new HashMap<>(this.mapping);
 		resultMap.putAll(mapping);
 		return new GenericMapper(registry, resultMap);
 	}
 	
 	public GenericMapper getInner(GlobalTypeRegistry registry, TypeParameter[] parameters) {
-		Map<TypeParameter, TypeArgument> resultMap = new HashMap<>(this.mapping);
+		Map<TypeParameter, StoredType> resultMap = new HashMap<>(this.mapping);
 		for (TypeParameter parameter : parameters)
-			resultMap.put(parameter, new TypeArgument(registry.getGeneric(parameter), null));
+			resultMap.put(parameter, new StoredType(registry.getGeneric(parameter), null));
 		return new GenericMapper(registry, resultMap);
 	}
 	
@@ -81,7 +79,7 @@ public class GenericMapper {
 		StringBuilder result = new StringBuilder();
 		result.append('{');
 		boolean first = true;
-		for (Map.Entry<TypeParameter, TypeArgument> entry : mapping.entrySet()) {
+		for (Map.Entry<TypeParameter, StoredType> entry : mapping.entrySet()) {
 			if (first) {
 				first = false;
 			} else {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/context/TypeContext.java

@@ -11,7 +11,6 @@ import java.util.Map;
 import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 
@@ -60,7 +59,7 @@ public class TypeContext {
 	}
 	
 	public GenericMapper getMapper() {
-		Map<TypeParameter, TypeArgument> mapper = TypeArgument.getSelfMapping(moduleContext.registry, typeParameters);
+		Map<TypeParameter, StoredType> mapper = StoredType.getSelfMapping(moduleContext.registry, typeParameters);
 		return new GenericMapper(moduleContext.registry, mapper);
 	}
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/definition/ExpansionDefinition.java

@@ -8,14 +8,14 @@ package org.openzen.zenscript.codemodel.definition;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.Module;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class ExpansionDefinition extends HighLevelDefinition {
-	public TypeArgument target;
+	public StoredType target;
 	
 	public ExpansionDefinition(CodePosition position, Module module, ZSPackage pkg, int modifiers, HighLevelDefinition outerDefinition) {
 		super(position, module, pkg, null, modifiers, outerDefinition);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/CallArguments.java

@@ -10,7 +10,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.FunctionHeader;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -19,17 +19,17 @@ import org.openzen.zenscript.codemodel.type.TypeArgument;
 public class CallArguments {
 	public static final CallArguments EMPTY = new CallArguments(new Expression[0]);
 	
-	public final TypeArgument[] typeArguments;
+	public final StoredType[] typeArguments;
 	public final Expression[] arguments;
 	
 	public CallArguments(Expression... arguments) {
-		this.typeArguments = TypeArgument.NONE;
+		this.typeArguments = StoredType.NONE;
 		this.arguments = arguments;
 	}
 	
-	public CallArguments(TypeArgument[] typeArguments, Expression[] arguments) {
+	public CallArguments(StoredType[] typeArguments, Expression[] arguments) {
 		if (typeArguments == null)
-			typeArguments = TypeArgument.NONE;
+			typeArguments = StoredType.NONE;
 		if (arguments == null)
 			throw new IllegalArgumentException("Arguments cannot be null!");
 		
@@ -37,11 +37,11 @@ public class CallArguments {
 		this.arguments = arguments;
 	}
 	
-	public CallArguments(TypeArgument... dummy) {
-		this.typeArguments = TypeArgument.NONE;
+	public CallArguments(StoredType... dummy) {
+		this.typeArguments = StoredType.NONE;
 		this.arguments = new Expression[dummy.length];
 		for (int i = 0; i < dummy.length; i++)
-			arguments[i] = new DummyExpression(dummy[i].stored());
+			arguments[i] = new DummyExpression(dummy[i]);
 	}
 	
 	public int getNumberOfTypeArguments() {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/expression/Expression.java

@@ -25,7 +25,6 @@ import org.openzen.zenscript.codemodel.statement.StatementTransformer;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.storage.UniqueStorageTag;
 
 /**
@@ -131,7 +130,7 @@ public abstract class Expression implements IPartialExpression {
 	}
 	
 	@Override
-	public TypeArgument[] getTypeArguments() {
+	public StoredType[] getTypeArguments() {
 		return null;
 	}
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/generic/ParameterTypeBound.java

@@ -33,7 +33,7 @@ public class ParameterTypeBound extends TypeParameterBound {
 
 	@Override
 	public void registerMembers(LocalMemberCache cache, TypeMembers members) {
-		cache.get(this.type.stored(members.type.storage))
+		cache.get(this.type.stored(members.type.getSpecifiedStorage()))
 				.copyMembersTo(position, members, TypeMemberPriority.FROM_TYPE_BOUNDS);
 	}
 

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/ImplementationMember.java

@@ -16,7 +16,6 @@ import org.openzen.zenscript.codemodel.member.ref.ImplementationMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.TypeID;
@@ -41,10 +40,10 @@ public class ImplementationMember extends DefinitionMember {
 
 	@Override
 	public void registerTo(TypeMembers members, TypeMemberPriority priority, GenericMapper mapper) {
-		TypeID instancedType = mapper == null ? type : mapper.map(position, new TypeArgument(type, null)).type;
+		TypeID instancedType = mapper == null ? type : mapper.map(position, type.stored()).type;
 		members.addImplementation(new ImplementationMemberRef(this, members.type, instancedType), priority);
 		
-		TypeMembers interfaceTypeMembers = members.getMemberCache().get(instancedType.stored(members.type.storage));
+		TypeMembers interfaceTypeMembers = members.getMemberCache().get(instancedType.stored(members.type.getActualStorage()));
 		interfaceTypeMembers.copyMembersTo(position, members, TypeMemberPriority.INTERFACE);
 	}
 

CodeModel/src/main/java/org/openzen/zenscript/codemodel/member/InnerDefinition.java

@@ -11,7 +11,7 @@ import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -19,19 +19,19 @@ import org.openzen.zenscript.codemodel.type.TypeArgument;
  */
 public class InnerDefinition {
 	public final HighLevelDefinition definition;
-	public final Map<TypeParameter, TypeArgument> outerTypeArguments;
+	public final Map<TypeParameter, StoredType> outerTypeArguments;
 	
 	public InnerDefinition(HighLevelDefinition definition) {
 		this.definition = definition;
 		this.outerTypeArguments = Collections.emptyMap();
 	}
 	
-	public InnerDefinition(HighLevelDefinition definition, Map<TypeParameter, TypeArgument> outerTypeArguments) {
+	public InnerDefinition(HighLevelDefinition definition, Map<TypeParameter, StoredType> outerTypeArguments) {
 		this.definition = definition;
 		this.outerTypeArguments = outerTypeArguments;
 	}
 	
-	public DefinitionTypeID instance(GlobalTypeRegistry registry, TypeArgument[] typeArguments, DefinitionTypeID outer) {
+	public DefinitionTypeID instance(GlobalTypeRegistry registry, StoredType[] typeArguments, DefinitionTypeID outer) {
 		return registry.getForDefinition(definition, typeArguments, outer);
 	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/IPartialExpression.java

@@ -19,8 +19,6 @@ import org.openzen.zenscript.codemodel.member.IDefinitionMember;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
-import org.openzen.zenscript.codemodel.type.TypeID;
 
 /**
  *
@@ -41,7 +39,7 @@ public interface IPartialExpression {
 	
 	Expression call(CodePosition position, TypeScope scope, List<StoredType> hints, CallArguments arguments) throws CompileException;
 	
-	TypeArgument[] getTypeArguments();
+	StoredType[] getTypeArguments();
 	
 	/**
 	 * Retrieves the (primary) member this expression refers to, or null if there is no primary target.

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialGlobalExpression.java

@@ -16,7 +16,6 @@ import org.openzen.zenscript.codemodel.expression.GlobalExpression;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 
 /**
  *
@@ -26,9 +25,9 @@ public class PartialGlobalExpression implements IPartialExpression {
 	private final CodePosition position;
 	private final String name;
 	private final IPartialExpression resolution;
-	private final TypeArgument[] typeArguments;
+	private final StoredType[] typeArguments;
 	
-	public PartialGlobalExpression(CodePosition position, String name, IPartialExpression resolution, TypeArgument[] typeArguments) {
+	public PartialGlobalExpression(CodePosition position, String name, IPartialExpression resolution, StoredType[] typeArguments) {
 		this.position = position;
 		this.name = name;
 		this.resolution = resolution;
@@ -61,7 +60,7 @@ public class PartialGlobalExpression implements IPartialExpression {
 	}
 
 	@Override
-	public TypeArgument[] getTypeArguments() {
+	public StoredType[] getTypeArguments() {
 		return typeArguments;
 	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialMemberGroupExpression.java

@@ -19,7 +19,6 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberGroup;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.TypeMember;
 
 /**
@@ -30,7 +29,7 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 	private final CodePosition position;
 	private final Expression target;
 	private final TypeMemberGroup group;
-	private final TypeArgument[] typeArguments;
+	private final StoredType[] typeArguments;
 	private final boolean allowStaticUsage;
 	private final TypeScope scope;
 	
@@ -39,7 +38,7 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 			TypeScope scope,
 			Expression target,
 			TypeMemberGroup group,
-			TypeArgument[] typeArguments,
+			StoredType[] typeArguments,
 			boolean allowStaticMembers)
 	{
 		this.position = position;
@@ -56,7 +55,7 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 			Expression target,
 			String name,
 			FunctionalMemberRef member,
-			TypeArgument[] typeArguments,
+			StoredType[] typeArguments,
 			boolean allowStaticMembers)
 	{
 		this.position = position;
@@ -127,7 +126,7 @@ public class PartialMemberGroupExpression implements IPartialExpression {
 	}
 
 	@Override
-	public TypeArgument[] getTypeArguments() {
+	public StoredType[] getTypeArguments() {
 		return typeArguments;
 	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialPackageExpression.java

@@ -17,7 +17,6 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 
 /**
  *
@@ -58,7 +57,7 @@ public class PartialPackageExpression implements IPartialExpression {
 	}
 
 	@Override
-	public TypeArgument[] getTypeArguments() {
+	public StoredType[] getTypeArguments() {
 		return null;
 	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialStaticMemberGroupExpression.java

@@ -18,7 +18,6 @@ import org.openzen.zenscript.codemodel.type.member.TypeMemberGroup;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPriority;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
@@ -27,7 +26,7 @@ import org.openzen.zenscript.codemodel.type.TypeID;
  * @author Hoofdgebruiker
  */
 public class PartialStaticMemberGroupExpression implements IPartialExpression {
-	public static PartialStaticMemberGroupExpression forMethod(CodePosition position, TypeScope scope, String name, TypeID target, FunctionalMemberRef method, TypeArgument[] typeArguments) {
+	public static PartialStaticMemberGroupExpression forMethod(CodePosition position, TypeScope scope, String name, TypeID target, FunctionalMemberRef method, StoredType[] typeArguments) {
 		TypeMemberGroup group = new TypeMemberGroup(true, name);
 		group.addMethod(method, TypeMemberPriority.SPECIFIED);
 		return new PartialStaticMemberGroupExpression(position, scope, target, group, typeArguments);
@@ -37,9 +36,9 @@ public class PartialStaticMemberGroupExpression implements IPartialExpression {
 	private final TypeScope scope;
 	private final TypeID target;
 	private final TypeMemberGroup group;
-	private final TypeArgument[] typeArguments;
+	private final StoredType[] typeArguments;
 	
-	public PartialStaticMemberGroupExpression(CodePosition position, TypeScope scope, TypeID target, TypeMemberGroup group, TypeArgument[] typeArguments) {
+	public PartialStaticMemberGroupExpression(CodePosition position, TypeScope scope, TypeID target, TypeMemberGroup group, StoredType[] typeArguments) {
 		this.position = position;
 		this.scope = scope;
 		this.group = group;
@@ -81,7 +80,7 @@ public class PartialStaticMemberGroupExpression implements IPartialExpression {
 	}
 
 	@Override
-	public TypeArgument[] getTypeArguments() {
+	public StoredType[] getTypeArguments() {
 		return typeArguments;
 	}
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialTypeExpression.java

@@ -19,7 +19,6 @@ import org.openzen.zenscript.codemodel.expression.LambdaClosure;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.type.storage.StaticExpressionStorageTag;
 
@@ -30,9 +29,9 @@ import org.openzen.zenscript.codemodel.type.storage.StaticExpressionStorageTag;
 public class PartialTypeExpression implements IPartialExpression {
 	private final CodePosition position;
 	private final StoredType type;
-	private final TypeArgument[] typeArguments;
+	private final StoredType[] typeArguments;
 	
-	public PartialTypeExpression(CodePosition position, TypeID type, TypeArgument[] typeArguments) {
+	public PartialTypeExpression(CodePosition position, TypeID type, StoredType[] typeArguments) {
 		this.position = position;
 		this.type = type.stored(StaticExpressionStorageTag.INSTANCE);
 		this.typeArguments = typeArguments;
@@ -72,7 +71,7 @@ public class PartialTypeExpression implements IPartialExpression {
 	}
 
 	@Override
-	public TypeArgument[] getTypeArguments() {
+	public StoredType[] getTypeArguments() {
 		return typeArguments;
 	}
 	

CodeModel/src/main/java/org/openzen/zenscript/codemodel/partial/PartialVariantOptionExpression.java

@@ -20,8 +20,6 @@ import org.openzen.zenscript.codemodel.member.ref.VariantOptionRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
-import org.openzen.zenscript.codemodel.type.TypeID;
 
 /**
  *
@@ -70,7 +68,7 @@ public class PartialVariantOptionExpression implements IPartialExpression {
 	}
 
 	@Override
-	public TypeArgument[] getTypeArguments() {
-		return TypeArgument.NONE;
+	public StoredType[] getTypeArguments() {
+		return StoredType.NONE;
 	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/DefinitionScope.java

@@ -29,7 +29,6 @@ import org.openzen.zenscript.codemodel.partial.PartialTypeExpression;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPreparer;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
@@ -37,7 +36,6 @@ import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.type.storage.BorrowStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StaticExpressionStorageTag;
-import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
 
 /**
  *
@@ -60,21 +58,19 @@ public class DefinitionScope extends BaseScope {
 		this.outer = outer;
 		this.definition = definition;
 		
-		Map<TypeParameter, TypeArgument> typeParameters = new HashMap<>();
+		Map<TypeParameter, StoredType> typeParameters = new HashMap<>();
 		if (definition instanceof ExpansionDefinition) {
 			ExpansionDefinition expansion = (ExpansionDefinition)definition;
-			type = expansion.target.storage == null
-					? expansion.target.stored(BorrowStorageTag.THIS)
-					: expansion.target.stored();
+			type = expansion.target;
 			this.typeParameters = expansion.typeParameters;
-			typeParameters = TypeArgument.getSelfMapping(outer.getTypeRegistry(), expansion.typeParameters);
+			typeParameters = StoredType.getSelfMapping(outer.getTypeRegistry(), expansion.typeParameters);
 		} else {
 			DefinitionTypeID definitionType = outer.getTypeRegistry().getForMyDefinition(definition);
 			type = definitionType.stored(BorrowStorageTag.THIS);
 			
 			List<TypeParameter> typeParameterList = new ArrayList<>();
 			while (definitionType != null) {
-				typeParameters = TypeArgument.getSelfMapping(outer.getTypeRegistry(), definitionType.definition.typeParameters);
+				typeParameters = StoredType.getSelfMapping(outer.getTypeRegistry(), definitionType.definition.typeParameters);
 				typeParameterList.addAll(Arrays.asList(definitionType.definition.typeParameters));
 				
 				definitionType = definitionType.definition.isStatic() ? null : definitionType.outer;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/scope/ExpressionScope.java

@@ -26,7 +26,6 @@ import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberPreparer;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
@@ -41,7 +40,7 @@ public class ExpressionScope extends BaseScope {
 	private final DollarEvaluator dollar;
 	
 	public final List<StoredType> hints;
-	public final Map<TypeParameter, TypeArgument> genericInferenceMap;
+	public final Map<TypeParameter, StoredType> genericInferenceMap;
 	public final Map<String, Function<CodePosition, Expression>> innerVariables = new HashMap<>();
 	
 	public ExpressionScope(BaseScope outer) {
@@ -69,7 +68,7 @@ public class ExpressionScope extends BaseScope {
 			BaseScope scope,
 			List<StoredType> hints,
 			DollarEvaluator dollar,
-			Map<TypeParameter, TypeArgument> genericInferenceMap,
+			Map<TypeParameter, StoredType> genericInferenceMap,
 			Map<String, Function<CodePosition, Expression>> innerVariables) {
 		this.outer = scope;
 		this.hints = hints;
@@ -110,7 +109,7 @@ public class ExpressionScope extends BaseScope {
 		if (header.typeParameters == null)
 			return this;
 		
-		Map<TypeParameter, TypeArgument> genericInferenceMap = new HashMap<>();
+		Map<TypeParameter, StoredType> genericInferenceMap = new HashMap<>();
 		for (TypeParameter parameter : header.typeParameters)
 			genericInferenceMap.put(parameter, null);
 		

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/ArrayTypeID.java

@@ -55,11 +55,6 @@ public class ArrayTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isValueType() {
@@ -77,8 +72,8 @@ public class ArrayTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		return mapper.registry.getArray(elementType.instance(mapper), dimension).argument(storage);
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		return mapper.registry.getArray(elementType.instance(mapper), dimension).stored(storage);
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/AssocTypeID.java

@@ -32,10 +32,10 @@ public class AssocTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
 		return mapper.registry.getAssociative(
 				keyType.instance(mapper),
-				valueType.instance(mapper)).argument(storage);
+				valueType.instance(mapper)).stored(storage);
 	}
 	
 	@Override
@@ -57,11 +57,6 @@ public class AssocTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isValueType() {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/BasicTypeID.java

@@ -41,12 +41,10 @@ public enum BasicTypeID implements TypeID {
 	
 	public final String name;
 	public final StoredType stored;
-	public final TypeArgument argument;
 	
 	BasicTypeID(String name) {
 		this.name = name;
-		stored = new StoredType(this, ValueStorageTag.INSTANCE);
-		argument = new TypeArgument(this, ValueStorageTag.INSTANCE);
+		stored = new StoredType(this, null);
 	}
 	
 	@Override
@@ -55,8 +53,8 @@ public enum BasicTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		return new TypeArgument(this, storage);
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		return stored(storage);
 	}
 	
 	@Override
@@ -78,11 +76,6 @@ public enum BasicTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isValueType() {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/DefinitionTypeID.java

@@ -29,22 +29,22 @@ public class DefinitionTypeID implements TypeID {
 		if (definition.typeParameters != null && definition.typeParameters.length > 0)
 			throw new IllegalArgumentException("Definition has type arguments!");
 		
-		return new DefinitionTypeID(registry, definition, TypeArgument.NONE);
+		return new DefinitionTypeID(registry, definition, StoredType.NONE);
 	}
 	
 	public final HighLevelDefinition definition;
-	public final TypeArgument[] typeArguments;
+	public final StoredType[] typeArguments;
 	public final DefinitionTypeID outer;
 	private TypeID normalized;
 	
 	public TypeID superType;
 	
-	public DefinitionTypeID(GlobalTypeRegistry typeRegistry, HighLevelDefinition definition, TypeArgument[] typeArguments) {
+	public DefinitionTypeID(GlobalTypeRegistry typeRegistry, HighLevelDefinition definition, StoredType[] typeArguments) {
 		this(typeRegistry, definition, typeArguments, null);
 	}
 	
 	// For inner classes of generic outer classes
-	public DefinitionTypeID(GlobalTypeRegistry typeRegistry, HighLevelDefinition definition, TypeArgument[] typeArguments, DefinitionTypeID outer) {
+	public DefinitionTypeID(GlobalTypeRegistry typeRegistry, HighLevelDefinition definition, StoredType[] typeArguments, DefinitionTypeID outer) {
 		if (typeArguments == null)
 			throw new NullPointerException("typeParameters cannot be null");
 		if (typeArguments.length != definition.getNumberOfGenericParameters())
@@ -67,7 +67,7 @@ public class DefinitionTypeID implements TypeID {
 		if (definition instanceof AliasDefinition)
 			return true;
 		
-		for (TypeArgument typeArgument : typeArguments)
+		for (StoredType typeArgument : typeArguments)
 			if (!typeArgument.getNormalized().equals(typeArgument))
 				return true;
 		if (outer != null && !outer.getNormalized().equals(outer))
@@ -82,7 +82,7 @@ public class DefinitionTypeID implements TypeID {
 			if (alias.type == null)
 				throw new IllegalStateException("Alias type not yet initialized!");
 			
-			Map<TypeParameter, TypeArgument> typeMapping = new HashMap<>();
+			Map<TypeParameter, StoredType> typeMapping = new HashMap<>();
 			for (int i = 0; i < definition.typeParameters.length; i++)
 				typeMapping.put(definition.typeParameters[i], typeArguments[i].getNormalized());
 			GenericMapper mapper = new GenericMapper(typeRegistry, typeMapping);
@@ -90,7 +90,7 @@ public class DefinitionTypeID implements TypeID {
 			return result;
 		}
 		
-		TypeArgument[] normalizedTypeParameters = new TypeArgument[typeArguments.length];
+		StoredType[] normalizedTypeParameters = new StoredType[typeArguments.length];
 		for (int i = 0; i < normalizedTypeParameters.length; i++)
 			normalizedTypeParameters[i] = typeArguments[i].getNormalized();
 		
@@ -101,8 +101,8 @@ public class DefinitionTypeID implements TypeID {
 		return typeArguments.length > 0;
 	}
 	
-	public Map<TypeParameter, TypeArgument> getTypeParameterMapping() {
-		Map<TypeParameter, TypeArgument> mapping = new HashMap<>();
+	public Map<TypeParameter, StoredType> getTypeParameterMapping() {
+		Map<TypeParameter, StoredType> mapping = new HashMap<>();
 		DefinitionTypeID current = this;
 		do {
 			if (current.typeArguments != null) {
@@ -120,7 +120,7 @@ public class DefinitionTypeID implements TypeID {
 	
 	public DefinitionTypeID(HighLevelDefinition definition) {
 		this.definition = definition;
-		this.typeArguments = TypeArgument.NONE;
+		this.typeArguments = StoredType.NONE;
 		this.superType = definition.getSuperType();
 		this.outer = null;
 	}
@@ -131,23 +131,23 @@ public class DefinitionTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
 		if (!hasTypeParameters() && outer == null)
-			return argument(storage);
+			return stored(storage);
 		if (mapper.getMapping().isEmpty())
-			return argument(storage);
+			return stored(storage);
 		if (mapper.registry == null)
 			throw new NullPointerException();
 		
-		TypeArgument[] instancedArguments = TypeArgument.NONE;
+		StoredType[] instancedArguments = StoredType.NONE;
 		if (hasTypeParameters()) {
-			instancedArguments = new TypeArgument[typeArguments.length];
+			instancedArguments = new StoredType[typeArguments.length];
 			for (int i = 0; i < typeArguments.length; i++)
 				instancedArguments[i] = typeArguments[i].instance(mapper);
 		}
 		
 		DefinitionTypeID instancedOuter = outer == null ? null : (DefinitionTypeID)outer.instance(mapper, storage).type;
-		return mapper.registry.getForDefinition(definition, instancedArguments, instancedOuter).argument(storage);
+		return mapper.registry.getForDefinition(definition, instancedArguments, instancedOuter).stored(storage);
 	}
 	
 	@Override
@@ -169,11 +169,6 @@ public class DefinitionTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isValueType() {
@@ -203,7 +198,7 @@ public class DefinitionTypeID implements TypeID {
 	@Override
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
 		if (hasTypeParameters()) {
-			for (TypeArgument typeArgument : typeArguments)
+			for (StoredType typeArgument : typeArguments)
 				if (typeArgument.type.hasInferenceBlockingTypeParameters(parameters))
 					return true;
 		}
@@ -264,7 +259,7 @@ public class DefinitionTypeID implements TypeID {
 
 	@Override
 	public void extractTypeParameters(List<TypeParameter> typeParameters) {
-		for (TypeArgument type : this.typeArguments)
+		for (StoredType type : this.typeArguments)
 			type.type.extractTypeParameters(typeParameters);
 	}
 

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/FunctionTypeID.java

@@ -37,8 +37,8 @@ public class FunctionTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		return new TypeArgument(mapper.registry.getFunction(mapper.map(header)), storage);
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		return mapper.registry.getFunction(mapper.map(header)).stored(storage);
 	}
 	
 	@Override
@@ -55,11 +55,6 @@ public class FunctionTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isValueType() {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/GenericMapTypeID.java

@@ -48,11 +48,6 @@ public class GenericMapTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isValueType() {
@@ -70,8 +65,8 @@ public class GenericMapTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		return new TypeArgument(mapper.registry.getGenericMap(value.instance(mapper), key), storage);
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		return mapper.registry.getGenericMap(value.instance(mapper), key).stored(storage);
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/GenericName.java

@@ -13,13 +13,13 @@ import java.util.List;
  */
 public class GenericName {
 	public final String name;
-	public final TypeArgument[] arguments;
+	public final StoredType[] arguments;
 	
 	public GenericName(String name) {
-		this(name, TypeArgument.NONE);
+		this(name, StoredType.NONE);
 	}
 	
-	public GenericName(String name, TypeArgument[] arguments) {
+	public GenericName(String name, StoredType[] arguments) {
 		if (arguments == null)
 			throw new NullPointerException("Arguments cannot be null");
 		

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/GenericTypeID.java

@@ -24,8 +24,8 @@ public class GenericTypeID implements TypeID {
 		this.parameter = parameter;
 	}
 	
-	public boolean matches(LocalMemberCache cache, TypeArgument type) {
-		if (type.storage != null && parameter.storage != null && !type.storage.equals(parameter.storage))
+	public boolean matches(LocalMemberCache cache, StoredType type) {
+		if (type.getSpecifiedStorage() != null && parameter.storage != null && !type.getActualStorage().equals(parameter.storage))
 			return false;
 		
 		return parameter.matches(cache, type.type);
@@ -37,8 +37,9 @@ public class GenericTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		return mapper.map(this).argument(StorageTag.union(parameter.storage, storage));
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		StoredType mapped = mapper.map(this);
+		return new StoredType(mapped.type, StorageTag.union(mapped.getSpecifiedStorage(), storage));
 	}
 	
 	@Override
@@ -55,11 +56,6 @@ public class GenericTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isValueType() {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/GlobalTypeRegistry.java

@@ -26,7 +26,7 @@ public class GlobalTypeRegistry {
 	private final Map<DefinitionTypeID, DefinitionTypeID> definitionTypes = new HashMap<>();
 	private final Map<GenericTypeID, GenericTypeID> genericTypes = new HashMap<>();
 	
-	private final Map<ModifiedTypeID, ModifiedTypeID> modifiedTypes = new HashMap<>();
+	private final Map<OptionalTypeID, OptionalTypeID> optionalTypes = new HashMap<>();
 	
 	public final ZSPackage stdlib;
 	
@@ -76,11 +76,11 @@ public class GlobalTypeRegistry {
 	}
 	
 	public DefinitionTypeID getForMyDefinition(HighLevelDefinition definition) {
-		TypeArgument[] typeArguments = TypeArgument.NONE;
+		StoredType[] typeArguments = StoredType.NONE;
 		if (definition.getNumberOfGenericParameters() > 0) {
-			typeArguments = new TypeArgument[definition.getNumberOfGenericParameters()];
+			typeArguments = new StoredType[definition.getNumberOfGenericParameters()];
 			for (int i = 0; i < definition.typeParameters.length; i++)
-				typeArguments[i] = new TypeArgument(getGeneric(definition.typeParameters[i]), definition.typeParameters[i].storage);
+				typeArguments[i] = new StoredType(getGeneric(definition.typeParameters[i]), definition.typeParameters[i].storage);
 		}
 		DefinitionTypeID outer = null;
 		if (definition.outerDefinition != null)
@@ -89,35 +89,17 @@ public class GlobalTypeRegistry {
 		return getForDefinition(definition, typeArguments, outer);
 	}
 	
-	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, TypeArgument... typeArguments) {
+	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, StoredType... typeArguments) {
 		return this.getForDefinition(definition, typeArguments, null);
 	}
 	
-	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, TypeArgument[] typeArguments, DefinitionTypeID outer) {
+	public DefinitionTypeID getForDefinition(HighLevelDefinition definition, StoredType[] typeArguments, DefinitionTypeID outer) {
 		DefinitionTypeID id = new DefinitionTypeID(this, definition, typeArguments, definition.isStatic() ? null : outer);
-		
-		if (definitionTypes.containsKey(id)) {
-			return definitionTypes.get(id);
-		} else {
-			definitionTypes.put(id, id);
-			return id;
-		}
+		return internalize(definitionTypes, id);
 	}
 	
 	public TypeID getOptional(TypeID original) {
-		return getModified(ModifiedTypeID.MODIFIER_OPTIONAL, original);
-	}
-	
-	public TypeID getModified(int modifiers, TypeID type) {
-		if (modifiers == 0)
-			return type;
-		if (type instanceof ModifiedTypeID) {
-			ModifiedTypeID modified = (ModifiedTypeID)type;
-			return getModified(modified.modifiers | modifiers, modified.baseType);
-		}
-		
-		ModifiedTypeID result = new ModifiedTypeID(this, modifiers, type);
-		return internalize(modifiedTypes, result);
+		return internalize(optionalTypes, new OptionalTypeID(this, original));
 	}
 	
 	private <T> T internalize(Map<T, T> identityMap, T id) {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/ISymbol.java

@@ -15,7 +15,7 @@ import org.openzen.zenscript.codemodel.scope.BaseScope;
  * @author Hoofdgebruiker
  */
 public interface ISymbol {
-	public IPartialExpression getExpression(CodePosition position, BaseScope scope, TypeArgument[] typeArguments);
+	public IPartialExpression getExpression(CodePosition position, BaseScope scope, StoredType[] typeArguments);
 	
-	public TypeID getType(CodePosition position, TypeResolutionContext context, TypeArgument[] typeArguments);
+	public TypeID getType(CodePosition position, TypeResolutionContext context, StoredType[] typeArguments);
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/InvalidTypeID.java

@@ -35,8 +35,8 @@ public class InvalidTypeID implements TypeID {
 	}
 
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		return new TypeArgument(this, storage);
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		return stored(storage);
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/IteratorTypeID.java

@@ -61,11 +61,6 @@ public class IteratorTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isDestructible() {
@@ -83,9 +78,9 @@ public class IteratorTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
 		StoredType[] instanced = mapper.map(iteratorTypes);
-		return new TypeArgument(mapper.registry.getIterator(instanced), storage);
+		return mapper.registry.getIterator(instanced).stored(storage);
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/ModifiedTypeID.java → CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/OptionalTypeID.java

@@ -17,22 +17,16 @@ import org.openzen.zenscript.codemodel.type.storage.StorageTag;
  *
  * @author Hoofdgebruiker
  */
-public class ModifiedTypeID implements TypeID {
-	public static final int MODIFIER_OPTIONAL = 1;
-	public static final int MODIFIER_CONST = 2;
-	public static final int MODIFIER_IMMUTABLE = 4;
-	
-	public final int modifiers;
+public class OptionalTypeID implements TypeID {
 	public final TypeID baseType;
 	private final TypeID normalized;
 	private final GlobalTypeRegistry registry;
 	
-	public ModifiedTypeID(GlobalTypeRegistry registry, int modifiers, TypeID baseType) {
-		this.modifiers = modifiers;
+	public OptionalTypeID(GlobalTypeRegistry registry, TypeID baseType) {
 		this.baseType = baseType;
 		this.registry = registry;
 		
-		normalized = baseType.getNormalized() == baseType ? this : registry.getModified(modifiers, baseType.getNormalized());
+		normalized = baseType.getNormalized() == baseType ? this : registry.getOptional(baseType.getNormalized());
 	}
 	
 	@Override
@@ -41,14 +35,14 @@ public class ModifiedTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		TypeArgument base = baseType.instance(mapper, storage);
-		return new TypeArgument(mapper.registry.getModified(modifiers, base.type), base.storage);
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		StoredType base = baseType.instance(mapper, storage);
+		return mapper.registry.getOptional(base.type).stored(StorageTag.union(base.getSpecifiedStorage(), storage));
 	}
 	
 	@Override
 	public <R> R accept(TypeVisitor<R> visitor) {
-		return visitor.visitModified(this);
+		return visitor.visitOptional(this);
 	}
 	
 	@Override
@@ -58,17 +52,7 @@ public class ModifiedTypeID implements TypeID {
 
 	@Override
 	public boolean isOptional() {
-		return (modifiers & MODIFIER_OPTIONAL) > 0;
-	}
-	
-	@Override
-	public boolean isImmutable() {
-		return (modifiers & MODIFIER_IMMUTABLE) > 0;
-	}
-
-	@Override
-	public boolean isConst() {
-		return (modifiers & MODIFIER_CONST) > 0;
+		return true;
 	}
 	
 	@Override
@@ -88,22 +72,7 @@ public class ModifiedTypeID implements TypeID {
 	
 	@Override
 	public TypeID withoutOptional() {
-		return without(MODIFIER_OPTIONAL);
-	}
-	
-	@Override
-	public TypeID withoutImmutable() {
-		return without(MODIFIER_IMMUTABLE);
-	}
-	
-	@Override
-	public TypeID withoutConst() {
-		return without(MODIFIER_CONST);
-	}
-	
-	private TypeID without(int modifiers) {
-		int newModifiers = this.modifiers & ~modifiers;
-		return newModifiers == 0 ? baseType : registry.getModified(newModifiers, baseType);
+		return baseType;
 	}
 
 	@Override
@@ -125,7 +94,6 @@ public class ModifiedTypeID implements TypeID {
 	public int hashCode() {
 		int hash = 3;
 		hash = 79 * hash + Objects.hashCode(this.baseType);
-		hash = 79 * hash + modifiers;
 		return hash;
 	}
 
@@ -137,34 +105,20 @@ public class ModifiedTypeID implements TypeID {
 			return false;
 		if (getClass() != obj.getClass())
 			return false;
-		final ModifiedTypeID other = (ModifiedTypeID) obj;
-		return this.baseType == other.baseType
-				&& this.modifiers == other.modifiers;
+		final OptionalTypeID other = (OptionalTypeID) obj;
+		return this.baseType == other.baseType;
 	}
 	
 	@Override
 	public String toString() {
-		StringBuilder result = new StringBuilder();
-		if ((modifiers & MODIFIER_IMMUTABLE) > 0)
-			result.append("immutable ");
-		if ((modifiers & MODIFIER_CONST) > 0)
-			result.append("const ");
-		result.append(baseType.toString());
-		if ((modifiers & MODIFIER_OPTIONAL) > 0)
-			result.append("?");
-		return result.toString();
+		return baseType.toString() + "?";
 	}
 	
 	@Override
 	public String toString(StorageTag storage) {
 		StringBuilder result = new StringBuilder();
-		if ((modifiers & MODIFIER_IMMUTABLE) > 0)
-			result.append("immutable ");
-		if ((modifiers & MODIFIER_CONST) > 0)
-			result.append("const ");
 		result.append(baseType.toString(storage));
-		if ((modifiers & MODIFIER_OPTIONAL) > 0)
-			result.append("?");
+		result.append("?");
 		return result.toString();
 	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/RangeTypeID.java

@@ -11,7 +11,6 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
-import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
 
 /**
  *
@@ -34,7 +33,7 @@ public class RangeTypeID implements TypeID {
 			normalized = registry.getRange(baseType.getNormalized());
 		}
 		
-		stored = new StoredType(this, baseType.storage);
+		stored = new StoredType(this, baseType.getSpecifiedStorage());
 	}
 	
 	@Override
@@ -43,8 +42,8 @@ public class RangeTypeID implements TypeID {
 	}
 	
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		return mapper.registry.getRange(baseType.instance(mapper)).argument(storage);
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		return mapper.registry.getRange(baseType.instance(mapper)).stored(storage);
 	}
 	
 	@Override
@@ -61,11 +60,6 @@ public class RangeTypeID implements TypeID {
 	public boolean isOptional() {
 		return false;
 	}
-
-	@Override
-	public boolean isConst() {
-		return false;
-	}
 	
 	@Override
 	public boolean isValueType() {

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/StoredType.java

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -12,6 +13,7 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
+import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
 
@@ -20,24 +22,44 @@ import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
  * @author Hoofdgebruiker
  */
 public class StoredType {
+	public static Map<TypeParameter, StoredType> getMapping(TypeParameter[] parameters, StoredType[] arguments) {
+		Map<TypeParameter, StoredType> typeArguments = new HashMap<>();
+		for (int i = 0; i < parameters.length; i++)
+			typeArguments.put(parameters[i], arguments[i]);
+		return typeArguments;
+	}
+	
+	public static Map<TypeParameter, StoredType> getSelfMapping(GlobalTypeRegistry registry, TypeParameter[] parameters) {
+		Map<TypeParameter, StoredType> typeArguments = new HashMap<>();
+		for (TypeParameter parameter : parameters)
+			typeArguments.put(parameter, registry.getGeneric(parameter).stored(parameter.storage));
+		return typeArguments;
+	}
+	
 	public static final StoredType[] NONE = new StoredType[0];
 	
 	public final TypeID type;
-	public final StorageTag storage;
+	private final StorageTag storage;
 	
 	public StoredType(TypeID type, StorageTag storage) {
-		if (storage == null)
-			throw new NullPointerException();
-		
-		if (type.isValueType())
-			storage = ValueStorageTag.INSTANCE;
-		else if (storage == ValueStorageTag.INSTANCE)
+		if (/*!type.isValueType() && */storage == ValueStorageTag.INSTANCE)
 			throw new IllegalArgumentException("storage of a nonvalue type cannot be value");
 		
 		this.type = type;
 		this.storage = storage;
 	}
 	
+	public StorageTag getSpecifiedStorage() {
+		return storage;
+	}
+	
+	public StorageTag getActualStorage() {
+		if (storage != null)
+			return storage;
+		
+		return type.isValueType() ? ValueStorageTag.INSTANCE : AutoStorageTag.INSTANCE;
+	}
+	
 	public StoredType getNormalized() {
 		return type.getNormalized() == type ? this : new StoredType(type, storage);
 	}
@@ -48,16 +70,15 @@ public class StoredType {
 	}
 	
 	public StoredType instance(GenericMapper mapper) {
-		TypeArgument result = type.instance(mapper, storage);
-		return result == type ? this : result.stored();
+		return type.instance(mapper, storage);
 	}
 	
 	public boolean isDestructible() {
-		return type.isDestructible() && storage.isDestructible();
+		return type.isDestructible() && getActualStorage().isDestructible();
 	}
 	
 	public boolean isDestructible(Set<HighLevelDefinition> scanning) {
-		return type.isDestructible(scanning) && storage.isDestructible();
+		return type.isDestructible(scanning) && getActualStorage().isDestructible();
 	}
 	
 	public boolean hasDefaultValue() {
@@ -69,11 +90,11 @@ public class StoredType {
 	}
 	
 	public boolean isConst() {
-		return storage.isConst();
+		return getActualStorage().isConst();
 	}
 	
 	public boolean isImmutable() {
-		return storage.isImmutable();
+		return getActualStorage().isImmutable();
 	}
 	
 	public boolean isBasic(BasicTypeID type) {
@@ -88,21 +109,13 @@ public class StoredType {
 		return new StoredType(type.withoutOptional(), storage);
 	}
 	
-	public StoredType withoutConst() {
-		return new StoredType(type.withoutConst(), storage);
-	}
-	
-	public StoredType withoutImmutable() {
-		return new StoredType(type.withoutImmutable(), storage);
-	}
-	
 	public boolean hasInferenceBlockingTypeParameters(TypeParameter[] parameters) {
 		return type.hasInferenceBlockingTypeParameters(parameters);
 	}
 	
 	// Infers type parameters for this type so it matches with targetType
 	// returns false if that isn't possible
-	public Map<TypeParameter, TypeArgument> inferTypeParameters(LocalMemberCache cache, TypeArgument targetType) {
+	public Map<TypeParameter, StoredType> inferTypeParameters(LocalMemberCache cache, StoredType targetType) {
 		return type.inferTypeParameters(cache, targetType);
 	}
 	
@@ -122,10 +135,6 @@ public class StoredType {
 		return (DefinitionTypeID)type;
 	}
 	
-	public TypeArgument asArgument() {
-		return new TypeArgument(type, storage);
-	}
-	
 	@Override
 	public int hashCode() {
 		int hash = 5;
@@ -148,15 +157,15 @@ public class StoredType {
 	
 	@Override
 	public String toString() {
-		return type.toString(storage);
+		return storage == null ? type.toString() : type.toString(storage);
 	}
 	
 	public static class MatchingTypeVisitor implements TypeVisitor<Boolean> {
 		private final TypeID type;
-		private final Map<TypeParameter, TypeArgument> mapping;
+		private final Map<TypeParameter, StoredType> mapping;
 		private final LocalMemberCache cache;
 		
-		public MatchingTypeVisitor(LocalMemberCache cache, TypeID type, Map<TypeParameter, TypeArgument> mapping) {
+		public MatchingTypeVisitor(LocalMemberCache cache, TypeID type, Map<TypeParameter, StoredType> mapping) {
 			this.type = type;
 			this.mapping = mapping;
 			this.cache = cache;
@@ -179,7 +188,7 @@ public class StoredType {
 				if (arrayType.dimension != array.dimension)
 					return false;
 				
-				return match(arrayType.elementType, array.elementType.asArgument());
+				return match(arrayType.elementType, array.elementType);
 			} else {
 				return false;
 			}
@@ -189,8 +198,8 @@ public class StoredType {
 		public Boolean visitAssoc(AssocTypeID assoc) {
 			if (type instanceof AssocTypeID) {
 				AssocTypeID assocType = (AssocTypeID) type;
-				return match(assocType.keyType, assoc.keyType.asArgument())
-						&& match(assocType.valueType, assoc.valueType.asArgument());
+				return match(assocType.keyType, assoc.keyType)
+						&& match(assocType.valueType, assoc.valueType);
 			} else {
 				return false;
 			}
@@ -205,7 +214,7 @@ public class StoredType {
 				
 				boolean result = true;
 				for (int i = 0; i < iteratorType.iteratorTypes.length; i++)
-					result = result && match(iterator.iteratorTypes[i], iteratorType.iteratorTypes[i].asArgument());
+					result = result && match(iterator.iteratorTypes[i], iteratorType.iteratorTypes[i]);
 				
 				return result;
 			} else {
@@ -220,11 +229,11 @@ public class StoredType {
 				if (functionType.header.parameters.length != function.header.parameters.length)
 					return false;
 				
-				if (!match(functionType.header.getReturnType(), function.header.getReturnType().asArgument()))
+				if (!match(functionType.header.getReturnType(), function.header.getReturnType()))
 					return false;
 				
 				for (int i = 0; i < function.header.parameters.length; i++) {
-					if (!match(functionType.header.parameters[i].type, function.header.parameters[i].type.asArgument()))
+					if (!match(functionType.header.parameters[i].type, function.header.parameters[i].type))
 						return false;
 				}
 				
@@ -243,7 +252,7 @@ public class StoredType {
 				
 				if (definition.typeArguments != null) {
 					for (int i = 0; i < definitionType.typeArguments.length; i++) {
-						if (!match(definitionType.typeArguments[i].stored(), definition.typeArguments[i]))
+						if (!match(definitionType.typeArguments[i], definition.typeArguments[i]))
 							return false;
 					}
 				}
@@ -258,8 +267,8 @@ public class StoredType {
 		public Boolean visitGeneric(GenericTypeID generic) {
 			if (mapping.containsKey(generic.parameter)) {
 				return mapping.get(generic.parameter) == type;
-			} else if (type == generic || generic.matches(cache, new TypeArgument(type, null))) {
-				mapping.put(generic.parameter, new TypeArgument(type, null));
+			} else if (type == generic || generic.matches(cache, type.stored())) {
+				mapping.put(generic.parameter, type.stored());
 				return true;
 			} else {
 				return false;
@@ -270,31 +279,31 @@ public class StoredType {
 		public Boolean visitRange(RangeTypeID range) {
 			if (type instanceof RangeTypeID) {
 				RangeTypeID rangeType = (RangeTypeID) type;
-				return match(rangeType.baseType, range.baseType.asArgument());
+				return match(rangeType.baseType, range.baseType);
 			} else {
 				return false;
 			}
 		}
 
 		@Override
-		public Boolean visitModified(ModifiedTypeID type) {
-			if (this.type instanceof ModifiedTypeID) {
-				ModifiedTypeID constType = (ModifiedTypeID) this.type;
-				return match(constType.baseType, new TypeArgument(type.baseType, null));
+		public Boolean visitOptional(OptionalTypeID type) {
+			if (this.type instanceof OptionalTypeID) {
+				OptionalTypeID constType = (OptionalTypeID) this.type;
+				return match(constType.baseType, type.baseType.stored());
 			} else {
 				return false;
 			}
 		}
 		
-		private boolean match(StoredType type, TypeArgument pattern) {
+		private boolean match(StoredType type, StoredType pattern) {
 			if (pattern.storage != null && type.storage != pattern.storage)
 				return false;
 			
-			return TypeMatcher.match(cache, type.asArgument(), pattern) != null;
+			return TypeMatcher.match(cache, type, pattern) != null;
 		}
 		
-		private boolean match(TypeID type, TypeArgument pattern) {
-			return TypeMatcher.match(cache, new TypeArgument(type, null), pattern) != null;
+		private boolean match(TypeID type, StoredType pattern) {
+			return TypeMatcher.match(cache, type.stored(), pattern) != null;
 		}
 
 		@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/StringTypeID.java

@@ -68,8 +68,8 @@ public class StringTypeID implements TypeID {
 	}
 
 	@Override
-	public TypeArgument instance(GenericMapper mapper, StorageTag storage) {
-		return argument(storage);
+	public StoredType instance(GenericMapper mapper, StorageTag storage) {
+		return new StoredType(this, storage);
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeArgument.java

@@ -1,111 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.zenscript.codemodel.type;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import org.openzen.zencode.shared.CodePosition;
-import org.openzen.zencode.shared.CompileExceptionCode;
-import org.openzen.zenscript.codemodel.GenericMapper;
-import org.openzen.zenscript.codemodel.generic.TypeParameter;
-import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
-import org.openzen.zenscript.codemodel.type.storage.SharedStorageTag;
-import org.openzen.zenscript.codemodel.type.storage.StorageTag;
-import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class TypeArgument {
-	public static Map<TypeParameter, TypeArgument> getMapping(TypeParameter[] parameters, TypeArgument[] arguments) {
-		Map<TypeParameter, TypeArgument> typeArguments = new HashMap<>();
-		for (int i = 0; i < parameters.length; i++)
-			typeArguments.put(parameters[i], arguments[i]);
-		return typeArguments;
-	}
-	
-	public static Map<TypeParameter, TypeArgument> getSelfMapping(GlobalTypeRegistry registry, TypeParameter[] parameters) {
-		Map<TypeParameter, TypeArgument> typeArguments = new HashMap<>();
-		for (TypeParameter parameter : parameters)
-			typeArguments.put(parameter, new TypeArgument(registry.getGeneric(parameter), parameter.storage));
-		return typeArguments;
-	}
-	
-	public static final TypeArgument[] NONE = new TypeArgument[0];
-	
-	public final TypeID type;
-	public final StorageTag storage; // can be null
-	
-	public TypeArgument(TypeID type, StorageTag storage) {
-		this.type = type;
-		this.storage = storage;
-	}
-	
-	public TypeArgument instance(GenericMapper mapper) {
-		return type.instance(mapper, storage);
-	}
-	
-	public TypeArgument instance(CodePosition position, GenericMapper mapper, StorageTag storage) {
-		if (storage != null && this.storage != null && !storage.equals(this.storage))
-			return new TypeArgument(new InvalidTypeID(position, CompileExceptionCode.INCOMPATIBLE_STORAGE_TAG, "Incompatible storage tag"), null);
-		
-		return type.instance(mapper, storage);
-	}
-	
-	public TypeArgument getNormalized() {
-		return type.getNormalized() == type ? this : new TypeArgument(type, storage);
-	}
-	
-	public StoredType stored() {
-		return new StoredType(type, storage == null ? AutoStorageTag.INSTANCE : storage);
-	}
-	
-	public StoredType stored(StorageTag storage) {
-		return new StoredType(type, storage);
-	}
-	
-	public TypeArgument argument(StorageTag storage) {
-		return storage == null ? this : new TypeArgument(type, storage);
-	}
-	
-	public boolean isBasic(BasicTypeID type) {
-		return this.type == type;
-	}
-	
-	@Override
-	public String toString() {
-		if (storage == null)
-			return type.toString();
-		
-		return type.toString() + "`" + storage.toString();
-	}
-
-	@Override
-	public int hashCode() {
-		int hash = 3;
-		hash = 53 * hash + Objects.hashCode(this.type);
-		hash = 53 * hash + Objects.hashCode(this.storage);
-		return hash;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		final TypeArgument other = (TypeArgument) obj;
-		return Objects.equals(this.type, other.type)
-				&& Objects.equals(this.storage, other.storage);
-	}
-}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeID.java

@@ -12,7 +12,6 @@ import org.openzen.zenscript.codemodel.GenericMapper;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
-import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
 
@@ -27,7 +26,7 @@ public interface TypeID {
 		return null;
 	}
 	
-	TypeArgument instance(GenericMapper mapper, StorageTag storage);
+	StoredType instance(GenericMapper mapper, StorageTag storage);
 	
 	TypeID getNormalized();
 	
@@ -41,8 +40,8 @@ public interface TypeID {
 	
 	// Infers type parameters for this type so it matches with targetType
 	// returns false if that isn't possible
-	default Map<TypeParameter, TypeArgument> inferTypeParameters(LocalMemberCache cache, TypeArgument targetType) {
-		return TypeMatcher.match(cache, new TypeArgument(this, null), targetType);
+	default Map<TypeParameter, StoredType> inferTypeParameters(LocalMemberCache cache, StoredType targetType) {
+		return TypeMatcher.match(cache, stored(), targetType);
 	}
 	
 	void extractTypeParameters(List<TypeParameter> typeParameters);
@@ -56,25 +55,13 @@ public interface TypeID {
 	}
 	
 	default StoredType stored() {
-		return new StoredType(this, AutoStorageTag.INSTANCE);
-	}
-	
-	default TypeArgument argument(StorageTag storage) {
-		return new TypeArgument(this, storage);
+		return new StoredType(this, null);
 	}
 	
 	default boolean isOptional() {
 		return false;
 	}
 	
-	default boolean isConst() {
-		return false;
-	}
-	
-	default boolean isImmutable() {
-		return false;
-	}
-	
 	default boolean isGeneric() {
 		return false;
 	}
@@ -85,14 +72,6 @@ public interface TypeID {
 		throw new UnsupportedOperationException("Not an optional type");
 	}
 	
-	default TypeID withoutConst() {
-		throw new UnsupportedOperationException("Not a const type");
-	}
-	
-	default TypeID withoutImmutable() {
-		throw new UnsupportedOperationException("Not an immutable type");
-	}
-	
 	default boolean isVariant() {
 		return false;
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeMatcher.java

@@ -15,7 +15,7 @@ import org.openzen.zenscript.codemodel.type.member.LocalMemberCache;
  * @author Hoofdgebruiker
  */
 public class TypeMatcher implements TypeVisitorWithContext<TypeMatcher.Matching, Boolean, RuntimeException> {
-	public static Map<TypeParameter, TypeArgument> match(LocalMemberCache cache, TypeArgument type, TypeArgument pattern) {
+	public static Map<TypeParameter, StoredType> match(LocalMemberCache cache, StoredType type, StoredType pattern) {
 		Matching matching = new Matching(cache, type);
 		if (pattern.type.accept(matching, INSTANCE))
 			return matching.mapping;
@@ -127,8 +127,8 @@ public class TypeMatcher implements TypeVisitorWithContext<TypeMatcher.Matching,
 	@Override
 	public Boolean visitGeneric(Matching context, GenericTypeID generic) {
 		if (context.mapping.containsKey(generic.parameter)) {
-			TypeArgument argument = context.mapping.get(generic.parameter);
-			return argument.type == context.type && (argument.storage == null || argument.storage == context.type.storage);
+			StoredType argument = context.mapping.get(generic.parameter);
+			return argument.type == context.type && (argument.getSpecifiedStorage() == null || argument.getSpecifiedStorage() == context.type.getSpecifiedStorage());
 		} else if (context.type.type == generic || generic.matches(context.cache, context.type)) {
 			context.mapping.put(generic.parameter, context.type);
 			return true;
@@ -148,25 +148,21 @@ public class TypeMatcher implements TypeVisitorWithContext<TypeMatcher.Matching,
 	}
 
 	@Override
-	public Boolean visitModified(Matching context, ModifiedTypeID type) {
-		if (context.type.type instanceof ModifiedTypeID) {
-			ModifiedTypeID modified = (ModifiedTypeID) context.type.type;
-			return match(context, modified.baseType.argument(null), type.baseType.argument(null));
+	public Boolean visitModified(Matching context, OptionalTypeID type) {
+		if (context.type.type instanceof OptionalTypeID) {
+			OptionalTypeID modified = (OptionalTypeID) context.type.type;
+			return match(context, modified.baseType.stored(), type.baseType.stored());
 		} else {
 			return false;
 		}
 	}
 
-	private boolean match(Matching context, TypeArgument type, TypeArgument pattern) {
-		if (pattern.storage != null && !pattern.storage.equals(type.storage))
+	private boolean match(Matching context, StoredType type, StoredType pattern) {
+		if (pattern.getSpecifiedStorage() != null && !pattern.getSpecifiedStorage().equals(type.getSpecifiedStorage()))
 			return false;
 		
 		return pattern.type.accept(context.withType(type), this);
 	}
-	
-	private boolean match(Matching context, StoredType type, StoredType pattern) {
-		return match(context, type.asArgument(), pattern.asArgument());
-	}
 
 	@Override
 	public Boolean visitGenericMap(Matching context, GenericMapTypeID map) {
@@ -175,22 +171,22 @@ public class TypeMatcher implements TypeVisitorWithContext<TypeMatcher.Matching,
 		
 	public static final class Matching {
 		public final LocalMemberCache cache;
-		public final TypeArgument type;
-		public final Map<TypeParameter, TypeArgument> mapping;
+		public final StoredType type;
+		public final Map<TypeParameter, StoredType> mapping;
 		
-		public Matching(LocalMemberCache cache, TypeArgument type) {
+		public Matching(LocalMemberCache cache, StoredType type) {
 			this.cache = cache;
 			this.type = type;
 			mapping = new HashMap<>();
 		}
 		
-		private Matching(LocalMemberCache cache, TypeArgument type, Map<TypeParameter, TypeArgument> mapping) {
+		private Matching(LocalMemberCache cache, StoredType type, Map<TypeParameter, StoredType> mapping) {
 			this.cache = cache;
 			this.type = type;
 			this.mapping = mapping;
 		}
 		
-		public Matching withType(TypeArgument type) {
+		public Matching withType(StoredType type) {
 			return new Matching(cache, type, mapping);
 		}
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeParameterCollector.java

@@ -65,7 +65,7 @@ public class TypeParameterCollector implements TypeVisitorWithContext<Map<TypePa
 
 	@Override
 	public Void visitDefinition(Map<TypeParameter, GenericTypeID> context, DefinitionTypeID definition) {
-		for (TypeArgument argument : definition.typeArguments)
+		for (StoredType argument : definition.typeArguments)
 			argument.type.accept(context, this);
 		if (definition.outer != null)
 			visitDefinition(context, definition.outer);
@@ -85,7 +85,7 @@ public class TypeParameterCollector implements TypeVisitorWithContext<Map<TypePa
 	}
 
 	@Override
-	public Void visitModified(Map<TypeParameter, GenericTypeID> context, ModifiedTypeID type) {
+	public Void visitModified(Map<TypeParameter, GenericTypeID> context, OptionalTypeID type) {
 		type.baseType.accept(context, this);
 		return null;
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeSymbol.java

@@ -24,12 +24,12 @@ public class TypeSymbol implements ISymbol {
 	}
 	
 	@Override
-	public IPartialExpression getExpression(CodePosition position, BaseScope scope, TypeArgument[] typeArguments) {
+	public IPartialExpression getExpression(CodePosition position, BaseScope scope, StoredType[] typeArguments) {
 		return new PartialTypeExpression(position, scope.getTypeRegistry().getForDefinition(definition, typeArguments), typeArguments);
 	}
 
 	@Override
-	public TypeID getType(CodePosition position, TypeResolutionContext context, TypeArgument[] typeArguments) {
+	public TypeID getType(CodePosition position, TypeResolutionContext context, StoredType[] typeArguments) {
 		return context.getTypeRegistry().getForDefinition(definition, typeArguments);
 	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeVisitor.java

@@ -30,7 +30,7 @@ public interface TypeVisitor<T> {
 	
 	public T visitRange(RangeTypeID range);
 	
-	public T visitModified(ModifiedTypeID type);
+	public T visitOptional(OptionalTypeID type);
 	
 	public default T visitInvalid(InvalidTypeID type) {
 		throw new UnsupportedOperationException("Invalid type: " + type.message);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/TypeVisitorWithContext.java

@@ -30,7 +30,7 @@ public interface TypeVisitorWithContext<C, R, E extends Exception> {
 	
 	R visitRange(C context, RangeTypeID range) throws E;
 	
-	R visitModified(C context, ModifiedTypeID type) throws E;
+	R visitModified(C context, OptionalTypeID type) throws E;
 	
 	default R visitInvalid(C context, InvalidTypeID type) throws E {
 		throw new RuntimeException("Invalid type: " + type.message);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/TypeMemberBuilder.java

@@ -53,7 +53,7 @@ import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import static org.openzen.zenscript.codemodel.type.BasicTypeID.*;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
@@ -70,14 +70,12 @@ import org.openzen.zenscript.codemodel.member.IteratorMember;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeVisitorWithContext;
 import org.openzen.zenscript.codemodel.type.storage.BorrowStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StaticStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.UniqueStorageTag;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
-import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
 
 /**
  *
@@ -102,7 +100,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 			if (expansion.target == null)
 				throw new RuntimeException(expansion.position.toString() + ": Missing expansion target");
 			
-			Map<TypeParameter, TypeArgument> mapping = matchType(type, expansion.target);
+			Map<TypeParameter, StoredType> mapping = matchType(type, expansion.target);
 			if (mapping == null)
 				continue;
 			
@@ -122,7 +120,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		}
 	}
 	
-	private Map<TypeParameter, TypeArgument> matchType(StoredType type, TypeArgument pattern) {
+	private Map<TypeParameter, StoredType> matchType(StoredType type, StoredType pattern) {
 		return type.inferTypeParameters(cache, pattern);
 	}
 
@@ -177,7 +175,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 	public Void visitString(Void context, StringTypeID string) {
 		ClassDefinition builtin = new ClassDefinition(BUILTIN, Module.BUILTIN, null, "string", Modifiers.EXPORT, null);
 		
-		constructor(builtin, STRING_CONSTRUCTOR_CHARACTERS, new StoredType(registry.getModified(ModifiedTypeID.MODIFIER_CONST, registry.getArray(CHAR.stored, 1)), BorrowStorageTag.INVOCATION));
+		constructor(builtin, STRING_CONSTRUCTOR_CHARACTERS, new StoredType(registry.getOptional(registry.getArray(CHAR.stored, 1)), BorrowStorageTag.INVOCATION));
 		
 		add(builtin, STRING_ADD_STRING, StringTypeID.BORROW, StringTypeID.UNIQUE);
 		indexGet(builtin, STRING_INDEXGET, USIZE.stored, CHAR.stored);
@@ -204,7 +202,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		HighLevelDefinition definition = new ClassDefinition(BUILTIN, Module.BUILTIN, null, "", Modifiers.EXPORT);
 		StoredType baseType = array.elementType;
 		int dimension = array.dimension;
-		StorageTag storage = type.storage;
+		StorageTag storage = type.getActualStorage();
 
 		FunctionParameter[] indexGetParameters = new FunctionParameter[dimension];
 		for (int i = 0; i < indexGetParameters.length; i++)
@@ -388,12 +386,17 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 	@Override
 	public Void visitGenericMap(Void context, GenericMapTypeID map) {
 		TypeParameter functionParameter = new TypeParameter(BUILTIN, "T");
-		Map<TypeParameter, TypeArgument> parameterFilled = Collections.singletonMap(map.key, new TypeArgument(registry.getGeneric(functionParameter), null));
+		Map<TypeParameter, StoredType> parameterFilled = Collections.singletonMap(map.key, registry.getGeneric(functionParameter).stored());
 		StoredType valueType = map.value.instance(new GenericMapper(registry, parameterFilled));
 		
-		FunctionHeader getOptionalHeader = new FunctionHeader(new TypeParameter[] { functionParameter }, registry.getOptional(valueType.type).stored(valueType.storage), null, null, new FunctionParameter[0]);
+		FunctionHeader getOptionalHeader = new FunctionHeader(
+				new TypeParameter[] { functionParameter },
+				registry.getOptional(valueType.type).stored(valueType.getSpecifiedStorage()),
+				null,
+				null,
+				FunctionParameter.NONE);
 		FunctionHeader putHeader = new FunctionHeader(new TypeParameter[] { functionParameter }, VOID.stored, null, null, new FunctionParameter(valueType));
-		FunctionHeader containsHeader = new FunctionHeader(new TypeParameter[] { functionParameter }, BOOL.stored, null, null, new FunctionParameter[0]);
+		FunctionHeader containsHeader = new FunctionHeader(new TypeParameter[] { functionParameter }, BOOL.stored, null, null, FunctionParameter.NONE);
 		
 		ClassDefinition builtin = new ClassDefinition(BUILTIN, Module.BUILTIN, null, "", Modifiers.EXPORT);
 		constructor(builtin, GENERICMAP_CONSTRUCTOR);
@@ -443,7 +446,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		HighLevelDefinition definition = definitionType.definition;
 		GenericMapper mapper = null;
 		if (definitionType.hasTypeParameters() || (definitionType.outer != null && definitionType.outer.hasTypeParameters())) {
-			Map<TypeParameter, TypeArgument> mapping = definitionType.getTypeParameterMapping();
+			Map<TypeParameter, StoredType> mapping = definitionType.getTypeParameterMapping();
 			mapper = new GenericMapper(registry, mapping);
 		}
 		
@@ -508,7 +511,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 			for (int i = 0; i < constValues.length; i++)
 				constValues[i] = new EnumConstantExpression(BUILTIN, definitionType, enumConstants.get(i));
 			
-			constant(definition, ENUM_VALUES, "values", new ArrayExpression(BUILTIN, constValues, registry.getArray(definitionType.stored(ValueStorageTag.INSTANCE), 1).stored(StaticStorageTag.INSTANCE)));
+			constant(definition, ENUM_VALUES, "values", new ArrayExpression(BUILTIN, constValues, registry.getArray(definitionType.stored(), 1).stored(StaticStorageTag.INSTANCE)));
 			compare(definition, ENUM_COMPARE, type);
 			
 			if (!members.canCast(StringTypeID.STATIC)) {
@@ -519,12 +522,12 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		if (definition instanceof InterfaceDefinition) {
 			InterfaceDefinition interfaceDefinition = (InterfaceDefinition)definition;
 			for (TypeID baseType : interfaceDefinition.baseInterfaces)
-				cache.get(baseType.instance(mapper, type.storage).stored())
+				cache.get(baseType.instance(mapper, type.getSpecifiedStorage()))
 						.copyMembersTo(definitionType.definition.position, members, TypeMemberPriority.INHERITED);
 		}
 		
 		if (definitionType.superType != null) {
-			cache.get(definitionType.superType.stored(type.storage))
+			cache.get(definitionType.superType.stored(type.getSpecifiedStorage()))
 					.copyMembersTo(definitionType.definition.position, members, TypeMemberPriority.INHERITED);
 		} else {
 			getter(definition, OBJECT_HASHCODE, "objectHashCode", INT.stored);
@@ -573,7 +576,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 	}
 
 	@Override
-	public Void visitModified(Void context, ModifiedTypeID modified) {
+	public Void visitModified(Void context, OptionalTypeID modified) {
 		ClassDefinition builtin = new ClassDefinition(BUILTIN, Module.BUILTIN, null, "modified", Modifiers.EXPORT, null);
 		modified.baseType.accept(context, this);
 		
@@ -836,7 +839,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		method(builtin, INT_COUNT_LOW_ONES, "countLowOnes", USIZE.stored);
 		method(builtin, INT_COUNT_HIGH_ONES, "countHighOnes", USIZE.stored);
 		
-		StoredType optionalUSize = registry.getOptional(USIZE).stored(ValueStorageTag.INSTANCE);
+		StoredType optionalUSize = registry.getOptional(USIZE).stored();
 		getter(builtin, INT_HIGHEST_ONE_BIT, "highestOneBit", optionalUSize);
 		getter(builtin, INT_LOWEST_ONE_BIT, "lowestOneBit", optionalUSize);
 		getter(builtin, INT_HIGHEST_ZERO_BIT, "highestZeroBit", optionalUSize);
@@ -916,7 +919,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		method(builtin, UINT_COUNT_LOW_ONES, "countLowOnes", USIZE.stored);
 		method(builtin, UINT_COUNT_HIGH_ONES, "countHighOnes", USIZE.stored);
 		
-		StoredType optionalUSize = registry.getOptional(USIZE).stored(ValueStorageTag.INSTANCE);
+		StoredType optionalUSize = registry.getOptional(USIZE).stored();
 		getter(builtin, UINT_HIGHEST_ONE_BIT, "highestOneBit", optionalUSize);
 		getter(builtin, UINT_LOWEST_ONE_BIT, "lowestOneBit", optionalUSize);
 		getter(builtin, UINT_HIGHEST_ZERO_BIT, "highestZeroBit", optionalUSize);
@@ -989,7 +992,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		method(builtin, LONG_COUNT_LOW_ONES, "countLowOnes", USIZE.stored);
 		method(builtin, LONG_COUNT_HIGH_ONES, "countHighOnes", USIZE.stored);
 		
-		StoredType optionalUSize = registry.getOptional(USIZE).stored(ValueStorageTag.INSTANCE);
+		StoredType optionalUSize = registry.getOptional(USIZE).stored();
 		getter(builtin, LONG_HIGHEST_ONE_BIT, "highestOneBit", optionalUSize);
 		getter(builtin, LONG_LOWEST_ONE_BIT, "lowestOneBit", optionalUSize);
 		getter(builtin, LONG_HIGHEST_ZERO_BIT, "highestZeroBit", optionalUSize);
@@ -1061,7 +1064,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		method(builtin, ULONG_COUNT_LOW_ONES, "countLowOnes", USIZE.stored);
 		method(builtin, ULONG_COUNT_HIGH_ONES, "countHighOnes", USIZE.stored);
 		
-		StoredType optionalUSize = registry.getOptional(USIZE).stored(ValueStorageTag.INSTANCE);
+		StoredType optionalUSize = registry.getOptional(USIZE).stored();
 		getter(builtin, ULONG_HIGHEST_ONE_BIT, "highestOneBit", optionalUSize);
 		getter(builtin, ULONG_LOWEST_ONE_BIT, "lowestOneBit", optionalUSize);
 		getter(builtin, ULONG_HIGHEST_ZERO_BIT, "highestZeroBit", optionalUSize);
@@ -1138,7 +1141,7 @@ public class TypeMemberBuilder implements TypeVisitorWithContext<Void, Void, Run
 		method(builtin, USIZE_COUNT_LOW_ONES, "countLowOnes", USIZE.stored);
 		method(builtin, USIZE_COUNT_HIGH_ONES, "countHighOnes", USIZE.stored);
 		
-		StoredType optionalUSize = registry.getOptional(USIZE).stored(ValueStorageTag.INSTANCE);
+		StoredType optionalUSize = registry.getOptional(USIZE).stored();
 		getter(builtin, USIZE_HIGHEST_ONE_BIT, "highestOneBit", optionalUSize);
 		getter(builtin, USIZE_LOWEST_ONE_BIT, "lowestOneBit", optionalUSize);
 		getter(builtin, USIZE_HIGHEST_ZERO_BIT, "highestZeroBit", optionalUSize);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/TypeMemberGroup.java

@@ -33,7 +33,6 @@ import org.openzen.zenscript.codemodel.member.ref.GetterMemberRef;
 import org.openzen.zenscript.codemodel.member.ref.SetterMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
 /**
@@ -269,7 +268,7 @@ public class TypeMemberGroup {
 			
 			if (header.typeParameters != null) {
 				for (StoredType resultHint : typeHints) {
-					Map<TypeParameter, TypeArgument> mapping = header.getReturnType().inferTypeParameters(scope.getMemberCache(), resultHint.asArgument());
+					Map<TypeParameter, StoredType> mapping = header.getReturnType().inferTypeParameters(scope.getMemberCache(), resultHint);
 					if (mapping != null) {
 						header = header.withGenericArguments(scope.getTypeRegistry(), scope.getLocalTypeParameters().getInner(scope.getTypeRegistry(), mapping));
 						break;

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/TypeMembers.java

@@ -20,7 +20,6 @@ import org.openzen.zenscript.codemodel.expression.CheckNullExpression;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.InterfaceCastExpression;
 import org.openzen.zenscript.codemodel.expression.InvalidExpression;
-import org.openzen.zenscript.codemodel.expression.MakeConstExpression;
 import org.openzen.zenscript.codemodel.expression.NullExpression;
 import org.openzen.zenscript.codemodel.expression.StorageCastExpression;
 import org.openzen.zenscript.codemodel.expression.SupertypeCastExpression;
@@ -90,14 +89,14 @@ public final class TypeMembers {
 		if (superType != null) {
 			if (superType == other)
 				return true;
-			if (cache.get(superType.stored(type.storage)).extendsOrImplements(other))
+			if (cache.get(superType.stored(type.getActualStorage())).extendsOrImplements(other))
 				return true;
 		}
 		
 		for (TypeMember<ImplementationMemberRef> implementation : implementations) {
 			if (implementation.member.implementsType.equals(other)) // TODO: for some reason duplicate types are generated
 				return true;
-			if (cache.get(implementation.member.implementsType.stored(type.storage)).extendsOrImplements(other))
+			if (cache.get(implementation.member.implementsType.stored(type.getActualStorage())).extendsOrImplements(other))
 				return true;
 		}
 		
@@ -110,7 +109,7 @@ public final class TypeMembers {
 		if (superType != null) {
 			if (superType == other)
 				return true;
-			if (cache.get(superType.stored(type.storage)).extendsType(other))
+			if (cache.get(superType.stored(type.getActualStorage())).extendsType(other))
 				return true;
 		}
 		
@@ -403,7 +402,7 @@ public final class TypeMembers {
 		if (type.type == BasicTypeID.NULL && toType.type.isOptional())
 			return true;
 		
-		if (!type.storage.canCastTo(toType.storage) && !toType.storage.canCastFrom(type.storage))
+		if (!type.getActualStorage().canCastTo(toType.getActualStorage()) && !toType.getActualStorage().canCastFrom(type.getActualStorage()))
 			return false;
 		
 		if (toType.isOptional() && canCastImplicit(toType.withoutOptional()))
@@ -417,7 +416,7 @@ public final class TypeMembers {
 	private boolean areEquivalent(StoredType fromType, StoredType toType) {
 		if (fromType == toType)
 			return true;
-		if (!fromType.storage.canCastTo(toType.storage) && !toType.storage.canCastFrom(fromType.storage))
+		if (!fromType.getActualStorage().canCastTo(toType.getActualStorage()) && !toType.getActualStorage().canCastFrom(fromType.getActualStorage()))
 			return false;
 		
 		return fromType.type == toType.type;
@@ -461,7 +460,7 @@ public final class TypeMembers {
 			return value;
 		
 		if (!(toType.type instanceof StringTypeID))
-			System.out.println(position + ": " + value.type.storage + " -> " + toType.storage);
+			System.out.println(position + ": " + value.type.getActualStorage() + " -> " + toType.getActualStorage());
 		
 		return new StorageCastExpression(position, value, toType);
 	}
@@ -489,7 +488,7 @@ public final class TypeMembers {
 		}
 		for (TypeMember<ImplementationMemberRef> implementation : implementations) {
 			if (implementation.member.implementsType.equals(toType.type))
-				return castEquivalent(position, new InterfaceCastExpression(position, value, toType.type.stored(type.storage)), toType);
+				return castEquivalent(position, new InterfaceCastExpression(position, value, toType.type.stored(type.getActualStorage())), toType);
 		}
 		if (extendsType(toType.type))
 			return new SupertypeCastExpression(position, value, toType);

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/storage/BorrowStorageTag.java

@@ -22,7 +22,7 @@ public class BorrowStorageTag implements StorageTag {
 	
 	@Override
 	public String toString() {
-		return "borrow";
+		return this == THIS ? "borrow:this" : "borrow";
 	}
 
 	@Override

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/storage/MutableStorageTag.java

@@ -0,0 +1,52 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.codemodel.type.storage;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class MutableStorageTag implements StorageTag {
+	public static final MutableStorageTag INVOCATION = new MutableStorageTag();
+	public static final MutableStorageTag THIS = new MutableStorageTag();
+	
+	private MutableStorageTag() {} // TODO: scoped borrow
+
+	@Override
+	public StorageType getType() {
+		return BorrowStorageType.INSTANCE;
+	}
+	
+	@Override
+	public String toString() {
+		return this == THIS ? "mutable:this" : "mutable";
+	}
+
+	@Override
+	public boolean canCastTo(StorageTag other) {
+		return this == other;
+	}
+
+	@Override
+	public boolean canCastFrom(StorageTag other) {
+		return true;
+	}
+
+	@Override
+	public boolean isDestructible() {
+		return false;
+	}
+	
+	@Override
+	public boolean isConst() {
+		return true;
+	}
+	
+	@Override
+	public boolean isImmutable() {
+		return true;
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/storage/MutableStorageType.java

@@ -0,0 +1,36 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.codemodel.type.storage;
+
+import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileExceptionCode;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class MutableStorageType implements StorageType {
+	public static final MutableStorageType INSTANCE = new MutableStorageType();
+
+	private MutableStorageType() {}
+
+	@Override
+	public String getName() {
+		return "mutable";
+	}
+
+	@Override
+	public StorageTag instance(CodePosition position, String[] arguments) {
+		if (arguments.length > 0) {
+			if (arguments.length == 1 && arguments[0].equals("this"))
+				return MutableStorageTag.THIS;
+			
+			return new InvalidStorageTag(position, CompileExceptionCode.INVALID_STORAGE_TYPE_ARGUMENTS, "mutable storage type doesn't take arguments");
+		}
+		
+		return MutableStorageTag.INVOCATION;
+	}
+}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/storage/StorageTag.java

@@ -28,7 +28,7 @@ public interface StorageTag {
 		if (major == AutoStorageTag.INSTANCE || major == null)
 			return minor;
 		if (!minor.equals(major))
-			throw new IllegalArgumentException("Could not unite storage types"); // TODO: proper reporting
+			throw new IllegalArgumentException("Could not unite storage types: " + minor + " and " + major); // TODO: proper reporting
 		
 		return major;
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/storage/StorageType.java

@@ -16,6 +16,7 @@ public interface StorageType {
 		return new StorageType[] {
 			AutoStorageType.INSTANCE,
 			BorrowStorageType.INSTANCE,
+			MutableStorageType.INSTANCE,
 			SharedStorageType.INSTANCE,
 			StaticStorageType.INSTANCE,
 			UniqueStorageType.INSTANCE

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/storage/ValueStorageTag.java

@@ -43,4 +43,9 @@ public class ValueStorageTag implements StorageTag {
 	public boolean isImmutable() {
 		return false;
 	}
+	
+	@Override
+	public String toString() {
+		return "value";
+	}
 }

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaBoxingTypeVisitor.java

@@ -122,7 +122,7 @@ public class JavaBoxingTypeVisitor implements TypeVisitorWithContext<StoredType,
 	}
 
 	@Override
-	public Void visitModified(StoredType context, ModifiedTypeID type) {
+	public Void visitModified(StoredType context, OptionalTypeID type) {
 		//NO-OP
 		return null;
 	}

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaExpressionVisitor.java

@@ -2381,8 +2381,8 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void> {
 		expression.value.accept(this);
 		
 		if (expression.type.isDestructible()) { // only destructible types matter here; nondestructible types never need conversion
-			StorageTag fromTag = expression.value.type.storage;
-			StorageTag toTag = expression.type.storage;
+			StorageTag fromTag = expression.value.type.getActualStorage();
+			StorageTag toTag = expression.type.getActualStorage();
 			if (JavaTypeUtils.isShared(fromTag) && toTag == BorrowStorageTag.INVOCATION) {
 				// Shared<T>.get()
 				javaWriter.invokeVirtual(SHARED_GET);

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaSyntheticTypeSignatureConverter.java

@@ -19,7 +19,7 @@ import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.codemodel.type.IteratorTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.RangeTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
@@ -145,12 +145,8 @@ public class JavaSyntheticTypeSignatureConverter implements TypeVisitorWithConte
 	}
 
 	@Override
-	public String visitModified(StoredType context, ModifiedTypeID type) {
+	public String visitModified(StoredType context, OptionalTypeID type) {
 		StringBuilder result = new StringBuilder();
-		if (type.isConst())
-			result.append("Const");
-		if (type.isImmutable())
-			result.append("Immutable");
 		if (type.isOptional())
 			result.append("Optional");
 		

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeDescriptorVisitor.java

@@ -127,11 +127,8 @@ public class JavaTypeDescriptorVisitor implements TypeVisitor<String> {
     }
 
     @Override
-    public String visitModified(ModifiedTypeID modified) {
-		if (modified.isOptional())
-			return modified.withoutOptional().accept(forOptional);
-		
-		return modified.baseType.accept(this);
+    public String visitOptional(OptionalTypeID modified) {
+		return modified.withoutOptional().accept(forOptional);
     }
 
 	@Override

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeGenericVisitor.java

@@ -122,7 +122,7 @@ public class JavaTypeGenericVisitor implements TypeVisitorWithContext<StoredType
 
 		if (definition.typeArguments.length > 0) {
 			builder.append("<");
-			for (TypeArgument typeParameter : definition.typeArguments) {
+			for (StoredType typeParameter : definition.typeArguments) {
 				builder.append(typeParameter.type.accept(null, this));
 			}
 			builder.append(">");
@@ -142,7 +142,7 @@ public class JavaTypeGenericVisitor implements TypeVisitorWithContext<StoredType
 	}
 
 	@Override
-	public String visitModified(StoredType context, ModifiedTypeID type) {
+	public String visitModified(StoredType context, OptionalTypeID type) {
 		return type.baseType.accept(context, this);
 	}
 }

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeInfo.java

@@ -13,7 +13,7 @@ import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.codemodel.type.IteratorTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.RangeTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
@@ -95,7 +95,7 @@ public class JavaTypeInfo {
 		}
 
 		@Override
-		public JavaTypeInfo visitModified(StoredType context, ModifiedTypeID type) {
+		public JavaTypeInfo visitModified(StoredType context, OptionalTypeID type) {
 			return type.baseType.accept(null, this);
 		}
 	}

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeInternalNameVisitor.java

@@ -108,7 +108,7 @@ public class JavaTypeInternalNameVisitor implements TypeVisitorWithContext<Store
     }
 
     @Override
-    public String visitModified(StoredType context, ModifiedTypeID modified) {
+    public String visitModified(StoredType context, OptionalTypeID modified) {
 		if (modified.isOptional())
 			return modified.withoutOptional().accept(context, forOptional);
 		

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeNameVisitor.java

@@ -9,7 +9,7 @@ import org.openzen.zenscript.codemodel.FunctionParameter;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
@@ -114,14 +114,10 @@ public class JavaTypeNameVisitor implements TypeVisitorWithContext<StoredType, S
 	}
 
 	@Override
-	public String visitModified(StoredType context, ModifiedTypeID type) {
+	public String visitModified(StoredType context, OptionalTypeID type) {
 		StringBuilder result = new StringBuilder();
-		if (type.isConst())
-			result.append("Const");
 		if (type.isOptional())
 			result.append("Optional");
-		if (type.isImmutable())
-			result.append("Immutable");
 		result.append(type.baseType.accept(context, this));
 		return result.toString();
 	}

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaTypeUtils.java

@@ -18,7 +18,7 @@ public class JavaTypeUtils {
 	private JavaTypeUtils() {}
 	
 	public static boolean isShared(StoredType type) {
-		return type.type.isDestructible() && isShared(type.storage);
+		return type.type.isDestructible() && isShared(type.getActualStorage());
 	}
 	
 	public static boolean isShared(StorageTag storage) {

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/FormattingUtils.java

@@ -9,7 +9,7 @@ import org.openzen.zenscript.codemodel.expression.CallArguments;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.generic.TypeParameterBound;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.formattershared.ExpressionString;
 import org.openzen.zenscript.formattershared.StatementFormattingTarget;
 import org.openzen.zenscript.javasource.scope.JavaSourceStatementScope;
@@ -52,7 +52,7 @@ public class FormattingUtils {
 			result.append("<");
 			
 			int index = 0;
-			for (TypeArgument typeArgument : arguments.typeArguments) {
+			for (StoredType typeArgument : arguments.typeArguments) {
 				if (index > 0)
 					result.append(", ");
 				result.append(scope.type(typeArgument));
@@ -79,7 +79,7 @@ public class FormattingUtils {
 			result.append("<");
 			
 			int index = 0;
-			for (TypeArgument typeArgument : arguments.typeArguments) {
+			for (StoredType typeArgument : arguments.typeArguments) {
 				if (index > 0)
 					result.append(", ");
 				result.append(scope.type(typeArgument));

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaDefinitionVisitor.java

@@ -29,7 +29,7 @@ import org.openzen.zenscript.codemodel.statement.BlockStatement;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.compiler.CompileScope;
 import org.openzen.zenscript.compiler.SemanticModule;
@@ -370,9 +370,9 @@ public class JavaDefinitionVisitor implements DefinitionVisitor<Void> {
 	
 	private void compileMembers(JavaSourceFileScope scope, HighLevelDefinition definition) {
 		if (definition.hasTag(JavaNativeClass.class)) {
-			TypeArgument[] typeParameters = new TypeArgument[definition.getNumberOfGenericParameters()];
+			StoredType[] typeParameters = new StoredType[definition.getNumberOfGenericParameters()];
 			for (int i = 0; i < typeParameters.length; i++)
-				typeParameters[i] = new TypeArgument(scope.semanticScope.getTypeRegistry().getGeneric(definition.typeParameters[i]), definition.typeParameters[i].storage);
+				typeParameters[i] = scope.semanticScope.getTypeRegistry().getGeneric(definition.typeParameters[i]).stored(definition.typeParameters[i].storage);
 			TypeID targetType = scope.semanticScope.getTypeRegistry().getForDefinition(definition, typeParameters);
 			
 			JavaExpansionMemberCompiler memberCompiler = new JavaExpansionMemberCompiler(settings, targetType, definition.typeParameters, indent + settings.indent, output, scope, definition);

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceExpressionFormatter.java

@@ -91,7 +91,6 @@ import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.BuiltinID;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
@@ -670,8 +669,8 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 	public ExpressionString visitStorageCast(StorageCastExpression expression) {
 		ExpressionString value = expression.accept(this);
 		if (expression.value.type.isDestructible()) {
-			StorageTag fromTag = expression.value.type.storage;
-			StorageTag toTag = expression.type.storage;
+			StorageTag fromTag = expression.value.type.getActualStorage();
+			StorageTag toTag = expression.type.getActualStorage();
 			if (JavaTypeUtils.isShared(fromTag)) {
 				// Shared<T>.get()
 				return value.unaryPostfix(JavaOperator.CALL, ".get()");
@@ -761,7 +760,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		return expression.value.accept(this);
 	}
 	
-	private String formatTypeArguments(TypeArgument[] types) {
+	private String formatTypeArguments(StoredType[] types) {
 		if (types == null || types.length == 0)
 			return "";
 		
@@ -827,7 +826,7 @@ public class JavaSourceExpressionFormatter implements ExpressionVisitor<Expressi
 		output.append(method).append("(");
 		boolean first = true;
 		if (expression.arguments.typeArguments != null) {
-			for (TypeArgument typeArgument : expression.arguments.typeArguments) {
+			for (StoredType typeArgument : expression.arguments.typeArguments) {
 				if (!first)
 					output.append(", ");
 				

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceSyntheticHelperGenerator.java

@@ -19,7 +19,7 @@ import java.util.Map;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
@@ -204,7 +204,7 @@ public class JavaSourceSyntheticHelperGenerator {
 		}
 
 		@Override
-		public ArrayKind visitModified(ModifiedTypeID type) {
+		public ArrayKind visitOptional(OptionalTypeID type) {
 			return ArrayKind.OBJECT;
 		}
 	}

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/JavaSourceTypeVisitor.java

@@ -12,7 +12,7 @@ import org.openzen.zenscript.codemodel.generic.ParameterTypeBound;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
@@ -198,8 +198,8 @@ public class JavaSourceTypeVisitor implements TypeVisitor<String>, GenericParame
 	}
 
 	@Override
-	public String visitModified(ModifiedTypeID optional) {
-		if (optional.isOptional() && optional.withoutOptional() == BasicTypeID.USIZE)
+	public String visitOptional(OptionalTypeID optional) {
+		if (optional.withoutOptional() == BasicTypeID.USIZE)
 			return "int"; // usize? is an int
 		
 		return optional.baseType.accept(new JavaSourceObjectTypeVisitor(importer, context));

JavaSourceCompiler/src/main/java/org/openzen/zenscript/javasource/scope/JavaSourceStatementScope.java

@@ -15,7 +15,6 @@ import org.openzen.zenscript.codemodel.statement.LoopStatement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.statement.VariableID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.formattershared.ExpressionString;
 import org.openzen.zenscript.formattershared.StatementFormattingTarget;
@@ -82,10 +81,6 @@ public class JavaSourceStatementScope {
 		return fileScope.type(type);
 	}
 	
-	public String type(TypeArgument type) {
-		return type.storage == null ? type(type.type) : type(type.stored());
-	}
-	
 	public String type(TypeID type) {
 		return fileScope.type(type);
 	}

ModuleDeserializer/src/main/java/org/openzen/zenscript/moduledeserializer/CodeReader.java

@@ -63,7 +63,7 @@ import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
 import org.openzen.zenscript.codemodel.type.TypeID;
@@ -336,9 +336,9 @@ public class CodeReader implements CodeSerializationInput {
 			case TypeEncoding.TYPE_OPTIONAL:
 				return registry.getOptional(deserializeTypeID(context));
 			case TypeEncoding.TYPE_CONST:
-				return registry.getModified(ModifiedTypeID.MODIFIER_CONST, deserializeTypeID(context));
+				return registry.getModified(OptionalTypeID.MODIFIER_CONST, deserializeTypeID(context));
 			case TypeEncoding.TYPE_IMMUTABLE:
-				return registry.getModified(ModifiedTypeID.MODIFIER_IMMUTABLE, deserializeTypeID(context));
+				return registry.getModified(OptionalTypeID.MODIFIER_IMMUTABLE, deserializeTypeID(context));
 			default:
 				throw new IllegalArgumentException("Unknown type: " + type);
 		}
@@ -794,7 +794,7 @@ public class CodeReader implements CodeSerializationInput {
 			}
 			case ExpressionEncoding.TYPE_MAKE_CONST: {
 				Expression value = deserializeExpression(context);
-				StoredType constType = registry.getModified(ModifiedTypeID.MODIFIER_CONST, value.type.type).stored(value.type.storage);
+				StoredType constType = registry.getModified(OptionalTypeID.MODIFIER_CONST, value.type.type).stored(value.type.getActualStorage());
 				return new MakeConstExpression(position, value, constType);
 			}
 			case ExpressionEncoding.TYPE_MAP: {
@@ -933,7 +933,7 @@ public class CodeReader implements CodeSerializationInput {
 			}
 			case ExpressionEncoding.TYPE_WRAP_OPTIONAL: {
 				Expression value = deserializeExpression(context);
-				StoredType optionalType = registry.getOptional(value.type.type).stored(value.type.storage);
+				StoredType optionalType = registry.getOptional(value.type.type).stored(value.type.getActualStorage());
 				return new WrapOptionalExpression(position, value, optionalType);
 			}
 			default:

ModuleSerializer/src/main/java/org/openzen/zenscript/moduleserializer/encoder/TypeSerializer.java

@@ -16,7 +16,7 @@ import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
 import org.openzen.zenscript.codemodel.type.GenericTypeID;
 import org.openzen.zenscript.codemodel.type.IteratorTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.RangeTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
@@ -137,7 +137,7 @@ public class TypeSerializer implements TypeVisitorWithContext<TypeContext, Void,
 	}
 
 	@Override
-	public Void visitModified(TypeContext context, ModifiedTypeID type) {
+	public Void visitModified(TypeContext context, OptionalTypeID type) {
 		if (type.isOptional()) {
 			output.writeUInt(TypeEncoding.TYPE_OPTIONAL);
 			type.withoutOptional().accept(context, this);

Parser/src/main/java/org/openzen/zenscript/parser/ParsedAnnotation.java

@@ -34,7 +34,7 @@ import org.openzen.zenscript.parser.expression.ParsedCallArguments;
 import org.openzen.zenscript.parser.type.IParsedType;
 import org.openzen.zenscript.codemodel.type.TypeID;
 import org.openzen.zenscript.codemodel.annotations.ParameterAnnotation;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -134,7 +134,7 @@ public class ParsedAnnotation {
 		try {
 			AnnotationDefinition annotationType = type.compileAnnotation(scope);
 			ExpressionScope evalScope = annotationType.getScopeForMember(member, scope);
-			TypeArgument[] types = type.compileTypeArguments(scope);
+			StoredType[] types = type.compileTypeArguments(scope);
 			CallArguments cArguments = arguments.compileCall(position, evalScope, types, annotationType.getInitializers(scope));
 			return annotationType.createForMember(position, cArguments);
 		} catch (CompileException ex) {
@@ -149,7 +149,7 @@ public class ParsedAnnotation {
 		
 		try {
 			ExpressionScope evalScope = annotationType.getScopeForType(definition, scope);
-			TypeArgument[] types = type.compileTypeArguments(scope);
+			StoredType[] types = type.compileTypeArguments(scope);
 			CallArguments cArguments = arguments.compileCall(position, evalScope, types, annotationType.getInitializers(scope));
 			return annotationType.createForDefinition(position, cArguments);
 		} catch (CompileException ex) {
@@ -164,7 +164,7 @@ public class ParsedAnnotation {
 		
 		try {
 			ExpressionScope evalScope = annotationType.getScopeForStatement(statement, scope);
-			TypeArgument[] types = type.compileTypeArguments(scope);
+			StoredType[] types = type.compileTypeArguments(scope);
 			CallArguments cArguments = arguments.compileCall(position, evalScope, types, annotationType.getInitializers(scope));
 			return annotationType.createForStatement(position, cArguments);
 		} catch (CompileException ex) {
@@ -179,7 +179,7 @@ public class ParsedAnnotation {
 		
 		try {
 			ExpressionScope evalScope = annotationType.getScopeForParameter(header, parameter, scope);
-			TypeArgument[] types = type.compileTypeArguments(scope);
+			StoredType[] types = type.compileTypeArguments(scope);
 			CallArguments cArguments = arguments.compileCall(position, evalScope, types, annotationType.getInitializers(scope));
 			return annotationType.createForParameter(position, cArguments);
 		} catch (CompileException ex) {

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedEnum.java

@@ -18,7 +18,7 @@ import org.openzen.zenscript.lexer.ZSTokenParser;
 import org.openzen.zenscript.lexer.ZSTokenType;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.lexer.ParseException;
 import org.openzen.zenscript.parser.ParsedAnnotation;
 import org.openzen.zenscript.parser.member.ParsedDefinitionMember;
@@ -97,7 +97,7 @@ public class ParsedEnum extends BaseParsedDefinition {
 	public void compile(BaseScope scope) throws CompileException {
 		super.compile(scope);
 		
-		DefinitionTypeID type = scope.getTypeRegistry().getForDefinition(compiled, TypeArgument.NONE);
+		DefinitionTypeID type = scope.getTypeRegistry().getForDefinition(compiled, StoredType.NONE);
 		ExpressionScope evalScope = new ExpressionScope(scope);
 		for (ParsedEnumConstant constant : enumValues) {
 			constant.compileCode(type, evalScope);

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedEnumConstant.java

@@ -74,7 +74,7 @@ public class ParsedEnumConstant {
 	
 	public void compileCode(DefinitionTypeID type, ExpressionScope scope) throws CompileException {
 		ParsedCallArguments arguments = new ParsedCallArguments(null, this.arguments);
-		compiled.constructor = (NewExpression)ParsedNewExpression.compile(position, type.stored(ValueStorageTag.INSTANCE), arguments, scope);
+		compiled.constructor = (NewExpression)ParsedNewExpression.compile(position, type.stored(), arguments, scope);
 		
 		if (value != null)
 			compiled.value = value.compile(scope).eval();

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedExpansion.java

@@ -69,7 +69,7 @@ public class ParsedExpansion extends BaseParsedDefinition {
 	@Override
 	public void linkTypesLocal(TypeResolutionContext context) {
 		ParsedTypeParameter.compile(context, compiled.typeParameters, this.parameters);
-		compiled.target = target.compileArgument(context);
+		compiled.target = target.compile(context);
 		if (compiled.target == null)
 			throw new RuntimeException(position + ": Could not compile expansion target: " + target);
 		

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedCallArguments.java

@@ -23,7 +23,6 @@ import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.lexer.ParseException;
 import org.openzen.zenscript.parser.type.IParsedType;
 
@@ -88,7 +87,7 @@ public class ParsedCallArguments {
 	public CallArguments compileCall(
 			CodePosition position, 
 			ExpressionScope scope,
-			TypeArgument[] genericParameters,
+			StoredType[] genericParameters,
 			TypeMemberGroup member) throws CompileException
 	{
 		List<FunctionHeader> possibleHeaders = member.getMethodMembers().stream()
@@ -100,13 +99,13 @@ public class ParsedCallArguments {
 	public CallArguments compileCall(
 			CodePosition position,
 			ExpressionScope scope,
-			TypeArgument[] typeArguments,
+			StoredType[] typeArguments,
 			List<FunctionHeader> candidateFunctions) throws CompileException
 	{
 		if (this.typeArguments != null) {
-			typeArguments = new TypeArgument[this.typeArguments.size()];
+			typeArguments = new StoredType[this.typeArguments.size()];
 			for (int i = 0; i < this.typeArguments.size(); i++)
-				typeArguments[i] = this.typeArguments.get(i).compileArgument(scope);
+				typeArguments[i] = this.typeArguments.get(i).compile(scope);
 		}
 		
 		List<FunctionHeader> candidates = new ArrayList<>();
@@ -153,14 +152,14 @@ public class ParsedCallArguments {
 			cArguments[i] = cArgument.eval();
 		}
 		
-		TypeArgument[] typeArguments2 = typeArguments;
+		StoredType[] typeArguments2 = typeArguments;
 		if (typeArguments2 == null || typeArguments2.length == 0) {
 			for (FunctionHeader candidate : candidates) {
 				if (candidate.typeParameters != null) {
-					typeArguments2 = new TypeArgument[candidate.typeParameters.length];
+					typeArguments2 = new StoredType[candidate.typeParameters.length];
 					for (int i = 0; i < typeArguments2.length; i++) {
 						if (innerScope.genericInferenceMap.get(candidate.typeParameters[i]) == null)
-							typeArguments2[i] = new TypeArgument(new InvalidTypeID(position, CompileExceptionCode.TYPE_ARGUMENTS_NOT_INFERRABLE, "Could not infer type parameter " + candidate.typeParameters[i].name), null);
+							typeArguments2[i] = new InvalidTypeID(position, CompileExceptionCode.TYPE_ARGUMENTS_NOT_INFERRABLE, "Could not infer type parameter " + candidate.typeParameters[i].name).stored();
 						else
 							typeArguments2[i] = innerScope.genericInferenceMap.get(candidate.typeParameters[i]);
 					}
@@ -177,7 +176,7 @@ public class ParsedCallArguments {
 	public CallArguments compileCall(
 			CodePosition position,
 			ExpressionScope scope,
-			TypeArgument[] typeArguments,
+			StoredType[] typeArguments,
 			FunctionHeader function) throws CompileException
 	{
 		ExpressionScope innerScope = scope.forCall(function);
@@ -194,10 +193,10 @@ public class ParsedCallArguments {
 			cArguments[i] = cArgument.eval();
 		}
 		
-		TypeArgument[] typeArguments2 = typeArguments;
+		StoredType[] typeArguments2 = typeArguments;
 		if (typeArguments2 == null) {
 			if (function.typeParameters != null) {
-				typeArguments2 = new TypeArgument[function.typeParameters.length];
+				typeArguments2 = new StoredType[function.typeParameters.length];
 				for (int i = 0; i < typeArguments2.length; i++) {
 					if (innerScope.genericInferenceMap.get(function.typeParameters[i]) == null)
 						throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_NOT_INFERRABLE, "Could not infer type parameter " + function.typeParameters[i].name);
@@ -216,10 +215,10 @@ public class ParsedCallArguments {
 			IPartialExpression cArgument = arguments.get(i).compile(scope);
 			cArguments[i] = cArgument.eval();
 		}
-		return new CallArguments(TypeArgument.NONE, cArguments);
+		return new CallArguments(StoredType.NONE, cArguments);
 	}
 	
-	private boolean isCompatibleWith(BaseScope scope, FunctionHeader header, TypeArgument[] typeArguments) {
+	private boolean isCompatibleWith(BaseScope scope, FunctionHeader header, StoredType[] typeArguments) {
 		if (arguments.size() != header.parameters.length)
 			return false;
 		

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionCoalesce.java

@@ -43,7 +43,7 @@ public class ParsedExpressionCoalesce extends ParsedExpression {
 		
 		TypeMembers resultTypeMembers = scope.getTypeMembers(resultType);
 		resultType = resultTypeMembers.union(cRight.type);
-		cLeft = cLeft.castImplicit(position, scope, resultType.isOptional() ? resultType : scope.getTypeRegistry().getOptional(resultType.type).stored(resultType.storage));
+		cLeft = cLeft.castImplicit(position, scope, resultType.isOptional() ? resultType : scope.getTypeRegistry().getOptional(resultType.type).stored(resultType.getSpecifiedStorage()));
 		cRight = cRight.castImplicit(position, scope, resultType);
 		
 		return new CoalesceExpression(position, cLeft, cRight);

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionFloat.java

@@ -18,7 +18,6 @@ import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 
 /**
@@ -69,7 +68,7 @@ public class ParsedExpressionFloat extends ParsedExpression {
 				if (method != null) {
 					try {
 						ParsedCallArguments parsedArguments = new ParsedCallArguments(Collections.emptyList(), Collections.singletonList(new ParsedExpressionFloat(position, value)));
-						CallArguments arguments = parsedArguments.compileCall(position, scope, TypeArgument.NONE, method.getHeader());
+						CallArguments arguments = parsedArguments.compileCall(position, scope, StoredType.NONE, method.getHeader());
 						method.callStatic(position, hint.type, method.getHeader(), arguments, scope);
 					} catch (CompileException ex) {
 						return new InvalidExpression(hint, ex);

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionFunction.java

@@ -25,7 +25,6 @@ import org.openzen.zenscript.codemodel.scope.LambdaScope;
 import org.openzen.zenscript.codemodel.scope.StatementScope;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
@@ -59,7 +58,7 @@ public class ParsedExpressionFunction extends ParsedExpression {
 						return new InvalidExpression(position, hint, CompileExceptionCode.MULTIPLE_MATCHING_HINTS, "Ambiguity trying to resolve function types, can't decide for the type");
 					
 					header = functionHint.header.forLambda(definedHeader);
-					storage = hint.storage;
+					storage = hint.getActualStorage();
 				}
 			}
 		}
@@ -85,7 +84,7 @@ public class ParsedExpressionFunction extends ParsedExpression {
 		if (!scope.genericInferenceMap.isEmpty()) {
 			// perform type parameter inference
 			StoredType returnType = statements.getReturnType();
-			Map<TypeParameter, TypeArgument> inferredTypes = returnType.type.inferTypeParameters(scope.getMemberCache(), genericHeader.getReturnType().asArgument());
+			Map<TypeParameter, StoredType> inferredTypes = returnType.type.inferTypeParameters(scope.getMemberCache(), genericHeader.getReturnType());
 			if (inferredTypes == null)
 				throw new CompileException(position, CompileExceptionCode.TYPE_ARGUMENTS_NOT_INFERRABLE, "Could not infer generic type parameters");
 			

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionIndex.java

@@ -19,7 +19,6 @@ import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.member.TypeMemberGroup;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 
 /**
  *
@@ -111,7 +110,7 @@ public class ParsedExpressionIndex extends ParsedExpression {
 		}
 
 		@Override
-		public TypeArgument[] getTypeArguments() {
+		public StoredType[] getTypeArguments() {
 			return null;
 		}
 	}

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionInt.java

@@ -28,7 +28,6 @@ import org.openzen.zenscript.codemodel.member.ref.FunctionalMemberRef;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 
 /**
@@ -167,7 +166,7 @@ public class ParsedExpressionInt extends ParsedExpression {
 				if (method != null) {
 					try {
 						ParsedCallArguments parsedArguments = new ParsedCallArguments(Collections.emptyList(), Collections.singletonList(new ParsedExpressionInt(position, negative, value, "")));
-						CallArguments arguments = parsedArguments.compileCall(position, scope, TypeArgument.NONE, method.getHeader());
+						CallArguments arguments = parsedArguments.compileCall(position, scope, StoredType.NONE, method.getHeader());
 						method.callStatic(position, hint.type, method.getHeader(), arguments, scope);
 					} catch (CompileException ex) {
 						return new InvalidExpression(hint, ex);

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionMember.java

@@ -13,7 +13,7 @@ import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.partial.IPartialExpression;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
+import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.parser.type.IParsedType;
 
@@ -37,7 +37,7 @@ public class ParsedExpressionMember extends ParsedExpression {
 	@Override
 	public IPartialExpression compile(ExpressionScope scope) throws CompileException {
 		IPartialExpression cValue = value.compile(scope.withoutHints());
-		TypeArgument[] typeArguments = IParsedType.compileArguments(genericParameters, scope);
+		StoredType[] typeArguments = IParsedType.compileTypes(genericParameters, scope);
 		IPartialExpression member = cValue.getMember(
 				position,
 				scope,

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionRange.java

@@ -50,7 +50,7 @@ public class ParsedExpressionRange extends ParsedExpression {
 		Expression to = this.to.compile(scope.withHints(toHints)).eval();
 		
 		StoredType baseType = scope.getTypeMembers(from.type).union(to.type);
-		return new RangeExpression(position, scope.getTypeRegistry().getRange(baseType).stored(baseType.storage), from, to);
+		return new RangeExpression(position, scope.getTypeRegistry().getRange(baseType).stored(baseType.getSpecifiedStorage()), from, to);
 	}
 
 	@Override

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionVariable.java

@@ -25,7 +25,6 @@ import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.member.TypeMembers;
 import org.openzen.zenscript.codemodel.scope.ExpressionScope;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.parser.ParsedAnnotation;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionParameter;
@@ -49,7 +48,7 @@ public class ParsedExpressionVariable extends ParsedExpression {
 
 	@Override
 	public IPartialExpression compile(ExpressionScope scope) throws CompileException {
-		TypeArgument[] typeArguments = IParsedType.compileArguments(this.typeArguments, scope);
+		StoredType[] typeArguments = IParsedType.compileTypes(this.typeArguments, scope);
 		IPartialExpression result = scope.get(position, new GenericName(name, typeArguments));
 		if (result == null) {
 			for (StoredType hint : scope.hints) {

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedTryConvertExpression.java

@@ -38,8 +38,8 @@ public class ParsedTryConvertExpression extends ParsedExpression {
 		HighLevelDefinition result = scope.getTypeRegistry().stdlib.getDefinition("Result");
 		if (cValue.thrownType != null) {
 			// this function throws
-			DefinitionTypeID resultType = scope.getTypeRegistry().getForDefinition(result, cValue.type.asArgument(), cValue.thrownType.asArgument());
-			return new TryConvertExpression(position, resultType.stored(cValue.type.storage), cValue);
+			DefinitionTypeID resultType = scope.getTypeRegistry().getForDefinition(result, cValue.type, cValue.thrownType);
+			return new TryConvertExpression(position, resultType.stored(cValue.type.getActualStorage()), cValue);
 		} else {
 			throw new CompileException(position, CompileExceptionCode.TRY_CONVERT_ILLEGAL_TARGET, "try? can only be used on expressions that throw");
 		}

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedTryRethrowExpression.java

@@ -42,7 +42,7 @@ public class ParsedTryRethrowExpression extends ParsedExpression {
 				return new TryRethrowAsExceptionExpression(position, cSource.type, cSource, cSource.thrownType);
 			} else {
 				// rethrow as result
-				StoredType resultType = scope.getTypeRegistry().getForDefinition(result, cSource.type.asArgument(), cSource.thrownType.asArgument()).stored(cSource.thrownType.storage);
+				StoredType resultType = scope.getTypeRegistry().getForDefinition(result, cSource.type, cSource.thrownType).stored(cSource.thrownType.getSpecifiedStorage());
 				return new TryRethrowAsResultExpression(position, resultType, cSource);
 			}
 		} else {
@@ -50,7 +50,7 @@ public class ParsedTryRethrowExpression extends ParsedExpression {
 			if (cSource.type.type instanceof DefinitionTypeID) {
 				DefinitionTypeID sourceType = (DefinitionTypeID)cSource.type.type;
 				if (sourceType.definition == result) {
-					return new TryRethrowAsResultExpression(position, sourceType.typeArguments[0].stored(), cSource);
+					return new TryRethrowAsResultExpression(position, sourceType.typeArguments[0], cSource);
 				}
 			}
 			

Parser/src/main/java/org/openzen/zenscript/parser/member/ParsedSetter.java

@@ -70,13 +70,13 @@ public class ParsedSetter extends ParsedDefinitionMember {
 	
 	private void inferHeaders(BaseScope scope) throws CompileException {
 		if ((implementation != null && !Modifiers.isPrivate(modifiers))) {
-			fillOverride(scope, implementation.getCompiled().type.stored(scope.getThisType().storage));
+			fillOverride(scope, implementation.getCompiled().type.stored(scope.getThisType().getSpecifiedStorage()));
 			compiled.modifiers |= Modifiers.PUBLIC;
 		} else if (implementation == null && Modifiers.isOverride(modifiers)) {
 			if (definition.getSuperType() == null)
 				throw new CompileException(position, CompileExceptionCode.OVERRIDE_WITHOUT_BASE, "Override specified without base type");
 			
-			fillOverride(scope, definition.getSuperType().stored(scope.getThisType().storage));
+			fillOverride(scope, definition.getSuperType().stored(scope.getThisType().getSpecifiedStorage()));
 		}
 		
 		if (compiled == null)

Parser/src/main/java/org/openzen/zenscript/parser/type/IParsedType.java

@@ -15,9 +15,7 @@ import org.openzen.zenscript.lexer.ZSTokenParser;
 import org.openzen.zenscript.lexer.ZSTokenType;
 import static org.openzen.zenscript.lexer.ZSTokenType.*;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.lexer.ParseException;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
 import org.openzen.zenscript.parser.definitions.ParsedTypeParameter;
@@ -90,16 +88,6 @@ public interface IParsedType {
 	
 	public static IParsedType tryParse(ZSTokenParser tokens) throws ParseException {
 		CodePosition position = tokens.getPosition();
-		int modifiers = 0;
-		while (true) {
-			if (tokens.optional(ZSTokenType.K_CONST) != null) {
-				modifiers |= ModifiedTypeID.MODIFIER_CONST;
-			} else if (tokens.optional(ZSTokenType.K_IMMUTABLE) != null) {
-				modifiers |= ModifiedTypeID.MODIFIER_IMMUTABLE;
-			} else {
-				break;
-			}
-		}
 		
 		IParsedType result;
 		switch (tokens.peek().type) {
@@ -162,7 +150,7 @@ public interface IParsedType {
 			case K_STRING: {
 				tokens.next();
 				ParsedStorageTag storage = ParsedStorageTag.parse(tokens);
-				result = new ParsedString(position, modifiers, storage);
+				result = new ParsedString(position, storage);
 				break;
 			}
 			case K_FUNCTION: {
@@ -210,7 +198,7 @@ public interface IParsedType {
 						tokens.required(T_GREATER, "> expected");
 						tokens.required(ZSTokenType.T_SQCLOSE, "] expected");
 						ParsedStorageTag storage = ParsedStorageTag.parse(tokens);
-						result = new ParsedTypeGenericMap(position, parameter, result, modifiers, storage);
+						result = new ParsedTypeGenericMap(position, parameter, result, storage);
 					} else {
 						IParsedType keyType = parse(tokens);
 						tokens.required(ZSTokenType.T_SQCLOSE, "] expected");
@@ -220,16 +208,13 @@ public interface IParsedType {
 					break;
 				case T_QUEST:
 					tokens.next();
-					result = result.withOptional();
+					result = new ParsedOptionalType(result);
 					break;
 				default:
 					break outer;
 			}
 		}
 		
-		if (modifiers > 0)
-			result = result.withModifiers(modifiers);
-		
 		return result;
 	}
 	
@@ -255,32 +240,26 @@ public interface IParsedType {
 		return result;
 	}
 	
-	public static TypeArgument[] compileArguments(List<IParsedType> typeParameters, TypeResolutionContext context) {
-		TypeArgument[] result = TypeArgument.NONE;
+	public static StoredType[] compileTypes(List<IParsedType> typeParameters, TypeResolutionContext context) {
+		StoredType[] result = StoredType.NONE;
 		if (typeParameters != null && typeParameters.size() > 0) {
-			result = new TypeArgument[typeParameters.size()];
+			result = new StoredType[typeParameters.size()];
 			for (int i = 0; i < typeParameters.size(); i++) {
-				result[i] = typeParameters.get(i).compileArgument(context);
+				result[i] = typeParameters.get(i).compile(context);
 			}
 		}
 		return result;
 	}
 	
-	public IParsedType withOptional();
-	
-	public IParsedType withModifiers(int modifiers);
-	
 	public StoredType compile(TypeResolutionContext context);
 	
 	public TypeID compileUnstored(TypeResolutionContext context);
 	
-	public TypeArgument compileArgument(TypeResolutionContext context);
-	
 	public default AnnotationDefinition compileAnnotation(BaseScope scope) {
 		return null;
 	}
 	
-	public default TypeArgument[] compileTypeArguments(BaseScope scope) {
-		return TypeArgument.NONE;
+	public default StoredType[] compileTypeArguments(BaseScope scope) {
+		return StoredType.NONE;
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedFunctionType.java

@@ -9,13 +9,10 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 import org.openzen.zenscript.parser.definitions.ParsedFunctionHeader;
 import org.openzen.zenscript.codemodel.type.TypeID;
-import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 
 /**
  *
@@ -23,38 +20,19 @@ import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
  */
 public class ParsedFunctionType implements IParsedType {
 	private final CodePosition position;
-	private final int modifiers;
 	private final ParsedFunctionHeader header;
 	private final ParsedStorageTag storage;
 	
 	public ParsedFunctionType(CodePosition position, ParsedFunctionHeader header, ParsedStorageTag storage) {
 		this.position = position;
 		this.header = header;
-		this.modifiers = 0;
 		this.storage = storage;
 	}
-	
-	private ParsedFunctionType(CodePosition position, ParsedFunctionHeader header, int modifiers, ParsedStorageTag storageTag) {
-		this.position = position;
-		this.header = header;
-		this.modifiers = modifiers;
-		this.storage = storageTag;
-	}
-	
-	@Override
-	public IParsedType withOptional() {
-		return new ParsedFunctionType(position, header, modifiers | ModifiedTypeID.MODIFIER_OPTIONAL, storage);
-	}
-
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		return new ParsedFunctionType(position, header, modifiers | this.modifiers, storage);
-	}
 
 	@Override
 	public StoredType compile(TypeResolutionContext context) {
-		StorageTag storage = this.storage == ParsedStorageTag.NULL ? AutoStorageTag.INSTANCE : this.storage.resolve(position, context);
-		return context.getTypeRegistry().getModified(modifiers, context.getTypeRegistry().getFunction(header.compile(context))).stored(storage);
+		StorageTag storage = this.storage.resolve(position, context);
+		return context.getTypeRegistry().getFunction(header.compile(context)).stored(storage);
 	}
 	
 	@Override
@@ -62,12 +40,6 @@ public class ParsedFunctionType implements IParsedType {
 		if (storage != ParsedStorageTag.NULL)
 			return new InvalidTypeID(position, CompileExceptionCode.STORAGE_NOT_SUPPORTED, "Storage tag not supported here");
 		
-		return context.getTypeRegistry().getModified(modifiers, context.getTypeRegistry().getFunction(header.compile(context)));
-	}
-
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		StorageTag storage = this.storage == ParsedStorageTag.NULL ? null : this.storage.resolve(position, context);
-		return new TypeArgument(context.getTypeRegistry().getModified(modifiers, context.getTypeRegistry().getFunction(header.compile(context))), storage);
+		return context.getTypeRegistry().getFunction(header.compile(context));
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedNamedType.java

@@ -14,13 +14,8 @@ import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.scope.BaseScope;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
-import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 import org.openzen.zenscript.codemodel.type.TypeID;
-import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
-import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
 
 /**
  *
@@ -28,20 +23,11 @@ import org.openzen.zenscript.codemodel.type.storage.ValueStorageTag;
  */
 public class ParsedNamedType implements IParsedType {
 	private final CodePosition position;
-	private final int modifiers;
 	public final List<ParsedNamePart> name;
 	private final ParsedStorageTag storage;
 	
 	public ParsedNamedType(CodePosition position, List<ParsedNamePart> name, ParsedStorageTag storage) {
 		this.position = position;
-		this.modifiers = 0;
-		this.name = name;
-		this.storage = storage;
-	}
-	
-	private ParsedNamedType(CodePosition position, int modifiers, List<ParsedNamePart> name, ParsedStorageTag storage) {
-		this.position = position;
-		this.modifiers = modifiers;
 		this.name = name;
 		this.storage = storage;
 	}
@@ -55,21 +41,11 @@ public class ParsedNamedType implements IParsedType {
 		for (ParsedNamePart namePart : name)
 			genericNames.add(namePart.compile(context));
 		
-		TypeID baseType = context.getType(position, genericNames);
-		if (baseType == null)
-			return new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "Type not found: " + toString()).stored(ValueStorageTag.INSTANCE);
-		
-		TypeID result = context.getTypeRegistry().getModified(modifiers, baseType);
+		TypeID result = context.getType(position, genericNames);
 		if (result == null)
-			return new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "Type not found: " + toString()).stored(ValueStorageTag.INSTANCE);
+			return new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "Type not found: " + toString()).stored();
 		
-		StorageTag storage;
-		if (this.storage == ParsedStorageTag.NULL) {
-			storage = AutoStorageTag.INSTANCE;
-		} else {
-			storage = this.storage.resolve(position, context);
-		}
-		return result.stored(storage);
+		return result.stored(storage.resolve(position, context));
 	}
 	
 	@Override
@@ -80,42 +56,6 @@ public class ParsedNamedType implements IParsedType {
 		return compile(context).type;
 	}
 	
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		if (name.size() == 1 && name.get(0).name.equals("Iterator"))
-			return toIterator(context).asArgument();
-		
-		List<GenericName> genericNames = new ArrayList<>();
-		for (ParsedNamePart namePart : name)
-			genericNames.add(namePart.compile(context));
-		
-		TypeID baseType = context.getType(position, genericNames);
-		if (baseType == null)
-			return new TypeArgument(new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "Type not found: " + toString()), null);
-		
-		TypeID result = context.getTypeRegistry().getModified(modifiers, baseType);
-		if (result == null)
-			return new TypeArgument(new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "Type not found: " + toString()), null);
-		
-		StorageTag storage;
-		if (this.storage == ParsedStorageTag.NULL) {
-			storage = null;
-		} else {
-			storage = this.storage.resolve(position, context);
-		}
-		return new TypeArgument(result, storage);
-	}
-	
-	@Override
-	public IParsedType withOptional() {
-		return new ParsedNamedType(position, modifiers | ModifiedTypeID.MODIFIER_OPTIONAL, name, storage);
-	}
-	
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		return new ParsedNamedType(position, this.modifiers | modifiers, name, storage);
-	}
-	
 	@Override
 	public String toString() {
 		StringBuilder nameTotal = new StringBuilder();
@@ -136,9 +76,9 @@ public class ParsedNamedType implements IParsedType {
 	}
 	
 	@Override
-	public TypeArgument[] compileTypeArguments(BaseScope scope) {
+	public StoredType[] compileTypeArguments(BaseScope scope) {
 		ParsedNamePart last = name.get(name.size() - 1);
-		return IParsedType.compileArguments(last.typeArguments, scope);
+		return IParsedType.compileTypes(last.typeArguments, scope);
 	}
 	
 	private StoredType toIterator(TypeResolutionContext context) {
@@ -147,11 +87,8 @@ public class ParsedNamedType implements IParsedType {
 		for (int i = 0; i < genericTypes.size(); i++)
 			iteratorTypes[i] = genericTypes.get(i).compile(context);
 
-		StorageTag storage = this.storage.resolve(position, context);
 		TypeID type = context.getTypeRegistry().getIterator(iteratorTypes);
-		if (storage == null)
-			storage = AutoStorageTag.INSTANCE;
-		return context.getTypeRegistry().getModified(modifiers, type).stored(storage);
+		return type.stored(storage.resolve(position, context));
 	}
 	
 	public static class ParsedNamePart {
@@ -164,7 +101,7 @@ public class ParsedNamedType implements IParsedType {
 		}
 		
 		private GenericName compile(TypeResolutionContext context) {
-			return new GenericName(name, IParsedType.compileArguments(typeArguments, context));
+			return new GenericName(name, IParsedType.compileTypes(typeArguments, context));
 		}
 		
 		@Override

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedOptionalBasicType.java

@@ -1,51 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.zenscript.parser.type;
-
-import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
-import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
-import org.openzen.zenscript.codemodel.type.TypeID;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class ParsedOptionalBasicType implements IParsedType {
-	private final ParsedTypeBasic type;
-	
-	public ParsedOptionalBasicType(ParsedTypeBasic type) {
-		this.type = type;
-	}
-
-	@Override
-	public IParsedType withOptional() {
-		return this;
-	}
-
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public StoredType compile(TypeResolutionContext context) {
-		StoredType base = type.compile(context);
-		return context.getTypeRegistry().getModified(ModifiedTypeID.MODIFIER_OPTIONAL, base.type).stored(base.storage);
-	}
-
-	@Override
-	public TypeID compileUnstored(TypeResolutionContext context) {
-		return context.getTypeRegistry().getModified(ModifiedTypeID.MODIFIER_OPTIONAL, type.compileUnstored(context));
-	}
-
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		TypeArgument base = type.compileArgument(context);
-		return new TypeArgument(context.getTypeRegistry().getModified(ModifiedTypeID.MODIFIER_OPTIONAL, base.type), base.storage);
-	}
-}

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedOptionalType.java

@@ -0,0 +1,33 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.zenscript.parser.type;
+
+import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
+import org.openzen.zenscript.codemodel.type.StoredType;
+import org.openzen.zenscript.codemodel.type.TypeID;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ParsedOptionalType implements IParsedType {
+	private final IParsedType type;
+	
+	public ParsedOptionalType(IParsedType type) {
+		this.type = type;
+	}
+
+	@Override
+	public StoredType compile(TypeResolutionContext context) {
+		StoredType base = type.compile(context);
+		return new StoredType(context.getTypeRegistry().getOptional(base.type), base.getSpecifiedStorage());
+	}
+
+	@Override
+	public TypeID compileUnstored(TypeResolutionContext context) {
+		return context.getTypeRegistry().getOptional(type.compileUnstored(context));
+	}
+}

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedString.java

@@ -9,12 +9,9 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
-import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 
 /**
  *
@@ -22,30 +19,16 @@ import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
  */
 public class ParsedString implements IParsedType {
 	private final CodePosition position;
-	private final int modifiers;
 	private final ParsedStorageTag storage;
 	
-	public ParsedString(CodePosition position, int modifiers, ParsedStorageTag storage) {
+	public ParsedString(CodePosition position, ParsedStorageTag storage) {
 		this.position = position;
-		this.modifiers = modifiers;
 		this.storage = storage;
 	}
 
-	@Override
-	public IParsedType withOptional() {
-		return new ParsedString(position, modifiers | ModifiedTypeID.MODIFIER_OPTIONAL, storage);
-	}
-
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		return new ParsedString(position, this.modifiers | modifiers, storage);
-	}
-
 	@Override
 	public StoredType compile(TypeResolutionContext context) {
-		return context.getTypeRegistry()
-				.getModified(modifiers, StringTypeID.INSTANCE)
-				.stored(storage == ParsedStorageTag.NULL ? AutoStorageTag.INSTANCE : storage.resolve(position, context));
+		return StringTypeID.INSTANCE.stored(storage.resolve(position, context));
 	}
 
 	@Override
@@ -55,10 +38,4 @@ public class ParsedString implements IParsedType {
 		
 		return StringTypeID.INSTANCE;
 	}
-
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		return new TypeArgument(context.getTypeRegistry()
-				.getModified(modifiers, StringTypeID.INSTANCE), storage.resolve(position, context));
-	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedTypeArray.java

@@ -10,11 +10,8 @@ import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
-import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 
 /**
@@ -25,7 +22,6 @@ public class ParsedTypeArray implements IParsedType {
 	private final CodePosition position;
 	public final IParsedType baseType;
 	public final int dimension;
-	public final int modifiers;
 	public final ParsedStorageTag storage;
 	
 	public ParsedTypeArray(CodePosition position, IParsedType baseType, int dimension, ParsedStorageTag storage) {
@@ -35,37 +31,15 @@ public class ParsedTypeArray implements IParsedType {
 		this.position = position;
 		this.baseType = baseType;
 		this.dimension = dimension;
-		this.modifiers = 0;
 		this.storage = storage;
 	}
 
-	private ParsedTypeArray(CodePosition position, IParsedType baseType, int dimension, int modifiers, ParsedStorageTag storage) {
-		if (storage == null)
-			throw new NullPointerException();
-		
-		this.position = position;
-		this.baseType = baseType;
-		this.dimension = dimension;
-		this.modifiers = modifiers;
-		this.storage = storage;
-	}
-	
-	@Override
-	public IParsedType withOptional() {
-		return new ParsedTypeArray(position, baseType, dimension, modifiers | ModifiedTypeID.MODIFIER_OPTIONAL, storage);
-	}
-
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		return new ParsedTypeArray(position, baseType, dimension, this.modifiers | modifiers, storage);
-	}
-
 	@Override
 	public StoredType compile(TypeResolutionContext context) {
 		StoredType baseType = this.baseType.compile(context);
 		StorageTag storage = this.storage.resolve(position, context);
 		GlobalTypeRegistry registry = context.getTypeRegistry();
-		return registry.getModified(modifiers, registry.getArray(baseType, dimension)).stored(storage == null ? AutoStorageTag.INSTANCE : storage);
+		return registry.getArray(baseType, dimension).stored(storage);
 	}
 	
 	@Override
@@ -76,14 +50,6 @@ public class ParsedTypeArray implements IParsedType {
 		StoredType baseType = this.baseType.compile(context);
 		StorageTag storage = this.storage.resolve(position, context);
 		GlobalTypeRegistry registry = context.getTypeRegistry();
-		return registry.getModified(modifiers, registry.getArray(baseType, dimension));
-	}
-
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		StoredType baseType = this.baseType.compile(context);
-		StorageTag storage = this.storage.resolve(position, context);
-		GlobalTypeRegistry registry = context.getTypeRegistry();
-		return new TypeArgument(registry.getModified(modifiers, registry.getArray(baseType, dimension)), storage);
+		return registry.getArray(baseType, dimension);
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedTypeAssociative.java

@@ -8,13 +8,9 @@ package org.openzen.zenscript.parser.type;
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
-import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
-import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 
 /**
@@ -25,42 +21,21 @@ public class ParsedTypeAssociative implements IParsedType {
 	private final CodePosition position;
 	public final IParsedType key;
 	public final IParsedType value;
-	public final int modifiers;
 	private final ParsedStorageTag storage;
 	
 	public ParsedTypeAssociative(CodePosition position, IParsedType key, IParsedType value, ParsedStorageTag storage) {
 		this.position = position;
 		this.key = key;
 		this.value = value;
-		this.modifiers = 0;
 		this.storage = storage;
 	}
 
-	private ParsedTypeAssociative(CodePosition position, IParsedType key, IParsedType value, int modifiers, ParsedStorageTag storage) {
-		this.position = position;
-		this.key = key;
-		this.value = value;
-		this.modifiers = modifiers;
-		this.storage = storage;
-	}
-	
-	@Override
-	public IParsedType withOptional() {
-		return new ParsedTypeAssociative(position, key, value, modifiers | ModifiedTypeID.MODIFIER_OPTIONAL, storage);
-	}
-
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		return new ParsedTypeAssociative(position, key, value, this.modifiers | modifiers, storage);
-	}
-
 	@Override
 	public StoredType compile(TypeResolutionContext context) {
 		StorageTag storage = this.storage.resolve(position, context);
 		StoredType key = this.key.compile(context);
 		StoredType value = this.value.compile(context);
-		GlobalTypeRegistry registry = context.getTypeRegistry();
-		return registry.getModified(modifiers, context.getTypeRegistry().getAssociative(key, value)).stored(storage == null ? AutoStorageTag.INSTANCE : storage);
+		return context.getTypeRegistry().getAssociative(key, value).stored(storage);
 	}
 
 	@Override
@@ -71,16 +46,6 @@ public class ParsedTypeAssociative implements IParsedType {
 		StorageTag storage = this.storage.resolve(position, context);
 		StoredType key = this.key.compile(context);
 		StoredType value = this.value.compile(context);
-		GlobalTypeRegistry registry = context.getTypeRegistry();
-		return registry.getModified(modifiers, context.getTypeRegistry().getAssociative(key, value));
-	}
-
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		StorageTag storage = this.storage.resolve(position, context);
-		StoredType key = this.key.compile(context);
-		StoredType value = this.value.compile(context);
-		GlobalTypeRegistry registry = context.getTypeRegistry();
-		return new TypeArgument(registry.getModified(modifiers, context.getTypeRegistry().getAssociative(key, value)), storage);
+		return context.getTypeRegistry().getAssociative(key, value);
 	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedTypeBasic.java

@@ -8,7 +8,6 @@ package org.openzen.zenscript.parser.type;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
 /**
@@ -48,19 +47,4 @@ public enum ParsedTypeBasic implements IParsedType {
 	public TypeID compileUnstored(TypeResolutionContext context) {
 		return type;
 	}
-	
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		return type.argument;
-	}
-
-	@Override
-	public IParsedType withOptional() {
-		return new ParsedOptionalBasicType(this);
-	}
-
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		throw new UnsupportedOperationException();
-	}
 }

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedTypeGenericMap.java

@@ -14,11 +14,8 @@ import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.GenericName;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
-import org.openzen.zenscript.codemodel.type.storage.AutoStorageTag;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 import org.openzen.zenscript.parser.definitions.ParsedTypeParameter;
 
@@ -30,27 +27,15 @@ public class ParsedTypeGenericMap implements IParsedType {
 	private final CodePosition position;
 	private final ParsedTypeParameter key;
 	private final IParsedType value;
-	private final int modifiers;
 	private final ParsedStorageTag storage;
 	
-	public ParsedTypeGenericMap(CodePosition position, ParsedTypeParameter key, IParsedType value, int modifiers, ParsedStorageTag storage) {
+	public ParsedTypeGenericMap(CodePosition position, ParsedTypeParameter key, IParsedType value, ParsedStorageTag storage) {
 		this.position = position;
 		this.key = key;
 		this.value = value;
-		this.modifiers = modifiers;
 		this.storage = storage;
 	}
 
-	@Override
-	public IParsedType withOptional() {
-		return new ParsedTypeGenericMap(position, key, value, modifiers | ModifiedTypeID.MODIFIER_OPTIONAL, storage);
-	}
-
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		return new ParsedTypeGenericMap(position, key, value, modifiers | this.modifiers, storage);
-	}
-
 	@Override
 	public StoredType compile(TypeResolutionContext context) {
 		TypeParameter cKey = key.compiled;
@@ -58,7 +43,7 @@ public class ParsedTypeGenericMap implements IParsedType {
 		
 		GlobalTypeRegistry registry = context.getTypeRegistry();
 		StorageTag storage = this.storage.resolve(position, context);
-		return registry.getModified(modifiers, registry.getGenericMap(valueType, cKey)).stored(storage == null ? AutoStorageTag.INSTANCE : storage);
+		return registry.getGenericMap(valueType, cKey).stored(storage);
 	}
 
 	@Override
@@ -71,17 +56,7 @@ public class ParsedTypeGenericMap implements IParsedType {
 		
 		GlobalTypeRegistry registry = context.getTypeRegistry();
 		StorageTag storage = this.storage.resolve(position, context);
-		return registry.getModified(modifiers, registry.getGenericMap(valueType, cKey));
-	}
-
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		TypeParameter cKey = key.compiled;
-		StoredType valueType = this.value.compile(new GenericMapScope(context, cKey));
-		
-		GlobalTypeRegistry registry = context.getTypeRegistry();
-		StorageTag storage = this.storage.resolve(position, context);
-		return new TypeArgument(registry.getModified(modifiers, registry.getGenericMap(valueType, cKey)), storage);
+		return registry.getGenericMap(valueType, cKey);
 	}
 	
 	private class GenericMapScope implements TypeResolutionContext {

Parser/src/main/java/org/openzen/zenscript/parser/type/ParsedTypeRange.java

@@ -9,9 +9,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zenscript.codemodel.context.TypeResolutionContext;
 import org.openzen.zenscript.codemodel.type.InvalidTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
 /**
@@ -22,30 +20,11 @@ public class ParsedTypeRange implements IParsedType {
 	private final CodePosition position;
 	private final IParsedType from;
 	private final IParsedType to;
-	private final int modifiers;
 	
 	public ParsedTypeRange(CodePosition position, IParsedType from, IParsedType to) {
 		this.position = position;
 		this.from = from;
 		this.to = to;
-		this.modifiers = 0;
-	}
-	
-	private ParsedTypeRange(CodePosition position, IParsedType from, IParsedType to, int modifiers) {
-		this.position = position;
-		this.from = from;
-		this.to = to;
-		this.modifiers = modifiers;
-	}
-
-	@Override
-	public IParsedType withOptional() {
-		return new ParsedTypeRange(position, from, to, modifiers | ModifiedTypeID.MODIFIER_OPTIONAL);
-	}
-
-	@Override
-	public IParsedType withModifiers(int modifiers) {
-		return new ParsedTypeRange(position, from, to, this.modifiers | modifiers);
 	}
 	
 	@Override
@@ -53,9 +32,9 @@ public class ParsedTypeRange implements IParsedType {
 		StoredType from = this.from.compile(context);
 		StoredType to = this.to.compile(context);
 		if (!from.equals(to))
-			return new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "from and to in a range must be the same type").stored(from.storage);
+			return new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "from and to in a range must be the same type").stored(from.getSpecifiedStorage());
 		
-		return context.getTypeRegistry().getModified(modifiers, context.getTypeRegistry().getRange(from)).stored(from.storage);
+		return context.getTypeRegistry().getRange(from).stored(from.getSpecifiedStorage());
 	}
 	
 	@Override
@@ -65,16 +44,6 @@ public class ParsedTypeRange implements IParsedType {
 		if (!from.equals(to))
 			return new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "from and to in a range must be the same type");
 		
-		return context.getTypeRegistry().getModified(modifiers, context.getTypeRegistry().getRange(from));
-	}
-	
-	@Override
-	public TypeArgument compileArgument(TypeResolutionContext context) {
-		StoredType from = this.from.compile(context);
-		StoredType to = this.to.compile(context);
-		if (!from.equals(to))
-			return new TypeArgument(new InvalidTypeID(position, CompileExceptionCode.NO_SUCH_TYPE, "from and to in a range must be the same type"), null);
-		
-		return new TypeArgument(context.getTypeRegistry().getModified(modifiers, context.getTypeRegistry().getRange(from)), from.storage);
+		return context.getTypeRegistry().getRange(from);
 	}
 }

ScriptingExample/src/main/java/org/openzen/zenscript/scriptingexample/GlobalRegistry.java

@@ -30,8 +30,8 @@ import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.GlobalTypeRegistry;
 import org.openzen.zenscript.codemodel.type.ISymbol;
+import org.openzen.zenscript.codemodel.type.StoredType;
 import org.openzen.zenscript.codemodel.type.StringTypeID;
-import org.openzen.zenscript.codemodel.type.TypeArgument;
 import org.openzen.zenscript.codemodel.type.storage.BorrowStorageTag;
 import org.openzen.zenscript.javashared.JavaClass;
 import org.openzen.zenscript.javashared.JavaField;
@@ -119,7 +119,7 @@ public class GlobalRegistry {
 	private class PrintlnSymbol implements ISymbol {
 
 		@Override
-		public IPartialExpression getExpression(CodePosition position, BaseScope scope, TypeArgument[] typeArguments) {
+		public IPartialExpression getExpression(CodePosition position, BaseScope scope, StoredType[] typeArguments) {
 			return new PartialMemberGroupExpression(
 					position,
 					scope,
@@ -131,7 +131,7 @@ public class GlobalRegistry {
 		}
 
 		@Override
-		public TypeID getType(CodePosition position, TypeResolutionContext context, TypeArgument[] typeArguments) {
+		public TypeID getType(CodePosition position, TypeResolutionContext context, StoredType[] typeArguments) {
 			return null; // not a type
 		}
 	}

Validator/src/main/java/org/openzen/zenscript/validator/visitors/ExpressionValidator.java

@@ -613,7 +613,7 @@ public class ExpressionValidator implements ExpressionVisitor<Void> {
 	public Void visitStorageCast(StorageCastExpression expression) {
 		if (expression.value.type.type != expression.type.type)
 			validator.logError(ValidationLogEntry.Code.INVALID_STORAGE_CAST, expression.position, "Invalid storage cast");
-		if (!expression.value.type.storage.canCastTo(expression.type.storage) && !expression.type.storage.canCastFrom(expression.value.type.storage))
+		if (!expression.value.type.getActualStorage().canCastTo(expression.type.getActualStorage()) && !expression.type.getActualStorage().canCastFrom(expression.value.type.getActualStorage()))
 			validator.logError(ValidationLogEntry.Code.INVALID_STORAGE_CAST, expression.position, "Invalid storage cast");
 		
 		expression.value.accept(this);

Validator/src/main/java/org/openzen/zenscript/validator/visitors/SupertypeValidator.java

@@ -11,7 +11,7 @@ import org.openzen.zenscript.codemodel.Modifiers;
 import org.openzen.zenscript.codemodel.type.ArrayTypeID;
 import org.openzen.zenscript.codemodel.type.AssocTypeID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
-import org.openzen.zenscript.codemodel.type.ModifiedTypeID;
+import org.openzen.zenscript.codemodel.type.OptionalTypeID;
 import org.openzen.zenscript.codemodel.type.DefinitionTypeID;
 import org.openzen.zenscript.codemodel.type.FunctionTypeID;
 import org.openzen.zenscript.codemodel.type.GenericMapTypeID;
@@ -100,8 +100,8 @@ public class SupertypeValidator implements TypeVisitor<Void> {
 	}
 
 	@Override
-	public Void visitModified(ModifiedTypeID type) {
-		validator.logError(ValidationLogEntry.Code.SUPERCLASS_NOT_A_CLASS, position, "Superclass cannot be a modified type");
+	public Void visitOptional(OptionalTypeID type) {
+		validator.logError(ValidationLogEntry.Code.SUPERCLASS_NOT_A_CLASS, position, "Superclass cannot be an optional type");
 		return null;
 	}