Remove unused parameters

Change-Id: I24df3575733efb5cc052c565e1478549d39a3b6d

126 files changed, 192 insertions, 206 deletions

diff --git a/dx/src/com/android/jack/dx/io/EncodedValueReader.java b/dx/src/com/android/jack/dx/io/EncodedValueReader.java
index d65d35c..d7eade0 100644
--- a/dx/src/com/android/jack/dx/io/EncodedValueReader.java
+++ b/dx/src/com/android/jack/dx/io/EncodedValueReader.java
@@ -117,44 +117,32 @@ public class EncodedValueReader {
     }
   }
 
-  @SuppressWarnings("unused")
   protected void visitArray(int size) {}
 
-  @SuppressWarnings("unused")
   protected void visitAnnotation(int typeIndex, int size) {}
 
-  @SuppressWarnings("unused")
   protected void visitAnnotationName(int nameIndex) {}
 
-  @SuppressWarnings("unused")
   protected void visitPrimitive(int argAndType, int type, int arg, int size) {
     for (int i = 0; i < size; i++) {
       in.readByte();
     }
   }
 
-  @SuppressWarnings("unused")
   protected void visitString(int type, int index) {}
 
-  @SuppressWarnings("unused")
   protected void visitType(int type, int index) {}
 
-  @SuppressWarnings("unused")
   protected void visitField(int type, int index) {}
 
-  @SuppressWarnings("unused")
   protected void visitMethod(int type, int index) {}
 
-  @SuppressWarnings("unused")
   protected void visitArrayValue(int argAndType) {}
 
-  @SuppressWarnings("unused")
   protected void visitAnnotationValue(int argAndType) {}
 
-  @SuppressWarnings("unused")
   protected void visitEncodedBoolean(int argAndType) {}
 
