diff --git a/src/BizHawk.Client.Common/config/PathEntryCollection.cs b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
index 414408bacb..cba2e3a97c 100644
--- a/src/BizHawk.Client.Common/config/PathEntryCollection.cs
+++ b/src/BizHawk.Client.Common/config/PathEntryCollection.cs
@@ -72,14 +72,14 @@ namespace BizHawk.Client.Common
 			=> new(sysID, "Cheats", Path.Combine(".", "Cheats"));
 
 		private static IEnumerable<PathEntry> CommonEntriesFor(string sysID, string basePath, bool omitSaveRAM = false)
-		{
-			yield return BaseEntryFor(sysID, basePath);
-			yield return ROMEntryFor(sysID);
-			yield return SavestatesEntryFor(sysID);
-			if (!omitSaveRAM) yield return SaveRAMEntryFor(sysID);
-			yield return ScreenshotsEntryFor(sysID);
-			yield return CheatsEntryFor(sysID);
-		}
+			=> [
+				BaseEntryFor(sysID, basePath),
+				ROMEntryFor(sysID),
+				SavestatesEntryFor(sysID),
+				..(omitSaveRAM ? [ ] : new[] { SaveRAMEntryFor(sysID) }),
+				ScreenshotsEntryFor(sysID),
+				CheatsEntryFor(sysID),
+			];
 
 		public static string GetDisplayNameFor(string sysID)
 			=> _displayNameLookup.GetValueOrPut(sysID, static s => s + " (INTERIM)");
diff --git a/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs b/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
index ce3e1eacf9..cafc967053 100644
--- a/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
@@ -35,16 +35,12 @@ namespace BizHawk.Client.Common
 		/// <summary>
 		/// Gets an enumeration of <see cref="WatchDisplayType"/> that are valid for a <see cref="ByteWatch"/>
 		/// </summary>
-		public static IEnumerable<WatchDisplayType> ValidTypes
-		{
-			get
-			{
-				yield return WatchDisplayType.Unsigned;
-				yield return WatchDisplayType.Signed;
-				yield return WatchDisplayType.Hex;
-				yield return WatchDisplayType.Binary;
-			}
-		}
+		public static IEnumerable<WatchDisplayType> ValidTypes { get; } = [
+			WatchDisplayType.Unsigned,
+			WatchDisplayType.Signed,
+			WatchDisplayType.Hex,
+			WatchDisplayType.Binary,
+		];
 
 		/// <summary>
 		/// Get a list a <see cref="WatchDisplayType"/> that can be used for this <see cref="ByteWatch"/>
diff --git a/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs b/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
index 0f50cdf7ed..f02d906d42 100644
--- a/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
@@ -36,19 +36,15 @@ namespace BizHawk.Client.Common
 		/// <summary>
 		/// Gets a list of <see cref="WatchDisplayType"/> for a <see cref="DWordWatch"/>
 		/// </summary>
-		public static IEnumerable<WatchDisplayType> ValidTypes
-		{
-			get
-			{
-				yield return WatchDisplayType.Unsigned;
-				yield return WatchDisplayType.Signed;
-				yield return WatchDisplayType.Hex;
-				yield return WatchDisplayType.Binary;
-				yield return WatchDisplayType.FixedPoint_20_12;
-				yield return WatchDisplayType.FixedPoint_16_16;
-				yield return WatchDisplayType.Float;
-			}
-		}
+		public static IEnumerable<WatchDisplayType> ValidTypes { get; } = [
+			WatchDisplayType.Unsigned,
+			WatchDisplayType.Signed,
+			WatchDisplayType.Hex,
+			WatchDisplayType.Binary,
+			WatchDisplayType.FixedPoint_20_12,
+			WatchDisplayType.FixedPoint_16_16,
+			WatchDisplayType.Float,
+		];
 
 		/// <summary>
 		/// Get a list of <see cref="WatchDisplayType"/> that can be used for a <see cref="DWordWatch"/>
