Index: tools/smaz.adb
==================================================================
--- tools/smaz.adb
+++ tools/smaz.adb
@@ -403,10 +403,11 @@
          --  Perform the requested operations
 
       function To_Dictionary
         (Handler : in Callback'Class;
          Input : in String_Lists.List;
+         Data_List : in String_Lists.List;
          Method : in Methods)
         return Dictionary;
          --  Convert the input into a dictionary given the option in Handler
 
    end Dictionary_Subprograms;
@@ -729,15 +730,11 @@
          Word_List : in String_Lists.List;
          Data_List : in String_Lists.List;
          Method : in Methods)
       is
          Dict : constant Dictionary := Activate_Dictionary
-           (Adjust_Dictionary
-              (Handler,
-               To_Dictionary (Handler, Word_List, Method),
-               Data_List,
-               Method));
+           (To_Dictionary (Handler, Word_List, Data_List, Method));
          Sx_Output : Natools.S_Expressions.Printers.Canonical
            (Ada.Text_IO.Text_Streams.Stream (Ada.Text_IO.Current_Output));
          Ada_Dictionary : constant String
            := Ada.Strings.Unbounded.To_String (Handler.Ada_Dictionary);
          Hash_Package : constant String
@@ -1041,19 +1038,24 @@
 
 
       function To_Dictionary
         (Handler : in Callback'Class;
          Input : in String_Lists.List;
+         Data_List : in String_Lists.List;
          Method : in Methods)
         return Dictionary
       is
          use type Natools.Smaz_Tools.String_Count;
          use type Dict_Sources.Enum;
       begin
          case Handler.Dict_Source is
             when Dict_Sources.S_Expression =>
-               return To_Dictionary (Input, Handler.Vlen_Verbatim);
+               return Adjust_Dictionary
+                 (Handler,
+                  To_Dictionary (Input, Handler.Vlen_Verbatim),
+                  Data_List,
+                  Method);
 
             when Dict_Sources.Text_List | Dict_Sources.Unoptimized_Text_List =>
                declare
                   Counter : Word_Counter;
                begin