diff --git a/SourceGen/AppForms/ProjectView.cs b/SourceGen/AppForms/ProjectView.cs
index 380bfed..d4d4347 100644
--- a/SourceGen/AppForms/ProjectView.cs
+++ b/SourceGen/AppForms/ProjectView.cs
@@ -2805,7 +2805,7 @@ namespace SourceGen.AppForms {
                 // Create and show modeless dialog.  This one is "always on top" by default,
                 // to allow the user to click around to various points.
                 mHexDumpDialog = new Tools.HexDumpViewer(mProject.FileData, mOutputFormatter);
-                mHexDumpDialog.OnWindowClosing += (arg) => {
+                mHexDumpDialog.OnWindowClosing += (sender1, e1) => {
                     Debug.WriteLine("Hex dump dialog closed");
                     //showHexDumpToolStripMenuItem.Checked = false;
                     mHexDumpDialog = null;
@@ -2836,7 +2836,7 @@ namespace SourceGen.AppForms {
             // Show or hide the modeless dialog.
             if (mAsciiChartDialog == null) {
                 Tools.AsciiChart dlg = new Tools.AsciiChart();
-                dlg.OnWindowClosing += (arg) => {
+                dlg.OnWindowClosing += (sender1, e1) => {
                     Debug.WriteLine("ASCII chart closed");
                     aSCIIChartToolStripMenuItem.Checked = false;
                     mAsciiChartDialog = null;
@@ -4259,7 +4259,7 @@ namespace SourceGen.AppForms {
                 Tools.ShowText dlg = new Tools.ShowText();
                 dlg.Title = "Undo/Redo History";
                 dlg.BodyText = mProject.DebugGetUndoRedoHistory();
-                dlg.OnWindowClosing += (arg) => {
+                dlg.OnWindowClosing += (sender1, e1) => {
                     Debug.WriteLine("Undo/redo dialog closed");
                     showUndoRedoHistoryToolStripMenuItem.Checked = false;
                     mShowUndoRedoHistoryDialog = null;
@@ -4285,7 +4285,7 @@ namespace SourceGen.AppForms {
                 } else {
                     dlg.BodyText = mGenerationLog.WriteToString();
                 }
-                dlg.OnWindowClosing += (arg) => {
+                dlg.OnWindowClosing += (sender1, e1) => {
                         Debug.WriteLine("Analyzer output dialog closed");
                         showAnalyzerOutputToolStripMenuItem.Checked = false;
                         mShowAnalyzerOutputDialog = null;
@@ -4307,7 +4307,7 @@ namespace SourceGen.AppForms {
                 Tools.ShowText dlg = new Tools.ShowText();
                 dlg.Title = "Analysis Timers";
                 dlg.BodyText = "(no data yet)";
-                dlg.OnWindowClosing += (arg) => {
+                dlg.OnWindowClosing += (sender1, e1) => {
                     Debug.WriteLine("Analysis timers dialog closed");
                     showAnalysisTimersToolStripMenuItem.Checked = false;
                     mShowAnalysisTimersDialog = null;
diff --git a/SourceGen/SourceGen.csproj b/SourceGen/SourceGen.csproj
index 7d7f8ec..bab598f 100644
--- a/SourceGen/SourceGen.csproj
+++ b/SourceGen/SourceGen.csproj
@@ -38,6 +38,7 @@
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/SourceGen/Tools/AsciiChart.cs b/SourceGen/Tools/AsciiChart.cs
index 20f8763..5565568 100644
--- a/SourceGen/Tools/AsciiChart.cs
+++ b/SourceGen/Tools/AsciiChart.cs
@@ -31,7 +31,7 @@ namespace SourceGen.Tools {
         /// Subscribe to this to be notified when the dialog closes.
         /// </summary>
         public event WindowClosing OnWindowClosing;
-        public delegate void WindowClosing(object sender);
+        public delegate void WindowClosing(object sender, EventArgs e);
 
         public AsciiChart() {
             InitializeComponent();
@@ -48,7 +48,7 @@ namespace SourceGen.Tools {
 
         private void AsciiChart_FormClosed(object sender, FormClosedEventArgs e) {
             if (OnWindowClosing != null) {
-                OnWindowClosing(this);
+                OnWindowClosing(this, e);
             }
         }
 
diff --git a/SourceGen/Tools/HexDumpViewer.cs b/SourceGen/Tools/HexDumpViewer.cs
index e6ac062..043cdd9 100644
--- a/SourceGen/Tools/HexDumpViewer.cs
+++ b/SourceGen/Tools/HexDumpViewer.cs
@@ -62,7 +62,7 @@ namespace SourceGen.Tools {
         /// Subscribe to this to be notified when the dialog closes.
         /// </summary>
         public event WindowClosing OnWindowClosing;
-        public delegate void WindowClosing(object sender);
+        public delegate void WindowClosing(object sender, EventArgs e);
 
 
         public HexDumpViewer(byte[] data, Formatter formatter) {
@@ -127,7 +127,7 @@ namespace SourceGen.Tools {
 
         private void HexDumpViewer_FormClosed(object sender, FormClosedEventArgs e) {
             if (OnWindowClosing != null) {
-                OnWindowClosing(this);
+                OnWindowClosing(this, e);
             }
         }
 
diff --git a/SourceGen/Tools/ShowText.cs b/SourceGen/Tools/ShowText.cs
index 28a58fb..c471617 100644
--- a/SourceGen/Tools/ShowText.cs
+++ b/SourceGen/Tools/ShowText.cs
@@ -50,7 +50,7 @@ namespace SourceGen.Tools {
         /// Subscribe to this to be notified when the dialog closes.
         /// </summary>
         public event WindowClosing OnWindowClosing;
-        public delegate void WindowClosing(object sender);
+        public delegate void WindowClosing(object sender, EventArgs e);
 
         public ShowText() {
             InitializeComponent();
@@ -71,7 +71,7 @@ namespace SourceGen.Tools {
 
         private void ShowText_FormClosed(object sender, FormClosedEventArgs e) {
             if (OnWindowClosing != null) {
-                OnWindowClosing(this);
+                OnWindowClosing(this, e);
             }
         }
     }