diff --git a/src/plugins/alias/Alias.ml b/src/plugins/alias/Alias.ml
index 052631fc80f649919140841dc43c09a4648a9074..0d38459c28ab0731dfc4ba3486309aed13df9030 100644
--- a/src/plugins/alias/Alias.ml
+++ b/src/plugins/alias/Alias.ml
@@ -29,7 +29,7 @@ let main () =
   if Options.Enabled.get() then
     begin
       Analysis.compute ();
-      Options.feedback "Analysis complete";
+      Options.debug "Analysis complete";
     end
 
 let () =
diff --git a/src/plugins/alias/abstract_state.ml b/src/plugins/alias/abstract_state.ml
index 28bb0a783bcccce7b54a0c027ab2f9e3fec01deb..cba0e935397c5e8552e21c8df4a7231a5bce8061 100644
--- a/src/plugins/alias/abstract_state.ml
+++ b/src/plugins/alias/abstract_state.ml
@@ -325,9 +325,9 @@ let find_all_aliases (lv1: Lval.t) (x: t) : LSet.t =
     with
       Not_found -> (LSet.empty,o)
   in
-  Options.debug "decompose_lval %a : [@[<hov 2>" Lval.pp_debug lv1;
-  List.iter (fun (x, o) -> Options.debug " (%a,%a) " Lval.pp_debug x Offset.pretty o) list_of_lval_to_be_searched;
-  Options.debug "@]]@.";
+  Options.debug ~level:5 "decompose_lval %a : [@[<hov 2>" Lval.pp_debug lv1;
+  List.iter (fun (x, o) -> Options.debug ~level:5 " (%a,%a) " Lval.pp_debug x Offset.pretty o) list_of_lval_to_be_searched;
+  Options.debug ~level:5 "@]]@.";
   let list_of_aliases : (LSet.t*offset) list =
     List.map f_map list_of_lval_to_be_searched
   in
@@ -353,7 +353,7 @@ let create_vertex_simple (lv:Lval.t) (x:t) : V.t * t =
   (* find all the alias of lv (because of offset) *)
   let set_of_aliases : LSet.t = find_all_aliases lv x in
   (* add all these aliases *)
-  Options.debug "all_aliases of %a : %a @." Lval.pp_debug lv LSet.pp_debug set_of_aliases;
+  Options.debug ~level:5 "all_aliases of %a : %a @." Lval.pp_debug lv LSet.pp_debug set_of_aliases;
   let new_lmap =
     LSet.fold
       (fun lv acc -> assert (not (LLMap.mem lv x.lmap)); LLMap.add lv new_v acc)
@@ -411,7 +411,7 @@ let diff_offset (lv1:Lval.t) (lv2:Lval.t) =
    in the graph. If it is present, there will be bugs *)
 let rec create_vertex_lval (blv:Lval.t) (x:t) : V.t * t =
   assert (not (LLMap.mem blv x.lmap));
-  Options.debug "creating a vertex for %a@." Lval.pp_debug blv;
+  Options.debug ~level:4 "creating a vertex for %a@." Lval.pp_debug blv;
   match blv with
     BNone -> Options.fatal "this should not happen"
   | BLval lv ->
@@ -485,7 +485,7 @@ and find_or_create_vertex (lv:Lval.t) (x:t) : V.t * t =
           map_predecessors
           VSet.empty
       in
-      Options.debug "found aliases of %a : %a@." Lval.pp_debug lv VSet.pretty vset_res;
+      Options.debug ~level:5 "found aliases of %a : %a@." Lval.pp_debug lv VSet.pretty vset_res;
       if VSet.is_empty vset_res
       then create_vertex_lval lv x
       else
diff --git a/src/plugins/alias/analysis.ml b/src/plugins/alias/analysis.ml
index ddea391372b763b21e68dca1f09c7132d8c960df..e760bcad1d23dac97e881d5b4fac5f5770f56a8d 100644
--- a/src/plugins/alias/analysis.ml
+++ b/src/plugins/alias/analysis.ml
@@ -257,9 +257,9 @@ let is_computed () = !computed_flag
 
 let compute () =
   Ast.compute();
