Index: src/natools-smaz_generic-tools.ads
==================================================================
--- src/natools-smaz_generic-tools.ads
+++ src/natools-smaz_generic-tools.ads
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
--- Copyright (c) 2016, Natacha Porté                                        --
+-- Copyright (c) 2016-2017, Natacha Porté                                   --
 --                                                                          --
 -- Permission to use, copy, modify, and distribute this software for any    --
 -- purpose with or without fee is hereby granted, provided that the above   --
 -- copyright notice and this permission notice appear in all copies.        --
 --                                                                          --
@@ -19,11 +19,10 @@
 -- implementation. These tools are useful for dictionary manipulation,      --
 -- even though the intended use of this Smaz implementation is through a    --
 -- global constant dictionary object.                                       --
 ------------------------------------------------------------------------------
 
-with Ada.Containers;
 with Natools.Smaz_Tools;
 
 generic
 package Natools.Smaz_Generic.Tools is
    pragma Preelaborate;
@@ -33,12 +32,12 @@
 
    function To_Dictionary
      (List : in String_Lists.List;
       Variable_Length_Verbatim : in Boolean)
      return Dictionary
-     with Pre => String_Lists.Length (List) in 1 ..
-                 Ada.Containers.Count_Type (Ada.Streams.Stream_Element'Last);
+     with Pre => String_Lists.Length (List)
+                 in 1 .. Dictionary_Code'Pos (Dictionary_Code'Last);
       --  Build a Dictionary object from a string list
       --  Note that Hash is set to a placeholder which unconditionnally
       --  raises Program_Error when called.
 
    function To_String_List (Dict : in Dictionary) return String_Lists.List;