diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
index 5878b3e128..b35530fcca 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
@@ -744,10 +744,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 		{
 			public bool UseRGBDSSyntax;
 
-			public override IEnumerable<string> AvailableCpus
-			{
-				get { yield return "LR35902"; }
-			}
+			public override IEnumerable<string> AvailableCpus { get; } = new[] { "LR35902" };
 
 			public override string PCRegisterName => "PC";
 
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBDisassembler.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBDisassembler.cs
index 0f75b5d1d0..c5e801d376 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBDisassembler.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBDisassembler.cs
@@ -9,10 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 	{
 		public bool UseRGBDSSyntax;
 
-		public override IEnumerable<string> AvailableCpus
-		{
-			get { yield return "Z80GB"; }
-		}
+		public override IEnumerable<string> AvailableCpus { get; } = new[] { "LR35902" };
 
 		public override string PCRegisterName => "PC";