-  @SuppressWarnings("unused")
   protected void visitEncodedNull(int argAndType) {}
 
   private int readIndex(ByteInput in, int byteCount) {
diff --git a/jack/.settings/org.eclipse.jdt.core.prefs b/jack/.settings/org.eclipse.jdt.core.prefs
index 4fe7fb2..41027ae 100644
--- a/jack/.settings/org.eclipse.jdt.core.prefs
+++ b/jack/.settings/org.eclipse.jdt.core.prefs
@@ -88,7 +88,7 @@ org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/jack/src/com/android/jack/Jack.java b/jack/src/com/android/jack/Jack.java
index cb313e8..8e64a61 100644
--- a/jack/src/com/android/jack/Jack.java
+++ b/jack/src/com/android/jack/Jack.java
@@ -422,9 +422,9 @@ public abstract class Jack {
         if (targetProduction.contains(JackFormatProduct.class)
             && !targetProduction.contains(DexFileProduct.class)) {
           if (options.ecjArguments == null) {
-            fillJayceToJaycePlan(options, planBuilder);
+            fillJayceToJaycePlan(planBuilder);
           } else {
-            fillJavaToJaycePlan(options, planBuilder);
+            fillJavaToJaycePlan(planBuilder);
           }
           SubPlanBuilder<JDefinedClassOrInterface> typePlan =
               planBuilder.appendSubPlan(JDefinedClassOrInterfaceAdaptor.class);
@@ -674,8 +674,7 @@ public abstract class Jack {
     return dir;
   }
 
-  private static void fillJayceToJaycePlan(
-      @Nonnull Options options, @Nonnull PlanBuilder<JSession> planBuilder) {
+  private static void fillJayceToJaycePlan(@Nonnull PlanBuilder<JSession> planBuilder) {
     // Add here transformations we want to apply before writing .jack file
     FeatureSet features = planBuilder.getRequest().getFeatures();
     ProductionSet productions = planBuilder.getRequest().getTargetProductions();
@@ -979,8 +978,7 @@ public abstract class Jack {
     planBuilder.append(DexFilePreparer.class);
   }
 
-  private static void fillJavaToJaycePlan(
-      @Nonnull Options options, @Nonnull PlanBuilder<JSession> planBuilder) {
+  private static void fillJavaToJaycePlan(@Nonnull PlanBuilder<JSession> planBuilder) {
     Request request = planBuilder.getRequest();
     FeatureSet features = request.getFeatures();
     ProductionSet productions = request.getTargetProductions();
diff --git a/jack/src/com/android/jack/frontend/java/JAstBuilder.java b/jack/src/com/android/jack/frontend/java/JAstBuilder.java
index 940a887..9c2ba97 100644
--- a/jack/src/com/android/jack/frontend/java/JAstBuilder.java
+++ b/jack/src/com/android/jack/frontend/java/JAstBuilder.java
@@ -101,7 +101,7 @@ class JAstBuilder extends JavaParser {
     for (int i = 0; i < compoundNameLength; i++) {
       String name = String.valueOf(compoundName[i]);
       currentPackage = currentPackage.getOrCreateSubPackage(name);
-      currentPackage.setOnPath(true);
+      currentPackage.setOnPath();
     }
 
     return currentPackage;
diff --git a/jack/src/com/android/jack/ir/ast/JNode.java b/jack/src/com/android/jack/ir/ast/JNode.java
index 5a2b853..25f24e5 100644
--- a/jack/src/com/android/jack/ir/ast/JNode.java
+++ b/jack/src/com/android/jack/ir/ast/JNode.java
@@ -186,6 +186,15 @@ public abstract class JNode extends LocalMarkerManager
     transform(existingNode, newNode, Transformation.INSERT_AFTER);
   }
 
+  /**
+   * Transform a {@link JNode}.
+   *
+   * @param existingNode {@link JNode} to transform.
+   * @param newNode {@link JNode} that will replace the existing node if the transformation kind is
+   *        set to remove.
+   * @param transformation transformation kind.
+   * @throws UnsupportedOperationException
+   */
  protected void transform(
       @Nonnull JNode existingNode,
       @CheckForNull JNode newNode,
@@ -242,6 +251,11 @@ public abstract class JNode extends LocalMarkerManager
     this.parent = parent;
   }
 
+  /**
+   * Check if the result of an expression is used or not.
+   * @param expr {@link JExpression} that we want to check the result usage.
+   * @return true if result of {@link JExpression} is used, false otherwise.
+   */
   protected boolean isResultOfExpressionUsed(JExpression expr) {
     throw new AssertionError("Not yet supported");
   }
diff --git a/jack/src/com/android/jack/ir/ast/JPackage.java b/jack/src/com/android/jack/ir/ast/JPackage.java
index b53c7ea..9401ccd 100644
--- a/jack/src/com/android/jack/ir/ast/JPackage.java
+++ b/jack/src/com/android/jack/ir/ast/JPackage.java
@@ -210,7 +210,7 @@ public class JPackage extends JNode implements HasName, CanBeRenamed, HasEnclosi
     return loadClassOrInterface(typeName);
   }
 
-  public void setOnPath(boolean isOnPath) {
+  public void setOnPath() {
     this.isOnPath = OnPath.TRUE;
   }
 
diff --git a/jack/src/com/android/jack/ir/ast/JPrimitiveType.java b/jack/src/com/android/jack/ir/ast/JPrimitiveType.java
index f52223a..d192ebe 100644
--- a/jack/src/com/android/jack/ir/ast/JPrimitiveType.java
+++ b/jack/src/com/android/jack/ir/ast/JPrimitiveType.java
@@ -68,7 +68,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Nonnull
   protected final String name;
 
-  private JPrimitiveType(@Nonnull String name, @Nonnull String signatureName) {
+  private JPrimitiveType(@Nonnull String name) {
     super(SourceOrigin.UNKNOWN);
     this.name = name;
   }
@@ -193,7 +193,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java boolean type")
   public static class JBooleanType extends JPrimitiveType {
     private JBooleanType() {
-      super("boolean", "Z");
+      super("boolean");
     }
 
     @Override
@@ -228,7 +228,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java byte type")
   public static class JByteType extends JPrimitiveType implements JIntegralType32 {
     private JByteType() {
-      super("byte", "B");
+      super("byte");
     }
 
     @Override
@@ -267,7 +267,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java char type")
   public static class JCharType extends JPrimitiveType implements JIntegralType32 {
     private JCharType() {
-      super("char", "C");
+      super("char");
     }
 
     @Override
@@ -306,7 +306,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java double type")
   public static class JDoubleType extends JPrimitiveType implements JFloatingPointType {
     private JDoubleType() {
-      super("double", "D");
+      super("double");
     }
 
     @Override
@@ -340,7 +340,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java float type")
   public static class JFloatType extends JPrimitiveType implements JFloatingPointType {
     private JFloatType() {
-      super("float", "F");
+      super("float");
     }
 
     @Override
@@ -374,7 +374,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java int type")
   public static class JIntType extends JPrimitiveType implements JIntegralType32 {
     private JIntType() {
-      super("int", "I");
+      super("int");
     }
 
     @Override
@@ -413,7 +413,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java long type")
   public static class JLongType extends JPrimitiveType implements JIntegralType64 {
     private JLongType() {
-      super("long", "J");
+      super("long");
     }
 
     @Override
@@ -447,7 +447,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java short type")
   public static class JShortType extends JPrimitiveType implements JIntegralType32 {
     private JShortType() {
-      super("short", "S");
+      super("short");
     }
 
     @Override
@@ -486,7 +486,7 @@ public abstract class JPrimitiveType extends JNode implements JType {
   @Description("Java void type")
   public static class JVoidType extends JPrimitiveType {
     private JVoidType() {
-      super("void", "V");
+      super("void");
     }
 
     @Override
diff --git a/jack/src/com/android/jack/ir/ast/JVisitor.java b/jack/src/com/android/jack/ir/ast/JVisitor.java
index 8534e21..94442c4 100644
--- a/jack/src/com/android/jack/ir/ast/JVisitor.java
+++ b/jack/src/com/android/jack/ir/ast/JVisitor.java
@@ -322,7 +322,11 @@ public class JVisitor {
     endVisit((JMethodCall) newInstance);
   }
 
-  public void endVisit(@Nonnull JNode x) {
+  /**
+   * End visit of a {@link JNode}
+   * @param jnode visited {@link JNode}
+   */
+  public void endVisit(@Nonnull JNode jnode) {
     // empty block
   }
 
@@ -698,7 +702,11 @@ public class JVisitor {
     return visit((JMethodCall) x);
   }
 
-  public boolean visit(@Nonnull JNode x) {
+  /**
+   * Visit of a {@link JNode}
+   * @param jnode visited {@link JNode}
+   */
+  public boolean visit(@Nonnull JNode jnode) {
     return true;
   }
 
@@ -1136,7 +1144,12 @@ public class JVisitor {
     visit((JMethodCall) x, transformRequest);
   }
 
-  public void visit(@Nonnull JNode x, @Nonnull TransformRequest transformRequest)
+  /**
+   * Visit of a {@link JNode} with a {@link TransformRequest} to apply on.
+   * @param jnode visited {@link JNode}
+   * @param transformRequest {@link TransformRequest} to apply on.
+   */
+  public void visit(@Nonnull JNode jnode, @Nonnull TransformRequest transformRequest)
       throws Exception {}
 
   public void visit(@Nonnull JNullLiteral x, @Nonnull TransformRequest transformRequest)
diff --git a/jack/src/com/android/jack/ir/impl/EcjSourceTypeLoader.java b/jack/src/com/android/jack/ir/impl/EcjSourceTypeLoader.java
index f6bed62..109a39d 100644
--- a/jack/src/com/android/jack/ir/impl/EcjSourceTypeLoader.java
+++ b/jack/src/com/android/jack/ir/impl/EcjSourceTypeLoader.java
@@ -159,8 +159,7 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
   }
 
 
-  private void load(@Nonnull JLookup lookup, @Nonnull JDefinedClassOrInterface enclosingType,
-      @Nonnull FieldBinding binding) {
+  private void load(@Nonnull FieldBinding binding) {
     getRefMap().createField(binding);
   }
 
@@ -172,13 +171,12 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
   }
 
 
-  private void load(@Nonnull JLookup lookup, @Nonnull JDefinedClassOrInterface enclosingType,
-      @Nonnull MethodBinding binding) {
+  private void load(@Nonnull MethodBinding binding) {
     getRefMap().createMethod(binding, null);
   }
 
   @Nonnull
-  private SourceTypeBinding getBinding(@Nonnull JDefinedClassOrInterface loaded) {
+  private SourceTypeBinding getBinding() {
     SourceTypeBinding binding = bindingRef.get();
     assert binding != null;
     return binding;
@@ -199,7 +197,7 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
       if (isLoaded(Scope.HIERARCHY)) {
         return;
       }
-      SourceTypeBinding binding = getBinding(loaded);
+      SourceTypeBinding binding = getBinding();
       JLookup lookup = loaded.getEnclosingPackage().getSession().getPhantomLookup();
       if (loaded instanceof JDefinedClass) {
         ReferenceBinding superclass = binding.superclass();
@@ -224,7 +222,7 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
       if (isLoaded(Scope.ENCLOSING)) {
         return;
       }
-      ReferenceBinding enclosingBinding = getBinding(loaded).enclosingType();
+      ReferenceBinding enclosingBinding = getBinding().enclosingType();
       if (enclosingBinding != null) {
         JDefinedClassOrInterface enclosing =
             (JDefinedClassOrInterface) getRefMap().get(enclosingBinding);
@@ -241,7 +239,7 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
       if (isLoaded(Scope.MARKERS)) {
         return;
       }
-      SourceTypeBinding binding = getBinding(loaded);
+      SourceTypeBinding binding = getBinding();
       OriginalTypeInfo marker = new OriginalTypeInfo();
       char [] genSignature = binding.genericSignature();
       if (genSignature != null) {
@@ -316,10 +314,9 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
       if (isLoaded(Scope.METHODS)) {
         return;
       }
-      SourceTypeBinding binding = getBinding(loaded);
-      JLookup lookup = loaded.getEnclosingPackage().getSession().getPhantomLookup();
+      SourceTypeBinding binding = getBinding();
       for (MethodBinding methodBinding : binding.methods()) {
-        load(lookup, loaded, methodBinding);
+        load(methodBinding);
       }
       markLoaded(Scope.METHODS);
     }
@@ -337,10 +334,9 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
       if (isLoaded(Scope.FIELDS)) {
         return;
       }
-      SourceTypeBinding binding = getBinding(loaded);
-      JLookup lookup = loaded.getEnclosingPackage().getSession().getPhantomLookup();
+      SourceTypeBinding binding = getBinding();
       for (FieldBinding fieldBinding : binding.fields()) {
-        load(lookup, loaded, fieldBinding);
+        load(fieldBinding);
       }
       markLoaded(Scope.FIELDS);
     }
@@ -358,7 +354,7 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
         return;
       }
       loaded.setRetentionPolicy(ReferenceMapper.getRetentionPolicy(
-          getBinding(loaded).getAnnotationTagBits()));
+          getBinding().getAnnotationTagBits()));
       markLoaded(Scope.RETENTION);
     }
   }
@@ -371,7 +367,7 @@ public class EcjSourceTypeLoader implements ClassOrInterfaceLoader {
         return;
       }
 
-      SourceTypeBinding binding = getBinding(loaded);
+      SourceTypeBinding binding = getBinding();
       int accessFlags = binding.getAccessFlags();
       if (binding.isAnonymousType()) {
         accessFlags |= JModifier.ANONYMOUS_TYPE;
diff --git a/jack/src/com/android/jack/ir/impl/GwtAstBuilder.java b/jack/src/com/android/jack/ir/impl/GwtAstBuilder.java
index 930679f..3d576d1 100644
--- a/jack/src/com/android/jack/ir/impl/GwtAstBuilder.java
+++ b/jack/src/com/android/jack/ir/impl/GwtAstBuilder.java
@@ -1300,7 +1300,7 @@ public class GwtAstBuilder {
     public void endVisit(MethodDeclaration x, ClassScope scope) {
       try {
         if (x.isNative()) {
-          processNativeMethod(x);
+          processNativeMethod();
         } else {
           List<JStatement> statements = pop(x.statements);
           curMethod.body.getBlock().addStmts(statements);
@@ -2233,8 +2233,8 @@ public class GwtAstBuilder {
 
     private JField createEnumValuesField(JDefinedEnum type) {
       // $VALUES = new E[]{A,B,B};
-      JArrayType enumArrayType = (JArrayType) getTypeMap()
-          .get("[" + Jack.getLookupFormatter().getName(type), lookupEnvironment);
+      JArrayType enumArrayType =
+          (JArrayType) getTypeMap().get("[" + Jack.getLookupFormatter().getName(type));
 
       JField valuesField = new JField(type.getSourceInfo(), "$VALUES", type,
           enumArrayType,
@@ -2483,17 +2483,17 @@ public class GwtAstBuilder {
       {
         JMethod valueOfMethod = type.getMethod(VALUE_OF_STRING, type, javaLangString);
         assert VALUE_OF_STRING.equals(valueOfMethod.getName());
-        writeEnumValueOfMethod(type, valueOfMethod, valuesField);
+        writeEnumValueOfMethod(type, valueOfMethod);
       }
       {
         JMethod valuesMethod = type.getMethod(VALUES_STRING,
-            getTypeMap().get("[" + Jack.getLookupFormatter().getName(type), lookupEnvironment));
+            getTypeMap().get("[" + Jack.getLookupFormatter().getName(type)));
         assert VALUES_STRING.equals(valuesMethod.getName());
         writeEnumValuesMethod(type, valuesMethod, valuesField);
       }
     }
 
-    private void processNativeMethod(MethodDeclaration x) {
+    private void processNativeMethod() {
       JMethod method = curMethod.method;
       SourceInfo info = method.getSourceInfo();
       JNativeMethodBody body = new JNativeMethodBody(info);
@@ -2850,7 +2850,7 @@ public class GwtAstBuilder {
 
           if (!(((FieldReference) x).receiver instanceof ThisReference)
               && !binding.isStatic()) {
-              return generateGetClassFollowedByConstant(result, x, cst);
+              return generateGetClassFollowedByConstant(result, cst);
           }
 
           result = cst;
@@ -2864,7 +2864,7 @@ public class GwtAstBuilder {
             JLiteral cst = getConstant(result.getSourceInfo(), constant);
 
             if (!lastBinding.isStatic()) {
-              return generateGetClassFollowedByConstant(result, x, cst);
+              return generateGetClassFollowedByConstant(result, cst);
             }
 
             // Prefer JDT-computed constant value to the actual written expression.
@@ -2875,8 +2875,7 @@ public class GwtAstBuilder {
       return result;
     }
 
-    private JExpression generateGetClassFollowedByConstant(
-        JExpression result, Expression x, JLiteral cst) {
+    private JExpression generateGetClassFollowedByConstant(JExpression result, JLiteral cst) {
       assert result instanceof JFieldRef;
       // a.x => (a.getClass(), constant)
 
@@ -2891,7 +2890,7 @@ public class GwtAstBuilder {
       return (new JMultiExpression(sourceInfo, exprs));
     }
 
-    private void writeEnumValueOfMethod(JDefinedEnum type, JMethod method, JField valuesField) {
+    private void writeEnumValueOfMethod(JDefinedEnum type, JMethod method) {
       ReferenceBinding enumType = curCud.scope.getJavaLangEnum();
       ReferenceBinding classType = curCud.scope.getJavaLangClass();
 
diff --git a/jack/src/com/android/jack/ir/impl/ReferenceMapper.java b/jack/src/com/android/jack/ir/impl/ReferenceMapper.java
index 6a179ab..991b4bb 100644
--- a/jack/src/com/android/jack/ir/impl/ReferenceMapper.java
+++ b/jack/src/com/android/jack/ir/impl/ReferenceMapper.java
@@ -148,16 +148,9 @@ public class ReferenceMapper {
   }
 
   @Nonnull
-  public JType get(@Nonnull String signature, @Nonnull LookupEnvironment lookupEnvironment)
-      throws JTypeLookupException {
-    return get(signature, lookupEnvironment, null);
-  }
-
-  @Nonnull
   public JType get(@Nonnull TypeBinding binding) throws JTypeLookupException {
     binding = binding.erasure();
-    String key = new String(binding.signature());
-    return get(key, null, binding);
+    return get(new String(binding.signature()));
   }
 
   @Nonnull
@@ -171,8 +164,7 @@ public class ReferenceMapper {
   }
 
   @Nonnull
-  private JType get(@Nonnull String signature, @CheckForNull LookupEnvironment lookupEnvironment,
-      @CheckForNull TypeBinding binding) throws JTypeLookupException {
+  public JType get(@Nonnull String signature) throws JTypeLookupException {
     return lookup.getType(signature);
   }
 
diff --git a/jack/src/com/android/jack/jayce/JayceReader.java b/jack/src/com/android/jack/jayce/JayceReader.java
index 46da8df..5660497 100644
--- a/jack/src/com/android/jack/jayce/JayceReader.java
+++ b/jack/src/com/android/jack/jayce/JayceReader.java
@@ -93,8 +93,8 @@ public class JayceReader extends JayceProcessor {
   private void initialize(@Nonnull NodeLevel nodeLevel) throws JayceVersionException {
 
     jayceInternalReader = (JayceInternalReader) instantiateConstructorWithParameters(
-        readerClassName, new Class[] {InputStream.class, Charset.class},
-        new Object[] {in, encoding}, majorVersion + "." + minorVersion);
+        readerClassName, new Class[] {InputStream.class},
+        new Object[] {in}, majorVersion + "." + minorVersion);
     int minorMin = jayceInternalReader.getMinorMin();
     int currentMinor = jayceInternalReader.getCurrentMinor();
     if (minorVersion < minorMin) {
diff --git a/jack/src/com/android/jack/jayce/JayceWriter.java b/jack/src/com/android/jack/jayce/JayceWriter.java
index 5cfaee1..b54fe09 100644
--- a/jack/src/com/android/jack/jayce/JayceWriter.java
+++ b/jack/src/com/android/jack/jayce/JayceWriter.java
@@ -81,7 +81,7 @@ public class JayceWriter extends JayceProcessor {
         "com.android.jack.jayce.v" + majorVersionString + ".io.JayceInternalWriterImpl";
     JayceInternalWriter jayceInternalWriter =
         (JayceInternalWriter) instantiateConstructorWithParameters(className,
-            new Class[] {OutputStream.class, Charset.class}, new Object[] {out, encoding},
+            new Class[] {OutputStream.class}, new Object[] {out},
             String.valueOf(majorVersion));
     int currentMinor = jayceInternalWriter.getCurrentMinor();
     JayceHeader jayceHeader = new JayceHeader(majorVersion, currentMinor, encoding, emitterId);
diff --git a/jack/src/com/android/jack/jayce/v0002/io/ImportHelper.java b/jack/src/com/android/jack/jayce/v0002/io/ImportHelper.java
index d07663c..6cfde8f 100644
--- a/jack/src/com/android/jack/jayce/v0002/io/ImportHelper.java
+++ b/jack/src/com/android/jack/jayce/v0002/io/ImportHelper.java
@@ -118,7 +118,7 @@ public class ImportHelper {
       return NSourceInfo.UNKNOWN;
     }
     NSourceInfo nSourceInfo = new NSourceInfo();
-    nSourceInfo.importFromJast(this, sourceInfo);
+    nSourceInfo.importFromJast(sourceInfo);
     return nSourceInfo;
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/io/JayceInternalReaderImpl.java b/jack/src/com/android/jack/jayce/v0002/io/JayceInternalReaderImpl.java
index 3bc42aa..bd93bbe 100644
--- a/jack/src/com/android/jack/jayce/v0002/io/JayceInternalReaderImpl.java
+++ b/jack/src/com/android/jack/jayce/v0002/io/JayceInternalReaderImpl.java
@@ -39,7 +39,6 @@ import com.android.sched.util.log.stats.StatisticId;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -81,7 +80,7 @@ public class JayceInternalReaderImpl implements JayceInternalReader {
   @Nonnull
   private final Tracer tracer = TracerFactory.getTracer();
 
-  public JayceInternalReaderImpl(@Nonnull InputStream in, @Nonnull Charset encoding) {
+  public JayceInternalReaderImpl(@Nonnull InputStream in) {
     this.tokenizer = new Tokenizer(in);
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/io/JayceInternalWriterImpl.java b/jack/src/com/android/jack/jayce/v0002/io/JayceInternalWriterImpl.java
index 562b48b..69a2001 100644
--- a/jack/src/com/android/jack/jayce/v0002/io/JayceInternalWriterImpl.java
+++ b/jack/src/com/android/jack/jayce/v0002/io/JayceInternalWriterImpl.java
@@ -37,7 +37,6 @@ import com.android.sched.util.log.TracerFactory;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -66,7 +65,7 @@ public class JayceInternalWriterImpl implements JayceInternalWriter {
   @Nonnull
   private final  List<String> currentCatchBlockList = new ArrayList<String>();
 
-  public JayceInternalWriterImpl(@Nonnull OutputStream out, @Nonnull Charset encoding) {
+  public JayceInternalWriterImpl(@Nonnull OutputStream out) {
     this.out = new JayceOutputStream(out);
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAbsentArrayDimension.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAbsentArrayDimension.java
index fc49090..b7ae371 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAbsentArrayDimension.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAbsentArrayDimension.java
@@ -49,7 +49,7 @@ public class NAbsentArrayDimension extends NLiteral {
   @Nonnull
   public JAbsentArrayDimension exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    return new JAbsentArrayDimension(sourceInfo.exportAsJast(exportSession));
+    return new JAbsentArrayDimension(sourceInfo.exportAsJast());
   }
 
   @SuppressWarnings("unused")
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAddOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAddOperation.java
index 9771b1f..1ce77e9 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAddOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAddOperation.java
@@ -59,7 +59,7 @@ public class NAddOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAddOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAddOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAlloc.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAlloc.java
index 010d2e0..4666284 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAlloc.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAlloc.java
@@ -56,7 +56,7 @@ public class NAlloc extends NExpression {
     assert sourceInfo != null;
     assert instanceType != null;
     JClass jType = exportSession.getLookup().getClass(instanceType);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JAlloc jAlloc = new JAlloc(jSourceInfo, jType);
     return jAlloc;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAndOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAndOperation.java
index 19c05ff..1a8ec71 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAndOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAndOperation.java
@@ -59,7 +59,7 @@ public class NAndOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAndOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAndOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationLiteral.java
index ae57af2..f6a7be3 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationLiteral.java
@@ -70,7 +70,7 @@ public class NAnnotationLiteral extends NLiteral {
     assert retentionPolicy != null;
     assert sourceInfo != null;
     assert annotationType != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JAnnotation type = exportSession.getLookup().getAnnotation(annotationType);
     JAnnotationLiteral jAnnotationLiteral =
         new JAnnotationLiteral(jSourceInfo, retentionPolicy, type);
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationMethod.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationMethod.java
index bd74d7a..3c75b0d 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationMethod.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationMethod.java
@@ -76,7 +76,7 @@ public class NAnnotationMethod extends NMethod {
     assert returnType != null;
     assert sourceInfo != null;
     assert body == null;
-    SourceInfo info = sourceInfo.exportAsJast(exportSession);
+    SourceInfo info = sourceInfo.exportAsJast();
     JDefinedClassOrInterface enclosingType = exportSession.getCurrentType();
     assert enclosingType != null;
     JAnnotationMethod jAnnotationMethod = new JAnnotationMethod(
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationType.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationType.java
index 0f611b2..9843b69 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationType.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAnnotationType.java
@@ -81,8 +81,7 @@ public class NAnnotationType extends NInterfaceType {
     assert retentionPolicy != null;
     String binaryName = NamingTools.getClassBinaryNameFromDescriptor(signature);
     String simpleName = NamingTools.getSimpleClassNameFromBinaryName(binaryName);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(
-        new ExportSession(loader.getLookup(), enclosingPackage.getSession(), NodeLevel.TYPES));
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JDefinedAnnotation jInterfaceType =
         new JDefinedAnnotation(jSourceInfo, simpleName, modifiers, enclosingPackage, loader);
     jInterfaceType.setRetentionPolicy(retentionPolicy);
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NArrayLength.java b/jack/src/com/android/jack/jayce/v0002/nodes/NArrayLength.java
index 7324cef..f1b1aa3 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NArrayLength.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NArrayLength.java
@@ -57,7 +57,7 @@ public class NArrayLength extends NExpression {
     assert sourceInfo != null;
     assert instance != null;
     JExpression jInstance = instance.exportAsJast(exportSession);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JArrayLength jArrayLength = new JArrayLength(jSourceInfo, jInstance);
     return jArrayLength;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NArrayLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NArrayLiteral.java
index 67d90c0..044e04b 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NArrayLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NArrayLiteral.java
@@ -62,7 +62,7 @@ public class NArrayLiteral extends NLiteral {
     for (NLiteral value : values) {
       jValues.add(value.exportAsJast(exportSession));
     }
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JArrayLiteral jArrayLiteral = new JArrayLiteral(jSourceInfo, jValues);
     return jArrayLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NArrayRef.java b/jack/src/com/android/jack/jayce/v0002/nodes/NArrayRef.java
index 51beb70..127e8e9 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NArrayRef.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NArrayRef.java
@@ -61,7 +61,7 @@ public class NArrayRef extends NExpression {
     assert sourceInfo != null;
     assert instance != null;
     assert index != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JExpression jInstance = instance.exportAsJast(exportSession);
     JExpression jIndex = index.exportAsJast(exportSession);
     JArrayRef jArrayRef = new JArrayRef(jSourceInfo, jInstance, jIndex);
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgAddOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgAddOperation.java
index 07c9036..5ed01d7 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgAddOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgAddOperation.java
@@ -59,7 +59,7 @@ public class NAsgAddOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgAddOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgAddOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitAndOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitAndOperation.java
index 3db05fc..135ffc1 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitAndOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitAndOperation.java
@@ -59,7 +59,7 @@ public class NAsgBitAndOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgBitAndOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgBitAndOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitOrOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitOrOperation.java
index 53d1558..fa74a27 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitOrOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitOrOperation.java
@@ -59,7 +59,7 @@ public class NAsgBitOrOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgBitOrOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgBitOrOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitXorOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitXorOperation.java
index a6de764..9a5d12f 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitXorOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgBitXorOperation.java
@@ -59,7 +59,7 @@ public class NAsgBitXorOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgBitXorOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgBitXorOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgConcatOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgConcatOperation.java
index 75a5e3d..5bcb903 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgConcatOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgConcatOperation.java
@@ -59,7 +59,7 @@ public class NAsgConcatOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgConcatOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgConcatOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgDivOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgDivOperation.java
index 5911e38..787f0c7 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgDivOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgDivOperation.java
@@ -59,7 +59,7 @@ public class NAsgDivOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgDivOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgDivOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgModOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgModOperation.java
index e78b9e7..6e221ca 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgModOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgModOperation.java
@@ -59,7 +59,7 @@ public class NAsgModOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgModOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgModOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgMulOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgMulOperation.java
index b15b841..6d13e96 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgMulOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgMulOperation.java
@@ -59,7 +59,7 @@ public class NAsgMulOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgMulOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgMulOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgOperation.java
index 21b05c0..3c28c9a 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgOperation.java
@@ -59,7 +59,7 @@ public class NAsgOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShlOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShlOperation.java
index 1556f37..fedccab 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShlOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShlOperation.java
@@ -59,7 +59,7 @@ public class NAsgShlOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgShlOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgShlOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShrOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShrOperation.java
index e167365..75db277 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShrOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShrOperation.java
@@ -59,7 +59,7 @@ public class NAsgShrOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgShrOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgShrOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShruOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShruOperation.java
index 1608443..bd58771 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShruOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgShruOperation.java
@@ -59,7 +59,7 @@ public class NAsgShruOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgShruOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgShruOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgSubOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgSubOperation.java
index 358edde..df6d9b7 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAsgSubOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAsgSubOperation.java
@@ -59,7 +59,7 @@ public class NAsgSubOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JAsgSubOperation(sourceInfo.exportAsJast(exportSession),
+    return new JAsgSubOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NAssertStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NAssertStatement.java
index bd16908..20b52ce 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NAssertStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NAssertStatement.java
@@ -72,7 +72,7 @@ public class NAssertStatement extends NStatement {
       jArg = arg.exportAsJast(exportSession);
     }
     JAssertStatement jAssertStatement = new JAssertStatement(
-        sourceInfo.exportAsJast(exportSession), testExpression.exportAsJast(exportSession), jArg);
+        sourceInfo.exportAsJast(), testExpression.exportAsJast(exportSession), jArg);
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId,
           new CatchBlockLinker(jAssertStatement));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NBitAndOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NBitAndOperation.java
index fb63a6f..475433a 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NBitAndOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NBitAndOperation.java
@@ -59,7 +59,7 @@ public class NBitAndOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JBitAndOperation(sourceInfo.exportAsJast(exportSession),
+    return new JBitAndOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NBitOrOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NBitOrOperation.java
index 78d380e..93ae5b4 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NBitOrOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NBitOrOperation.java
@@ -59,7 +59,7 @@ public class NBitOrOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JBitOrOperation(sourceInfo.exportAsJast(exportSession),
+    return new JBitOrOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NBitXorOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NBitXorOperation.java
index 64f3721..d148d6d 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NBitXorOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NBitXorOperation.java
@@ -59,7 +59,7 @@ public class NBitXorOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JBitXorOperation(sourceInfo.exportAsJast(exportSession),
+    return new JBitXorOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NBlock.java b/jack/src/com/android/jack/jayce/v0002/nodes/NBlock.java
index 8ca50cf..605da74 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NBlock.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NBlock.java
@@ -60,7 +60,7 @@ public class NBlock extends NStatement {
   @Nonnull
   public JBlock exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    JBlock jBlock = new JBlock(sourceInfo.exportAsJast(exportSession));
+    JBlock jBlock = new JBlock(sourceInfo.exportAsJast());
     for (NStatement nStatement : statements) {
       jBlock.addStmt(nStatement.exportAsJast(exportSession));
     }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NBooleanLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NBooleanLiteral.java
index 4d16a06..4bbfb12 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NBooleanLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NBooleanLiteral.java
@@ -53,7 +53,7 @@ public class NBooleanLiteral extends NLiteral {
   @Nonnull
   public JBooleanLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JBooleanLiteral jBooleanLiteral = new JBooleanLiteral(jSourceInfo, value);
     return jBooleanLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NBreakStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NBreakStatement.java
index 444d6a1..4b10bd7 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NBreakStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NBreakStatement.java
@@ -61,7 +61,7 @@ public class NBreakStatement extends NStatement {
   @Nonnull
   public JBreakStatement exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JLabel jLabel = (label == null) ? null : new JLabel(jSourceInfo, label);
     JBreakStatement jBreakStatement = new JBreakStatement(jSourceInfo, jLabel);
     for (String catchId : catchBlockIds) {
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NByteLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NByteLiteral.java
index 1affe11..a1eb1f6 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NByteLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NByteLiteral.java
@@ -53,7 +53,7 @@ public class NByteLiteral extends NLiteral {
   @Nonnull
   public JByteLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JByteLiteral jByteLiteral = new JByteLiteral(jSourceInfo, value);
     return jByteLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NCaseStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NCaseStatement.java
index 01552cd..8687efd 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NCaseStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NCaseStatement.java
@@ -68,7 +68,7 @@ public class NCaseStatement extends NStatement {
     assert sourceInfo != null;
     assert id != null;
     JLiteral jExpr = expr != null ? expr.exportAsJast(exportSession) : null;
-    JCaseStatement jCase = new JCaseStatement(sourceInfo.exportAsJast(exportSession), jExpr);
+    JCaseStatement jCase = new JCaseStatement(sourceInfo.exportAsJast(), jExpr);
     exportSession.getCaseResolver().addTarget(id, jCase);
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jCase));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NCatchBlock.java b/jack/src/com/android/jack/jayce/v0002/nodes/NCatchBlock.java
index e9b9284..6afdba3 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NCatchBlock.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NCatchBlock.java
@@ -84,7 +84,7 @@ public class NCatchBlock extends NStatement {
     assert catchVar != null;
     JLocal jCatchVar = catchVar.exportAsJast(exportSession);
     final JCatchBlock jCatchBlock =
-        new JCatchBlock(sourceInfo.exportAsJast(exportSession), jCatchTypes, jCatchVar);
+        new JCatchBlock(sourceInfo.exportAsJast(), jCatchTypes, jCatchVar);
 
     for (NStatement nStatement : statements) {
       jCatchBlock.addStmt(nStatement.exportAsJast(exportSession));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NCharLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NCharLiteral.java
index 1601a27..5f99a87 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NCharLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NCharLiteral.java
@@ -53,7 +53,7 @@ public class NCharLiteral extends NLiteral {
   @Nonnull
   public JCharLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JCharLiteral jCharLiteral = new JCharLiteral(jSourceInfo, value);
     return jCharLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NClassLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NClassLiteral.java
index 54bd860..ef23b03 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NClassLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NClassLiteral.java
@@ -58,7 +58,7 @@ public class NClassLiteral extends NLiteral {
     assert sourceInfo != null;
     assert refType != null;
     return new JClassLiteral(
-        sourceInfo.exportAsJast(exportSession),
+        sourceInfo.exportAsJast(),
         exportSession.getLookup().getType(refType),
         exportSession.getLookup().getClass(JAVA_LANG_CLASS));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NClassType.java b/jack/src/com/android/jack/jayce/v0002/nodes/NClassType.java
index 6744a25..66b6200 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NClassType.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NClassType.java
@@ -116,8 +116,7 @@ public class NClassType extends NDeclaredType {
     assert sourceInfo != null;
     String binaryName = NamingTools.getClassBinaryNameFromDescriptor(signature);
     String simpleName = NamingTools.getSimpleClassNameFromBinaryName(binaryName);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(
-        new ExportSession(loader.getLookup(), enclosingPackage.getSession(), NodeLevel.TYPES));
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JDefinedClass jClassType =
         new JDefinedClass(jSourceInfo, simpleName, modifiers, enclosingPackage, loader);
     return jClassType;
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NConcatOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NConcatOperation.java
index 9e957cb..33425cf 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NConcatOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NConcatOperation.java
@@ -62,7 +62,7 @@ public class NConcatOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JConcatOperation(sourceInfo.exportAsJast(exportSession),
+    return new JConcatOperation(sourceInfo.exportAsJast(),
         exportSession.getLookup().getClass(JAVA_LANG_STRING),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NConditionalExpression.java b/jack/src/com/android/jack/jayce/v0002/nodes/NConditionalExpression.java
index 9a244ab..794dfff 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NConditionalExpression.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NConditionalExpression.java
@@ -69,7 +69,7 @@ public class NConditionalExpression extends NExpression {
     JExpression jIf = ifTest.exportAsJast(exportSession);
     JExpression jThen = thenExpr.exportAsJast(exportSession);
     JExpression jElse = elseExpr.exportAsJast(exportSession);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JConditionalExpression jConditionalExpression =
         new JConditionalExpression(jSourceInfo, jIf, jThen, jElse);
     return jConditionalExpression;
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NConstructor.java b/jack/src/com/android/jack/jayce/v0002/nodes/NConstructor.java
index 7197c22..68233be 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NConstructor.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NConstructor.java
@@ -68,7 +68,7 @@ public class NConstructor extends NMethod {
       @Nonnull JayceClassOrInterfaceLoader enclosingLoader) {
     assert sourceInfo != null;
     exportSession.getLocalResolver().clear();
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JDefinedClass enclosingType = (JDefinedClass) exportSession.getCurrentType();
     assert enclosingType != null;
     JConstructor jConstructor = new JConstructor(jSourceInfo,
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NContinueStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NContinueStatement.java
index 215add5..225d0db 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NContinueStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NContinueStatement.java
@@ -62,7 +62,7 @@ public class NContinueStatement extends NStatement {
   @Nonnull
   public JContinueStatement exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JLabel jLabel = (label == null) ? null : new JLabel(jSourceInfo, label);
     JContinueStatement jContinueStatement = new JContinueStatement(jSourceInfo, jLabel);
     for (String catchId : catchBlockIds) {
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NDivOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NDivOperation.java
index 93caa7a..65c4401 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NDivOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NDivOperation.java
@@ -59,7 +59,7 @@ public class NDivOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JDivOperation(sourceInfo.exportAsJast(exportSession),
+    return new JDivOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NDoStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NDoStatement.java
index f11391f..87ca2d2 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NDoStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NDoStatement.java
@@ -68,7 +68,7 @@ public class NDoStatement extends NStatement {
     assert sourceInfo != null;
     JStatement jBody = body != null ? body.exportAsJast(exportSession) : null;
     JDoStatement jDoStatement = new JDoStatement(
-        sourceInfo.exportAsJast(exportSession), testExpression.exportAsJast(exportSession), jBody);
+        sourceInfo.exportAsJast(), testExpression.exportAsJast(exportSession), jBody);
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jDoStatement));
     }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NDoubleLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NDoubleLiteral.java
index 20ab7e7..3018907 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NDoubleLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NDoubleLiteral.java
@@ -54,7 +54,7 @@ public class NDoubleLiteral extends NLiteral {
   @Nonnull
   public JLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JDoubleLiteral jDoubleLiteral = new JDoubleLiteral(jSourceInfo, value);
     return jDoubleLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NDynamicCastOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NDynamicCastOperation.java
index bd86247..168c00f 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NDynamicCastOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NDynamicCastOperation.java
@@ -63,7 +63,7 @@ public class NDynamicCastOperation extends NExpression {
     assert expr != null;
     JType jType = exportSession.getLookup().getType(castType);
     JExpression jExpr = expr.exportAsJast(exportSession);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JDynamicCastOperation jDynamicCastOperation =
         new JDynamicCastOperation(jSourceInfo, jType, jExpr);
     return jDynamicCastOperation;
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NEnumField.java b/jack/src/com/android/jack/jayce/v0002/nodes/NEnumField.java
index e8e001e..4801095 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NEnumField.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NEnumField.java
@@ -62,7 +62,7 @@ public class NEnumField extends NField {
     JDefinedEnum enclosingType = (JDefinedEnum) exportSession.getCurrentType();
     assert enclosingType != null;
     JEnumField jField = new JEnumField(
-        sourceInfo.exportAsJast(exportSession),
+        sourceInfo.exportAsJast(),
         name,
         ordinal,
         enclosingType,
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NEnumLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NEnumLiteral.java
index 6a3b37a..30ba4c1 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NEnumLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NEnumLiteral.java
@@ -64,7 +64,7 @@ public class NEnumLiteral extends NLiteral {
     assert sourceInfo != null;
     assert enumFieldDeclaringType != null;
     assert enumFieldName != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JLookup lookup = exportSession.getLookup();
     JEnum enumType = lookup.getEnum(enumFieldDeclaringType);
     /* type of the field is enumType, see JLS-8 8.9.2 */
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NEnumType.java b/jack/src/com/android/jack/jayce/v0002/nodes/NEnumType.java
index e0ff8d0..d407d38 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NEnumType.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NEnumType.java
@@ -79,8 +79,7 @@ public class NEnumType extends NClassType {
     assert signature != null;
     String binaryName = NamingTools.getClassBinaryNameFromDescriptor(signature);
     String simpleName = NamingTools.getSimpleClassNameFromBinaryName(binaryName);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(
-        new ExportSession(loader.getLookup(), enclosingPackage.getSession(), NodeLevel.TYPES));
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JDefinedEnum jEnumType =
         new JDefinedEnum(jSourceInfo, simpleName, modifiers, enclosingPackage, loader);
     return jEnumType;
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NEqOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NEqOperation.java
index 2dfc23e..61df893 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NEqOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NEqOperation.java
@@ -59,7 +59,7 @@ public class NEqOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JEqOperation(sourceInfo.exportAsJast(exportSession),
+    return new JEqOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NExceptionRuntimeValue.java b/jack/src/com/android/jack/jayce/v0002/nodes/NExceptionRuntimeValue.java
index 0853731..d78e623 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NExceptionRuntimeValue.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NExceptionRuntimeValue.java
@@ -55,7 +55,7 @@ public class NExceptionRuntimeValue extends NExpression {
     assert sourceInfo != null;
     assert catchedType != null;
     return new JExceptionRuntimeValue(
-        sourceInfo.exportAsJast(exportSession),
+        sourceInfo.exportAsJast(),
         (JClassOrInterface) exportSession.getLookup().getType(catchedType));
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NExpressionStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NExpressionStatement.java
index a883390..82b0064 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NExpressionStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NExpressionStatement.java
@@ -63,7 +63,7 @@ public class NExpressionStatement extends NStatement {
     assert sourceInfo != null;
     assert expression != null;
     JExpressionStatement jExpressionStatement = new JExpressionStatement(
-        sourceInfo.exportAsJast(exportSession), expression.exportAsJast(exportSession));
+        sourceInfo.exportAsJast(), expression.exportAsJast(exportSession));
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver()
           .addLink(catchId, new CatchBlockLinker(jExpressionStatement));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NField.java b/jack/src/com/android/jack/jayce/v0002/nodes/NField.java
index c8a4076..5d33667 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NField.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NField.java
@@ -82,7 +82,7 @@ public class NField extends NNode implements HasSourceInfo {
     JDefinedClassOrInterface enclosingType = exportSession.getCurrentType();
     assert enclosingType != null;
     JField jField = new JField(
-        sourceInfo.exportAsJast(exportSession),
+        sourceInfo.exportAsJast(),
         name,
         enclosingType,
         exportSession.getLookup().getType(type),
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NFieldInitializer.java b/jack/src/com/android/jack/jayce/v0002/nodes/NFieldInitializer.java
index b24f1ad..52a7f3d 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NFieldInitializer.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NFieldInitializer.java
@@ -72,7 +72,7 @@ public class NFieldInitializer extends NStatement {
     assert initializer != null;
     JFieldInitializer jFieldInitializer =
         new JFieldInitializer(
-            sourceInfo.exportAsJast(exportSession),
+            sourceInfo.exportAsJast(),
             fieldRef.exportAsJast(exportSession),
             initializer.exportAsJast(exportSession));
     // field of fieldRef can be external after exportToJast(), so use  field resolver here
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NFieldRef.java b/jack/src/com/android/jack/jayce/v0002/nodes/NFieldRef.java
index d619f78..ed43766 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NFieldRef.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NFieldRef.java
@@ -81,7 +81,7 @@ public class NFieldRef extends NExpression {
     JExpression jInstance = instance != null ? instance.exportAsJast(exportSession) : null;
     JType jReceiverType = exportSession.getLookup().getType(receiverType);
     JType jFieldType = exportSession.getLookup().getType(fieldType);
-    return new JFieldRef(sourceInfo.exportAsJast(exportSession), jInstance,
+    return new JFieldRef(sourceInfo.exportAsJast(), jInstance,
         exportSession.getFieldId((JClassOrInterface) jReceiverType, field, jFieldType, kind),
         (JClassOrInterface) jReceiverType);
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NFloatLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NFloatLiteral.java
index e9bc3bd..ff6e5ef 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NFloatLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NFloatLiteral.java
@@ -54,7 +54,7 @@ public class NFloatLiteral extends NLiteral {
   @Nonnull
   public JLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JFloatLiteral jFloatLiteral = new JFloatLiteral(jSourceInfo, value);
     return jFloatLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NForStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NForStatement.java
index e6bac84..8700f79 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NForStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NForStatement.java
@@ -90,7 +90,7 @@ public class NForStatement extends NStatement {
       jIncrements.add(increment.exportAsJast(exportSession));
     }
     JForStatement jForStatement = new JForStatement(
-      sourceInfo.exportAsJast(exportSession), jInitializers, jTestExpression, jIncrements, jBody);
+      sourceInfo.exportAsJast(), jInitializers, jTestExpression, jIncrements, jBody);
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jForStatement));
     }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NGoto.java b/jack/src/com/android/jack/jayce/v0002/nodes/NGoto.java
index 23848b0..6ace01c 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NGoto.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NGoto.java
@@ -64,7 +64,7 @@ public class NGoto extends NStatement {
     assert sourceInfo != null;
     assert target != null;
     JGoto jGoto =
-        new JGoto(sourceInfo.exportAsJast(exportSession), JLabeledStatementUnresolved.INSTANCE);
+        new JGoto(sourceInfo.exportAsJast(), JLabeledStatementUnresolved.INSTANCE);
     exportSession.getLabelResolver().addLink(target, new GotoLinker(jGoto));
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jGoto));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NGtOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NGtOperation.java
index e50c24a..fa33ec6 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NGtOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NGtOperation.java
@@ -59,7 +59,7 @@ public class NGtOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JGtOperation(sourceInfo.exportAsJast(exportSession),
+    return new JGtOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NGteOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NGteOperation.java
index 3b72ba4..6632c9e 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NGteOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NGteOperation.java
@@ -59,7 +59,7 @@ public class NGteOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JGteOperation(sourceInfo.exportAsJast(exportSession),
+    return new JGteOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NIfStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NIfStatement.java
index e33d693..7b52b7a 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NIfStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NIfStatement.java
@@ -76,7 +76,7 @@ public class NIfStatement extends NStatement {
       jElseStatement = elseStatement.exportAsJast(exportSession);
     }
     JIfStatement jIfStatement = new JIfStatement(
-        sourceInfo.exportAsJast(exportSession), ifExpression.exportAsJast(exportSession),
+        sourceInfo.exportAsJast(), ifExpression.exportAsJast(exportSession),
         thenStatement.exportAsJast(exportSession), jElseStatement);
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jIfStatement));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NInstanceOf.java b/jack/src/com/android/jack/jayce/v0002/nodes/NInstanceOf.java
index 1c13476..2633095 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NInstanceOf.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NInstanceOf.java
@@ -63,7 +63,7 @@ public class NInstanceOf extends NExpression {
     assert testType != null;
     JExpression jExpr = expr.exportAsJast(exportSession);
     JReferenceType jType = (JReferenceType) exportSession.getLookup().getType(testType);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JInstanceOf jInstanceOf = new JInstanceOf(jSourceInfo, jType, jExpr);
     return jInstanceOf;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NIntLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NIntLiteral.java
index 1c2dede..983e87c 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NIntLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NIntLiteral.java
@@ -53,7 +53,7 @@ public class NIntLiteral extends NLiteral {
   @Nonnull
   public JIntLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JIntLiteral jIntLiteral = new JIntLiteral(jSourceInfo, value);
     return jIntLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NInterfaceType.java b/jack/src/com/android/jack/jayce/v0002/nodes/NInterfaceType.java
index 70f5c4e..6325ac4 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NInterfaceType.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NInterfaceType.java
@@ -102,8 +102,7 @@ public class NInterfaceType extends NDeclaredType {
     assert signature != null;
     String binaryName = NamingTools.getClassBinaryNameFromDescriptor(signature);
     String simpleName = NamingTools.getSimpleClassNameFromBinaryName(binaryName);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(
-        new ExportSession(loader.getLookup(), enclosingPackage.getSession(), NodeLevel.TYPES));
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JDefinedInterface jInterfaceType =
         new JDefinedInterface(jSourceInfo, simpleName, modifiers, enclosingPackage, loader);
     return jInterfaceType;
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NLabeledStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NLabeledStatement.java
index c8e0960..579f3a1 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NLabeledStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NLabeledStatement.java
@@ -74,7 +74,7 @@ public class NLabeledStatement extends NStatement {
     assert body != null;
     assert id != null;
     assert label != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JLabeledStatement jLabeled = new JLabeledStatement(jSourceInfo,
         new JLabel(jSourceInfo, label), body.exportAsJast(exportSession));
     exportSession.getLabelResolver().addTarget(id, jLabeled);
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NLocal.java b/jack/src/com/android/jack/jayce/v0002/nodes/NLocal.java
index d730949..1d88a35 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NLocal.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NLocal.java
@@ -78,7 +78,7 @@ public class NLocal extends NVariable {
     assert type != null;
     assert id != null;
     JLocal jLocal = new JLocal(
-        sourceInfo.exportAsJast(exportSession),
+        sourceInfo.exportAsJast(),
         name,
         exportSession.getLookup().getType(type),
         modifiers,
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NLocalRef.java b/jack/src/com/android/jack/jayce/v0002/nodes/NLocalRef.java
index c55cdc3..a059c67 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NLocalRef.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NLocalRef.java
@@ -57,7 +57,7 @@ public class NLocalRef extends NExpression {
     assert sourceInfo != null;
     assert localId != null;
     JLocalRef jLocalRef =
-        new JLocalRef(sourceInfo.exportAsJast(exportSession), JLocalUnresolved.INSTANCE);
+        new JLocalRef(sourceInfo.exportAsJast(), JLocalUnresolved.INSTANCE);
     exportSession.getLocalResolver().addLink(localId, new LocalRefLinker(jLocalRef));
     return jLocalRef;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NLock.java b/jack/src/com/android/jack/jayce/v0002/nodes/NLock.java
index 42293b0..72c03b1 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NLock.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NLock.java
@@ -63,7 +63,7 @@ public class NLock extends NStatement {
   public JLock exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert lockExpr != null;
-    JLock jStatement = new JLock(sourceInfo.exportAsJast(exportSession),
+    JLock jStatement = new JLock(sourceInfo.exportAsJast(),
         lockExpr.exportAsJast(exportSession));
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jStatement));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NLongLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NLongLiteral.java
index 41e24ab..a2114f9 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NLongLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NLongLiteral.java
@@ -53,7 +53,7 @@ public class NLongLiteral extends NLiteral {
   @Nonnull
   public JLongLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JLongLiteral jLongLiteral = new JLongLiteral(jSourceInfo, value);
     return jLongLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NLtOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NLtOperation.java
index e27c38a..0d6edb9 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NLtOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NLtOperation.java
@@ -59,7 +59,7 @@ public class NLtOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JLtOperation(sourceInfo.exportAsJast(exportSession),
+    return new JLtOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NLteOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NLteOperation.java
index 4c24242..00c3d26 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NLteOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NLteOperation.java
@@ -59,7 +59,7 @@ public class NLteOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JLteOperation(sourceInfo.exportAsJast(exportSession),
+    return new JLteOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NMethod.java b/jack/src/com/android/jack/jayce/v0002/nodes/NMethod.java
index 39da324..482badb 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NMethod.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NMethod.java
@@ -110,7 +110,7 @@ public class NMethod extends NNode implements HasSourceInfo, MethodNode {
     assert returnType != null;
     assert methodKind != null;
     assert sourceInfo != null;
-    SourceInfo info = sourceInfo.exportAsJast(exportSession);
+    SourceInfo info = sourceInfo.exportAsJast();
     JDefinedClassOrInterface enclosingType = exportSession.getCurrentType();
     assert enclosingType != null;
     JMethodId id = new JMethodId(name, methodKind);
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NMethodBody.java b/jack/src/com/android/jack/jayce/v0002/nodes/NMethodBody.java
index c9f67a9..aec58cc 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NMethodBody.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NMethodBody.java
@@ -61,7 +61,7 @@ public class NMethodBody extends NAbstractMethodBody {
     assert block != null;
     assert sourceInfo != null;
     JMethodBody jMethodBody =
-        new JMethodBody(sourceInfo.exportAsJast(exportSession), block.exportAsJast(exportSession));
+        new JMethodBody(sourceInfo.exportAsJast(), block.exportAsJast(exportSession));
     for (NLocal local : locals) {
       JLocal jLocal = local.exportAsJast(exportSession);
       jLocal.setEnclosingMethodBody(jMethodBody);
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NMethodCall.java b/jack/src/com/android/jack/jayce/v0002/nodes/NMethodCall.java
index a2cfc1c..158884a 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NMethodCall.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NMethodCall.java
@@ -124,7 +124,7 @@ public class NMethodCall extends NExpression {
     JMethodId methodId = exportSession.getMethodId(jReceiverType, methodName, methodArgsType,
         methodKind);
     JType jReturnType = exportSession.getLookup().getType(returnType);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JMethodCall jMethodCall = new JMethodCall(jSourceInfo, jInstance, jReceiverType, methodId,
         jReturnType, dispatchKind == DispatchKind.VIRTUAL /* isVirtualDispatch */);
     for (NExpression arg : args) {
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NMethodLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NMethodLiteral.java
index a213381..bcc8ec8 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NMethodLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NMethodLiteral.java
@@ -66,7 +66,7 @@ public class NMethodLiteral extends NLiteral {
     JDefinedClassOrInterface jEnclosingType =
         (JDefinedClassOrInterface) exportSession.getLookup().getType(methodEnclosingType);
     JMethod jMethod = exportSession.getDeclaredMethod(jEnclosingType, method);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JMethodLiteral jMethodLiteral = new JMethodLiteral(jMethod, jSourceInfo);
     return jMethodLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NModOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NModOperation.java
index 815e4f3..47ca6e4 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NModOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NModOperation.java
@@ -59,7 +59,7 @@ public class NModOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JModOperation(sourceInfo.exportAsJast(exportSession),
+    return new JModOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NMulOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NMulOperation.java
index 975040b..58d29e4 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NMulOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NMulOperation.java
@@ -59,7 +59,7 @@ public class NMulOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JMulOperation(sourceInfo.exportAsJast(exportSession),
+    return new JMulOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NMultiExpression.java b/jack/src/com/android/jack/jayce/v0002/nodes/NMultiExpression.java
index c879599..a442275 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NMultiExpression.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NMultiExpression.java
@@ -58,7 +58,7 @@ public class NMultiExpression extends NExpression {
   @Nonnull
   public JMultiExpression exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     List<JExpression> jExprs = new ArrayList<JExpression>(exprs.size());
     for (NExpression expr : exprs) {
       jExprs.add(expr.exportAsJast(exportSession));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NNameValuePair.java b/jack/src/com/android/jack/jayce/v0002/nodes/NNameValuePair.java
index 49a1a1a..b5a6f6f 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NNameValuePair.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NNameValuePair.java
@@ -66,7 +66,7 @@ public class NNameValuePair extends NNode implements HasSourceInfo {
     assert value != null;
     assert name != null;
     JLiteral jValue = value.exportAsJast(exportSession);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JMethodId methodId = new JMethodId(name, MethodKind.INSTANCE_VIRTUAL);
     JNameValuePair jNameValuePair = new JNameValuePair(jSourceInfo, methodId, jValue);
     return jNameValuePair;
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NNativeMethodBody.java b/jack/src/com/android/jack/jayce/v0002/nodes/NNativeMethodBody.java
index cd24dfa..57848a0 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NNativeMethodBody.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NNativeMethodBody.java
@@ -50,7 +50,7 @@ public class NNativeMethodBody extends NAbstractMethodBody {
   @Nonnull
   public JNativeMethodBody exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JNativeMethodBody jNativeMethodBody = new JNativeMethodBody(jSourceInfo);
     return jNativeMethodBody;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NNeqOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NNeqOperation.java
index 1f76042..619f2e1 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NNeqOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NNeqOperation.java
@@ -59,7 +59,7 @@ public class NNeqOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JNeqOperation(sourceInfo.exportAsJast(exportSession),
+    return new JNeqOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NNewArray.java b/jack/src/com/android/jack/jayce/v0002/nodes/NNewArray.java
index 49b2311..1895bf5 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NNewArray.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NNewArray.java
@@ -68,7 +68,7 @@ public class NNewArray extends NExpression {
     assert sourceInfo != null;
     assert type != null;
     JArrayType jType = (JArrayType) exportSession.getLookup().getType(type);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     if (initializers.isEmpty()) {
       List<JExpression> jDims = new ArrayList<JExpression>(dims.size());
       for (NExpression expr : dims) {
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NNewInstance.java b/jack/src/com/android/jack/jayce/v0002/nodes/NNewInstance.java
index 3df6089..73083e2 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NNewInstance.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NNewInstance.java
@@ -66,7 +66,7 @@ public class NNewInstance extends NMethodCall {
     JClassOrInterface jReceiverType = exportSession.getLookup().getClass(receiverType);
     JMethodId methodId = exportSession.getMethodId(jReceiverType, INIT_NAME, methodArgsType,
         MethodKind.INSTANCE_NON_VIRTUAL);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JNewInstance jNewInstance = new JNewInstance(jSourceInfo, jReceiverType, methodId);
     for (NExpression arg : args) {
       jNewInstance.addArg(arg.exportAsJast(exportSession));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NNullLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NNullLiteral.java
index 56141ea..3a82c18 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NNullLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NNullLiteral.java
@@ -50,7 +50,7 @@ public class NNullLiteral extends NLiteral {
   @Nonnull
   public JNullLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JNullLiteral jNullLiteral = new JNullLiteral(jSourceInfo);
     return jNullLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NOrOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NOrOperation.java
index bd76a9e..63b63c7 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NOrOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NOrOperation.java
@@ -59,7 +59,7 @@ public class NOrOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JOrOperation(sourceInfo.exportAsJast(exportSession),
+    return new JOrOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NParameter.java b/jack/src/com/android/jack/jayce/v0002/nodes/NParameter.java
index 1654dc7..d938486 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NParameter.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NParameter.java
@@ -78,7 +78,7 @@ public class NParameter extends NVariable {
     assert type != null;
     assert name != null;
     JParameter jParameter = new JParameter(
-        sourceInfo.exportAsJast(exportSession),
+        sourceInfo.exportAsJast(),
         name,
         exportSession.getLookup().getType(type),
         modifiers,
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NParameterRef.java b/jack/src/com/android/jack/jayce/v0002/nodes/NParameterRef.java
index a8230f3..bb2ee91 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NParameterRef.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NParameterRef.java
@@ -56,7 +56,7 @@ public class NParameterRef extends NExpression {
   public JParameterRef exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert localId != null;
-    JParameterRef jRef = new JParameterRef(sourceInfo.exportAsJast(exportSession),
+    JParameterRef jRef = new JParameterRef(sourceInfo.exportAsJast(),
         JParameterUnresolved.INSTANCE);
     exportSession.getParameterResolver().addLink(localId, new ParameterRefLinker(jRef));
     return jRef;
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NPostfixDecOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NPostfixDecOperation.java
index 95ed39b..87c369c 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NPostfixDecOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NPostfixDecOperation.java
@@ -54,7 +54,7 @@ public class NPostfixDecOperation extends NExpression {
   public JPostfixDecOperation exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert arg != null;
-    return new JPostfixDecOperation(sourceInfo.exportAsJast(exportSession),
+    return new JPostfixDecOperation(sourceInfo.exportAsJast(),
         arg.exportAsJast(exportSession));
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NPostfixIncOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NPostfixIncOperation.java
index 2229f47..5fa47c2 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NPostfixIncOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NPostfixIncOperation.java
@@ -54,7 +54,7 @@ public class NPostfixIncOperation extends NExpression {
   public JPostfixIncOperation exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert arg != null;
-    return new JPostfixIncOperation(sourceInfo.exportAsJast(exportSession),
+    return new JPostfixIncOperation(sourceInfo.exportAsJast(),
         arg.exportAsJast(exportSession));
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixBitNotOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixBitNotOperation.java
index 251ef3e..2225573 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixBitNotOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixBitNotOperation.java
@@ -54,7 +54,7 @@ public class NPrefixBitNotOperation extends NExpression {
   public JPrefixBitNotOperation exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert arg != null;
-    return new JPrefixBitNotOperation(sourceInfo.exportAsJast(exportSession),
+    return new JPrefixBitNotOperation(sourceInfo.exportAsJast(),
         arg.exportAsJast(exportSession));
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixDecOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixDecOperation.java
index 89a730e..7c3ad50 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixDecOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixDecOperation.java
@@ -54,7 +54,7 @@ public class NPrefixDecOperation extends NExpression {
   public JPrefixDecOperation exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert arg != null;
-    return new JPrefixDecOperation(sourceInfo.exportAsJast(exportSession),
+    return new JPrefixDecOperation(sourceInfo.exportAsJast(),
         arg.exportAsJast(exportSession));
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixIncOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixIncOperation.java
index 8e1c534..50c0301 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixIncOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixIncOperation.java
@@ -54,7 +54,7 @@ public class NPrefixIncOperation extends NExpression {
   public JPrefixIncOperation exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert arg != null;
-    return new JPrefixIncOperation(sourceInfo.exportAsJast(exportSession),
+    return new JPrefixIncOperation(sourceInfo.exportAsJast(),
         arg.exportAsJast(exportSession));
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixNegOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixNegOperation.java
index 7e34457..ada1a4e 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixNegOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixNegOperation.java
@@ -54,7 +54,7 @@ public class NPrefixNegOperation extends NExpression {
   public JPrefixNegOperation exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert arg != null;
-    return new JPrefixNegOperation(sourceInfo.exportAsJast(exportSession),
+    return new JPrefixNegOperation(sourceInfo.exportAsJast(),
         arg.exportAsJast(exportSession));
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixNotOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixNotOperation.java
index b9117d6..1e0a634 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixNotOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NPrefixNotOperation.java
@@ -54,7 +54,7 @@ public class NPrefixNotOperation extends NExpression {
   public JPrefixNotOperation exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert arg != null;
-    return new JPrefixNotOperation(sourceInfo.exportAsJast(exportSession),
+    return new JPrefixNotOperation(sourceInfo.exportAsJast(),
         arg.exportAsJast(exportSession));
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NReinterpretCastOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NReinterpretCastOperation.java
index 8e673fb..c6e296b 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NReinterpretCastOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NReinterpretCastOperation.java
@@ -64,7 +64,7 @@ public class NReinterpretCastOperation extends NExpression {
     assert expr != null;
     JType jType = exportSession.getLookup().getType(castType);
     JExpression jExpr = expr.exportAsJast(exportSession);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JReinterpretCastOperation jReinterpretCastOperation =
         new JReinterpretCastOperation(jSourceInfo, jType, jExpr);
     return jReinterpretCastOperation;
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NReturnStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NReturnStatement.java
index 1f402dc..fb7845e 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NReturnStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NReturnStatement.java
@@ -63,7 +63,7 @@ public class NReturnStatement extends NStatement {
     assert sourceInfo != null;
     JExpression jExpr = expr != null ? expr.exportAsJast(exportSession) : null;
     JReturnStatement statement =
-        new JReturnStatement(sourceInfo.exportAsJast(exportSession), jExpr);
+        new JReturnStatement(sourceInfo.exportAsJast(), jExpr);
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(statement));
     }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NShlOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NShlOperation.java
index f04894e..172f3f2 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NShlOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NShlOperation.java
@@ -59,7 +59,7 @@ public class NShlOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JShlOperation(sourceInfo.exportAsJast(exportSession),
+    return new JShlOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NShortLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NShortLiteral.java
index acae036..d44e7a0 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NShortLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NShortLiteral.java
@@ -53,7 +53,7 @@ public class NShortLiteral extends NLiteral {
   @Nonnull
   public JShortLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JShortLiteral jShortLiteral = new JShortLiteral(jSourceInfo, value);
     return jShortLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NShrOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NShrOperation.java
index 91353a7..39878f2 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NShrOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NShrOperation.java
@@ -59,7 +59,7 @@ public class NShrOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JShrOperation(sourceInfo.exportAsJast(exportSession),
+    return new JShrOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NShruOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NShruOperation.java
index 8ab91fb..3b519e1 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NShruOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NShruOperation.java
@@ -59,7 +59,7 @@ public class NShruOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JShruOperation(sourceInfo.exportAsJast(exportSession),
+    return new JShruOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NSourceInfo.java b/jack/src/com/android/jack/jayce/v0002/nodes/NSourceInfo.java
index e59ea79..ac1291f 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NSourceInfo.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NSourceInfo.java
@@ -18,8 +18,6 @@ package com.android.jack.jayce.v0002.nodes;
 
 import com.android.jack.ir.SourceInfo;
 import com.android.jack.ir.SourceOrigin;
-import com.android.jack.jayce.v0002.io.ExportSession;
-import com.android.jack.jayce.v0002.io.ImportHelper;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnegative;
@@ -43,11 +41,7 @@ public class NSourceInfo {
 
   public static final NSourceInfo UNKNOWN = new NSourceInfo();
 
-  public void importFromJast(@Nonnull ImportHelper loader, @Nonnull Object object) {
-    importFromJast(loader, (SourceInfo) object);
-  }
-
-  public void importFromJast(@Nonnull ImportHelper loader, @Nonnull SourceInfo sourceInfo) {
+  public void importFromJast(@Nonnull SourceInfo sourceInfo) {
     fileName = sourceInfo.getFileName();
     startLine = sourceInfo.getStartLine();
     endLine = sourceInfo.getEndLine();
@@ -56,7 +50,7 @@ public class NSourceInfo {
   }
 
   @Nonnull
-  public SourceInfo exportAsJast(@Nonnull ExportSession exportSession) {
+  public SourceInfo exportAsJast() {
     if (fileName == null
         && startLine == 0
         && endLine == 0
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NStringLiteral.java b/jack/src/com/android/jack/jayce/v0002/nodes/NStringLiteral.java
index 80b9d7a..1fe8807 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NStringLiteral.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NStringLiteral.java
@@ -55,7 +55,7 @@ public class NStringLiteral extends NLiteral {
   public JAbstractStringLiteral exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert value != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JAbstractStringLiteral jStringLiteral = new JStringLiteral(jSourceInfo, value);
     return jStringLiteral;
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NSubOperation.java b/jack/src/com/android/jack/jayce/v0002/nodes/NSubOperation.java
index 9f11059..0c078ab 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NSubOperation.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NSubOperation.java
@@ -59,7 +59,7 @@ public class NSubOperation extends NExpression {
     assert sourceInfo != null;
     assert lhs != null;
     assert rhs != null;
-    return new JSubOperation(sourceInfo.exportAsJast(exportSession),
+    return new JSubOperation(sourceInfo.exportAsJast(),
         lhs.exportAsJast(exportSession),
         rhs.exportAsJast(exportSession));
   }
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NSwitchStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NSwitchStatement.java
index 62051f7..605a2b1 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NSwitchStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NSwitchStatement.java
@@ -79,7 +79,7 @@ public class NSwitchStatement extends NStatement {
     assert sourceInfo != null;
     assert expr != null;
     assert body != null;
-    final JSwitchStatement jSwitch = new JSwitchStatement(sourceInfo.exportAsJast(exportSession),
+    final JSwitchStatement jSwitch = new JSwitchStatement(sourceInfo.exportAsJast(),
         expr.exportAsJast(exportSession),
         body.exportAsJast(exportSession),
         new ArrayList<JCaseStatement>(1),
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NSynchronizedBlock.java b/jack/src/com/android/jack/jayce/v0002/nodes/NSynchronizedBlock.java
index 93f1bdc..4ac22dc 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NSynchronizedBlock.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NSynchronizedBlock.java
@@ -73,7 +73,7 @@ public class NSynchronizedBlock extends NStatement {
     assert synchronizedBlock != null;
     JExpression jLockExpr = lockExpr.exportAsJast(exportSession);
     JBlock jBlock = synchronizedBlock.exportAsJast(exportSession);
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JSynchronizedBlock jSynchronizedBlock = new JSynchronizedBlock(jSourceInfo, jLockExpr, jBlock);
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver()
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NThisRef.java b/jack/src/com/android/jack/jayce/v0002/nodes/NThisRef.java
index 505f43e..946ef79 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NThisRef.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NThisRef.java
@@ -55,7 +55,7 @@ public class NThisRef extends NExpression {
   public JThisRef exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert type != null;
-    SourceInfo jSourceInfo = sourceInfo.exportAsJast(exportSession);
+    SourceInfo jSourceInfo = sourceInfo.exportAsJast();
     JThis jThis = exportSession.getCurrentMethod().getThis();
     assert jThis != null;
     JThisRef jThisRef = new JThisRef(jSourceInfo, jThis);
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NThrowStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NThrowStatement.java
index 1a5fb22..dc31f39 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NThrowStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NThrowStatement.java
@@ -63,7 +63,7 @@ public class NThrowStatement extends NStatement {
   public JThrowStatement exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert expr != null;
-    JThrowStatement jStatement = new JThrowStatement(sourceInfo.exportAsJast(exportSession),
+    JThrowStatement jStatement = new JThrowStatement(sourceInfo.exportAsJast(),
         expr.exportAsJast(exportSession));
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jStatement));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NTryStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NTryStatement.java
index 272b04b..578721c 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NTryStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NTryStatement.java
@@ -83,7 +83,7 @@ public class NTryStatement extends NStatement {
       jResourcesDeclaration.add(stmt.exportAsJast(exportSession));
     }
 
-    JTryStatement jTryStatement = new JTryStatement(sourceInfo.exportAsJast(exportSession),
+    JTryStatement jTryStatement = new JTryStatement(sourceInfo.exportAsJast(),
         jResourcesDeclaration,
         tryBlock.exportAsJast(exportSession),
         jCatchBlocks,
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NUnlock.java b/jack/src/com/android/jack/jayce/v0002/nodes/NUnlock.java
index 12cef64..6f530d5 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NUnlock.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NUnlock.java
@@ -63,7 +63,7 @@ public class NUnlock extends NStatement {
   public JUnlock exportAsJast(@Nonnull ExportSession exportSession) {
     assert sourceInfo != null;
     assert lockExpr != null;
-    JUnlock jStatement = new JUnlock(sourceInfo.exportAsJast(exportSession),
+    JUnlock jStatement = new JUnlock(sourceInfo.exportAsJast(),
         lockExpr.exportAsJast(exportSession));
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jStatement));
diff --git a/jack/src/com/android/jack/jayce/v0002/nodes/NWhileStatement.java b/jack/src/com/android/jack/jayce/v0002/nodes/NWhileStatement.java
index 66ae66d..43fedf5 100644
--- a/jack/src/com/android/jack/jayce/v0002/nodes/NWhileStatement.java
+++ b/jack/src/com/android/jack/jayce/v0002/nodes/NWhileStatement.java
@@ -68,7 +68,7 @@ public class NWhileStatement extends NStatement {
     assert sourceInfo != null;
     JStatement jBody = body != null ? body.exportAsJast(exportSession) : null;
     JWhileStatement jWhileStatement = new JWhileStatement(
-        sourceInfo.exportAsJast(exportSession), testExpression.exportAsJast(exportSession), jBody);
+        sourceInfo.exportAsJast(), testExpression.exportAsJast(exportSession), jBody);
     for (String catchId : catchBlockIds) {
       exportSession.getCatchBlockResolver().addLink(catchId, new CatchBlockLinker(jWhileStatement));
     }
diff --git a/jack/src/com/android/jack/shrob/obfuscation/MappingApplier.java b/jack/src/com/android/jack/shrob/obfuscation/MappingApplier.java
index 941bd0a..603782f 100644
--- a/jack/src/com/android/jack/shrob/obfuscation/MappingApplier.java
+++ b/jack/src/com/android/jack/shrob/obfuscation/MappingApplier.java
@@ -136,7 +136,7 @@ public class MappingApplier {
         newEnclosingPackage = newEnclosingPackage.getEnclosingPackage();
       }
 
-      rename(clOrI, mappingFile, lineNumber, newSimpleName);
+      rename(clOrI, newSimpleName);
       return clOrI;
     }
     return null;
@@ -270,8 +270,7 @@ public class MappingApplier {
     }
   }
 
-  private void rename(@Nonnull CanBeRenamed renamable, @Nonnull File mappingFile, int lineNumber,
-      @Nonnull String newName) {
+  private void rename(@Nonnull CanBeRenamed renamable, @Nonnull String newName) {
     AbstractMarkerManager markerManager = (AbstractMarkerManager) renamable;
     if (!markerManager.containsMarker(OriginalNameMarker.class)) {
       markerManager.addMarker(new OriginalNameMarker(((HasName) renamable).getName()));
@@ -279,9 +278,10 @@ public class MappingApplier {
     }
   }
 
+
   protected void renameField(@Nonnull JField field, @Nonnull File mappingFile, int lineNumber,
       @Nonnull String newName) {
-    rename(field.getId(), mappingFile, lineNumber, newName);
+    rename(field.getId(), newName);
   }
 
   private int readChar(@Nonnull String line, int index, char expectedChar,
@@ -354,7 +354,7 @@ public class MappingApplier {
       logger.log(Level.WARNING, "{0}:{1}: Static initializers cannot be renamed",
           new Object[] {mappingFile.getAbsolutePath(), Integer.valueOf(lineNumber)});
     } else {
-      rename(method.getMethodId(), mappingFile, lineNumber, newName);
+      rename(method.getMethodId(), newName);
     }
   }
 
diff --git a/jack/tests/com/android/jack/jayce/v0002/io/EscapeStringTest.java b/jack/tests/com/android/jack/jayce/v0002/io/EscapeStringTest.java
index 306ea9e..2f27ca8 100644
--- a/jack/tests/com/android/jack/jayce/v0002/io/EscapeStringTest.java
+++ b/jack/tests/com/android/jack/jayce/v0002/io/EscapeStringTest.java
@@ -32,7 +32,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
 
 import javax.annotation.Nonnull;
 
@@ -118,9 +117,8 @@ public class EscapeStringTest {
       options.checkValidity(new RunnableHooks());
       options.getConfigBuilder().setDebug();
       ThreadConfig.setConfig(options.getConfig());
-      Charset encoding = Charset.forName("UTF-8");
       FileOutputStream fos = new FileOutputStream(tmp);
-      JayceInternalWriterImpl jw = new JayceInternalWriterImpl(fos, encoding);
+      JayceInternalWriterImpl jw = new JayceInternalWriterImpl(fos);
       jw.writeString(stringToWrite);
       jw.close();
       FileInputStream fis = new FileInputStream(tmp);