diff --git a/src/BizHawk.Client.Common/cheats/GenesisActionReplayDecoder.cs b/src/BizHawk.Client.Common/cheats/GenesisActionReplayDecoder.cs
index a8b4856004..5653e49188 100644
--- a/src/BizHawk.Client.Common/cheats/GenesisActionReplayDecoder.cs
+++ b/src/BizHawk.Client.Common/cheats/GenesisActionReplayDecoder.cs
@@ -29,9 +29,9 @@ namespace BizHawk.Client.Common.cheats
 				// Value: 64
 				new DecodeResult
 				{
-					Address = int.Parse(parseString.Remove(4, 3), NumberStyles.HexNumber)
-					, Value = int.Parse(parseString.Remove(0, 5), NumberStyles.HexNumber)
-					, Size = WatchSize.Byte
+					Address = int.Parse(parseString.Remove(4, 3), NumberStyles.HexNumber),
+					Value = int.Parse(parseString.Remove(0, 5), NumberStyles.HexNumber),
+					Size = WatchSize.Byte,
 				},
 				11 =>
 				// Sample Code of 2-Byte:
@@ -41,9 +41,9 @@ namespace BizHawk.Client.Common.cheats
 				// Value: 6411
 				new DecodeResult
 				{
-					Address = int.Parse(parseString.Remove(4, 5), NumberStyles.HexNumber)
-					, Value = int.Parse(parseString.Remove(0, 5), NumberStyles.HexNumber)
-					, Size = WatchSize.Word
+					Address = int.Parse(parseString.Remove(4, 5), NumberStyles.HexNumber),
+					Value = int.Parse(parseString.Remove(0, 5), NumberStyles.HexNumber),
+					Size = WatchSize.Word,
 				},
 				_ => new InvalidCheatCode(
 					"Action Replay/Pro Action Replay Codes need to be either 9 or 11 characters.")
diff --git a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
index 24c93aeee0..71616ec3dd 100644
--- a/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
+++ b/src/BizHawk.Emulation.Cores/Arcades/MAME/MAME.cs
@@ -183,29 +183,29 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
 			// https://docs.mamedev.org/commandline/commandline-index.html
 			var args = new List<string>
 			{
-				 "mame"                                 // dummy, internally discarded by index, so has to go first
-				, _gameFileName                         // no dash for rom names
-				, "-noreadconfig"                       // forbid reading ini files
-				, "-nowriteconfig"                      // forbid writing ini files
-				, "-norewind"                           // forbid rewind savestates (captured upon frame advance)
-				, "-skip_gameinfo"                      // forbid this blocking screen that requires user input
-				, "-nothrottle"                         // forbid throttling to "real" speed of the device
-				, "-update_in_pause"                    // ^ including frame-advancing
-				, "-rompath",                       ""  // mame doesn't load roms from full paths, only from dirs to scan
-				, "-joystick_contradictory"             // allow L+R/U+D on digital joystick
-				, "-nvram_directory",               ""  // path to nvram
-				, "-artpath",                       ""  // path to artwork
-				, "-diff_directory",                ""  // path to hdd diffs
-				, "-cfg_directory",                 ""  // path to config
-				, "-volume",                     "-32"  // lowest attenuation means mame osd remains silent
-				, "-output",                 "console"  // print everything to hawk console
-				, "-samplerate", _sampleRate.ToString() // match hawk samplerate
-				, "-sound",                     "none"  // forbid osd sound driver
-				, "-video",                     "none"  // forbid mame window altogether
-				, "-keyboardprovider",          "none"
-				, "-mouseprovider",             "none"
-				, "-lightgunprovider",          "none"
-				, "-joystickprovider",          "none"
+				"mame",                                // dummy, internally discarded by index, so has to go first
+				_gameFileName,                         // no dash for rom names
+				"-noreadconfig",                       // forbid reading ini files
+				"-nowriteconfig",                      // forbid writing ini files
+				"-norewind",                           // forbid rewind savestates (captured upon frame advance)
+				"-skip_gameinfo",                      // forbid this blocking screen that requires user input
+				"-nothrottle",                         // forbid throttling to "real" speed of the device
+				"-update_in_pause",                    // ^ including frame-advancing
+				"-rompath",                        "", // mame doesn't load roms from full paths, only from dirs to scan
+				"-joystick_contradictory",             // allow L+R/U+D on digital joystick
+				"-nvram_directory",                "", // path to nvram
+				"-artpath",                        "", // path to artwork
+				"-diff_directory",                 "", // path to hdd diffs
+				"-cfg_directory",                  "", // path to config
+				"-volume",                      "-32", // lowest attenuation means mame osd remains silent
+				"-output",                  "console", // print everything to hawk console
+				"-samplerate", _sampleRate.ToString(), // match hawk samplerate
+				"-sound",                      "none", // forbid osd sound driver
+				"-video",                      "none", // forbid mame window altogether
+				"-keyboardprovider",           "none",
+				"-mouseprovider",              "none",
+				"-lightgunprovider",           "none",
+				"-joystickprovider",           "none",
 			};
 
 			if (_syncSettings.DriverSettings.TryGetValue(
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9xControllers.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9xControllers.cs
index 2a405c03a8..e9f4303b87 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9xControllers.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES9X/Snes9xControllers.cs
@@ -92,8 +92,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES9X
 			{
 				var order = new Dictionary<string, int>
 				{
-					["0Up"] = 0, ["0Down"] = 1, ["0Left"] = 2, ["0Right"] = 3, ["0Select"] = 4, ["0Start"] = 5, ["0Y"] = 6, ["0B"] = 7, ["0X"] = 8, ["0A"] = 9
-					, ["0L"] = 10, ["0R"] = 11
+					["0Up"] = 0, ["0Down"] = 1, ["0Left"] = 2, ["0Right"] = 3,
+					["0Select"] = 4, ["0Start"] = 5,
+					["0Y"] = 6, ["0B"] = 7, ["0X"] = 8, ["0A"] = 9,
+					["0L"] = 10, ["0R"] = 11,
 				};
 
 				return order[btn];