diff --git a/LR35902/inc/LR35902.h b/LR35902/inc/LR35902.h
index cfaf6fa..07467b1 100644
--- a/LR35902/inc/LR35902.h
+++ b/LR35902/inc/LR35902.h
@@ -40,7 +40,7 @@ namespace EightBit {
 			Signal<EventArgs> MachineTicked;
 
 			void tickMachine(const int extra) { for (int i = 0; i < extra; ++i) tickMachine(); }
-			void tickMachine() { tick(4); MachineTicked.fire(EventArgs::empty()); }
+			void tickMachine() { tick(4); MachineTicked.fire(); }
 
 		protected:
 			int execute() final;
diff --git a/M6502/src/Profiler.cpp b/M6502/src/Profiler.cpp
index c0ee9f2..57b9cc0 100644
--- a/M6502/src/Profiler.cpp
+++ b/M6502/src/Profiler.cpp
@@ -17,15 +17,15 @@ EightBit::Profiler::Profiler(MOS6502& targetProcessor, Disassembly& disassembler
 }
 
 void EightBit::Profiler::Generate() {
-	StartingOutput.fire(EventArgs::empty());
+	StartingOutput.fire();
 	EmitProfileInformation();
-	StartingOutput.fire(EventArgs::empty());
+	StartingOutput.fire();
 }
 
 void EightBit::Profiler::EmitProfileInformation() {
 
 	{
-		StartingLineOutput.fire(EventArgs::empty());
+		StartingLineOutput.fire();
 		// For each memory address
 		for (int address = 0; address < 0x10000; ++address) {
 			// If there are any cycles associated
@@ -37,11 +37,11 @@ void EightBit::Profiler::EmitProfileInformation() {
 				EmitLine.fire(event);
 			}
 		}
-		FinishedLineOutput.fire(EventArgs::empty());
+		FinishedLineOutput.fire();
 	}
 
 	{
-		StartingScopeOutput.fire(EventArgs::empty());
+		StartingScopeOutput.fire();
 		for (auto& scopeCycle : scopeCycles) {
 			auto name = scopeCycle.first;
 			auto cycles = scopeCycle.second;
@@ -50,7 +50,7 @@ void EightBit::Profiler::EmitProfileInformation() {
 			ProfileScopeEventArgs event(name, cycles, count);
 			EmitScope.fire(event);
 		}
-		FinishedScopeOutput.fire(EventArgs::empty());
+		FinishedScopeOutput.fire();
 	}
 }
 
diff --git a/M6532/src/M6532.cpp b/M6532/src/M6532.cpp
index 2598837..a9d1bb8 100644
--- a/M6532/src/M6532.cpp
+++ b/M6532/src/M6532.cpp
@@ -23,7 +23,7 @@ void EightBit::M6532::step() {
 	if (!activated())
 		return;
 
-	Accessing.fire(EventArgs::empty());
+	Accessing.fire();
 
 	if (lowered(RES())) {
 		reset();
@@ -120,7 +120,7 @@ void EightBit::M6532::step() {
 		}
 	}
 
-	Accessed.fire(EventArgs::empty());
+	Accessed.fire();
 }
 
 void EightBit::M6532::reset() {
diff --git a/MC6850/src/MC6850.cpp b/MC6850/src/MC6850.cpp
index fb8b250..3050bfd 100644
Binary files a/MC6850/src/MC6850.cpp and b/MC6850/src/MC6850.cpp differ