Index: src/natools-chunked_strings.adb
==================================================================
--- src/natools-chunked_strings.adb
+++ src/natools-chunked_strings.adb
@@ -255,11 +255,12 @@
       pragma Assert (Chunk_Nb > 0);
 
       if Data = null or else Data'Length < Chunk_Nb then
          declare
             First_New : Positive := 1;
-            New_Data : Chunk_Array_Access := new Chunk_Array (1 .. Chunk_Nb);
+            New_Data : constant Chunk_Array_Access
+              := new Chunk_Array (1 .. Chunk_Nb);
          begin
             if Data /= null then
                Resize_Chunk (Data (Data'Last), Chunk_Size);
                New_Data (1 .. Data'Last) := Data.all;
                First_New := Data'Last + 1;

Index: tests/natools-chunked_strings-tests-cxa4011.adb
==================================================================
--- tests/natools-chunked_strings-tests-cxa4011.adb
+++ tests/natools-chunked_strings-tests-cxa4011.adb
@@ -86,11 +86,12 @@
          Tests : array (1 .. 3) of Boolean;
       begin
          Incomplete_String := 'I' & Incomplete_String;
          Incomplete_String := Incomplete_String & A_Small_G;
          if not Is_Valid (Incomplete_String)
-           or not Is_Valid (Complete_String) then
+           or not Is_Valid (Complete_String)
+         then
             NT.Item (Report, Name, NT.Error);
             if not Is_Valid (Incomplete_String) then
                NT.Info (Report, "Incomplete_String is invalid");
             end if;
             if not Is_Valid (Complete_String) then