diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java
index 7005ed4b..e78f9759 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java
@@ -36,7 +36,6 @@ import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NotNull;
 import org.jf.smalidea.psi.impl.SmaliClass;
 import org.jf.smalidea.psi.index.SmaliClassNameIndex;
@@ -74,12 +73,7 @@ public class SmaliClassElementType extends SmaliStubElementType<SmaliClassStub,
 
     @NotNull @Override
     public SmaliClassStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
-        StringRef nameRef = dataStream.readName();
-        String name = null;
-        if (nameRef != null) {
-            name = nameRef.getString();
-        }
-        return new SmaliClassStub(parentStub, name);
+        return new SmaliClassStub(parentStub, deserializeNullableString(dataStream));
     }
 
     @Override public void indexStub(@NotNull SmaliClassStub stub, @NotNull IndexSink sink) {
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliFieldElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliFieldElementType.java
index f4542a5b..c2fc2aa1 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliFieldElementType.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliFieldElementType.java
@@ -36,7 +36,6 @@ import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NotNull;
 import org.jf.smalidea.psi.impl.SmaliField;
 import org.jf.smalidea.psi.stub.SmaliFieldStub;
@@ -74,13 +73,8 @@ public class SmaliFieldElementType extends SmaliStubElementType<SmaliFieldStub,
 
     @NotNull @Override
     public SmaliFieldStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
-        StringRef nameRef = dataStream.readName();
-        String name = null;
-        if (nameRef != null) {
-            name = nameRef.getString();
-        }
-
-        return new SmaliFieldStub(parentStub, name, dataStream.readName().getString());
+        return new SmaliFieldStub(parentStub, deserializeNullableString(dataStream),
+                dataStream.readName().getString());
     }
 
     @Override public void indexStub(@NotNull SmaliFieldStub stub, @NotNull IndexSink sink) {
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodElementType.java
index d5bf804a..1d83f1a2 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodElementType.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodElementType.java
@@ -36,7 +36,6 @@ import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NotNull;
 import org.jf.smalidea.psi.impl.SmaliMethod;
 import org.jf.smalidea.psi.stub.SmaliMethodStub;
@@ -73,8 +72,7 @@ public class SmaliMethodElementType extends SmaliStubElementType<SmaliMethodStub
 
     @NotNull @Override
     public SmaliMethodStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
-        StringRef methodNameRef = dataStream.readName();
-        return new SmaliMethodStub(parentStub, methodNameRef.getString());
+        return new SmaliMethodStub(parentStub, dataStream.readName().getString());
     }
 
     @Override public void indexStub(@NotNull SmaliMethodStub stub, @NotNull IndexSink sink) {
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodParameterElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodParameterElementType.java
index 3b972689..fb98f45a 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodParameterElementType.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodParameterElementType.java
@@ -36,7 +36,6 @@ import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NotNull;
 import org.jf.smalidea.psi.impl.SmaliMethodParameter;
 import org.jf.smalidea.psi.stub.SmaliMethodParameterStub;
@@ -77,11 +76,8 @@ public class SmaliMethodParameterElementType
     @NotNull @Override
     public SmaliMethodParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub)
             throws IOException {
-        String type = dataStream.readName().getString();
-        StringRef nameRef = dataStream.readName();
-        String name = nameRef==null ? null : nameRef.getString();
-
-        return new SmaliMethodParameterStub(parentStub, type, name);
+        return new SmaliMethodParameterStub(parentStub, dataStream.readName().getString(),
+                deserializeNullableString(dataStream));
     }
 
     @Override public void indexStub(@NotNull SmaliMethodParameterStub stub, @NotNull IndexSink sink) {
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodPrototypeElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodPrototypeElementType.java
index 9c06c49b..1919209e 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodPrototypeElementType.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodPrototypeElementType.java
@@ -37,7 +37,6 @@ import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
-import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NotNull;
 import org.jf.smalidea.psi.impl.SmaliMethodPrototype;
 import org.jf.smalidea.psi.stub.SmaliMethodPrototypeStub;
@@ -83,12 +82,7 @@ public class SmaliMethodPrototypeElementType
     @NotNull @Override
     public SmaliMethodPrototypeStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub)
             throws IOException {
-        StringRef returnTypeRef = dataStream.readName();
-        String returnType = null;
-        if (returnTypeRef != null) {
-            returnType = returnTypeRef.getString();
-        }
-        return new SmaliMethodPrototypeStub(parentStub, returnType);
+        return new SmaliMethodPrototypeStub(parentStub, deserializeNullableString(dataStream));
     }
 
     @Override public void indexStub(@NotNull SmaliMethodPrototypeStub stub, @NotNull IndexSink sink) {
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliStubElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliStubElementType.java
index ea4c43d5..51544b49 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliStubElementType.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliStubElementType.java
@@ -35,10 +35,15 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubElement;
+import com.intellij.psi.stubs.StubInputStream;
+import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jf.smalidea.SmaliLanguage;
 
+import java.io.IOException;
+
 public abstract class SmaliStubElementType<StubT extends StubElement, PsiT extends PsiElement>
         extends IStubElementType<StubT, PsiT> {
     protected SmaliStubElementType(@NotNull @NonNls String debugName) {
@@ -46,4 +51,13 @@ public abstract class SmaliStubElementType<StubT extends StubElement, PsiT exten
     }
 
     public abstract PsiT createPsi(@NotNull ASTNode node);
+
+    @Nullable
+    protected String deserializeNullableString(@NotNull StubInputStream dataStream) throws IOException {
+        StringRef stringRef = dataStream.readName();
+        if (stringRef == null) {
+            return null;
+        }
+        return stringRef.getString();
+    }
 }