General refactor and cleanup.

Aaru.CommonTypes/AaruMetadata/AaruMetadata.cs

@@ -48,6 +48,7 @@ namespace Aaru.CommonTypes.AaruMetadata;
 
 [JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
 [JsonSerializable(typeof(MetadataJson))]
+
 // ReSharper disable once PartialTypeWithSinglePart
 public partial class MetadataJsonContext : JsonSerializerContext;
 
@@ -89,8 +90,7 @@ public class Metadata
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Metadata(CICMMetadataType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var metadata = new Metadata
         {
@@ -114,32 +114,28 @@ public class Metadata
         {
             metadata.Barcodes = new List<Barcode>();
 
-            foreach(Schemas.BarcodeType code in cicm.Barcodes)
-                metadata.Barcodes.Add(code);
+            foreach(Schemas.BarcodeType code in cicm.Barcodes) metadata.Barcodes.Add(code);
         }
 
         if(cicm.Magazine is not null)
         {
             metadata.Magazines = new List<Magazine>();
 
-            foreach(MagazineType magazine in cicm.Magazine)
-                metadata.Magazines.Add(magazine);
+            foreach(MagazineType magazine in cicm.Magazine) metadata.Magazines.Add(magazine);
         }
 
         if(cicm.Book is not null)
         {
             metadata.Books = new List<Book>();
 
-            foreach(BookType book in cicm.Book)
-                metadata.Books.Add(book);
+            foreach(BookType book in cicm.Book) metadata.Books.Add(book);
         }
 
         if(cicm.Languages is not null)
         {
             metadata.Languages = new List<Language>();
 
-            foreach(LanguagesTypeLanguage lng in cicm.Languages)
-                metadata.Languages.Add((Language)lng);
+            foreach(LanguagesTypeLanguage lng in cicm.Languages) metadata.Languages.Add((Language)lng);
         }
 
         if(cicm.Architectures is not null)
@@ -162,57 +158,49 @@ public class Metadata
         {
             metadata.UserManuals = new List<UserManual>();
 
-            foreach(UserManualType manual in cicm.UserManual)
-                metadata.UserManuals.Add(manual);
+            foreach(UserManualType manual in cicm.UserManual) metadata.UserManuals.Add(manual);
         }
 
         if(cicm.OpticalDisc is not null)
         {
             metadata.OpticalDiscs = new List<OpticalDisc>();
 
-            foreach(OpticalDiscType disc in cicm.OpticalDisc)
-                metadata.OpticalDiscs.Add(disc);
+            foreach(OpticalDiscType disc in cicm.OpticalDisc) metadata.OpticalDiscs.Add(disc);
         }
 
         if(cicm.Advertisement is not null)
         {
             metadata.Advertisements = new List<Advertisement>();
 
-            foreach(AdvertisementType adv in cicm.Advertisement)
-                metadata.Advertisements.Add(adv);
+            foreach(AdvertisementType adv in cicm.Advertisement) metadata.Advertisements.Add(adv);
         }
 
         if(cicm.LinearMedia is not null)
         {
             metadata.LinearMedias = new List<LinearMedia>();
 
-            foreach(LinearMediaType media in cicm.LinearMedia)
-                metadata.LinearMedias.Add(media);
+            foreach(LinearMediaType media in cicm.LinearMedia) metadata.LinearMedias.Add(media);
         }
 
         if(cicm.PCICard is not null)
         {
             metadata.PciCards = new List<Pci>();
 
-            foreach(PCIType pci in cicm.PCICard)
-                metadata.PciCards.Add(pci);
+            foreach(PCIType pci in cicm.PCICard) metadata.PciCards.Add(pci);
         }
 
         if(cicm.BlockMedia is not null)
         {
             metadata.BlockMedias = new List<BlockMedia>();
 
-            foreach(BlockMediaType media in cicm.BlockMedia)
-                metadata.BlockMedias.Add(media);
+            foreach(BlockMediaType media in cicm.BlockMedia) metadata.BlockMedias.Add(media);
         }
 
-        if(cicm.AudioMedia is null)
-            return metadata;
+        if(cicm.AudioMedia is null) return metadata;
 
         metadata.AudioMedias = new List<AudioMedia>();
 
-        foreach(AudioMediaType media in cicm.AudioMedia)
-            metadata.AudioMedias.Add(media);
+        foreach(AudioMediaType media in cicm.AudioMedia) metadata.AudioMedias.Add(media);
 
         return metadata;
     }

Aaru.CommonTypes/AaruMetadata/Advertisement.cs

@@ -63,8 +63,7 @@ public class Advertisement
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Advertisement(AdvertisementType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var adv = new Advertisement
         {
@@ -82,34 +81,29 @@ public class Advertisement
         {
             adv.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                adv.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) adv.Checksums.Add(chk);
         }
 
         if(cicm.AudioTrack is not null)
         {
             adv.AudioTracks = new List<AudioTrack>();
 
-            foreach(AudioTracksType trk in cicm.AudioTrack)
-                adv.AudioTracks.Add(trk);
+            foreach(AudioTracksType trk in cicm.AudioTrack) adv.AudioTracks.Add(trk);
         }
 
         if(cicm.VideoTrack is not null)
         {
             adv.VideoTracks = new List<VideoTrack>();
 
-            foreach(VideoTracksType trk in cicm.VideoTrack)
-                adv.VideoTracks.Add(trk);
+            foreach(VideoTracksType trk in cicm.VideoTrack) adv.VideoTracks.Add(trk);
         }
 
-        if(cicm.SubtitleTrack is null)
-            return adv;
+        if(cicm.SubtitleTrack is null) return adv;
 
         {
             adv.SubtitleTracks = new List<SubtitleTrack>();
 
-            foreach(SubtitleTracksType trk in cicm.SubtitleTrack)
-                adv.SubtitleTracks.Add(trk);
+            foreach(SubtitleTracksType trk in cicm.SubtitleTrack) adv.SubtitleTracks.Add(trk);
         }
 
         return adv;

Aaru.CommonTypes/AaruMetadata/AudioMedia.cs

@@ -65,8 +65,7 @@ public class AudioMedia
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator AudioMedia(AudioMediaType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var media = new AudioMedia
         {
@@ -87,25 +86,21 @@ public class AudioMedia
         {
             media.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                media.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) media.Checksums.Add(chk);
         }
 
         if(cicm.Block is not null)
         {
             media.Blocks = new List<AudioBlock>();
 
-            foreach(AudioBlockType blk in cicm.Block)
-                media.Blocks.Add(blk);
+            foreach(AudioBlockType blk in cicm.Block) media.Blocks.Add(blk);
         }
 
-        if(cicm.DumpHardwareArray is null)
-            return media;
+        if(cicm.DumpHardwareArray is null) return media;
 
         media.DumpHardware = new List<DumpHardware>();
 
-        foreach(DumpHardwareType hw in cicm.DumpHardwareArray)
-            media.DumpHardware.Add(hw);
+        foreach(DumpHardwareType hw in cicm.DumpHardwareArray) media.DumpHardware.Add(hw);
 
         return media;
     }
@@ -122,8 +117,7 @@ public class AudioBlock
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator AudioBlock(AudioBlockType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var blk = new AudioBlock
         {
@@ -133,13 +127,11 @@ public class AudioBlock
             Format    = cicm.Format
         };
 
-        if(cicm.Checksums is null)
-            return blk;
+        if(cicm.Checksums is null) return blk;
 
         blk.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            blk.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) blk.Checksums.Add(chk);
 
         return blk;
     }

Aaru.CommonTypes/AaruMetadata/AudioVideo.cs

@@ -60,8 +60,7 @@ public class AudioTrack
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator AudioTrack(AudioTracksType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var trk = new AudioTrack
         {
@@ -73,13 +72,11 @@ public class AudioTrack
             MeanBitrate = cicm.MeanBitrate
         };
 
-        if(cicm.Languages is null)
-            return trk;
+        if(cicm.Languages is null) return trk;
 
         trk.Languages = new List<Language>();
 
-        foreach(LanguagesTypeLanguage lng in cicm.Languages)
-            trk.Languages.Add((Language)lng);
+        foreach(LanguagesTypeLanguage lng in cicm.Languages) trk.Languages.Add((Language)lng);
 
         return trk;
     }
@@ -100,8 +97,7 @@ public class VideoTrack
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator VideoTrack(VideoTracksType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var trk = new VideoTrack
         {
@@ -113,13 +109,11 @@ public class VideoTrack
             ThreeD      = cicm.ThreeD
         };
 
-        if(cicm.Languages is null)
-            return trk;
+        if(cicm.Languages is null) return trk;
 
         trk.Languages = new List<Language>();
 
-        foreach(LanguagesTypeLanguage lng in cicm.Languages)
-            trk.Languages.Add((Language)lng);
+        foreach(LanguagesTypeLanguage lng in cicm.Languages) trk.Languages.Add((Language)lng);
 
         return trk;
     }
@@ -134,8 +128,7 @@ public class SubtitleTrack
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator SubtitleTrack(SubtitleTracksType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var sub = new SubtitleTrack
         {
@@ -143,13 +136,11 @@ public class SubtitleTrack
             Codec  = cicm.Codec
         };
 
-        if(cicm.Languages is null)
-            return sub;
+        if(cicm.Languages is null) return sub;
 
         sub.Languages = new List<Language>();
 
-        foreach(LanguagesTypeLanguage lng in cicm.Languages)
-            sub.Languages.Add((Language)lng);
+        foreach(LanguagesTypeLanguage lng in cicm.Languages) sub.Languages.Add((Language)lng);
 
         return sub;
     }
@@ -167,8 +158,7 @@ public class Recording
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Recording(RecordingType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var recording = new Recording
         {
@@ -179,13 +169,11 @@ public class Recording
             Coordinates       = cicm.Coordinates
         };
 
-        if(cicm.Software is null)
-            return recording;
+        if(cicm.Software is null) return recording;
 
         recording.Software = new List<Software>();
 
-        foreach(SoftwareType sw in cicm.Software)
-            recording.Software.Add(sw);
+        foreach(SoftwareType sw in cicm.Software) recording.Software.Add(sw);
 
         return recording;
     }

Aaru.CommonTypes/AaruMetadata/BlockMedia.cs

@@ -87,8 +87,7 @@ public class BlockMedia
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator BlockMedia(BlockMediaType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var media = new BlockMedia
         {
@@ -127,24 +126,21 @@ public class BlockMedia
         {
             media.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                media.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) media.Checksums.Add(chk);
         }
 
         if(cicm.ContentChecksums is not null)
         {
             media.ContentChecksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.ContentChecksums)
-                media.ContentChecksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.ContentChecksums) media.ContentChecksums.Add(chk);
         }
 
         if(cicm.VariableBlockSize is not null)
         {
             media.VariableBlockSize = new List<BlockSize>();
 
-            foreach(BlockSizeType blkSize in cicm.VariableBlockSize)
-                media.VariableBlockSize.Add(blkSize);
+            foreach(BlockSizeType blkSize in cicm.VariableBlockSize) media.VariableBlockSize.Add(blkSize);
         }
 
         if(cicm.TapeInformation is not null)
@@ -159,17 +155,14 @@ public class BlockMedia
         {
             media.FileSystemInformation = new List<Partition>();
 
-            foreach(PartitionType fsInfo in cicm.FileSystemInformation)
-                media.FileSystemInformation.Add(fsInfo);
+            foreach(PartitionType fsInfo in cicm.FileSystemInformation) media.FileSystemInformation.Add(fsInfo);
         }
 
-        if(cicm.DumpHardwareArray is null)
-            return media;
+        if(cicm.DumpHardwareArray is null) return media;
 
         media.DumpHardware = new List<DumpHardware>();
 
-        foreach(DumpHardwareType hw in cicm.DumpHardwareArray)
-            media.DumpHardware.Add(hw);
+        foreach(DumpHardwareType hw in cicm.DumpHardwareArray) media.DumpHardware.Add(hw);
 
         return media;
     }
