diff --git a/Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java b/Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java
index 32e1e9f98f..f997061237 100644
--- a/Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java
+++ b/Ghidra/Features/SystemEmulation/src/test/java/ghidra/pcode/struct/sub/StructuredSleighTest.java
@@ -15,7 +15,8 @@
  */
 package ghidra.pcode.struct.sub;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
@@ -246,7 +247,8 @@ public class StructuredSleighTest extends AbstractGhidraHeadlessIntegrationTest
 			}
 		};
 		SleighPcodeUseropDefinition<Object> myUserop = ss.generate().get("my_userop");
-		PcodeProgram program = myUserop.programFor(List.of(), PcodeUseropLibrary.nil());
+		PcodeProgram program =
+			myUserop.programFor(SleighPcodeUseropDefinition.EMPTY_ARGS, PcodeUseropLibrary.nil());
 		assertTrue(program.getCode().isEmpty());
 	}
 }
diff --git a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/SleighPcodeUseropDefinition.java b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/SleighPcodeUseropDefinition.java
index 7907f28e91..a355484ff1 100644
--- a/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/SleighPcodeUseropDefinition.java
+++ b/Ghidra/Framework/Emulation/src/main/java/ghidra/pcode/exec/SleighPcodeUseropDefinition.java
@@ -30,6 +30,7 @@ import ghidra.program.model.pcode.Varnode;
 public interface SleighPcodeUseropDefinition<T> extends PcodeUseropDefinition<T> {
 	/** The name of the output symbol */
 	String OUT_SYMBOL_NAME = "__op_output";
+	List<Varnode> EMPTY_ARGS = Collections.unmodifiableList(Arrays.asList(new Varnode[] { null }));
 
 	/**
 	 * A factory for building {@link SleighPcodeUseropDefinition}s.