diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
index ba53d33424..63f2bdd627 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs
@@ -7,6 +7,9 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 {
     public partial class HuC6280
     {
+        public bool Debug;
+        public Action<string> Logger;
+
         public void Execute(int cycles)
         {
             sbyte rel8;
@@ -55,7 +58,8 @@ namespace BizHawk.Emulation.Cores.Components.H6280
                 IRQControlByte = IRQNextControlByte;
                 LagIFlag = FlagI;
 
-                ExecuteCallbacks();
+                if (Debug) Logger(State());
+				CoreComm.MemoryCallbackSystem.CallExecute(PC);
 
                 byte opcode = ReadMemory(PC++);
                 switch (opcode)
diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
index fbf1c8672e..67f84e2994 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
@@ -9,24 +9,10 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 {
 	public sealed partial class HuC6280
 	{
-		public Action<string> TraceLogger;
-		public bool TraceEnabled;
-		public Action<uint> CallExecute;
-
-		void ExecuteCallbacks()
-		{
-			if (TraceEnabled)
-			{
-				TraceLogger(State());
-			}
-			if (CallExecute != null)
-				CallExecute(PC);
-		}
-
-
-		public HuC6280()
+		public HuC6280(CoreComm comm)
 		{
 			Reset();
+			CoreComm = comm;
 		}
 
 		public void Reset()
@@ -363,6 +349,8 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 		public Action<int, byte> WriteVDC;
 		public Action<int> ThinkAction = delegate { };
 
+		public CoreComm CoreComm;
+
 		public byte ReadMemory(ushort address)
 		{
 			byte page = MPR[address >> 13];
diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
index efbabf57ea..41b8d872f1 100644
--- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs	
+++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs	
@@ -93,13 +93,13 @@ namespace BizHawk.Emulation.Cores.PCEngine
 		void Init(GameInfo game, byte[] rom)
 		{
 			Controller = NullController.GetNullController();
-			Cpu = new HuC6280();
+			Cpu = new HuC6280(CoreComm);
 			VCE = new VCE();
 			VDC1 = new VDC(this, Cpu, VCE);
 			PSG = new HuC6280PSG();
 			SCSI = new ScsiCDBus(this, disc);
 
-			Cpu.TraceLogger = (s) => CoreComm.Tracer.Put(s);
+			Cpu.Logger = (s) => CoreComm.Tracer.Put(s);
 
 			if (TurboGrafx)
 			{
@@ -160,7 +160,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 				RomData = rom;
 				RomLength = RomData.Length;
 				// user request: current value of the SF2MapperLatch on the tracelogger
-				Cpu.TraceLogger = (s) => CoreComm.Tracer.Put(string.Format("{0:X1}:{1}", SF2MapperLatch, s));
+				Cpu.Logger = (s) => CoreComm.Tracer.Put(string.Format("{0:X1}:{1}", SF2MapperLatch, s));
 			}
 			else
 			{
@@ -260,19 +260,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
 			Frame++;
 			PSG.BeginFrame(Cpu.TotalExecutedCycles);
 
-			Cpu.TraceEnabled = CoreComm.Tracer.Enabled;
-
-			if (CoreComm.MemoryCallbackSystem.HasExecutes)
-			{
-				Cpu.CallExecute = delegate(uint addr)
-				{
-					CoreComm.MemoryCallbackSystem.CallExecute(addr);
-				};
-			}
-			else
-			{
-				Cpu.CallExecute = null;
-			}
+			Cpu.Debug = CoreComm.Tracer.Enabled;
 
 			if (SuperGrafx)
 				VPC.ExecFrame(render);
diff --git a/CpuCoreGenerator/HuC6280/CoreGenerator.cs b/CpuCoreGenerator/HuC6280/CoreGenerator.cs
index 4b417b100a..146e106ca1 100644
--- a/CpuCoreGenerator/HuC6280/CoreGenerator.cs
+++ b/CpuCoreGenerator/HuC6280/CoreGenerator.cs
@@ -438,10 +438,13 @@ namespace HuC6280
             w.WriteLine("// Do not modify this file directly! This is GENERATED code.");
             w.WriteLine("// Please open the CpuCoreGenerator solution and make your modifications there.");
             w.WriteLine();
-            w.WriteLine("namespace BizHawk.Emulation.Cores.Components.H6280");
+            w.WriteLine("namespace BizHawk.Emulation.Common.Components.H6280");
             w.WriteLine("{");
             w.WriteLine("    public partial class HuC6280");
             w.WriteLine("    {");
+            w.WriteLine("        public bool Debug;");
+            w.WriteLine("        public Action<string> Logger;");
+            w.WriteLine();
             w.WriteLine("        public void Execute(int cycles)");
             w.WriteLine("        {");
             w.WriteLine("            sbyte rel8;");
@@ -490,7 +493,8 @@ namespace HuC6280
             w.WriteLine("                IRQControlByte = IRQNextControlByte;");
             w.WriteLine("                LagIFlag = FlagI;");
             w.WriteLine();
-			w.WriteLine("                ExecuteCallbacks();");
+            w.WriteLine("                if (Debug) Logger(State());");
+            w.WriteLine("                CoreComm.MemoryCallbackSystem.CallExecute(PC);");
             w.WriteLine();
             w.WriteLine("                byte opcode = ReadMemory(PC++);");
             w.WriteLine("                switch (opcode)");
@@ -749,7 +753,7 @@ namespace HuC6280
         public void GenerateDisassembler(string file)
         {
             var w = new StreamWriter(file, false);
-            w.WriteLine("namespace BizHawk.Emulation.Cores.Components.H6280");
+            w.WriteLine("namespace BizHawk.Emulation.Common.Components.H6280");
             w.WriteLine();
             w.WriteLine("// Do not modify this file directly! This is GENERATED code.");
             w.WriteLine("// Please open the CpuCoreGenerator solution and make your modifications there.");
diff --git a/CpuCoreGenerator/Program.cs b/CpuCoreGenerator/Program.cs
index 5f064b2400..83a647c7ae 100644
--- a/CpuCoreGenerator/Program.cs
+++ b/CpuCoreGenerator/Program.cs
@@ -10,7 +10,7 @@
 
         var y = new HuC6280.CoreGenerator();
         y.InitOpcodeTable();
-        y.GenerateDisassembler("../../../BizHawk.Emulation.Cores/CPUs/HuC6280/Disassembler.cs");
-        y.GenerateExecutor("../../../BizHawk.Emulation.Cores/CPUs/HuC6280/Execute.cs");
+        y.GenerateDisassembler("../../../BizHawk.Emulation.Common/CPUs/HuC6280/Disassembler.cs");
+        y.GenerateExecutor("../../../BizHawk.Emulation.Common/CPUs/HuC6280/Execute.cs");
     }
 }