@@ -191,8 +184,7 @@ public class BlockTrack
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator BlockTrack(BlockTrackType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var trk = new BlockTrack
         {
@@ -207,13 +199,11 @@ public class BlockTrack
             Format         = cicm.Format
         };
 
-        if(cicm.Checksums is null)
-            return trk;
+        if(cicm.Checksums is null) return trk;
 
         trk.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            trk.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) trk.Checksums.Add(chk);
 
         return trk;
     }

Aaru.CommonTypes/AaruMetadata/Book.cs

@@ -61,8 +61,7 @@ public class Book
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Book(BookType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var book = new Book
         {
@@ -80,17 +79,14 @@ public class Book
         {
             book.Barcodes = new List<Barcode>();
 
-            foreach(Schemas.BarcodeType code in cicm.Barcodes)
-                book.Barcodes.Add(code);
+            foreach(Schemas.BarcodeType code in cicm.Barcodes) book.Barcodes.Add(code);
         }
 
-        if(cicm.Language is null)
-            return book;
+        if(cicm.Language is null) return book;
 
         book.Languages = new List<Language>();
 
-        foreach(LanguagesTypeLanguage lng in cicm.Language)
-            book.Languages.Add((Language)lng);
+        foreach(LanguagesTypeLanguage lng in cicm.Language) book.Languages.Add((Language)lng);
 
         return book;
     }

Aaru.CommonTypes/AaruMetadata/Contents.cs

@@ -54,8 +54,7 @@ public class FilesystemContents
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator FilesystemContents(FilesystemContentsType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var fs = new FilesystemContents
         {
@@ -66,17 +65,14 @@ public class FilesystemContents
         {
             fs.Files = new List<ContentsFile>();
 
-            foreach(ContentsFileType file in cicm.File)
-                fs.Files.Add(file);
+            foreach(ContentsFileType file in cicm.File) fs.Files.Add(file);
         }
 
-        if(cicm.Directory is null)
-            return fs;
+        if(cicm.Directory is null) return fs;
 
         fs.Directories = new List<Directory>();
 
-        foreach(DirectoryType dir in cicm.Directory)
-            fs.Directories.Add(dir);
+        foreach(DirectoryType dir in cicm.Directory) fs.Directories.Add(dir);
 
         return fs;
     }
@@ -104,8 +100,7 @@ public class ContentsFile
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator ContentsFile(ContentsFileType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var file = new ContentsFile
         {
@@ -129,17 +124,14 @@ public class ContentsFile
         {
             file.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                file.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) file.Checksums.Add(chk);
         }
 
-        if(cicm.ExtendedAttributes is null)
-            return file;
+        if(cicm.ExtendedAttributes is null) return file;
 
         file.ExtendedAttributes = new List<ExtendedAttribute>();
 
-        foreach(ExtendedAttributeType xa in cicm.ExtendedAttributes)
-            file.ExtendedAttributes.Add(xa);
+        foreach(ExtendedAttributeType xa in cicm.ExtendedAttributes) file.ExtendedAttributes.Add(xa);
 
         return file;
     }
@@ -154,8 +146,7 @@ public class ExtendedAttribute
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator ExtendedAttribute(ExtendedAttributeType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var xa = new ExtendedAttribute
         {
@@ -163,13 +154,11 @@ public class ExtendedAttribute
             Length = cicm.length
         };
 
-        if(cicm.Checksums is null)
-            return xa;
+        if(cicm.Checksums is null) return xa;
 
         xa.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            xa.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) xa.Checksums.Add(chk);
 
         return xa;
     }
@@ -196,8 +185,7 @@ public class Directory
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Directory(DirectoryType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var dir = new Directory
         {
@@ -220,17 +208,14 @@ public class Directory
         {
             dir.Directories = new List<Directory>();
 
-            foreach(DirectoryType d in cicm.Directory)
-                dir.Directories.Add(d);
+            foreach(DirectoryType d in cicm.Directory) dir.Directories.Add(d);
         }
 
-        if(cicm.File is null)
-            return dir;
+        if(cicm.File is null) return dir;
 
         dir.Files = new List<ContentsFile>();
 
-        foreach(ContentsFileType file in cicm.File)
-            dir.Files.Add(file);
+        foreach(ContentsFileType file in cicm.File) dir.Files.Add(file);
 
         return dir;
     }

Aaru.CommonTypes/AaruMetadata/Dimensions.cs

@@ -56,9 +56,10 @@ public class Dimensions
                                                                            ? null
                                                                            : new Dimensions
                                                                            {
-                                                                               Diameter = cicm.DiameterSpecified
-                                                                                   ? cicm.Diameter
-                                                                                   : null,
+                                                                               Diameter =
+                                                                                   cicm.DiameterSpecified
+                                                                                       ? cicm.Diameter
+                                                                                       : null,
                                                                                Height = cicm.HeightSpecified
                                                                                    ? cicm.Height
                                                                                    : null,
@@ -77,7 +78,7 @@ public class Dimensions
 
         switch(mediaType)
         {
-        #region 5.25" floppy disk
+#region 5.25" floppy disk
 
             case MediaType.Apple32SS:
             case MediaType.Apple32DS:
@@ -122,9 +123,9 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion 5.25" floppy disk
+#endregion 5.25" floppy disk
 
-        #region 3.5" floppy disk
+#region 3.5" floppy disk
 
             case MediaType.AppleSonySS:
             case MediaType.AppleSonyDS:
@@ -159,9 +160,9 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion 3.5" floppy disk
+#endregion 3.5" floppy disk
 
-        #region 8" floppy disk
+#region 8" floppy disk
 
             case MediaType.IBM23FD:
             case MediaType.IBM33FD_128:
@@ -190,9 +191,9 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion 8" floppy disk
+#endregion 8" floppy disk
 
-        #region 356mm magneto optical
+#region 356mm magneto optical
 
             case MediaType.ECMA_260:
             case MediaType.ECMA_260_Double:
@@ -205,9 +206,9 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion 356mm magneto optical
+#endregion 356mm magneto optical
 
-        #region 300mm magneto optical
+#region 300mm magneto optical
 
             case MediaType.ECMA_189:
             case MediaType.ECMA_190:
@@ -221,9 +222,9 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion 300mm magneto optical
+#endregion 300mm magneto optical
 
-        #region 5.25" magneto optical
+#region 5.25" magneto optical
 
             case MediaType.ECMA_153:
             case MediaType.ECMA_153_512:
@@ -258,9 +259,9 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion 5.25" magneto optical
+#endregion 5.25" magneto optical
 
-        #region 3.5" magneto optical
+#region 3.5" magneto optical
 
             case MediaType.ECMA_154:
             case MediaType.ECMA_201:
@@ -279,7 +280,7 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion 3.5" magneto optical
+#endregion 3.5" magneto optical
 
             case MediaType.PD650:
             case MediaType.PD650_WORM:
@@ -941,9 +942,9 @@ public class Dimensions
                 dmns.Thickness = 16.6;
 
                 return dmns;
-        #pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0612 // Type or member is obsolete
             case MediaType.Bernoulli:
-        #pragma warning restore CS0612 // Type or member is obsolete
+#pragma warning restore CS0612 // Type or member is obsolete
             case MediaType.Bernoulli10:
             case MediaType.Bernoulli20:
                 dmns.Height = 280;
@@ -953,9 +954,9 @@ public class Dimensions
                 dmns.Thickness = 18;
 
                 return dmns;
-        #pragma warning disable CS0612 // Type or member is obsolete
+#pragma warning disable CS0612 // Type or member is obsolete
             case MediaType.Bernoulli2:
-        #pragma warning restore CS0612 // Type or member is obsolete
+#pragma warning restore CS0612 // Type or member is obsolete
             case MediaType.BernoulliBox2_20:
             case MediaType.Bernoulli35:
             case MediaType.Bernoulli44:
@@ -1009,7 +1010,7 @@ public class Dimensions
 
                 return dmns;
 
-        #region CD/DVD/BD
+#region CD/DVD/BD
 
             case MediaType.CDDA:
             case MediaType.CDG:
@@ -1111,9 +1112,9 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion CD/DVD/BD
+#endregion CD/DVD/BD
 
-        #region Apple Hard Disks
+#region Apple Hard Disks
 
             // TODO: Find Apple Widget size
             case MediaType.AppleProfile:
@@ -1133,7 +1134,7 @@ public class Dimensions
 
                 return dmns;
 
-        #endregion Apple Hard Disks
+#endregion Apple Hard Disks
 
             case MediaType.UMD:
                 dmns.Height = 64;

Aaru.CommonTypes/AaruMetadata/Dump.cs

@@ -71,8 +71,7 @@ public class Dump
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Dump(DumpType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         Dump dump = new()
         {
@@ -80,13 +79,11 @@ public class Dump
             Size  = cicm.Size
         };
 
-        if(cicm.Checksums is null)
-            return dump;
+        if(cicm.Checksums is null) return dump;
 
         dump.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            dump.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) dump.Checksums.Add(chk);
 
         return dump;
     }
@@ -102,8 +99,7 @@ public class Border
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Border(BorderType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var border = new Border
         {
@@ -112,13 +108,11 @@ public class Border
             Session = cicm.sessionSpecified ? cicm.session : null
         };
 
-        if(cicm.Checksums is null)
-            return border;
+        if(cicm.Checksums is null) return border;
 
         border.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            border.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) border.Checksums.Add(chk);
 
         return border;
     }

Aaru.CommonTypes/AaruMetadata/DumpHardware.cs

@@ -58,8 +58,7 @@ public class DumpHardware
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator DumpHardware(DumpHardwareType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var hw = new DumpHardware
         {
@@ -71,13 +70,11 @@ public class DumpHardware
             Software     = cicm.Software
         };
 
-        if(cicm.Extents is null)
-            return hw;
+        if(cicm.Extents is null) return hw;
 
         hw.Extents = new List<Extent>();
 
-        foreach(ExtentType ext in cicm.Extents)
-            hw.Extents.Add(ext);
+        foreach(ExtentType ext in cicm.Extents) hw.Extents.Add(ext);
 
         return hw;
     }

Aaru.CommonTypes/AaruMetadata/FileSystem.cs

@@ -87,9 +87,10 @@ public class FileSystem
                                                                                        : null,
                                                                                ClusterSize = cicm.ClusterSize,
                                                                                Clusters    = cicm.Clusters,
-                                                                               Files = cicm.FilesSpecified
-                                                                                   ? cicm.Files
-                                                                                   : null,
+                                                                               Files =
+                                                                                   cicm.FilesSpecified
+                                                                                       ? cicm.Files
+                                                                                       : null,
                                                                                Bootable     = cicm.Bootable,
                                                                                VolumeSerial = cicm.VolumeSerial,
                                                                                VolumeName   = cicm.VolumeName,

Aaru.CommonTypes/AaruMetadata/Layers.cs

@@ -55,21 +55,18 @@ public class Layers
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Layers(LayersType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var layers = new Layers
         {
             Type = cicm.typeSpecified ? (LayerType)cicm.type : null
         };
 
-        if(cicm.Sectors is null)
-            return layers;
+        if(cicm.Sectors is null) return layers;
 
         layers.Sectors = new List<Sectors>();
 
-        foreach(SectorsType sec in cicm.Sectors)
-            layers.Sectors.Add(sec);
+        foreach(SectorsType sec in cicm.Sectors) layers.Sectors.Add(sec);
 
         return layers;
     }

Aaru.CommonTypes/AaruMetadata/LinearMedia.cs

@@ -70,8 +70,7 @@ public class LinearMedia
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator LinearMedia(LinearMediaType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var linearMedia = new LinearMedia
         {
@@ -97,25 +96,21 @@ public class LinearMedia
         {
             linearMedia.ImageChecksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.ImageChecksums)
-                linearMedia.ImageChecksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.ImageChecksums) linearMedia.ImageChecksums.Add(chk);
         }
 
         if(cicm.Checksums is not null)
         {
             linearMedia.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                linearMedia.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) linearMedia.Checksums.Add(chk);
         }
 
-        if(cicm.DumpHardwareArray is null)
-            return linearMedia;
+        if(cicm.DumpHardwareArray is null) return linearMedia;
 
         linearMedia.DumpHardware = new List<DumpHardware>();
 
-        foreach(DumpHardwareType hw in cicm.DumpHardwareArray)
-            linearMedia.DumpHardware.Add(hw);
+        foreach(DumpHardwareType hw in cicm.DumpHardwareArray) linearMedia.DumpHardware.Add(hw);
 
         return linearMedia;
     }

