Index: tools/smaz.adb
==================================================================
--- tools/smaz.adb
+++ tools/smaz.adb
@@ -38,13 +38,10 @@
 
 procedure Smaz is
    function To_SEA (S : String) return Ada.Streams.Stream_Element_Array
      renames Natools.S_Expressions.To_Atom;
 
-   package Holders is new Ada.Containers.Indefinite_Holders
-     (Natools.Smaz_256.Dictionary, Natools.Smaz_256."=");
-
    package Tools_256 is new Natools.Smaz_256.Tools;
 
    package Methods renames Natools.Smaz_Tools.Methods;
 
    package Actions is
@@ -166,12 +163,10 @@
       type String_Count is range <>;
       type Word_Counter is private;
 
       type Dictionary_Counts is array (Dictionary_Entry) of String_Count;
 
-      with package Holders
-        is new Ada.Containers.Indefinite_Holders (Dictionary);
       with package String_Lists
         is new Ada.Containers.Indefinite_Doubly_Linked_Lists (String);
 
       with procedure Add_Substrings
         (Counter : in out Word_Counter;
@@ -244,10 +239,12 @@
          Counts : in Dictionary_Counts;
          Method : in Methods)
         return Dictionary_Entry;
 
    package Dictionary_Subprograms is
+
+      package Holders is new Ada.Containers.Indefinite_Holders (Dictionary);
 
       procedure Evaluate_Dictionary
         (Job_Count : in Natural;
          Dict : in Dictionary;
          Corpus : in String_Lists.List;
@@ -582,11 +579,10 @@
       Dictionary_Entry => Ada.Streams.Stream_Element,
       Methods => Natools.Smaz_Tools.Methods.Enum,
       String_Count => Natools.Smaz_Tools.String_Count,
       Word_Counter => Natools.Smaz_Tools.Word_Counter,
       Dictionary_Counts => Tools_256.Dictionary_Counts,
-      Holders => Holders,
       String_Lists => Natools.Smaz_Tools.String_Lists,
       Add_Substrings => Natools.Smaz_Tools.Add_Substrings,
       Add_Words => Natools.Smaz_Tools.Add_Words,
       Append_String => Tools_256.Append_String,
       Dict_Entry => Natools.Smaz_256.Dict_Entry,