diff --git a/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs b/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
index 81de10f381..b78e31694a 100644
--- a/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
@@ -34,9 +34,7 @@ namespace BizHawk.Client.Common
 		/// </summary>
 		/// <returns>WatchDisplayType.Separator nothing else</returns>
 		public override IEnumerable<WatchDisplayType> AvailableTypes()
-		{
-			yield return WatchDisplayType.Separator;
-		}
+			=> [ WatchDisplayType.Separator ];
 
 		/// <summary>
 		/// Ignore that stuff
diff --git a/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs b/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs
index 206cf481e2..7dfaa07146 100644
--- a/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs
@@ -35,17 +35,13 @@ namespace BizHawk.Client.Common
 		/// <summary>
 		/// Gets an Enumeration of <see cref="WatchDisplayType"/>s that are valid for a <see cref="WordWatch"/>
 		/// </summary>
-		public static IEnumerable<WatchDisplayType> ValidTypes
-		{
-			get
-			{
-				yield return WatchDisplayType.Unsigned;
-				yield return WatchDisplayType.Signed;
-				yield return WatchDisplayType.Hex;
-				yield return WatchDisplayType.Binary;
-				yield return WatchDisplayType.FixedPoint_12_4;
-			}
-		}
+		public static IEnumerable<WatchDisplayType> ValidTypes { get; } = [
+			WatchDisplayType.Unsigned,
+			WatchDisplayType.Signed,
+			WatchDisplayType.Hex,
+			WatchDisplayType.Binary,
+			WatchDisplayType.FixedPoint_12_4,
+		];
 
 		/// <summary>
 		/// Get a list a <see cref="WatchDisplayType"/> that can be used for this <see cref="WordWatch"/>
diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
index c83a6499cb..04ab1772ae 100644
--- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
+++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
@@ -977,8 +977,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public IEnumerable<ToolStripItem> GenerateContextMenuItems()
 		{
-			if (!Rotatable) yield break;
-			yield return new ToolStripSeparator();
+			if (!Rotatable) return [ ];
 			var rotate = new ToolStripMenuItem
 			{
 				Name = "RotateMenuItem",
@@ -986,7 +985,7 @@ namespace BizHawk.Client.EmuHawk
 				ShortcutKeyDisplayString = RotateHotkeyStr
 			};
 			rotate.Click += (_, _) => HorizontalOrientation = !HorizontalOrientation;
-			yield return rotate;
+			return [ new ToolStripSeparator(), rotate ];
 		}
 
 		public string RotateHotkeyStr => "Ctrl+Shift+F";
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs b/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs
index dca7310fb5..3427d272b3 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDebuggable.cs
@@ -10,13 +10,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 		private IDebuggable _selectedDebuggable;
 
 		private IEnumerable<IDebuggable> GetAvailableDebuggables()
-		{
-			yield return _board.Cpu;
-			if (_board.DiskDrive != null)
-			{
-				yield return _board.DiskDrive;
-			}
-		}
+			=> _board.DiskDrive is IDebuggable dd ? [ _board.Cpu, dd ] : [ _board.Cpu ];
 
 		private void SetDefaultDebuggable()
 		{
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDisassemblable.cs b/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDisassemblable.cs
index 944c24bcb9..a2d8645406 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDisassemblable.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.IDisassemblable.cs
@@ -10,13 +10,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
 		private IDisassemblable _selectedDisassemblable;
 
 		private IEnumerable<IDisassemblable> GetAvailableDisassemblables()
-		{
-			yield return _board.Cpu;
-			if (_board.DiskDrive != null)
-			{
-				yield return _board.DiskDrive;
-			}
-		}
+			=> _board.DiskDrive is IDisassemblable dd ? [ _board.Cpu, dd ] : [ _board.Cpu ];
 
 		private void SetDefaultDisassemblable()
 		{