Aaru.CommonTypes/AaruMetadata/Magazine.cs

@@ -61,8 +61,7 @@ public class Magazine
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Magazine(MagazineType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var magazine = new Magazine
         {
@@ -79,15 +78,12 @@ public class Magazine
         {
             magazine.Barcodes = new List<Barcode>();
 
-            foreach(Schemas.BarcodeType code in cicm.Barcodes)
-                magazine.Barcodes.Add(code);
+            foreach(Schemas.BarcodeType code in cicm.Barcodes) magazine.Barcodes.Add(code);
         }
 
-        if(cicm.Language is null)
-            return magazine;
+        if(cicm.Language is null) return magazine;
 
-        foreach(LanguagesTypeLanguage lng in cicm.Language)
-            magazine.Languages.Add((Language)lng);
+        foreach(LanguagesTypeLanguage lng in cicm.Language) magazine.Languages.Add((Language)lng);
 
         return magazine;
     }

Aaru.CommonTypes/AaruMetadata/OpticalDisc.cs

@@ -99,8 +99,7 @@ public class OpticalDisc
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator OpticalDisc(OpticalDiscType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var disc = new OpticalDisc
         {
@@ -145,89 +144,77 @@ public class OpticalDisc
         {
             disc.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                disc.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) disc.Checksums.Add(chk);
         }
 
         if(cicm.RingCode is not null)
         {
             disc.RingCode = new List<LayeredText>();
 
-            foreach(LayeredTextType lt in cicm.RingCode)
-                disc.RingCode.Add(lt);
+            foreach(LayeredTextType lt in cicm.RingCode) disc.RingCode.Add(lt);
         }
 
         if(cicm.MasteringSID is not null)
         {
             disc.MasteringSid = new List<LayeredText>();
 
-            foreach(LayeredTextType lt in cicm.MasteringSID)
-                disc.MasteringSid.Add(lt);
+            foreach(LayeredTextType lt in cicm.MasteringSID) disc.MasteringSid.Add(lt);
         }
 
         if(cicm.Toolstamp is not null)
         {
             disc.Toolstamp = new List<LayeredText>();
 
-            foreach(LayeredTextType lt in cicm.Toolstamp)
-                disc.Toolstamp.Add(lt);
+            foreach(LayeredTextType lt in cicm.Toolstamp) disc.Toolstamp.Add(lt);
         }
 
         if(cicm.MouldSID is not null)
         {
             disc.MouldSid = new List<LayeredText>();
 
-            foreach(LayeredTextType lt in cicm.MouldSID)
-                disc.MouldSid.Add(lt);
+            foreach(LayeredTextType lt in cicm.MouldSID) disc.MouldSid.Add(lt);
         }
 
         if(cicm.MouldText is not null)
         {
             disc.MouldText = new List<LayeredText>();
 
-            foreach(LayeredTextType lt in cicm.MouldText)
-                disc.MouldText.Add(lt);
+            foreach(LayeredTextType lt in cicm.MouldText) disc.MouldText.Add(lt);
         }
 
         if(cicm.FirstTrackPregrap is not null)
         {
             disc.FirstTrackPregrap = new List<Border>();
 
-            foreach(BorderType lt in cicm.FirstTrackPregrap)
-                disc.FirstTrackPregrap.Add(lt);
+            foreach(BorderType lt in cicm.FirstTrackPregrap) disc.FirstTrackPregrap.Add(lt);
         }
 
         if(cicm.LeadIn is not null)
         {
             disc.LeadIn = new List<Border>();
 
-            foreach(BorderType lt in cicm.LeadIn)
-                disc.LeadIn.Add(lt);
+            foreach(BorderType lt in cicm.LeadIn) disc.LeadIn.Add(lt);
         }
 
         if(cicm.LeadOut is not null)
         {
             disc.LeadOut = new List<Border>();
 
-            foreach(BorderType lt in cicm.LeadOut)
-                disc.LeadOut.Add(lt);
+            foreach(BorderType lt in cicm.LeadOut) disc.LeadOut.Add(lt);
         }
 
         if(cicm.Track is not null)
         {
             disc.Track = new List<Track>();
 
-            foreach(Schemas.TrackType lt in cicm.Track)
-                disc.Track.Add(lt);
+            foreach(Schemas.TrackType lt in cicm.Track) disc.Track.Add(lt);
         }
 
-        if(cicm.DumpHardwareArray is null)
-            return disc;
+        if(cicm.DumpHardwareArray is null) return disc;
 
         disc.DumpHardware = new List<DumpHardware>();
 
-        foreach(DumpHardwareType hw in cicm.DumpHardwareArray)
-            disc.DumpHardware.Add(hw);
+        foreach(DumpHardwareType hw in cicm.DumpHardwareArray) disc.DumpHardware.Add(hw);
 
         return disc;
     }
@@ -255,8 +242,7 @@ public class Track
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Track(Schemas.TrackType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var trk = new Track
         {
@@ -279,25 +265,21 @@ public class Track
         {
             trk.Indexes = new List<TrackIndex>();
 
-            foreach(TrackIndexType idx in cicm.Indexes)
-                trk.Indexes.Add(idx);
+            foreach(TrackIndexType idx in cicm.Indexes) trk.Indexes.Add(idx);
         }
 
         if(cicm.Checksums is not null)
         {
             trk.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                trk.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) trk.Checksums.Add(chk);
         }
 
-        if(cicm.FileSystemInformation is null)
-            return trk;
+        if(cicm.FileSystemInformation is null) return trk;
 
         trk.FileSystemInformation = new List<Partition>();
 
-        foreach(PartitionType fs in cicm.FileSystemInformation)
-            trk.FileSystemInformation.Add(fs);
+        foreach(PartitionType fs in cicm.FileSystemInformation) trk.FileSystemInformation.Add(fs);
 
         return trk;
     }
@@ -376,8 +358,7 @@ public class SubChannel
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator SubChannel(SubChannelType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var subchannel = new SubChannel
         {
@@ -385,13 +366,11 @@ public class SubChannel
             Size  = cicm.Size
         };
 
-        if(cicm.Checksums is null)
-            return subchannel;
+        if(cicm.Checksums is null) return subchannel;
 
         subchannel.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            subchannel.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) subchannel.Checksums.Add(chk);
 
         return subchannel;
     }