-  Options.feedback "Parsing done";
+  Options.debug "Parsing done";
   Globals.Functions.iter doFunction;
-  Options.feedback "Functions done";
+  Options.debug "Functions done";
   computed_flag := true;
   let print_stmt_table_elt fmt k v :unit =
     let print_key = Stmt.pretty in
diff --git a/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
index a2d498488d75a7cf20cb31becec32bca2713d48c..533a4a283605f8aeb5dd691a752496e3a7a455c7 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing assignment1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b, c, d} are aliased
-[alias] Functions done
 Before statement int *a = (int *)0; :
  
 Before statement int *b = (int *)0; :
@@ -25,4 +23,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {a, b, c, d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle
index 470af4db7c93abffe9c9ab747d85f218861fa1be..543c44ff607e6ffcef28b473d9c6234b2ece78d6 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle
@@ -1,9 +1,7 @@
 [kernel] Parsing assignment2.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, c} are aliased
   {*a, *c, b, d} are aliased
-[alias] Functions done
 Before statement int **a = (int **)0; :
  
 Before statement int *b = (int *)0; :
@@ -29,4 +27,3 @@ Before statement return __retres; :
  {a, c} are aliased
 {*a, *c, b, d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle
index f702226fd42950929ec480d782d6f3c21c2f1b7d..421f8d8a689b3067bdc88fdc471c4e9826b8b468 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing assignment3.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, c, &b} are aliased
-[alias] Functions done
 Before statement int *a = (int *)0; :
  
 Before statement int b = 0; :
@@ -20,4 +18,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {a, c, &b} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle
index fffaee8da83c438a05001682f1564d8d2ff1619d..dfd7442f4ea8a7bbc72869261f0120a0c45e5b06 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing assignment4.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {*a, *c, b, d} are aliased
-[alias] Functions done
 Before statement int **a = (int **)0; :
  
 Before statement int *b = (int *)0; :
