Index: src/natools-s_expressions-interpreters.adb
==================================================================
--- src/natools-s_expressions-interpreters.adb
+++ src/natools-s_expressions-interpreters.adb
@@ -13,22 +13,10 @@
 -- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF  --
 -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.           --
 ------------------------------------------------------------------------------
 
 package body Natools.S_Expressions.Interpreters is
-
-   ---------------------
-   -- Atom Comparison --
-   ---------------------
-
-   function Less_Than (Left, Right : Atom) return Boolean is
-   begin
-      return Left'Length < Right'Length
-        or else (Left'Length = Right'Length and then Left < Right);
-   end Less_Than;
-
-
 
    -----------------
    -- Interpreter --
    -----------------
 

Index: src/natools-s_expressions-interpreters.ads
==================================================================
--- src/natools-s_expressions-interpreters.ads
+++ src/natools-s_expressions-interpreters.ads
@@ -113,12 +113,10 @@
 
 private
 
    type Exception_Command is new Command with null record;
 
-   function Less_Than (Left, Right : Atom) return Boolean;
-
    package Command_Maps is new Ada.Containers.Indefinite_Ordered_Maps
      (Atom, Command'Class, Less_Than);
 
    type Interpreter is new Command with record
       Commands : Command_Maps.Map;

Index: src/natools-s_expressions.adb
==================================================================
--- src/natools-s_expressions.adb
+++ src/natools-s_expressions.adb
@@ -33,14 +33,21 @@
             Result (I) := Character'Pos (Data (Data'First + Integer (I)));
          end loop;
       end return;
    end To_Atom;
 
+
+   function Less_Than (Left, Right : Atom) return Boolean is
+   begin
+      return Left'Length < Right'Length
+        or else (Left'Length = Right'Length and then Left < Right);
+   end Less_Than;
+
 
    procedure Next (Object : in out Descriptor'Class) is
       Discarded : Events.Event;
       pragma Unreferenced (Discarded);
    begin
       Next (Object, Discarded);
    end Next;
 
 end Natools.S_Expressions;

Index: src/natools-s_expressions.ads
==================================================================
--- src/natools-s_expressions.ads
+++ src/natools-s_expressions.ads
@@ -54,10 +54,12 @@
 
    Null_Atom : constant Atom (1 .. 0) := (others => <>);
 
    function To_String (Data : in Atom) return String;
    function To_Atom (Data : in String) return Atom;
+
+   function Less_Than (Left, Right : Atom) return Boolean;
 
 
 
    -----------------------------
    -- S-expression Descriptor --