Aaru.CommonTypes/AaruMetadata/PCMCIA.cs

@@ -66,15 +66,16 @@ public class Pcmcia
                                                                            cicm.ManufacturerCodeSpecified
                                                                                ? cicm.ManufacturerCode
                                                                                : null,
-                                                                       CardCode = cicm.CardCodeSpecified
-                                                                           ? cicm.CardCode
-                                                                           : null,
+                                                                       CardCode =
+                                                                           cicm.CardCodeSpecified
+                                                                               ? cicm.CardCode
+                                                                               : null,
                                                                        Manufacturer = cicm.Manufacturer,
                                                                        ProductName  = cicm.ProductName,
                                                                        AdditionalInformation =
                                                                            cicm.AdditionalInformation is null
                                                                                ? null
-                                                                               : new List<string>(cicm.
-                                                                                   AdditionalInformation)
+                                                                               : new List<string>(cicm
+                                                                                  .AdditionalInformation)
                                                                    };
 }

Aaru.CommonTypes/AaruMetadata/Partition.cs

@@ -58,8 +58,7 @@ public class Partition
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Partition(PartitionType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var part = new Partition
         {
@@ -71,13 +70,11 @@ public class Partition
             Description = cicm.Description
         };
 
-        if(cicm.FileSystems is null)
-            return part;
+        if(cicm.FileSystems is null) return part;
 
         part.FileSystems = new List<FileSystem>();
 
-        foreach(FileSystemType fs in cicm.FileSystems)
-            part.FileSystems.Add(fs);
+        foreach(FileSystemType fs in cicm.FileSystems) part.FileSystems.Add(fs);
 
         return part;
     }

