diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
index 5b64a402a1..27e13e2ab3 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
@@ -233,13 +233,13 @@ namespace BizHawk.Client.EmuHawk
 		/// Occurs when a column header is clicked
 		/// </summary>
 		[Category("Action")]
-		public event ColumnClickEventHandler ColumnClick;
+		public event System.Windows.Forms.ColumnClickEventHandler ColumnClick;
 
 		/// <summary>
 		/// Occurs whenever the 'SelectedItems' property for this control changes
 		/// </summary>
 		[Category("Behavior")]
-		public event SelectedIndexChangedHandler SelectedIndexChanged;
+		public event System.EventHandler SelectedIndexChanged;
 
 		/// <summary>
 		/// Occurs whenever the mouse wheel is scrolled while the right mouse button is held
@@ -259,10 +259,6 @@ namespace BizHawk.Client.EmuHawk
 
 		public delegate void CellChangeEventHandler(object sender, CellEventArgs e);
 
-		public delegate void ColumnClickEventHandler(object sender, ColumnClickEventArgs e);
-
-		public delegate void SelectedIndexChangedHandler(object sender, EventArgs e);
-
 		public delegate void RightMouseScrollEventHandler(object sender, MouseEventArgs e);
 
 		public class CellEventArgs
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.Designer.cs
index 2b859d2363..7b7c29d86a 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.Designer.cs
@@ -102,8 +102,8 @@
 			this.InputView.Text = "inputRoll1";
 			this.InputView.VirtualMode = false;
 			this.InputView.PointedCellChanged += new BizHawk.Client.EmuHawk.InputRoll.CellChangeEventHandler(this.InputView_PointedCellChanged);
-			this.InputView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.InputView_ColumnClick);
-			this.InputView.SelectedIndexChanged += new BizHawk.Client.EmuHawk.InputRoll.SelectedIndexChangedHandler(this.InputView_SelectedIndexChanged);
+			this.InputView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.InputView_ColumnClick);
+			this.InputView.SelectedIndexChanged += new System.EventHandler(this.InputView_SelectedIndexChanged);
 			// 
 			// OutputLabel
 			//