Index: src/natools-chunked_strings.adb
==================================================================
--- src/natools-chunked_strings.adb
+++ src/natools-chunked_strings.adb
@@ -1604,26 +1604,16 @@
                          Set    : in     Maps.Character_Set;
                          Test   : in     Ada.Strings.Membership;
                          First  :    out Positive;
                          Last   :    out Natural)
    is
-      function Invert (M : Ada.Strings.Membership)
-         return Ada.Strings.Membership;
-      pragma Inline (Invert);
+      Invert : constant array (Ada.Strings.Membership)
+        of Ada.Strings.Membership
+        := (Ada.Strings.Inside  => Ada.Strings.Outside,
+            Ada.Strings.Outside => Ada.Strings.Inside);
 
       N : Natural;
-
-      function Invert (M : Ada.Strings.Membership)
-         return Ada.Strings.Membership
-      is
-         use Ada.Strings;
-      begin
-         case M is
-            when Inside  => return Outside;
-            when Outside => return Inside;
-         end case;
-      end Invert;
    begin
       N := Index (Source, Set, Test);
 
       if N = 0 then
          First := 1;

Index: tests/natools-chunked_strings-tests-coverage.adb
==================================================================
--- tests/natools-chunked_strings-tests-coverage.adb
+++ tests/natools-chunked_strings-tests-coverage.adb
@@ -382,11 +382,11 @@
    exception
       when Error : others => NT.Report_Exception (Report, Name, Error);
    end;
 
    declare
-      Name : constant String := "Function Find_Token at string end";
+      Name : constant String := "Procedure Find_Token at string end";
       CS : constant Chunked_String := To_Chunked_String ("--end");
       First : Positive;
       Last : Natural;
    begin
       Find_Token