Aaru.CommonTypes/AaruMetadata/RequiredOperatingSystem.cs

@@ -51,12 +51,11 @@ public class RequiredOperatingSystem
     public List<string> Versions { get; set; }
 
     [Obsolete("Will be removed in Aaru 7")]
-    public static implicit operator RequiredOperatingSystem(RequiredOperatingSystemType cicm) =>
-        cicm is null
-            ? null
-            : new RequiredOperatingSystem
-            {
-                Name     = cicm.Name,
-                Versions = cicm.Version is null ? null : new List<string>(cicm.Version)
-            };
+    public static implicit operator RequiredOperatingSystem(RequiredOperatingSystemType cicm) => cicm is null
+        ? null
+        : new RequiredOperatingSystem
+        {
+            Name     = cicm.Name,
+            Versions = cicm.Version is null ? null : new List<string>(cicm.Version)
+        };
 }

Aaru.CommonTypes/AaruMetadata/SCSI.cs

@@ -56,8 +56,7 @@ public class SCSI
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator SCSI(SCSIType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var scsi = new SCSI
         {
@@ -67,13 +66,11 @@ public class SCSI
             ModeSense10 = cicm.ModeSense10
         };
 
-        if(cicm.EVPD is null)
-            return cicm;
+        if(cicm.EVPD is null) return cicm;
 
         scsi.Evpds = new List<Evpd>();
 
-        foreach(EVPDType evpd in cicm.EVPD)
-            scsi.Evpds.Add(evpd);
+        foreach(EVPDType evpd in cicm.EVPD) scsi.Evpds.Add(evpd);
 
         return scsi;
     }
