diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index e77168754f..f4a9d040c8 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -171,7 +171,7 @@ namespace BizHawk.Client.EmuHawk
 			if (Config.SkipWaterboxIntegrityChecks)
 				prefs = CoreComm.CorePreferencesFlags.WaterboxMemoryConsistencyCheck;
 
-			return new CoreComm(ShowMessageCoreComm, NotifyCoreComm, cfp, prefs);
+			return new CoreComm(ShowMessageCoreComm, AddOnScreenMessage, cfp, prefs);
 		}
 
 		void SetImages()
@@ -2177,7 +2177,7 @@ namespace BizHawk.Client.EmuHawk
 					//HACK
 					var _ = typeof(ToolStrip).InvokeMember(
 						"ProcessMnemonicInternal",
-						System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance,
+						BindingFlags.NonPublic | BindingFlags.InvokeMethod | BindingFlags.Instance,
 						null,
 						MainformMenu,
 						new object[] { c });
@@ -3377,7 +3377,7 @@ namespace BizHawk.Client.EmuHawk
 		private int? LoadArchiveChooser(HawkFile file)
 		{
 			using var ac = new ArchiveChooser(file);
-			if (ShowDialogAsChild(ac) == DialogResult.OK)
+			if (ShowDialogAsChild(ac).IsOk())
 			{
 				return ac.SelectedMemberIndex;
 			}
@@ -3444,11 +3444,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void NotifyCoreComm(string message)
-		{
-			AddOnScreenMessage(message);
-		}
-
 		private string ChoosePlatformForRom(RomGame rom)
 		{
 			using var platformChooser = new PlatformChooser(Config)