* Minor reformatting

src/backends/ocarina-backends-ada_tree-debug.ads

@@ -39,10 +39,10 @@ package Ocarina.Backends.Ada_Tree.Debug is
 
    N_Indents : Natural := 0;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol      (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int      (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line     (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str      (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Boolean     (N : Boolean);

src/backends/ocarina-backends-asn1_tree-debug.ads

@@ -39,10 +39,10 @@ package Ocarina.Backends.ASN1_Tree.Debug is
 
    N_Indents : Natural := 0;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol      (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int      (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line     (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str      (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Byte        (N : Byte);

src/backends/ocarina-backends-asn1_tree-nutils.adb

@@ -405,7 +405,8 @@ package body Ocarina.Backends.ASN1_Tree.Nutils is
          Set_Str_To_Name_Buffer (Image (T));
          Name := Name_Find;
          Name := Add_Suffix_To_Name (Keyword_Suffix, Name);
-         Set_Name_Table_Byte (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
+         Set_Name_Table_Byte
+           (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
 
          Set_Str_To_Name_Buffer (Image (T));
       else

src/backends/ocarina-backends-c_tree-debug.ads

@@ -39,10 +39,10 @@ package Ocarina.Backends.C_Tree.Debug is
 
    N_Indents : Natural := 0;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol      (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int      (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line     (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str      (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Byte        (N : Byte);

src/backends/ocarina-backends-c_tree-nutils.adb

@@ -1042,7 +1042,8 @@ package body Ocarina.Backends.C_Tree.Nutils is
          Set_Str_To_Name_Buffer (Image (T));
          Name := Name_Find;
          Name := Add_Suffix_To_Name (Keyword_Suffix, Name);
-         Set_Name_Table_Byte (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
+         Set_Name_Table_Byte
+           (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
 
          Set_Str_To_Name_Buffer (Image (T));
       else

src/backends/ocarina-backends-mast_tree-debug.ads

@@ -39,10 +39,10 @@ package Ocarina.Backends.MAST_Tree.Debug is
 
    N_Indents : Natural := 0;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol      (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int      (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line     (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str      (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Byte        (N : Byte);

src/backends/ocarina-backends-mast_tree-nutils.adb

@@ -387,7 +387,8 @@ package body Ocarina.Backends.MAST_Tree.Nutils is
          Set_Str_To_Name_Buffer (Image (T));
          Name := Name_Find;
          Name := Add_Suffix_To_Name (Keyword_Suffix, Name);
-         Set_Name_Table_Byte (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
+         Set_Name_Table_Byte
+           (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
 
          Set_Str_To_Name_Buffer (Image (T));
       else

src/backends/ocarina-backends-pn-debug.ads

@@ -38,10 +38,10 @@ package Ocarina.Backends.PN.Debug is
 
    N_Indents : Integer := -1;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol      (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int      (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line     (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str      (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Boolean     (N : Boolean);

src/backends/ocarina-backends-pn-nutils.adb

@@ -37,7 +37,9 @@ package body Ocarina.Backends.PN.Nutils is
    -- Append_Node_To_List --
    -------------------------
 
-   procedure Append_Node_To_List (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id) is
+   procedure Append_Node_To_List
+     (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id)
+   is
       use OPN;
 
       Last : Node_Id;
@@ -60,7 +62,9 @@ package body Ocarina.Backends.PN.Nutils is
    --  Push_Node_Into_List  --
    ---------------------------
 
-   procedure Push_Node_Into_List (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id) is
+   procedure Push_Node_Into_List
+     (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id)
+   is
       use OPN;
 
       First : Node_Id;
@@ -82,7 +86,9 @@ package body Ocarina.Backends.PN.Nutils is
    -- Delete_Node_From_List --
    ---------------------------
 
-   procedure Delete_Node_From_List (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id) is
+   procedure Delete_Node_From_List
+     (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id)
+   is
       use OPN;
 
       Node_Iter : Node_Id;

src/backends/ocarina-backends-pn-nutils.ads

@@ -47,12 +47,15 @@ package Ocarina.Backends.PN.Nutils is
    function Is_Empty (L : Ocarina.Types.List_Id) return Boolean;
    --  Return true if the list is empty, else return false
 
-   procedure Append_Node_To_List (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id);
+   procedure Append_Node_To_List
+     (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id);
    --  Append the node to the list
 
-   procedure Push_Node_Into_List (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id);
+   procedure Push_Node_Into_List
+     (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id);
 
-   procedure Delete_Node_From_List (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id);
+   procedure Delete_Node_From_List
+     (E : Ocarina.Types.Node_Id; L : Ocarina.Types.List_Id);
 
    function Make_Identifier
      (Pn_Entity : Ocarina.Types.Node_Id; Ident_Name : Ocarina.Types.Name_Id)

src/backends/ocarina-backends-rtsj_tree-debug.ads

@@ -39,10 +39,10 @@ package Ocarina.Backends.RTSJ_Tree.Debug is
 
    N_Indents : Natural := 0;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol      (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int      (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line     (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str      (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Boolean     (N : Boolean);

src/backends/ocarina-backends-rtsj_tree-nutils.adb

@@ -325,7 +325,8 @@ package body Ocarina.Backends.RTSJ_Tree.Nutils is
          Set_Str_To_Name_Buffer (Image (T));
          Name := Name_Find;
          Name := Add_Suffix_To_Name (Keyword_Suffix, Name);
-         Set_Name_Table_Byte (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
+         Set_Name_Table_Byte
+           (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
 
          Set_Str_To_Name_Buffer (Image (T));
       else

src/backends/ocarina-backends-xml_tree-debug.ads

@@ -39,10 +39,10 @@ package Ocarina.Backends.XML_Tree.Debug is
 
    N_Indents : Natural := 0;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol      (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int      (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line     (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str      (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Byte        (N : Byte);

src/backends/ocarina-backends-xml_tree-nutils.adb

@@ -418,7 +418,8 @@ package body Ocarina.Backends.XML_Tree.Nutils is
          Set_Str_To_Name_Buffer (Image (T));
          Name := Name_Find;
          Name := Add_Suffix_To_Name (Keyword_Suffix, Name);
-         Set_Name_Table_Byte (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
+         Set_Name_Table_Byte
+           (Name, Ocarina.Types.Byte (Token_Type'Pos (T) + 1));
 
          Set_Str_To_Name_Buffer (Image (T));
       else

src/core/common_files/locations.adb

@@ -34,7 +34,8 @@
 with GNAT.Directory_Operations;
 
 with Ocarina.Namet;
-with Ocarina.Types; use type Ocarina.Types.Name_Id, Ocarina.Types.Int, Ocarina.Types.Text_Ptr;
+with Ocarina.Types;
+use type Ocarina.Types.Name_Id, Ocarina.Types.Int, Ocarina.Types.Text_Ptr;
 
 package body Locations is
 

src/core/common_files/locations.ads

@@ -36,18 +36,26 @@ with Ocarina.Types;
 package Locations is
 
    type Location is record
-      Base_Name : Ocarina.Types.Name_Id;  --  Base name of file
-      Dir_Name  : Ocarina.Types.Name_Id;  --  Directory name of file
-      Line      : Ocarina.Types.Int;      --  Index of current line in buffer
-      First_Pos : Ocarina.Types.Text_Ptr; --  Index of first character in the line
-      Last_Pos  : Ocarina.Types.Text_Ptr; --  Index of last character read on the line
-      Scan      : Ocarina.Types.Text_Ptr; --  Index of current character in the line
-      EOF       : Ocarina.Types.Text_Ptr; --  Index of very last character in buffer
+      Base_Name : Ocarina.Types.Name_Id;
+      --  Base name of file
+      Dir_Name  : Ocarina.Types.Name_Id;
+      --  Directory name of file
+      Line      : Ocarina.Types.Int;
+      --  Index of current line in buffer
+      First_Pos : Ocarina.Types.Text_Ptr;
+      --  Index of first character in the line
+      Last_Pos  : Ocarina.Types.Text_Ptr;
+      --  Index of last character read on the line
+      Scan      : Ocarina.Types.Text_Ptr;
+      --  Index of current character in the line
+      EOF       : Ocarina.Types.Text_Ptr;
+      --  Index of very last character in buffer
       Buffer    : Ocarina.Types.Text_Buffer_Ptr;
    end record;
 
    No_Location : constant Location
-     := Location'(Ocarina.Types.No_Name, Ocarina.Types.No_Name, 0, 0, 0, 0, 0, null);
+     := Location'(Ocarina.Types.No_Name,
+                  Ocarina.Types.No_Name, 0, 0, 0, 0, 0, null);
 
    function Image (Loc : Location) return String;
    --  Return <base_name>:<line>:<column>. If Base_Name is null, then

src/core/tree/ocarina-me_aadl-aadl_instances-debug.ads

@@ -41,10 +41,10 @@ package Ocarina.Me_AADL.AADL_Instances.Debug is
 
    N_Indents : Integer := -1;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol       (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int       (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line      (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str       (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Boolean     (N : Boolean);

src/core/tree/ocarina-me_aadl-aadl_tree-debug.ads

@@ -39,10 +39,10 @@ package Ocarina.ME_AADL.AADL_Tree.Debug is
 
    N_Indents : Integer := -1;
 
-   procedure W_Eol         (N : Natural := 1) renames Ocarina.Output.Write_Eol;
-   procedure W_Int         (N : Int)          renames Ocarina.Output.Write_Int;
-   procedure W_Line        (N : String)       renames Ocarina.Output.Write_Line;
-   procedure W_Str         (N : String)       renames Ocarina.Output.Write_Str;
+   procedure W_Eol      (N : Natural := 1) renames Ocarina.Output.Write_Eol;
+   procedure W_Int      (N : Int)          renames Ocarina.Output.Write_Int;
+   procedure W_Line     (N : String)       renames Ocarina.Output.Write_Line;
+   procedure W_Str      (N : String)       renames Ocarina.Output.Write_Str;
    procedure W_Indents;
 
    procedure W_Boolean     (N : Boolean);

src/core/tree/ocarina-me_aadl-aadl_tree-entities-properties.ads

@@ -34,7 +34,6 @@
 --  This package provides functions to create or read property names,
 --  types, constants and associations.
 
-with Ocarina.Types;                           use Ocarina.Types;
 with Ocarina.AADL_Values;             use Ocarina.AADL_Values;
 with Ocarina.ME_AADL.AADL_Tree.Nodes; use Ocarina.ME_AADL.AADL_Tree.Nodes;
 

src/core/tree/ocarina-me_aadl-aadl_tree-entities.adb

@@ -49,7 +49,7 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    -------------------------
 
    function Get_Entity_Category
-     (Node : Ocarina.Types.Node_Id)
+     (Node : Node_Id)
      return Entity_Category
    is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
@@ -123,12 +123,11 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ------------------------
 
    function Get_Name_Of_Entity
-     (Entity : Ocarina.Types.Node_Id;
+     (Entity : Node_Id;
       Get_Display_Name : Boolean := True)
-     return Ocarina.Types.Name_Id
+     return Name_Id
    is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
-      use Ocarina.Types;
 
       pragma Assert
         (Kind (Entity) = K_Component_Implementation
@@ -177,11 +176,10 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ------------------------
 
    function Get_Name_Of_Entity
-     (Entity : Ocarina.Types.Node_Id;
+     (Entity : Node_Id;
       Get_Display_Name : Boolean := True)
      return String
    is
-      use Ocarina.Types;
       use Ocarina.Namet;
 
       Name : constant Name_Id := Get_Name_Of_Entity (Entity, Get_Display_Name);
@@ -198,11 +196,10 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ----------------------------------
 
    function Get_Name_Of_Entity_Reference
-     (Entity_Ref : Ocarina.Types.Node_Id;
+     (Entity_Ref : Node_Id;
       Get_Display_Name : Boolean := True)
-     return Ocarina.Types.Name_Id
+     return Name_Id
    is
-      use Ocarina.Types;
       use Ocarina.Namet;
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
 
@@ -243,12 +240,11 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ----------------------------------
 
    function Get_Name_Of_Entity_Reference
-     (Entity_Ref : Ocarina.Types.Node_Id;
+     (Entity_Ref : Node_Id;
       Get_Display_Name : Boolean := True)
      return String
    is
       use Ocarina.Namet;
-      use Ocarina.Types;
 
       Name : constant Name_Id := Get_Name_Of_Entity_Reference
         (Entity_Ref, Get_Display_Name);
@@ -265,11 +261,10 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ---------------------------
 
    function Get_Referenced_Entity
-     (Entity_Ref : Ocarina.Types.Node_Id)
-     return Ocarina.Types.Node_Id
+     (Entity_Ref : Node_Id)
+     return Node_Id
    is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
-      use Ocarina.Types;
 
       pragma Assert
         (Kind (Entity_Ref) = K_Entity_Reference
@@ -301,9 +296,8 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    -- Set_Referenced_Entity --
    ---------------------------
 
-   procedure Set_Referenced_Entity (Entity_Ref, Entity : Ocarina.Types.Node_Id) is
+   procedure Set_Referenced_Entity (Entity_Ref, Entity : Node_Id) is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
-      use Ocarina.Types;
 
       pragma Assert
         (Entity_Ref /= No_Node
@@ -326,10 +320,9 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ------------------------------------------------
 
    function Entity_Reference_Path_Has_Several_Elements
-     (Entity_Ref : Ocarina.Types.Node_Id)
+     (Entity_Ref : Node_Id)
      return Boolean
    is
-      use Ocarina.Types;
       use Ocarina.Me_AADL.AADL_Tree.Nodes;
       use Ocarina.Me_AADL.AADL_Tree.Nutils;
 
@@ -347,11 +340,10 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    --------------------------
 
    function Duplicate_Identifier
-     (Identifier : Ocarina.Types.Node_Id)
-     return Ocarina.Types.Node_Id
+     (Identifier : Node_Id)
+     return Node_Id
    is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
-      use Ocarina.Types;
       use Ocarina.ME_AADL.AADL_Tree.Nutils;
 
       pragma Assert (Identifier = No_Node
@@ -380,10 +372,9 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    -------------------------------
 
    function Get_Category_Of_Component
-     (Component : Ocarina.Types.Node_Id)
+     (Component : Node_Id)
      return Component_Category
    is
-      use Ocarina.Types;
       use Ocarina.Me_AADL.AADL_Tree.Nodes;
 
       pragma Assert
@@ -402,11 +393,10 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    --------------------------------
 
    function Get_Category_Of_Connection
-     (Connection : Ocarina.Types.Node_Id)
+     (Connection : Node_Id)
      return Connection_Type
    is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
-      use Ocarina.Types;
 
       pragma Assert
         (Connection /= No_Node
@@ -424,8 +414,7 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    -- Get_Category_Of_Flow --
    --------------------------
 
-   function Get_Category_Of_Flow (Flow : Ocarina.Types.Node_Id) return Flow_Category is
-      use Ocarina.Types;
+   function Get_Category_Of_Flow (Flow : Node_Id) return Flow_Category is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
 
       pragma Assert (Flow /= No_Node
@@ -445,10 +434,9 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ----------------------------------
 
    function Get_Category_Of_Subcomponent
-     (Subcomponent : Ocarina.Types.Node_Id)
+     (Subcomponent : Node_Id)
      return Component_Category
    is
-      use Ocarina.Types;
       use Ocarina.Me_AADL.AADL_Tree.Nodes;
 
       pragma Assert
@@ -463,10 +451,9 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ---------------------------------
 
    function Get_Corresponding_Component
-     (Subcomponent : Ocarina.Types.Node_Id)
-     return Ocarina.Types.Node_Id
+     (Subcomponent : Node_Id)
+     return Node_Id
    is
-      use Ocarina.Types;
       use Ocarina.Me_AADL.AADL_Tree.Nodes;
 
       pragma Assert (Subcomponent /= No_Node
@@ -488,10 +475,9 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ----------------------------------
 
    function Get_Corresponding_Subprogram
-     (Call : Ocarina.Types.Node_Id)
-     return Ocarina.Types.Node_Id
+     (Call : Node_Id)
+     return Node_Id
    is
-      use Ocarina.Types;
       use Ocarina.Me_AADL.AADL_Tree.Nodes;
 
       pragma Assert (Call /= No_Node
@@ -513,11 +499,10 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ---------------------------------------------------
 
    function Package_Has_Public_Declarations_Or_Properties
-     (Pack : Ocarina.Types.Node_Id)
+     (Pack : Node_Id)
      return Boolean
    is
       use Ocarina.Me_AADL.AADL_Tree.Nodes;
-      use Ocarina.Types;
 
       pragma Assert (Pack /= No_Node
                      and then Kind (Pack) = K_Package_Specification);
@@ -530,11 +515,10 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ----------------------------------------------------
 
    function Package_Has_Private_Declarations_Or_Properties
-     (Pack : Ocarina.Types.Node_Id)
+     (Pack : Node_Id)
      return Boolean
    is
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
-      use Ocarina.Types;
 
       pragma Assert (Pack /= No_Node
                      and then Kind (Pack) = K_Package_Specification);
@@ -550,10 +534,9 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    -----------------------------
 
    function Display_Node_Kind_Error
-     (Node : Ocarina.Types.Node_Id)
+     (Node : Node_Id)
      return Boolean
    is
-      use Ocarina.Types;
       use Ocarina.Output;
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
       use Ocarina.ME_AADL.AADL_Tree.Debug;
@@ -577,9 +560,8 @@ package body Ocarina.ME_AADL.AADL_Tree.Entities is
    ------------------------------------------
 
    procedure Add_Path_Element_To_Entity_Reference
-     (Entity_Ref, Item : Ocarina.Types.Node_Id)
+     (Entity_Ref, Item : Node_Id)
    is
-      use Ocarina.Types;
       use Ocarina.ME_AADL.AADL_Tree.Nodes;
       use Ocarina.ME_AADL.AADL_Tree.Nutils;