diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
index 165ca20fd9..4efb196076 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
@@ -59,7 +59,7 @@ namespace BizHawk.Emulation.Cores.Components.H6280
                 LagIFlag = FlagI;
 
                 if (Debug) Logger(State());
-                Core.MemoryCallbacks.CallExecutes(PC);
+                MemoryCallbacks.CallExecutes(PC);
 
                 if (CDLLoggingActive) CDLOpcode();
 
diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
index fa92ce297e..a94e56130b 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
@@ -9,10 +9,10 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 {
 	public sealed partial class HuC6280
 	{
-		public HuC6280(IDebuggable core)
+		public HuC6280(IMemoryCallbackSystem callbacks)
 		{
 			Reset();
-			Core = core;
+			MemoryCallbacks = callbacks;
 		}
 
 		public void Reset()
@@ -224,7 +224,7 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 		public Action<int, byte> WriteVDC;
 		public Action<int> ThinkAction = delegate { };
 
-		public IDebuggable Core;
+		public IMemoryCallbackSystem MemoryCallbacks;
 
 		public byte ReadMemory(ushort address)
 		{
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
index 534ffa70a5..31845df767 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs	
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs	
@@ -157,7 +157,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 		void Init(GameInfo game, byte[] rom)
 		{
 			Controller = NullController.GetNullController();
-			Cpu = new HuC6280(this);
+			Cpu = new HuC6280(MemoryCallbacks);
 			VCE = new VCE();
 			VDC1 = new VDC(this, Cpu, VCE);
 			PSG = new HuC6280PSG();
diff --git a/CpuCoreGenerator/HuC6280/CoreGenerator.cs b/CpuCoreGenerator/HuC6280/CoreGenerator.cs
index fed57d880f..7f83b305aa 100644
--- a/CpuCoreGenerator/HuC6280/CoreGenerator.cs
+++ b/CpuCoreGenerator/HuC6280/CoreGenerator.cs
@@ -494,7 +494,7 @@ namespace HuC6280
             w.WriteLine("                LagIFlag = FlagI;");
             w.WriteLine();
             w.WriteLine("                if (Debug) Logger(State());");
-            w.WriteLine("                Core.MemoryCallbacks.CallExecutes(PC);");
+            w.WriteLine("                MemoryCallbacks.CallExecutes(PC);");
             w.WriteLine("                if (CDLLoggingActive) CDLOpcode();");
             w.WriteLine();
             w.WriteLine("                byte opcode = ReadMemory(PC++);");