@@ -89,8 +86,7 @@ public class Evpd
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Evpd(EVPDType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var evpd = new Evpd
         {
@@ -99,13 +95,11 @@ public class Evpd
             Page  = cicm.pageSpecified ? cicm.page : null
         };
 
-        if(cicm.Checksums is null)
-            return evpd;
+        if(cicm.Checksums is null) return evpd;
 
         evpd.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            evpd.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) evpd.Checksums.Add(chk);
 
         return evpd;
     }

Aaru.CommonTypes/AaruMetadata/Scanning.cs

@@ -57,8 +57,7 @@ public class Scan
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Scan(ScanType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var scan = new Scan
         {
@@ -69,33 +68,28 @@ public class Scan
         {
             scan.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                scan.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) scan.Checksums.Add(chk);
         }
 
         if(cicm.Scanner is not null)
         {
             scan.Scanner = new List<Scanner>();
 
-            foreach(ScannerType scanner in cicm.Scanner)
-                scan.Scanner.Add(scanner);
+            foreach(ScannerType scanner in cicm.Scanner) scan.Scanner.Add(scanner);
         }
 
         if(cicm.ScanProcessing is not null)
         {
             scan.ScanProcessing = new List<ScanProcessing>();
 
-            foreach(ScanProcessingType processing in cicm.ScanProcessing)
-                scan.ScanProcessing.Add(processing);
+            foreach(ScanProcessingType processing in cicm.ScanProcessing) scan.ScanProcessing.Add(processing);
         }
 
-        if(cicm.OCR is null)
-            return scan;
+        if(cicm.OCR is null) return scan;
 
         scan.OCR = new List<OCR>();
 
-        foreach(OCRType ocr in cicm.OCR)
-            scan.OCR.Add(ocr);
+        foreach(OCRType ocr in cicm.OCR) scan.OCR.Add(ocr);
 
         return scan;
     }