@@ -26,4 +24,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {*a, *c, b, d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle
index 2601fde8f11576d3e046509a7b089c201ec25224..f0db22941a9d0a8af9728894d1596a5f491c5d0b 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle
@@ -1,9 +1,7 @@
 [kernel] Parsing assignment5.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {*a, *a, b} are aliased
   {*b, *(*a), c, d} are aliased
-[alias] Functions done
 Before statement int ***a = (int ***)0; :
  
 Before statement int **b = (int **)0; :
@@ -29,4 +27,3 @@ Before statement return __retres; :
  {*a, *a, b} are aliased
 {*b, *(*a), c, d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/cast1.res.oracle b/src/plugins/alias/tests/basic/oracle/cast1.res.oracle
index 7f20dad76ea6953c34177242917264f72e0224f3..9a17da89ca833b6a11e23f3d44f9afac19f36aa7 100644
--- a/src/plugins/alias/tests/basic/oracle/cast1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/cast1.res.oracle
@@ -1,9 +1,7 @@
 [kernel] Parsing cast1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, c} are aliased
   {b, d} are aliased
-[alias] Functions done
 Before statement int *a = (int *)0; :
  
 Before statement int *b = (int *)0; :
@@ -25,4 +23,3 @@ Before statement return __retres; :
  {a, c} are aliased
 {b, d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle b/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle
index b121f3c8bc6ef198147c963bde118e5f7c97ac22..bcc4b83a3544f3c1adbeb6c94256daff0e49e8cd 100644
--- a/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing conditional1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b, c} are aliased
-[alias] Functions done
 Before statement int *a = (int *)0; :
  
 Before statement int *b = (int *)0; :
@@ -24,4 +22,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {a, b, c} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle b/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle
index 14f533b75da77b202ff7629c8fd1990592338d1d..1e6ad30b5289a5a3a3817f2fed527cfcf00e4bd8 100644
--- a/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle
@@ -1,10 +1,8 @@
 [kernel] Parsing conditional2.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {d, &e} are aliased
   {a, b, &c} are aliased
   {c, &d} are aliased
-[alias] Functions done
 Before statement b = & c; :
  
 Before statement c = & d; :
@@ -39,4 +37,3 @@ Before statement return __retres; :
 {a, b, &c} are aliased
 {c, &d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function1.res.oracle b/src/plugins/alias/tests/basic/oracle/function1.res.oracle
index b966a8277053d5ce330a016e0b47e59ca2dd50de..18e2d97de5d8f4a66cf12f83e4254ac8c0ba8601 100644
--- a/src/plugins/alias/tests/basic/oracle/function1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function1.res.oracle
@@ -1,9 +1,7 @@
 [kernel] Parsing function1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b} are aliased
   {c, d} are aliased
-[alias] Functions done
 Before statement int *z = (int *)0; :
  
 Before statement return __retres; :
@@ -40,4 +38,3 @@ Before statement __retres = 0; :
 Before statement return; :
  {x, y, z} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function2.res.oracle b/src/plugins/alias/tests/basic/oracle/function2.res.oracle
index 9d06784951896af6d795c5a64c1b38aaec7583b9..9f7ebeed03bc822b7dc0cf3b14998eec66d9ada5 100644
--- a/src/plugins/alias/tests/basic/oracle/function2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function2.res.oracle
@@ -1,7 +1,5 @@
 [kernel] Parsing function2.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
-[alias] Functions done
 Before statement int *res = (int *)0; :
  
 Before statement int *res = (int *)0; :
@@ -22,4 +20,3 @@ Before statement __retres = 0; :
  
 Before statement return __retres; :
  
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function3.res.oracle b/src/plugins/alias/tests/basic/oracle/function3.res.oracle
index f5dc137623b424f10b24c2ca251164af35150aad..45664b0859cc7abddb7a602a457da4005709a425 100644
--- a/src/plugins/alias/tests/basic/oracle/function3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function3.res.oracle
@@ -1,9 +1,7 @@
 [kernel] Parsing function3.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b} are aliased
   {c, d} are aliased
-[alias] Functions done
 Before statement return __retres; :
  {x, y, tmp} are aliased
 
@@ -54,4 +52,3 @@ Before statement __retres = 0; :
  {a, b} are aliased
 {c, d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function4.res.oracle b/src/plugins/alias/tests/basic/oracle/function4.res.oracle
index 438d840cc15af701e4a5982bf7efcfb2fc277264..ea46094333a948875b2158a8d9ccf4137e9ff479 100644
--- a/src/plugins/alias/tests/basic/oracle/function4.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function4.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing function4.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b, &c} are aliased
-[alias] Functions done
 Before statement return x; :
  
 Before statement int *a = (int *)0; :
@@ -22,4 +20,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {a, b, &c} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function5.res.oracle b/src/plugins/alias/tests/basic/oracle/function5.res.oracle
index c9b2c736806b1340be3abe6db0e910f4e9dfe69f..d2eb85709323df7edc56b5aa8db05bacf1aae937 100644
--- a/src/plugins/alias/tests/basic/oracle/function5.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function5.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing function5.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b, c} are aliased
-[alias] Functions done
 Before statement goto return_label; :
  {x, __retres} are aliased
 
@@ -47,4 +45,3 @@ Before statement __retres = 0; :
 Before statement __retres = x;
                  goto return_label; :
  
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/if_then1.res.oracle b/src/plugins/alias/tests/basic/oracle/if_then1.res.oracle
index e62a38d3a86b5fbf424f42f654042a1ee5529395..9409d446e82f78cd705572b02598fd96a2054d1d 100644
--- a/src/plugins/alias/tests/basic/oracle/if_then1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/if_then1.res.oracle
@@ -1,10 +1,8 @@
 [kernel] Parsing if_then1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {x, z} are aliased
   {b, c, &y} are aliased
   {a, y, &x, &z} are aliased
