diff --git a/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Disassembler.cs b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Disassembler.cs
index 89a878243f..331930d808 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Disassembler.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/FairchildF8/F3850.Disassembler.cs
@@ -322,10 +322,7 @@ namespace BizHawk.Emulation.Cores.Components.FairchildF8
 
 		public string PCRegisterName => "PC";
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "F3850"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "F3850" ];
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
diff --git a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs b/src/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs
index 0c3bc9d30e..b1c18d791e 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/HuC6280/IDisassemblable.cs
@@ -13,10 +13,7 @@ namespace BizHawk.Emulation.Cores.Components.H6280
 
 		public string PCRegisterName => "PC";
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "6280"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "6280" ];
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
diff --git a/src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs b/src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs
index 6b0855cfd3..cb24d414d1 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs	
+++ b/src/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs	
@@ -20,10 +20,7 @@ namespace BizHawk.Emulation.Cores.Components.M6502
 
 		public string PCRegisterName => "PC";
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "6502"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "6502" ];
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
diff --git a/src/BizHawk.Emulation.Cores/CPUs/W65816/Disassembler.cs b/src/BizHawk.Emulation.Cores/CPUs/W65816/Disassembler.cs
index a77a378c2d..203fb7b8d7 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/W65816/Disassembler.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/W65816/Disassembler.cs
@@ -11,10 +11,7 @@ namespace BizHawk.Emulation.Cores.Components.W65816
 
 		private readonly W65816 disassemblerCpu = new W65816();
 		
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "W65816"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "W65816" ];
 
 		public string PCRegisterName => "PC";
 
diff --git a/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs b/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
index d2c57d422e..613fac029d 100644
--- a/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
+++ b/src/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
@@ -439,10 +439,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
 
 		public string PCRegisterName => "PC";
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "Z80"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "Z80" ];
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
diff --git a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDisassembler.cs b/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDisassembler.cs
index 4ae4f1a107..36a22b1c8f 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDisassembler.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.IDisassembler.cs
@@ -17,10 +17,7 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
 
 		public string PCRegisterName => "PC";
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "6502"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "6502" ];
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDisassemblable.cs b/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDisassemblable.cs
index 6ccfc9f3f7..8952e07643 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDisassemblable.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Chip6510.IDisassemblable.cs
@@ -6,10 +6,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 {
 	public sealed partial class Chip6510 : IDisassemblable
 	{
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "6510"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "6510" ];
 
 		public string Cpu
 		{
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs b/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs
index c8c159933e..6135995fde 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Commodore64/Serial/Drive1541.IDisassemblable.cs
@@ -5,10 +5,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Serial
 {
 	public sealed partial class Drive1541 : IDisassemblable
 	{
-		IEnumerable<string> IDisassemblable.AvailableCpus
-		{
-			get { yield return "Disk Drive 6502"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "Disk Drive 6502" ];
 
 		string IDisassemblable.Cpu
 		{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDisassemblable.cs b/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDisassemblable.cs
index df00bdc290..412aa7e863 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDisassemblable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IDisassemblable.cs
@@ -13,10 +13,7 @@ namespace BizHawk.Emulation.Cores.Intellivision
 
 		public string PCRegisterName => "PC";
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "CP1610"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "CP1610" ];
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDisassemblable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDisassemblable.cs
index 3e1a4a6ae8..232cde0f5b 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDisassemblable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDisassemblable.cs
@@ -13,13 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
 			set { }
 		}
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get
-			{
-				yield return "R4300";
-			}
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "R4300" ];
 
 		public string PCRegisterName => "PC";
 
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs
index 5599675375..19b4d44741 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.IDisassembler.cs
@@ -16,10 +16,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
 
 		public string PCRegisterName => "PC";
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "6502"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "6502" ];
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDisassembler.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDisassembler.cs
index 7c18841559..cdd4aa5b56 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDisassembler.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDisassembler.cs
@@ -17,10 +17,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 
 		public string PCRegisterName => "M68K PC";
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get { yield return "M68000"; }
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "M68000" ];
 
 		public string Disassemble(MemoryDomain m, uint addr, out int length)
 		{
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs
index cfeb69304c..3d697e6fbb 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.IDisassemblable.cs
@@ -12,13 +12,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 			set { }
 		}
 
-		public IEnumerable<string> AvailableCpus
-		{
-			get
-			{
-				yield return "R3000A";
-			}
-		}
+		public IEnumerable<string> AvailableCpus { get; } = [ "R3000A" ];
 
 		public string PCRegisterName => "pc";