diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
index 8caae3b06..50a7e99de 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
@@ -324,8 +324,7 @@ namespace Aaru.Core.Devices.Dumping
                     DecodedSense? decSense = Sense.Decode(senseBuf);
 
                     // MEDIUM ERROR, retry with ignore error below
-                    if(decSense.HasValue &&
-                       decSense.Value.ASC == 0x11)
+                    if(decSense is { ASC: 0x11 })
                         if(!sectorsNotEvenPartial.Contains(badSector))
                             sectorsNotEvenPartial.Add(badSector);
                 }
diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs
index 36391ea31..1b687b06f 100644
--- a/Aaru.Core/Media/Detection/MMC.cs
+++ b/Aaru.Core/Media/Detection/MMC.cs
@@ -1518,8 +1518,7 @@ namespace Aaru.Core.Media.Detection
                         return;
                     }
 
-                    if(ps2BootSectors        != null &&
-                       ps2BootSectors.Length == 0x6000)
+                    if(ps2BootSectors is { Length: 0x6000 })
                     {
                         // The decryption key is applied as XOR. As first byte is originally always NULL, it gives us the key :)
                         byte decryptByte = ps2BootSectors[0];
@@ -2337,8 +2336,7 @@ namespace Aaru.Core.Media.Detection
                 case MediaType.UHDBD:
                 case MediaType.Unknown:
                     // TODO: Nuon requires reading the filesystem, searching for a file called "/NUON/NUON.RUN"
-                    if(ps2BootSectors        != null &&
-                       ps2BootSectors.Length == 0x6000)
+                    if(ps2BootSectors is { Length: 0x6000 })
                     {
                         // The decryption key is applied as XOR. As first byte is originally always NULL, it gives us the key :)
                         byte decryptByte = ps2BootSectors[0];
diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs
index 7311e8fb3..7eaeff2ee 100644
--- a/Aaru.Core/Sidecar/BlockMedia.cs
+++ b/Aaru.Core/Sidecar/BlockMedia.cs
@@ -382,8 +382,7 @@ namespace Aaru.Core
             // TODO: Detect it
             sidecar.BlockMedia[0].PhysicalBlockSize = image.Info.SectorSize;
 
-            if(image is ITapeImage tapeImage &&
-               tapeImage.IsTape)
+            if(image is ITapeImage { IsTape: true } tapeImage)
             {
                 List<TapePartitionType> tapePartitions = new List<TapePartitionType>();
 
diff --git a/Aaru.Core/Statistics.cs b/Aaru.Core/Statistics.cs
index 77352ceb4..5ae3d4d7e 100644
--- a/Aaru.Core/Statistics.cs
+++ b/Aaru.Core/Statistics.cs
@@ -564,8 +564,7 @@ namespace Aaru.Core
                 AaruConsole.DebugWriteLine("Stats", "{0}", ex);
             }
 
-            if(Settings.Settings.Current.Stats != null &&
-               Settings.Settings.Current.Stats.ShareStats)
+            if(Settings.Settings.Current.Stats is { ShareStats: true })
                 SubmitStats();
         }
 
diff --git a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
index ca90af72f..c661ccb1f 100644
--- a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
@@ -320,11 +320,11 @@ namespace Aaru.Gui.ViewModels.Windows
 
                         break;
                     }
-                    case MediaModel mediaModel when mediaModel.NonRemovable:
+                    case MediaModel { NonRemovable: true }:
                         ContentPanel = "Non-removable device commands not yet implemented";
 
                         break;
-                    case MediaModel mediaModel when mediaModel.NoMediaInserted:
+                    case MediaModel { NoMediaInserted: true }:
                         ContentPanel = "No media inserted";
 
                         break;
diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs
index f4518b3c6..fb4b914ec 100644
--- a/Aaru.Images/AaruFormat/Write.cs
+++ b/Aaru.Images/AaruFormat/Write.cs
@@ -4482,10 +4482,7 @@ namespace Aaru.DiscImages
                     track = Tracks.FirstOrDefault(trk => sectorAddress >= trk.TrackStartSector &&
                                                          sectorAddress <= trk.TrackEndSector);
 
-                    if(track                  != null &&
-                       track.TrackSequence    == 0    &&
-                       track.TrackStartSector == 0    &&
-                       track.TrackEndSector   == 0)
+                    if(track is { TrackSequence: 0, TrackStartSector: 0, TrackEndSector: 0 })
                         track.TrackType = TrackType.Data;
 
                     break;
diff --git a/Aaru/Commands/Image/Checksum.cs b/Aaru/Commands/Image/Checksum.cs
index f00668fe1..850d5fb2c 100644
--- a/Aaru/Commands/Image/Checksum.cs
+++ b/Aaru/Commands/Image/Checksum.cs
@@ -369,7 +369,7 @@ namespace Aaru.Commands.Image
 
                     break;
 
-                case ITapeImage tapeImage when tapeImage.IsTape && tapeImage.Files?.Count > 0:
+                case ITapeImage { IsTape: true } tapeImage when tapeImage.Files?.Count > 0:
                 {
                     Checksum trackChecksum = null;