Small fixes

Author: LadyCailin

src/main/java/com/laytonsmith/core/constructs/CMutablePrimitive.java

@@ -63,7 +63,7 @@ public void set(Mixed index, Mixed c, Target t) {
 	}
 
 	@Override
-	public void set(Mixed index, Mixed c, Target t, com.laytonsmith.core.environments.Environment env) {
+	public void set(Mixed index, Mixed c, Target t, Environment env) {
 		throw new CRECastException("mutable_primitives cannot have values set in them", t);
 	}
 
@@ -93,7 +93,7 @@ public Mixed get(Mixed index, Target t) {
 	}
 
 	@Override
-	public Mixed get(Mixed index, Target t, com.laytonsmith.core.environments.Environment env) {
+	public Mixed get(Mixed index, Target t, Environment env) {
 		return value;
 	}
 
@@ -125,7 +125,7 @@ public long size() {
 	}
 
 	@Override
-	public long size(com.laytonsmith.core.environments.Environment env) {
+	public long size(Environment env) {
 		if(value.isInstanceOf(Sizeable.TYPE)) {
 			return ArgumentValidation.getObject(value, Target.UNKNOWN, Sizeable.class).size(env);
 		} else {

src/main/java/com/laytonsmith/core/constructs/CSlice.java

@@ -123,7 +123,7 @@ public void set(Mixed index, Mixed c, Target t) {
 	}
 
 	@Override
-	public void set(Mixed index, Mixed c, Target t, com.laytonsmith.core.environments.Environment env) {
+	public void set(Mixed index, Mixed c, Target t, Environment env) {
 		throw new CRECastException("CSlices cannot set values", t);
 	}
 
@@ -135,7 +135,7 @@ public Mixed get(Mixed index, Target t) {
 	}
 
 	@Override
-	public Mixed get(Mixed index, Target t, com.laytonsmith.core.environments.Environment env) {
+	public Mixed get(Mixed index, Target t, Environment env) {
 		long i = ArgumentValidation.getInt(index, t, env);
 		if(i > max) {
 			throw new CRERangeException("Index out of bounds. Index: " + i + " Size: " + max, t);
@@ -151,7 +151,7 @@ public Set<Mixed> keySet() {
 	}
 
 	@Override
-	public Set<Mixed> keySet(com.laytonsmith.core.environments.Environment env) {
+	public Set<Mixed> keySet(Environment env) {
 		// To keep our memory footprint down, we create a "fake" keyset here, which doesn't
 		// require actually creating an entire Set. Removing items from the set isn't supported,
 		// but all iteration options are.
@@ -195,7 +195,7 @@ public long size() {
 	}
 
 	@Override
-	public long size(com.laytonsmith.core.environments.Environment env) {
+	public long size(Environment env) {
 		return size;
 	}
 

src/main/java/com/laytonsmith/core/constructs/Construct.java

@@ -503,7 +503,7 @@ protected String getQuote() {
 	@Deprecated
 	@Override
 	public CClassType typeof() {
-		return typeof((Environment) null);
+		return typeof(null);
 	}
 
 	/**

src/main/java/com/laytonsmith/core/exceptions/CRE/AbstractCREException.java

@@ -352,7 +352,7 @@ public boolean isInstanceOf(CClassType type, LeftHandGenericUse lhsGenericParame
 	@Deprecated
 	@Override
 	public CClassType typeof() {
-		return typeof((Environment) null);
+		return typeof(null);
 	}
 
 	@Override

src/main/java/com/laytonsmith/core/natives/interfaces/AbstractMixed.java

@@ -96,7 +96,7 @@ public boolean isInstanceOf(Class<? extends Mixed> type) {
 	@Deprecated
 	@Override
 	public CClassType typeof() {
-		return typeof((Environment) null);
+		return typeof(null);
 	}
 
 	@Override

src/main/java/com/laytonsmith/core/natives/interfaces/AbstractMixedInterfaceRunner.java

@@ -121,7 +121,7 @@ public CClassType getContainingClass() {
 	@Deprecated
 	@Override
 	public final CClassType typeof() {
-		return typeof((Environment) null);
+		return typeof(null);
 	}
 
 	@Override

src/main/java/com/laytonsmith/core/natives/interfaces/MEnumType.java

@@ -161,7 +161,7 @@ public boolean isInstanceOf(CClassType type, LeftHandGenericUse lhsGenericParame
 			@Deprecated
 			@Override
 			public CClassType typeof() {
-				return typeof((Environment) null);
+				return typeof(null);
 			}
 
 			@Override
@@ -267,7 +267,7 @@ public String toString() {
 							@Deprecated
 							@Override
 							public CClassType typeof() {
-								return typeof((Environment) null);
+								return typeof(null);
 							}
 
 							@Override
@@ -492,7 +492,7 @@ public boolean isInstanceOf(CClassType type, LeftHandGenericUse lhsGenericParame
 	@Deprecated
 	@Override
 	public CClassType typeof() {
-		return typeof((Environment) null);
+		return typeof(null);
 	}
 
 	@Override

src/main/java/com/laytonsmith/core/objects/UserObject.java

@@ -172,7 +172,7 @@ public boolean isInstanceOf(CClassType type, LeftHandGenericUse lhsGenericParame
 	@Deprecated
 	@Override
 	public CClassType typeof() {
-		return typeof((Environment) null);
+		return typeof(null);
 	}
 
 	@Override