diff --git a/metafix/build.gradle b/metafix/build.gradle
index 4445d5b6..a5a7189e 100644
--- a/metafix/build.gradle
+++ b/metafix/build.gradle
@@ -94,6 +94,7 @@ task validateFixFile(type: JavaExec, group: 'Verification') {
   classpath = sourceSets.main.runtimeClasspath
 }
 
+def mwe2File = 'src/main/java/org/metafacture/metafix/GenerateFix.mwe2'
 def xtextFile = 'src/main/java/org/metafacture/metafix/Fix.xtext'
 
 task validateXtextLanguage(type: JavaExec, group: 'Verification') {
@@ -105,10 +106,10 @@ task validateXtextLanguage(type: JavaExec, group: 'Verification') {
 task generateXtextLanguage(type: JavaExec) {
   mainClass = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher'
   classpath = configurations.mwe2
-  inputs.file 'src/main/java/org/metafacture/metafix/GenerateFix.mwe2'
+  inputs.file mwe2File
   inputs.file xtextFile
   outputs.dir 'src/main/xtext-gen'
-  args += 'src/main/java/org/metafacture/metafix/GenerateFix.mwe2'
+  args += mwe2File
   args += '-p'
   args += "rootPath=/${projectDir}/.."
 }
diff --git a/metafix/src/main/java/org/metafacture/metafix/Value.java b/metafix/src/main/java/org/metafacture/metafix/Value.java
index 00d455cb..9f5b8f9c 100644
--- a/metafix/src/main/java/org/metafacture/metafix/Value.java
+++ b/metafix/src/main/java/org/metafacture/metafix/Value.java
@@ -90,12 +90,7 @@ public Value(final Map<String, Value> hash) {
     }
 
     public Value(final String string) {
-        type = string != null ? Type.String : null;
-
-        this.array = null;
-        this.hash = null;
-        this.string = string;
-        this.path = null;
+        this(string, null);
     }
 
     public Value(final int integer) {