diff --git a/RombaSharp/Features/Archive.cs b/RombaSharp/Features/Archive.cs
index b8209008..023547f7 100644
--- a/RombaSharp/Features/Archive.cs
+++ b/RombaSharp/Features/Archive.cs
@@ -65,9 +65,8 @@ have a current entry in the DAT index.";
             DatFile df = DatFile.Create();
             foreach (string dir in onlyDirs)
             {
-                // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-                df.PopulateFromDir(dir, Hash.DeepHashes, false, TreatAsFiles.CHDs, SkipFileType.None, false, false, false,  null);
-                df.PopulateFromDir(dir, Hash.DeepHashes, false, TreatAsFiles.Archives | TreatAsFiles.CHDs, SkipFileType.None, false, false, false, null);
+                df.PopulateFromDir(dir, asFiles: TreatAsFiles.CHDs);
+                df.PopulateFromDir(dir, asFiles: TreatAsFiles.Archives | TreatAsFiles.CHDs);
             }
 
             // Create an empty Dat for files that need to be rebuilt
diff --git a/RombaSharp/Features/Dir2Dat.cs b/RombaSharp/Features/Dir2Dat.cs
index e5f7e9bd..80fdc0d9 100644
--- a/RombaSharp/Features/Dir2Dat.cs
+++ b/RombaSharp/Features/Dir2Dat.cs
@@ -47,15 +47,11 @@ namespace RombaSharp.Features
                 return;
             }
 
-            // Create the encapsulating datfile
+            // Create and write the encapsulating datfile
             DatFile datfile = DatFile.Create();
             datfile.Header.Name = string.IsNullOrWhiteSpace(name) ? "untitled" : name;
             datfile.Header.Description = description;
-
-            // Now run the D2D on the input and write out
-            // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-            datfile.PopulateFromDir(source, Hash.DeepHashes, true /* bare */, TreatAsFiles.CHDs, SkipFileType.None, false /* addBlanks */,
-                false /* addDate */, false /* copyFiles */, null /* filter */);
+            datfile.PopulateFromDir(source, bare: true, asFiles: TreatAsFiles.CHDs);
             datfile.Write(outDir: outdat);
         }
     }
diff --git a/RombaSharp/Features/RefreshDats.cs b/RombaSharp/Features/RefreshDats.cs
index be3c7a8f..00b22140 100644
--- a/RombaSharp/Features/RefreshDats.cs
+++ b/RombaSharp/Features/RefreshDats.cs
@@ -62,9 +62,7 @@ contents of any changed dats.";
             // First get a list of SHA-1's from the input DATs
             DatFile datroot = DatFile.Create();
             datroot.Header.Type = "SuperDAT";
-
-            // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-            datroot.PopulateFromDir(_dats, Hash.DeepHashes, false, TreatAsFiles.CHDs, SkipFileType.None, false, false, false, null);
+            datroot.PopulateFromDir(_dats, asFiles: TreatAsFiles.CHDs);
             datroot.Items.BucketBy(BucketedBy.SHA1, DedupeType.None);
 
             // Create a List of dat hashes in the database (SHA-1)
diff --git a/RombaSharp/Features/RescanDepots.cs b/RombaSharp/Features/RescanDepots.cs
index 3829c880..75a671f5 100644
--- a/RombaSharp/Features/RescanDepots.cs
+++ b/RombaSharp/Features/RescanDepots.cs
@@ -64,9 +64,7 @@ namespace RombaSharp.Features
 
                 // Now rescan the depot itself
                 DatFile depot = DatFile.Create();
-
-                // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-                depot.PopulateFromDir(depotname, Hash.DeepHashes, false, TreatAsFiles.CHDs, SkipFileType.None, false, false, false, null);
+                depot.PopulateFromDir(depotname, asFiles: TreatAsFiles.CHDs);
                 depot.Items.BucketBy(BucketedBy.SHA1, DedupeType.None);
 
                 // Set the base queries to use
diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index 62b641f9..e4578d67 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -1495,16 +1495,17 @@ namespace SabreTools.Library.DatFiles
         /// <param name="copyFiles">True if files should be copied to the temp directory before hashing, false otherwise</param>
         /// <param name="filter">Filter object to be passed to the DatItem level</param>
         /// <param name="useTags">True if DatFile tags override splitting, false otherwise</param>
+        /// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
         public bool PopulateFromDir(
             string basePath,
-            Hash omitFromScan,
-            bool bare,
-            TreatAsFiles asFiles,
-            SkipFileType skipFileType,
-            bool addBlanks,
-            bool addDate,
-            bool copyFiles,
-            Filter filter,
+            Hash omitFromScan = Hash.DeepHashes,
+            bool bare = false,
+            TreatAsFiles asFiles = 0x00,
+            SkipFileType skipFileType = SkipFileType.None,
+            bool addBlanks = false,
+            bool addDate = false,
+            bool copyFiles = false,
+            Filter filter = null,
             bool useTags = false)
         {
             // If the description is defined but not the name, set the name from the description
@@ -2591,8 +2592,12 @@ namespace SabreTools.Library.DatFiles
             foreach (string input in inputs)
             {
                 // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-                PopulateFromDir(input, (quickScan ? Hash.SecureHashes : Hash.DeepHashes) /* omitFromScan */, true /* bare */, asFiles,
-                    SkipFileType.None, false /* addBlanks */, false /* addDate */, false /* copyFiles */, filter);
+                PopulateFromDir(
+                    input,
+                    quickScan ? Hash.SecureHashes : Hash.DeepHashes,
+                    bare: true,
+                    asFiles: asFiles,
+                    filter: filter);
             }
 
             // Setup the fixdat