diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java
index 02fb9727..b916b725 100644
--- a/test/transform/resource/after-delombok/BuilderDefaults.java
+++ b/test/transform/resource/after-delombok/BuilderDefaults.java
@@ -50,7 +50,11 @@ public final class BuilderDefaults {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaults build() {
-			return new BuilderDefaults(x$set ? x : BuilderDefaults.$default$x(), name, z$set ? z : BuilderDefaults.$default$z());
+			int x = this.x;
+			if (!x$set) x = BuilderDefaults.$default$x();
+			long z = this.z;
+			if (!z$set) z = BuilderDefaults.$default$z();
+			return new BuilderDefaults(x, name, z);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
diff --git a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
index 18dd375e..b88a61be 100644
--- a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
+++ b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java
@@ -58,7 +58,13 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderDefaultsGenerics<N, T, R> build() {
-			return new BuilderDefaultsGenerics<N, T, R>(callable$set ? callable : BuilderDefaultsGenerics.<N, T, R>$default$callable(), tee$set ? tee : BuilderDefaultsGenerics.<N, T, R>$default$tee(), arrr$set ? arrr : BuilderDefaultsGenerics.<N, T, R>$default$arrr());
+			java.util.concurrent.Callable<N> callable = this.callable;
+			if (!callable$set) callable = BuilderDefaultsGenerics.<N, T, R>$default$callable();
+			T tee = this.tee;
+			if (!tee$set) tee = BuilderDefaultsGenerics.<N, T, R>$default$tee();
+			R arrr = this.arrr;
+			if (!arrr$set) arrr = BuilderDefaultsGenerics.<N, T, R>$default$arrr();
+			return new BuilderDefaultsGenerics<N, T, R>(callable, tee, arrr);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")