diff --git a/BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs b/BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs
index 75da59a6d4..6a27269e1f 100644
--- a/BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs
+++ b/BizHawk.Client.ApiHawk/Classes/BasicApiProvider.cs
@@ -72,12 +72,6 @@ namespace BizHawk.Client.ApiHawk
 			return _Apis.ContainsKey(t);
 		}
 
-		public IEnumerable<Type> AvailableApis
-		{
-			get
-			{
-				return _Apis.Select(d => d.Key);
-			}
-		}
+		public IEnumerable<Type> AvailableApis => _Apis.Keys;
 	}
 }
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 671fb95c05..bfa06474a6 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -238,12 +238,12 @@ namespace BizHawk.Client.Common
 					frame = 1;
 				}
 
-				List<KeyValuePair<int, StateManagerState>> statesToRemove = _states.Where(s => s.Key >= frame).ToList();
+				var statesToRemove = _states.Keys.Where(k => k >= frame).ToList();
 				anyInvalidated = statesToRemove.Any();
 
 				foreach (var state in statesToRemove)
 				{
-					RemoveState(state.Key);
+					RemoveState(state);
 				}
 
 				CallInvalidateCallback(frame);
diff --git a/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs b/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs
index d087d2558c..db1e9b7317 100644
--- a/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs
+++ b/BizHawk.Client.EmuHawk/config/A7800/A7800ControllerSettings.cs
@@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_syncSettings = ((A7800Hawk)Global.Emulator).GetSyncSettings().Clone();
 
-			var possibleControllers = A7800HawkControllerDeck.ValidControllerTypes.Select(t => t.Key);
+			var possibleControllers = A7800HawkControllerDeck.ValidControllerTypes.Keys;
 
 			foreach (var val in possibleControllers)
 			{
diff --git a/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs b/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs
index d833f96787..2f51c1c77e 100644
--- a/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs
+++ b/BizHawk.Client.EmuHawk/config/A7800/A7800FilterSettings.cs
@@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_syncSettings = ((A7800Hawk)Global.Emulator).GetSyncSettings().Clone();
 
-			var possibleFilters = A7800Hawk.ValidFilterTypes.Select(t => t.Key);
+			var possibleFilters = A7800Hawk.ValidFilterTypes.Keys;
 
 			foreach (var val in possibleFilters)
 			{
diff --git a/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs b/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs
index 82325dce5a..5363129dd5 100644
--- a/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs
+++ b/BizHawk.Client.EmuHawk/config/ColecoVision/ColecoControllerSettings.cs
@@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_syncSettings = ((ColecoVision)Global.Emulator).GetSyncSettings().Clone();
 
-			var possibleControllers = ColecoVisionControllerDeck.ValidControllerTypes.Select(t => t.Key);
+			var possibleControllers = ColecoVisionControllerDeck.ValidControllerTypes.Keys;
 
 			foreach (var val in possibleControllers)
 			{
diff --git a/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs b/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs
index 964c7cd37e..37114d7396 100644
--- a/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs
+++ b/BizHawk.Client.EmuHawk/config/INTV/IntvControllerSettings.cs
@@ -20,7 +20,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_syncSettings = ((Intellivision)Global.Emulator).GetSyncSettings().Clone();
 
-			var possibleControllers = IntellivisionControllerDeck.ValidControllerTypes.Select(t => t.Key);
+			var possibleControllers = IntellivisionControllerDeck.ValidControllerTypes.Keys;
 
 			foreach (var val in possibleControllers)
 			{
diff --git a/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs b/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs
index 3e3414dac7..ee1d5a630b 100644
--- a/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs	
+++ b/BizHawk.Emulation.Common/Base Implementations/BasicServiceProvider.cs	
@@ -86,12 +86,6 @@ namespace BizHawk.Emulation.Common
 			return _services.ContainsKey(t);
 		}
 
-		public IEnumerable<Type> AvailableServices
-		{
-			get
-			{
-				return _services.Select(d => d.Key);
-			}
-		}
+		public IEnumerable<Type> AvailableServices => _services.Keys;
 	}
 }