diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorApplicationFixer.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorApplicationFixer.java
index 462b585..75c0655 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorApplicationFixer.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/ArgumentPropagatorApplicationFixer.java
@@ -105,7 +105,7 @@
           DexEncodedMethod replacement =
               method.toTypeSubstitutedMethodAsInlining(
                   methodReferenceAfterParameterRemoval,
-                  appView.dexItemFactory(),
+                  dexItemFactory,
                   builder -> {
                     if (graphLens.hasPrototypeChanges(methodReferenceAfterParameterRemoval)) {
                       RewrittenPrototypeDescription prototypeChanges =
diff --git a/src/main/java/com/android/tools/r8/repackaging/RepackagingUseRegistry.java b/src/main/java/com/android/tools/r8/repackaging/RepackagingUseRegistry.java
index 49eb0a2..59002e8 100644
--- a/src/main/java/com/android/tools/r8/repackaging/RepackagingUseRegistry.java
+++ b/src/main/java/com/android/tools/r8/repackaging/RepackagingUseRegistry.java
@@ -105,7 +105,7 @@
   }
 
   public void registerFieldAccess(DexField field) {
-    registerMemberAccess(appInfo.resolveField(graphLens.lookupField(field)), false);
+    registerMemberAccess(appInfo.resolveField(graphLens.lookupField(field, codeLens)), false);
   }
 
   public ProgramMethod registerMethodReference(DexMethod method) {
@@ -209,7 +209,8 @@
   @Override
   public void registerInitClass(DexType type) {
     registerMemberAccess(
-        appInfo.resolveField(initClassLens.getInitClassField(graphLens.lookupClassType(type))),
+        appInfo.resolveField(
+            initClassLens.getInitClassField(graphLens.lookupClassType(type, codeLens))),
         false);
   }
 
@@ -262,7 +263,7 @@
 
   @Override
   public void registerNewInstance(DexType type) {
-    registerTypeAccess(graphLens.lookupClassType(type));
+    registerTypeAccess(graphLens.lookupClassType(type, codeLens));
   }
 
   @Override
@@ -286,7 +287,7 @@
 
   @Override
   public void registerInstanceOf(DexType type) {
-    registerTypeAccess(graphLens.lookupType(type));
+    registerTypeAccess(graphLens.lookupType(type, codeLens));
   }
 
   public void registerEnclosingMethodAttribute(EnclosingMethodAttribute enclosingMethodAttribute) {