@@ -110,8 +104,7 @@ public class Cover
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Cover(CoverType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var cover = new Cover
         {
@@ -119,13 +112,11 @@ public class Cover
             Thumbnail = cicm.Thumbnail
         };
 
-        if(cicm.Checksums is null)
-            return cover;
+        if(cicm.Checksums is null) return cover;
 
         cover.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            cover.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) cover.Checksums.Add(chk);
 
         return cover;
     }
@@ -203,8 +194,8 @@ public class CaseScan
                                                                        ? null
                                                                        : new CaseScan
                                                                        {
-                                                                           Element = (CaseScanElement)cicm.
-                                                                               CaseScanElement,
+                                                                           Element = (CaseScanElement)cicm
+                                                                              .CaseScanElement,
                                                                            Scan = cicm.Scan
                                                                        };
 }
@@ -233,8 +224,8 @@ public class MediaScan
                                                                          ? null
                                                                          : new MediaScan
                                                                          {
-                                                                             Element = (MediaScanElement)cicm.
-                                                                                 MediaScanElement,
+                                                                             Element = (MediaScanElement)cicm
+                                                                                .MediaScanElement,
                                                                              Scan = cicm.Scan
                                                                          };
 }
@@ -301,8 +292,7 @@ public class OCR
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator OCR(OCRType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var ocr = new OCR
         {
@@ -311,13 +301,11 @@ public class OCR
             SoftwareVersion = cicm.SoftwareVersion
         };
 
-        if(cicm.Language is null)
-            return ocr;
+        if(cicm.Language is null) return ocr;
 
         ocr.Language = new List<Language>();
 
-        foreach(Language lng in cicm.Language)
-            ocr.Language.Add(lng);
+        foreach(Language lng in cicm.Language) ocr.Language.Add(lng);
 
         return ocr;
     }