-[alias] Functions done
 Before statement a = & x; :
  
 Before statement b = & y; :
@@ -37,4 +35,3 @@ Before statement return __retres; :
 {b, c, &y} are aliased
 {a, y, &x, &z} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/switch1.res.oracle b/src/plugins/alias/tests/basic/oracle/switch1.res.oracle
index 4f9262a665a3d904b9c801d141b5c509bea5224d..e028f12d8d38f09723c26012dadb4339ab69b387 100644
--- a/src/plugins/alias/tests/basic/oracle/switch1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/switch1.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing switch1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b, d} are aliased
-[alias] Functions done
 Before statement int *a = (int *)0; :
  
 Before statement int *b = (int *)0; :
@@ -36,4 +34,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {a, b, d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/switch2.res.oracle b/src/plugins/alias/tests/basic/oracle/switch2.res.oracle
index 0ce3e6954a107bd6781177a1ee80cb18c73e1847..6fcd78115e67ea11ee2c2064a3b6396a82b4eb3e 100644
--- a/src/plugins/alias/tests/basic/oracle/switch2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/switch2.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing switch2.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b, c, d} are aliased
-[alias] Functions done
 Before statement int *a = (int *)0; :
  
 Before statement int *b = (int *)0; :
@@ -39,4 +37,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {a, b, c, d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle b/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle
index 15cfb49f55aa134c5f07016d1d6d43a08e251e2d..cc8081857b01908f62d1f6e5089add770225c2b7 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle
@@ -1,7 +1,5 @@
 [kernel] Parsing while_for1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
-[alias] Functions done
 Before statement int *s = (int *)0; :
  
 Before statement {
@@ -33,4 +31,3 @@ Before statement __retres = 0; :
  
 Before statement return __retres; :
  
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle b/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle
index 4a539c05ec9e45964d6b4d49d1bef9033b18f3a3..597bc30773b6ee85751ec8c73646f05443f48d19 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing while_for2.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b} are aliased
-[alias] Functions done
 Before statement return __retres; :
  {a, b} are aliased
 
@@ -43,4 +41,3 @@ Before statement break; :
 Before statement __retres = 0; :
  {a, b} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle b/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle
index e2132b316f12699654ac9df4743637599d939c54..6cd62dca8623387b6153af0a777989669ec9818a 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing while_for3.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {a, b} are aliased
-[alias] Functions done
 Before statement __retres = 0; :
  {a, b} are aliased
 
@@ -59,4 +57,3 @@ Before statement goto __Cont; :
 Before statement __Cont: i ++; :
  {a, b} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/array1.res.oracle b/src/plugins/alias/tests/offsets/oracle/array1.res.oracle
index c88b8e636dbf1ddf350beb887fb2675f0666791b..a53c74c08487694afb33716492889cfb28b38e56 100644
--- a/src/plugins/alias/tests/offsets/oracle/array1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/array1.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing array1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {x, y, &tab[0]} are aliased
-[alias] Functions done
 Before statement tab[0] = 0; :
  
 Before statement tab[1] = 1; :
@@ -23,4 +21,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {x, y, &tab[0]} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/array2.res.oracle b/src/plugins/alias/tests/offsets/oracle/array2.res.oracle
index c1f8c3abacb77c4d9d4ddc0b2a1393cf62d7bbe6..8ad1a4522ed96890c8f9f2175f9f8e6445175f77 100644
--- a/src/plugins/alias/tests/offsets/oracle/array2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/array2.res.oracle
@@ -1,8 +1,6 @@
 [kernel] Parsing array2.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {*x, &mat[0]} are aliased
-[alias] Functions done
 Before statement mat[0][0] = 0; :
  
 Before statement mat[0][1] = 1; :
@@ -18,4 +16,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {*x, &mat[0]} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle b/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle
index 7a2421da4dbbf395ddb32b965645e7f40c76f1ad..5d116c4ee27a733a8c9c6fe50210ba6ef0c556e5 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle
@@ -1,7 +1,5 @@
 [kernel] Parsing collapse1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
-[alias] Functions done
 Before statement tab[0] = 0; :
  
 Before statement tab[1] = 1; :
@@ -37,4 +35,3 @@ Before statement __retres = 0; :
  
 Before statement return __retres; :
  
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle b/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle
index f83ede7d7ffb01b34c8c2954e53c0e38195cd4d7..ca058b7df28969b9e40e6a319a5d3093cf0847a0 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle
@@ -1,7 +1,5 @@
 [kernel] Parsing collapse2.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
-[alias] Functions done
 Before statement mat[0][0] = 0; :
  
 Before statement mat[0][1] = 1; :
@@ -18,4 +16,3 @@ Before statement __retres = 0; :
  
 Before statement return __retres; :
  
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle b/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle
index 5b2cacca08b4a9cb7027183b49d5bea583002fc3..e81f32e44cf5f94a530bb091f20c94ba3b787bdd 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle
@@ -1,7 +1,5 @@
 [kernel] Parsing collapse3.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
-[alias] Functions done
 Before statement mat[0][0] = 0; :
  
 Before statement mat[0][1] = 1; :
@@ -18,4 +16,3 @@ Before statement __retres = 0; :
  
 Before statement return __retres; :
  
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle b/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
index b330ac174326e37cabdce0fb7c18999a0ebba3d6..017747ec5d84215a61d94149a73a4cc39d5f8f4b 100644
--- a/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
@@ -1,5 +1,4 @@
 [kernel] Parsing nested1.c (with preprocessing)
-[alias] Parsing done
 [alias] Skipping st_2_t *z1 = malloc(sizeof(st_2_t)); (doInstr not implemented)
 [alias] Skipping st_2_t *z2 = malloc(sizeof(st_2_t)); (doInstr not implemented)
 [alias] Skipping st_3_t *t = malloc(sizeof(st_3_t)); (doInstr not implemented)
@@ -11,7 +10,6 @@
   {z2->c, b} are aliased
   {t->t, z1} are aliased
   {z1->c, t->d, a} are aliased
-[alias] Functions done
 Before statement t->t = (struct struct_2_t *)z1; :
  {x1, x2} are aliased
 {z1->s, z2->s, tab_y[0], &x1, &x2} are aliased
@@ -93,4 +91,3 @@ Before statement z2->c = b; :
 {z1->s, z2->s, tab_y[0], &x1, &x2} are aliased
 {z1->c, a} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle b/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle
index f888665076e1357b020ba96202562db3d5af7c8a..66cc7842c1cbcddec8d8e69016b59cd55c3c385c 100644
--- a/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle
@@ -1,5 +1,4 @@
 [kernel] Parsing nested2.c (with preprocessing)
-[alias] Parsing done
 [alias] Skipping st_2_t *z1 = malloc(sizeof(st_2_t)); (doInstr not implemented)
 [alias] Skipping st_3_t *t = malloc(sizeof(st_3_t)); (doInstr not implemented)
 [alias] Skipping int *a = malloc(sizeof(int)); (doInstr not implemented)
@@ -8,7 +7,6 @@
   {z1->s[0], &x2} are aliased
   {t->t, z1} are aliased
   {z1->c, t->d, a} are aliased
-[alias] Functions done
 Before statement st_1_t x1 = {.a = 0, .b = 1}; :
  
 Before statement st_1_t x2 = {.a = 2, .b = 3}; :
@@ -53,4 +51,3 @@ Before statement return __retres; :
 {t->t, z1} are aliased
 {z1->c, t->d, a} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle
index ca319a8beeeb204a5537ea6b4dbcff2c0dec5b1a..96f68bb686ca57a303679fafd71b46025d64091f 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle
@@ -1,9 +1,7 @@
 [kernel] Parsing structure1.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {p_x, p_y, &x, &y} are aliased
   {x, y} are aliased
-[alias] Functions done
 Before statement st_1_t x = {.a = 0, .b = 1}; :
  
 Before statement st_2_t y = {.a = 3, .c = 4}; :
@@ -29,4 +27,3 @@ Before statement return __retres; :
  {p_x, p_y, &x, &y} are aliased
 {x, y} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle
index ccaebfa88b7b80eba859a31314a5a25da5ffa430..65466195ddf431466b0008258f82ad18a78a7221 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle
@@ -1,9 +1,7 @@
 [kernel] Parsing structure2.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {y, &x1} are aliased
   {y.s, &x1.s, &x2} are aliased
-[alias] Functions done
 Before statement st_1_t x1 = {.a = 0, .b = 1}; :
  
 Before statement st_1_t x2 = {.a = 1, .b = 2}; :
@@ -21,4 +19,3 @@ Before statement return __retres; :
  {y, &x1} are aliased
 {y.s, &x1.s, &x2} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle
index b43ca1fc940d46bc4a472fc574a38e67e32dc45b..5be7e1782b37c98e62b2055161cd267356349693 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle
@@ -1,5 +1,4 @@
 [kernel] Parsing structure3.c (with preprocessing)
-[alias] Parsing done
 [alias] May-aliases at the end of function main:
   {y1, &x1} are aliased
   {y2, &x2} are aliased
@@ -7,7 +6,6 @@
   {z.t, &y1.t, &y2} are aliased
   {y1.c, &x1.c} are aliased
   {z.d, &y1.d} are aliased
-[alias] Functions done
 Before statement st_1_t x1 = {.a = 0, .b = 1}; :
  
 Before statement st_1_t x2 = {.a = 1, .b = 2}; :
@@ -48,4 +46,3 @@ Before statement return __retres; :
 {y1.c, &x1.c} are aliased
 {z.d, &y1.d} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle
index 07ffb81fe8cd0cd692075e4a1ddb6b9864d73fbc..fc5f7adb87d5717059766b01a18360ca795f58be 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle
@@ -1,10 +1,8 @@
 [kernel] Parsing structure4.c (with preprocessing)
-[alias] Parsing done
 [alias] Skipping st_1_t *y1 = malloc(sizeof(st_1_t)); (doInstr not implemented)
 [alias] Skipping st_2_t *z = malloc(sizeof(st_2_t)); (doInstr not implemented)
 [alias] May-aliases at the end of function main:
   {z->s, y1, &x1} are aliased
-[alias] Functions done
 Before statement st_1_t x1 = {.a = 0, .b = 1}; :
  
 Before statement st_1_t x2 = {.a = 1, .b = 2}; :
@@ -27,4 +25,3 @@ Before statement __retres = 0; :
 Before statement return __retres; :
  {z->s, y1, &x1} are aliased
 
-[alias] Analysis complete
diff --git a/src/plugins/alias/tests/real_world/oracle/example1.res.oracle b/src/plugins/alias/tests/real_world/oracle/example1.res.oracle
index 5ef36f75ea9fe8de42e3c4ac520c0e509056987a..bacef4e293adbafeab1f98d453fbf2ff5231803c 100644
--- a/src/plugins/alias/tests/real_world/oracle/example1.res.oracle
+++ b/src/plugins/alias/tests/real_world/oracle/example1.res.oracle
@@ -1,12 +1,10 @@
 [kernel] Parsing example1.c (with preprocessing)
-[alias] Parsing done
 [alias] Warning: a function with no return is employed in an assignment
 [alias] Warning: a function with no return is employed in an assignment
 [alias] Warning: a function with no return is employed in an assignment
 [alias] Warning: Analysis is continuing but will not be sound
 [alias] Warning: Analysis is continuing but will not be sound
 [alias] May-aliases at the end of function main:
-[alias] Functions done
 Before statement b->t1[i] = a->t1[i]; :
  
 Before statement idx = 0; :
@@ -226,4 +224,3 @@ Before statement b->t1[i] = a->t1[i];
 Before statement odata = tmp->t2[*(tmp->n2)]; :
  {x, tmp} are aliased
 
-[alias] Analysis complete