diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java
index e086e6e1..1e89781b 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java
@@ -79,8 +79,7 @@ public abstract class DexBackedEncodedValue {
                     return new DexBackedStringEncodedValue(reader, valueArg);
                 case ValueType.TYPE:
                     Preconditions.checkValueArg(valueArg, 3);
-                    return new ImmutableTypeEncodedValue(reader.dexBuf.getType(
-                            reader.readSizedSmallUint(valueArg + 1)));
+                    return new DexBackedTypeEncodedValue(reader, valueArg);
                 case ValueType.FIELD:
                     Preconditions.checkValueArg(valueArg, 3);
                     return new DexBackedFieldEncodedValue(reader, valueArg);
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEnumEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEnumEncodedValue.java
index c3c70cce..13ba1bdd 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEnumEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEnumEncodedValue.java
@@ -48,7 +48,7 @@ public class DexBackedEnumEncodedValue extends BaseEnumEncodedValue {
         fieldIndex = reader.readSizedSmallUint(valueArg + 1);
     }
 
-    @Override public FieldReference getValue() {
+    @Nonnull @Override public FieldReference getValue() {
         return new DexBackedFieldReference(dexFile, fieldIndex);
     }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedFieldEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedFieldEncodedValue.java
index c28d2a01..db289608 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedFieldEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedFieldEncodedValue.java
@@ -48,7 +48,7 @@ public class DexBackedFieldEncodedValue extends BaseFieldEncodedValue {
         fieldIndex = reader.readSizedSmallUint(valueArg + 1);
     }
 
-    @Override public FieldReference getValue() {
+    @Nonnull @Override public FieldReference getValue() {
         return new DexBackedFieldReference(dexFile, fieldIndex);
     }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedMethodEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedMethodEncodedValue.java
index 856ddf08..a0941ce3 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedMethodEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedMethodEncodedValue.java
@@ -48,7 +48,7 @@ public class DexBackedMethodEncodedValue extends BaseMethodEncodedValue {
         MethodIndex = reader.readSizedSmallUint(valueArg + 1);
     }
 
-    @Override public MethodReference getValue() {
+    @Nonnull @Override public MethodReference getValue() {
         return new DexBackedMethodReference(dexFile, MethodIndex);
     }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedStringEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedStringEncodedValue.java
index 3103c00d..bba3051e 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedStringEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedStringEncodedValue.java
@@ -46,7 +46,7 @@ public class DexBackedStringEncodedValue extends BaseStringEncodedValue {
         stringIndex = reader.readSizedSmallUint(valueArg + 1);
     }
 
-    @Override public String getValue() {
+    @Nonnull @Override public String getValue() {
         return dexFile.getString(stringIndex);
     }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedTypeEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedTypeEncodedValue.java
index f5f39599..9a2fd548 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedTypeEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedTypeEncodedValue.java
@@ -46,7 +46,7 @@ public class DexBackedTypeEncodedValue extends BaseTypeEncodedValue {
         typeIndex = reader.readSizedSmallUint(valueArg + 1);
     }
 
-    @Override public String getValue() {
+    @Nonnull @Override public String getValue() {
         return dexFile.getType(typeIndex);
     }
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/EnumEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/EnumEncodedValue.java
index 004b6c67..962785fd 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/EnumEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/EnumEncodedValue.java
@@ -47,7 +47,7 @@ public interface EnumEncodedValue extends EncodedValue {
      *
      * @return a reference to the field on the enum class that holds the enum value, as a FieldReference
      */
-    FieldReference getValue();
+    @Nonnull FieldReference getValue();
 
     /**
      * Returns a hashcode for this EncodedEnumValue.
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/FieldEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/FieldEncodedValue.java
index 864b2da0..80a96964 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/FieldEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/FieldEncodedValue.java
@@ -45,7 +45,7 @@ public interface FieldEncodedValue extends EncodedValue {
      *
      * @return the field value as a FieldReference
      */
-    FieldReference getValue();
+    @Nonnull FieldReference getValue();
 
     /**
      * Returns a hashcode for this EncodedFieldValue.
@@ -59,8 +59,7 @@ public interface FieldEncodedValue extends EncodedValue {
      *
      * @return The hash code value for this EncodedFieldValue
      */
-    @Override
-    int hashCode();
+    @Override int hashCode();
 
     /**
      * Compares this FieldEncodedValue to another FieldEncodedValue for equality.
@@ -70,8 +69,7 @@ public interface FieldEncodedValue extends EncodedValue {
      * @param o The object to be compared for equality with this FieldEncodedValue
      * @return true if the specified object is equal to this FieldEncodedValue
      */
-    @Override
-    boolean equals(@Nullable Object o);
+    @Override boolean equals(@Nullable Object o);
 
     /**
      * Compare this FieldEncodedValue to another EncodedValue.
@@ -82,6 +80,5 @@ public interface FieldEncodedValue extends EncodedValue {
      * @param o The EncodedValue to compare with this FieldEncodedValue
      * @return An integer representing the result of the comparison
      */
-    @Override
-    int compareTo(@Nonnull EncodedValue o);
+    @Override int compareTo(@Nonnull EncodedValue o);
 }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/StringEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/StringEncodedValue.java
index c9cd4f36..01da85cb 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/StringEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/StringEncodedValue.java
@@ -43,7 +43,7 @@ public interface StringEncodedValue extends EncodedValue {
      *
      * @return the string value
      */
-    String getValue();
+    @Nonnull String getValue();
 
     /**
      * Returns a hashcode for this EncodedStringValue.
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/TypeEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/TypeEncodedValue.java
index 95d9e9c0..6fb5ffdf 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/TypeEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/TypeEncodedValue.java
@@ -43,7 +43,7 @@ public interface TypeEncodedValue extends EncodedValue {
      *
      * @return the type value
      */
-    String getValue();
+    @Nonnull String getValue();
 
     /**
      * Returns a hashcode for this EncodedTypeValue.