diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
index 96245f1908..35ee045553 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDC.cs
@@ -2526,9 +2526,9 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
 				}
 
 				/*
-                if ((CMD_FLAG_MF && !ActiveCommand.MF) ||
-                    (CMD_FLAG_MT && !ActiveCommand.MT) ||
-                    (CMD_FLAG_SK && !ActiveCommand.SK))
+                if ((CMD_FLAG_MF && !ActiveCommand.MF)
+                    || (CMD_FLAG_MT && !ActiveCommand.MT)
+                    || (CMD_FLAG_SK && !ActiveCommand.SK))
                 {
                     // command byte included spurious bit 5,6 or 7 flags
                     CMDIndex = CommandList.Count - 1;
diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs
index 88b1178bbf..801deee8e7 100644
--- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/Hardware/Disk/NECUPD765.FDD.cs
@@ -546,8 +546,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
                             if (CurrentTrack == SeekingTrack)
                             {
                                 // we are already at the required track
-                                if (CurrentState == DriveMainState.Recalibrate &&
-                                    !FLAG_TRACK0)
+                                if (CurrentState is DriveMainState.Recalibrate && !FLAG_TRACK0)
                                 {
                                     // recalibration fail
                                     SeekIntState = SeekIntStatus.Abnormal;
@@ -565,8 +564,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC
                                     break;
                                 }
 
-                                if (CurrentState == DriveMainState.Recalibrate &&
-                                    FLAG_TRACK0)
+                                if (CurrentState is DriveMainState.Recalibrate && FLAG_TRACK0)
                                 {
                                     // recalibration success
                                     SeekIntState = SeekIntStatus.Normal;
diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.cs b/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.cs
index ef5044bb56..3391d4299f 100644
--- a/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Via.cs
@@ -197,8 +197,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 			// IRA is loaded when:
 			// - PA latch is disabled
 			// - a handshake is triggered by transition on CA1
-			if ((_acr & ACR_LATCH_PA) == 0 ||
-				(_ca2Handshake && (thisIrq & IRQ_CA1) != 0))
+			if ((_acr & ACR_LATCH_PA) is 0
+				|| (_ca2Handshake && (thisIrq & IRQ_CA1) is not 0))
 			{
 				_ira = _port.ReadExternalPra();
 			}
@@ -206,8 +206,8 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 			// IRB is loaded when:
 			// - PB latch is disabled
 			// - a handshake is triggered by transition on CB1
-			if ((_acr & ACR_LATCH_PB) == 0 ||
-				(_cb2Handshake && (thisIrq & IRQ_CB1) != 0))
+			if ((_acr & ACR_LATCH_PB) is 0
+				|| (_cb2Handshake && (thisIrq & IRQ_CB1) is not 0))
 			{
 				_irb = pbIn;
 			}
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
index 032d2fd9f4..5881b6d3cb 100644
--- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDC.cs
@@ -2554,9 +2554,9 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
 				}
 
 				/*
-                if ((CMD_FLAG_MF && !ActiveCommand.MF) ||
-                    (CMD_FLAG_MT && !ActiveCommand.MT) ||
-                    (CMD_FLAG_SK && !ActiveCommand.SK))
+                if ((CMD_FLAG_MF && !ActiveCommand.MF)
+                    || (CMD_FLAG_MT && !ActiveCommand.MT)
+                    || (CMD_FLAG_SK && !ActiveCommand.SK))
                 {
                     // command byte included spurious bit 5,6 or 7 flags
                     CMDIndex = CommandList.Count - 1;
diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs
index c927f73423..3768a0694a 100644
--- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs
+++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Disk/NECUPD765.FDD.cs
@@ -539,8 +539,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
                             if (CurrentTrack == SeekingTrack)
                             {
                                 // we are already at the required track
-                                if (CurrentState == DriveMainState.Recalibrate &&
-                                    !FLAG_TRACK0)
+                                if (CurrentState is DriveMainState.Recalibrate && !FLAG_TRACK0)
                                 {
                                     // recalibration fail
                                     SeekIntState = SeekIntStatus.Abnormal;
@@ -558,8 +557,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
                                     break;
                                 }
 
-                                if (CurrentState == DriveMainState.Recalibrate &&
-                                    FLAG_TRACK0)
+                                if (CurrentState is DriveMainState.Recalibrate && FLAG_TRACK0)
                                 {
                                     // recalibration success
                                     SeekIntState = SeekIntStatus.Normal;