Aaru.CommonTypes/AaruMetadata/Tape.cs

@@ -58,8 +58,7 @@ public class TapePartition
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator TapePartition(TapePartitionType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         TapePartition partition = new()
         {
@@ -74,17 +73,14 @@ public class TapePartition
         {
             partition.Checksums = new List<Checksum>();
 
-            foreach(Schemas.ChecksumType chk in cicm.Checksums)
-                partition.Checksums.Add(chk);
+            foreach(Schemas.ChecksumType chk in cicm.Checksums) partition.Checksums.Add(chk);
         }
 
-        if(cicm.File is null)
-            return partition;
+        if(cicm.File is null) return partition;
 
         partition.Files = new List<TapeFile>();
 
-        foreach(TapeFileType file in cicm.File)
-            partition.Files.Add(file);
+        foreach(TapeFileType file in cicm.File) partition.Files.Add(file);
 
         return partition;
     }
@@ -103,8 +99,7 @@ public class TapeFile
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator TapeFile(TapeFileType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var file = new TapeFile
         {
@@ -116,13 +111,11 @@ public class TapeFile
             EndBlock   = cicm.EndBlock
         };
 
-        if(cicm.Checksums is null)
-            return file;
+        if(cicm.Checksums is null) return file;
 
         file.Checksums = new List<Checksum>();
 
-        foreach(Schemas.ChecksumType chk in cicm.Checksums)
-            file.Checksums.Add(chk);
+        foreach(Schemas.ChecksumType chk in cicm.Checksums) file.Checksums.Add(chk);
 
         return file;
     }

Aaru.CommonTypes/AaruMetadata/UserManual.cs

@@ -55,8 +55,7 @@ public class UserManual
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator UserManual(UserManualType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         var manual = new UserManual
         {
@@ -65,13 +64,11 @@ public class UserManual
             Scan     = cicm.Scan
         };
 
-        if(cicm.Language is null)
-            return manual;
+        if(cicm.Language is null) return manual;
 
         manual.Language = new List<Language>();
 
-        foreach(LanguagesTypeLanguage lng in cicm.Language)
-            manual.Language.Add((Language)lng);
+        foreach(LanguagesTypeLanguage lng in cicm.Language) manual.Language.Add((Language)lng);
 
         return manual;
     }

Aaru.CommonTypes/AaruMetadata/Xbox.cs

@@ -54,8 +54,7 @@ public class Xbox
     [Obsolete("Will be removed in Aaru 7")]
     public static implicit operator Xbox(XboxType cicm)
     {
-        if(cicm is null)
-            return null;
+        if(cicm is null) return null;
 
         Xbox xbox = new()
         {
@@ -63,11 +62,9 @@ public class Xbox
             Dmi = cicm.DMI
         };
 
-        if(cicm.SecuritySectors is null)
-            return xbox;
+        if(cicm.SecuritySectors is null) return xbox;
 
-        foreach(XboxSecuritySectorsType ss in cicm.SecuritySectors)
-            xbox.SecuritySectors.Add(ss);
+        foreach(XboxSecuritySectorsType ss in cicm.SecuritySectors) xbox.SecuritySectors.Add(ss);
 
         return xbox;
     }
@@ -80,13 +77,12 @@ public class XboxSecuritySector
     public Dump SecuritySectors { get; set; }
 
     [Obsolete("Will be removed in Aaru 7")]
-    public static implicit operator XboxSecuritySector(XboxSecuritySectorsType cicm) =>
-        cicm is null
-            ? null
-            : new XboxSecuritySector
-            {
-                RequestNumber   = cicm.RequestNumber,
-                RequestVersion  = cicm.RequestVersion,
-                SecuritySectors = cicm.SecuritySectors
-            };
+    public static implicit operator XboxSecuritySector(XboxSecuritySectorsType cicm) => cicm is null
+        ? null
+        : new XboxSecuritySector
+        {
+            RequestNumber   = cicm.RequestNumber,
+            RequestVersion  = cicm.RequestVersion,
+            SecuritySectors = cicm.SecuritySectors
+        };
 }