diff --git a/src/plugins/alias/src/abstract_state.ml b/src/plugins/alias/src/abstract_state.ml
index ab6c344ace9c3cbca36160fd2e27b744a14d3d2b..997c08eb8297dffda8b51398692635a28d07cbbe 100644
--- a/src/plugins/alias/src/abstract_state.ml
+++ b/src/plugins/alias/src/abstract_state.ml
@@ -710,7 +710,6 @@ module Summary = struct
   (* a type for summaries of functions *)
   type t = {state   : state option;
             formals : lval list;
-            locals  : lval list;
             return  : exp option}
 
   let make s (kf : kernel_function) =
@@ -735,7 +734,6 @@ module Summary = struct
     in
     {state = Some s;
      formals = List.map (fun v -> (Var v,NoOffset)) (Kernel_function.get_formals kf);
-     locals = List.map (fun v -> (Var v,NoOffset)) (Kernel_function.get_locals kf);
      return = exp_return}
 
   let pretty ?(debug=false) fmt summary =
@@ -759,9 +757,8 @@ module Summary = struct
     | None -> if debug then Format.fprintf fmt "not found"
     | Some s when is_empty s -> if debug then Format.fprintf fmt "empty"
     | Some s ->
-      Format.fprintf fmt "@[formals: @[%a@]@;<4>locals: @[%a@]@;<4>returns: @[%a@]@;<4>state: @[%a@] "
+      Format.fprintf fmt "@[formals: @[%a@]@;<4>returns: @[%a@]@;<4>state: @[%a@] "
         (pp_list_lval s) summary.formals
-        (pp_list_lval s) summary.locals
         (pp_option Exp.pretty) summary.return
         (pp_option @@ pretty ~debug) summary.state
 
diff --git a/src/plugins/alias/tests/basic/oracle/addrof.res.oracle b/src/plugins/alias/tests/basic/oracle/addrof.res.oracle
index 79e61cb0b0aa7a91c52df4bb00d5fcea4cc98f8e..9d99ee3ec0c2d5a71ba546e083b70347465634d6 100644
--- a/src/plugins/alias/tests/basic/oracle/addrof.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/addrof.res.oracle
@@ -34,7 +34,6 @@
   0:{ a } → 1:{ x; z }   1:{ x; z } → 2:{  }   6:{ b } → 7:{ y }
   7:{ y } → 1:{ x; z }
 [alias] Summary of function main:
-  formals: 
-  locals: a→{ x; z }  b→{ y }  y→{ x; z }  x  z  p  __retres
-  returns: __retres    state: { *b; a; y }  { *(*b); *a; *y; x; z }
+  formals:     returns: __retres
+  state: { *b; a; y }  { *(*b); *a; *y; x; z }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle b/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
index 4c31afc87e8e5e4d692410292f68537cbb9d677a..b1e3f774ca69aa751f6a63e87cc3fff79b83fca9 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment1.res.oracle
@@ -29,6 +29,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a; b; c; d } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  d  __retres    returns: __retres
-  state: { a; b; c; d }
+  formals:     returns: __retres    state: { a; b; c; d }
 [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 ee488debdbb23f76b53495c02d470de896e659cf..a584e695cb3bf290518c41e0c4313c5d36906880 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment2.res.oracle
@@ -33,6 +33,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a; c } → 1:{ b; d }   1:{ b; d } → 2:{  }
 [alias] Summary of function main:
-  formals:     locals: a→{ b; d }  b  c→{ b; d }  d  __retres
-  returns: __retres    state: { a; c }  { *a; *c; b; d }
+  formals:     returns: __retres    state: { a; c }  { *a; *c; b; d }
 [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 1a83b4c75eda9f4674f3c1a710e6061b3908e9a9..22605c19af07f9a50a3b547c507b389718b4adec 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment3.res.oracle
@@ -24,6 +24,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a } → 5:{ b }   4:{ c } → 5:{ b }
 [alias] Summary of function main:
-  formals:     locals: a→{ b }  b  c→{ b }  __retres
-  returns: __retres    state: { a; c }
+  formals:     returns: __retres    state: { a; c }
 [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 3dec6c8a3c93fe2f930dec0802e65ffe0cdd5d16..69175d2e930b735b530c6482d78dd2d410e4382b 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment4.res.oracle
@@ -33,6 +33,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a } → 1:{ b; d }   1:{ b; d } → 2:{  }   5:{ c } → 1:{ b; d }
 [alias] Summary of function main:
-  formals:     locals: a→{ b; d }  b  c→{ b; d }  d  __retres
-  returns: __retres    state: { a; c }  { *a; *c; b; d }
+  formals:     returns: __retres    state: { a; c }  { *a; *c; b; d }
 [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 21da14a9497f73cbd105b681faffc340f6eacf08..64a9a7de39abd3aa7876c5a87a0dec4d273b1edc 100644
--- a/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/assignment5.res.oracle
@@ -34,6 +34,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a } → 1:{ b }   1:{ b } → 9:{ c; d }   9:{ c; d } → 10:{  }
 [alias] Summary of function main:
-  formals:     locals: a→{ b }  b→{ c; d }  c  d  __retres
-  returns: __retres    state: { *a; b }  { *(*a); *b; c; d }
+  formals:     returns: __retres    state: { *a; b }  { *(*a); *b; c; d }
 [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 6f28983041a9548ea145586af5b025e6f55815ed..176c4f381f9259dffabbb0b7f4de5fa873fbf492 100644
--- a/src/plugins/alias/tests/basic/oracle/cast1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/cast1.res.oracle
@@ -31,6 +31,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a; c } → 1:{  }   4:{ b; d } → 5:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  d  __retres    returns: __retres
-  state: { a; c }  { b; d }
+  formals:     returns: __retres    state: { a; c }  { b; d }
 [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 ede3b2e36f88bc3537ccbd4ac7ce7eca0a938110..0fa0dba3a4307b4ee494e725810288cdb9323883 100644
--- a/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/conditional1.res.oracle
@@ -26,6 +26,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a; b; c } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  __retres    returns: __retres
-  state: { a; b; c }
+  formals:     returns: __retres    state: { a; b; c }
 [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 5972b2065a0c839aa19fffc075c338dbe987763a..7fc2d29a8e6e828cba54c70a7b1935c428af995b 100644
--- a/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/conditional2.res.oracle
@@ -33,7 +33,6 @@
 [alias] May-alias graph at the end of function main:
   13:{ a; b } → 14:{ c }   14:{ c } → 15:{ d }   15:{ d } → 16:{ e }
 [alias] Summary of function main:
-  formals: 
-  locals: a→{ c }  b→{ c }  c→{ d }  d→{ e }  e  __retres
-  returns: __retres    state: { a; b }  { *a; *b; c }  { *(*a); *(*b); *c; d }
+  formals:     returns: __retres
+  state: { a; b }  { *a; *b; c }  { *(*a); *(*b); *c; d }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/conditional3.res.oracle b/src/plugins/alias/tests/basic/oracle/conditional3.res.oracle
index 2bf30184b329e57af82aca29a281b5775bf6ac25..c6dbb35184a35298494d14ee90341a2c5ad7be89 100644
--- a/src/plugins/alias/tests/basic/oracle/conditional3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/conditional3.res.oracle
@@ -73,10 +73,7 @@
   0:{ a; b; c } → 1:{ i; j }   1:{ i; j } → 2:{ x; y }
   2:{ x; y } → 3:{ t; u }   3:{ t; u } → 4:{  }
 [alias] Summary of function main:
-  formals: 
-  locals: a→{ i; j }  b→{ i; j }  c→{ i; j }  i→{ x; y }  j→{ x; y }
-           x→{ t; u }  y→{ t; u }  t  u  p  __retres
-  returns: __retres
+  formals:     returns: __retres
   state: { a; b; c }  { *a; *b; *c; i; j }
          { *(*a); *(*b); *(*c); *i; *j; x; y }
          { *(*(*a)); *(*(*b)); *(*(*c)); *(*i); *(*j); *x; *y; t; u }
diff --git a/src/plugins/alias/tests/basic/oracle/function1.res.oracle b/src/plugins/alias/tests/basic/oracle/function1.res.oracle
index 53a681adaf7945cb50ed637d17ee962c903654ff..2d3bdc6d06a4081fe504be989c432580a7dc79fb 100644
--- a/src/plugins/alias/tests/basic/oracle/function1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function1.res.oracle
@@ -30,7 +30,7 @@
 [alias] May-alias graph at the end of function swap:
   0:{ x; y; z } → 1:{  }
 [alias] Summary of function swap:
-  formals: x  y    locals: z    returns: <none>    state: { x; y; z }
+  formals: x  y    returns: <none>    state: { x; y; z }
 [alias] May-aliases after instruction  swap(a,b);  are  { a; b }
 [alias] May-alias graph after instruction  swap(a,b);  is
   8:{ a } → 7:{  }   10:{ b } → 7:{  }
@@ -49,8 +49,7 @@
   8:{ a } → 7:{  }   10:{ b } → 7:{  }   14:{ c } → 13:{  }
   16:{ d } → 13:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  d  __retres    returns: __retres
-  state: { a; b }  { c; d }
+  formals:     returns: __retres    state: { a; b }  { c; d }
 [alias] analysing function: swap
 [alias] analysing instruction: int *z = (int *)0;
 [alias] May-aliases after instruction  int *z = (int *)0;  are  <none>
@@ -59,5 +58,5 @@
 [alias] May-alias graph at the end of function swap:
   0:{ x; y; z } → 1:{  }
 [alias] Summary of function swap:
-  formals: x  y    locals: z    returns: <none>    state: { x; y; z }
+  formals: x  y    returns: <none>    state: { x; y; z }
 [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 8a156f682a6963af147c9064e9ff2da0b9131a4d..d7e607ebde164861b5db116e4a2157a97f9e278b 100644
--- a/src/plugins/alias/tests/basic/oracle/function2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function2.res.oracle
@@ -20,7 +20,7 @@
 [alias] May-alias graph at the end of function my_malloc:
   0:{ res } → 1:{  }
 [alias] Summary of function my_malloc:
-  formals: size    locals: res    returns: res    state: <none>
+  formals: size    returns: res    state: <none>
 [alias] May-aliases after instruction  a = my_malloc(2);  are  <none>
 [alias] May-alias graph after instruction  a = my_malloc(2);  is
   4:{ a } → 3:{  }
@@ -36,7 +36,7 @@
 [alias] May-alias graph at the end of function main:
   4:{ a } → 3:{  }   8:{ b } → 7:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  __retres    returns: __retres    state: <none>
+  formals:     returns: __retres    state: <none>
 [alias] analysing function: my_malloc
 [alias] analysing instruction: int *res = (int *)0;
 [alias] May-aliases after instruction  int *res = (int *)0;  are  <none>
@@ -45,5 +45,5 @@
 [alias] May-alias graph at the end of function my_malloc:
   0:{ res } → 1:{  }
 [alias] Summary of function my_malloc:
-  formals: size    locals: res    returns: res    state: <none>
+  formals: size    returns: res    state: <none>
 [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 4acd78961680e393c1fe3c5297411895ab89be85..1642757d0b1a51127c2c1ab0880e0d9ec81ce20a 100644
--- a/src/plugins/alias/tests/basic/oracle/function3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function3.res.oracle
@@ -18,8 +18,7 @@
 [alias] May-alias graph at the end of function f1:
   0:{ x; y; tmp } → 1:{  }
 [alias] Summary of function f1:
-  formals: x  y    locals: tmp  __retres    returns: __retres
-  state: { x; y; tmp }
+  formals: x  y    returns: __retres    state: { x; y; tmp }
 [alias] analysing function: main
 [alias] analysing instruction: int *a = (int *)0;
 [alias] May-aliases after instruction  int *a = (int *)0;  are  <none>
@@ -52,6 +51,5 @@
   16:{ a } → 9:{  }   18:{ b } → 9:{  }   28:{ c } → 21:{  }
   30:{ d } → 21:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  d  __retres    returns: __retres
-  state: { a; b }  { c; d }
+  formals:     returns: __retres    state: { a; b }  { c; d }
 [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 8dbe90ab465fc2c12ddfc94ea2a4b2e31acc25e2..2b8bbf2b4c64cabaa547f565ac191b6a07fa733d 100644
--- a/src/plugins/alias/tests/basic/oracle/function4.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function4.res.oracle
@@ -4,7 +4,7 @@
 [alias] May-alias graph at the end of function addr:
   <empty>
 [alias] Summary of function addr:
-  formals: x    locals:     returns: x    state: <none>
+  formals: x    returns: x    state: <none>
 [alias] analysing function: main
 [alias] analysing instruction: int *a = (int *)0;
 [alias] May-aliases after instruction  int *a = (int *)0;  are  <none>
@@ -31,6 +31,5 @@
 [alias] May-alias graph at the end of function main:
   4:{ a } → 9:{ c }   7:{  } → 9:{ c }   8:{ b } → 9:{ c }
 [alias] Summary of function main:
-  formals:     locals: a→{ c }  b→{ c }  c  __retres
-  returns: __retres    state: { a; b }
+  formals:     returns: __retres    state: { a; b }
 [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 c7d33151e1a9112a8c2a526607394f439bd4b5b3..cce128cc40eb99959377e03b5b26de0b7e7bbba3 100644
--- a/src/plugins/alias/tests/basic/oracle/function5.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function5.res.oracle
@@ -15,8 +15,7 @@
 [alias] May-alias graph at the end of function choice:
   0:{ x; y; __retres } → 1:{  }
 [alias] Summary of function choice:
-  formals: x  y    locals: c  __retres    returns: __retres
-  state: { x; y; __retres }
+  formals: x  y    returns: __retres    state: { x; y; __retres }
 [alias] analysing function: main
 [alias] analysing instruction: int *a = (int *)0;
 [alias] May-aliases after instruction  int *a = (int *)0;  are  <none>
@@ -39,6 +38,5 @@
 [alias] May-alias graph at the end of function main:
   10:{ c } → 9:{  }   12:{ a } → 9:{  }   14:{ b } → 9:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  __retres    returns: __retres
-  state: { a; b; c }
+  formals:     returns: __retres    state: { a; b; c }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/function6.res.oracle b/src/plugins/alias/tests/basic/oracle/function6.res.oracle
index 74f1dd62b95776d5a11a701bc27f5be540375eaf..e60a5f1225ecfdd72138228934f4c11fa3df73aa 100644
--- a/src/plugins/alias/tests/basic/oracle/function6.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/function6.res.oracle
@@ -42,8 +42,7 @@
 [alias] May-alias graph at the end of function main:
   <empty>
 [alias] Summary of function main:
-  formals:     locals: a  b  c  d  __retres    returns: __retres
-  state: <none>
+  formals:     returns: __retres    state: <none>
 [alias] analysing function: swap
 [alias] analysing instruction: int z = 0;
 [alias] May-aliases after instruction  int z = 0;  are  <none>
diff --git a/src/plugins/alias/tests/basic/oracle/globctr.res.oracle b/src/plugins/alias/tests/basic/oracle/globctr.res.oracle
index e5df545b132510deec597afaf51f5ed7af09202c..3b942fd3aae5a0f0e099016b82bdfa3fb35bb975 100644
--- a/src/plugins/alias/tests/basic/oracle/globctr.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/globctr.res.oracle
@@ -30,5 +30,5 @@
 [alias] May-alias graph at the end of function main:
   <empty>
 [alias] Summary of function main:
-  formals:     locals: a  b  __retres    returns: __retres    state: <none>
+  formals:     returns: __retres    state: <none>
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/loop.res.oracle b/src/plugins/alias/tests/basic/oracle/loop.res.oracle
index 74cdba557c8983a1f1164770ef90d706921f6ef8..e0dd21c5c92e01e09c9cd42556593d79cfec0077 100644
--- a/src/plugins/alias/tests/basic/oracle/loop.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/loop.res.oracle
@@ -33,6 +33,5 @@
 [alias] May-alias graph at the end of function main:
   <empty>
 [alias] Summary of function main:
-  formals:     locals: l  n_0  w  __retres    returns: __retres
-  state: <none>
+  formals:     returns: __retres    state: <none>
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/basic/oracle/steensgaard.res.oracle b/src/plugins/alias/tests/basic/oracle/steensgaard.res.oracle
index 61305c305a0cb59e6085a5987ee6ce7b5c12a862..45caffcae31e7ad8603f290150252e74e1fbe165 100644
--- a/src/plugins/alias/tests/basic/oracle/steensgaard.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/steensgaard.res.oracle
@@ -35,7 +35,5 @@
   0:{ a } → 15:{ x; z }   4:{ b } → 14:{ y }   13:{ c } → 14:{ y }
   14:{ y } → 15:{ x; z }
 [alias] Summary of function main:
-  formals: 
-  locals: a→{ x; z }  b→{ y }  c→{ y }  y→{ x; z }  x  z  p  __retres
-  returns: __retres    state: { b; c }  { *b; *c; a; y }
+  formals:     returns: __retres    state: { b; c }  { *b; *c; a; y }
 [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 5d4e7565c296953e92026d4d6cc203263e988f2f..05300247fce1f838844c67fa0680d5118c4002df 100644
--- a/src/plugins/alias/tests/basic/oracle/switch1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/switch1.res.oracle
@@ -31,6 +31,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a; b; d } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  d  e  __retres    returns: __retres
-  state: { a; b; d }
+  formals:     returns: __retres    state: { a; b; d }
 [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 35c8cb7b5d7312f2d58804c243b8c57bfb823545..ddad760995837ebb16e0f1661422a71e091c0bbe 100644
--- a/src/plugins/alias/tests/basic/oracle/switch2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/switch2.res.oracle
@@ -35,6 +35,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a; b; c; d } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  d  e  __retres    returns: __retres
-  state: { a; b; c; d }
+  formals:     returns: __retres    state: { a; b; c; d }
 [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 c389176d8e77f32afdd778d64cbf18f661460ed3..0db95fcf8a6756a1d61297dbfbf3436e506730e7 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for1.res.oracle
@@ -24,5 +24,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ s } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: s  idx  __retres    returns: __retres    state: <none>
+  formals:     returns: __retres    state: <none>
 [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 d6cd6b220b403aa05be9ad85693931f176437bb4..14fd60cfa99f24b91c7c48b1bf3aa5a79e5a5f3e 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for2.res.oracle
@@ -19,6 +19,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a; b } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  __retres    returns: __retres
-  state: { a; b }
+  formals:     returns: __retres    state: { a; b }
 [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 24560b86f6ecdc0f0141962db67bf9564f493ce3..fa8a4fc601abfa5883e6c3e788ec3a13e63cc916 100644
--- a/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle
+++ b/src/plugins/alias/tests/basic/oracle/while_for3.res.oracle
@@ -28,6 +28,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a; b } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  c  i  __retres    returns: __retres
-  state: { a; b }
+  formals:     returns: __retres    state: { a; b }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/arrays.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/arrays.res.oracle
index d126c7205b1f5aa316b7eeacd2d07101549f8c2b..dc03371929486375affbc2fdcb1da5e66a3b1e85 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/arrays.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/arrays.res.oracle
@@ -44,6 +44,6 @@
   10:{ z; q } → 11:{ t }   11:{ t } → 16:{ a; b; n }
   16:{ a; b; n } → 17:{  }
 [alias] Summary of function main:
-  formals:     locals: __retres    returns: __retres
+  formals:     returns: __retres
   state: { z; q }  { *z; *q; t }  { (*z)[0..]; (*q)[0..]; a; b; n; t[0..] }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/empty_nodes.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/empty_nodes.res.oracle
index 632370a683e843566296e801a064febbcc035b57..7141f4e9d659ca156e505174535b95c67b82ef6c 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/empty_nodes.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/empty_nodes.res.oracle
@@ -19,7 +19,7 @@
   0:{ y } → 9:{ t }   5:{ z } → 9:{ t }   8:{ x } → 9:{ t }
   9:{ t } → 10:{  }
 [alias] Summary of function f:
-  formals: x→{ t }  y→{ t }  z→{ t }    locals: t    returns: <none>
+  formals: x→{ t }  y→{ t }  z→{ t }    returns: <none>
   state: { x; y; z }  { *x; *y; *z; t }
 [alias] analysing function: g
 [alias] analysing instruction: f(a,a,a);
@@ -30,5 +30,5 @@
 [alias] May-alias graph at the end of function g:
   20:{  } → 21:{  }   22:{ a } → 20:{  }
 [alias] Summary of function g:
-  formals: a    locals:     returns: <none>    state: <none>
+  formals: a    returns: <none>    state: <none>
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla.res.oracle
index 1930c3168bd913694787687b70d20735dd4b6816..96084ba3ad058fd772be8579c58ca1c1df4e0175 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla.res.oracle
@@ -32,7 +32,7 @@
   0:{ res } → 1:{  }   1:{  } -a→ 2:{  }   1:{  } -b→ 4:{ b }
   2:{  } → 3:{  }   4:{ b } → 5:{  }
 [alias] Summary of function create_str_t:
-  formals: va  b    locals: res    returns: res    state: { res->b; b }
+  formals: va  b    returns: res    state: { res->b; b }
 [alias] analysing function: jfla
 [alias] analysing instruction: *(s->b) = *(s->a);
 [alias] May-aliases after instruction  *(s->b) = *(s->a);  are  <none>
@@ -49,8 +49,7 @@
 [alias] May-alias graph at the end of function jfla:
   8:{ s } → 9:{  }   9:{  } -a→ 10:{ i1; i2 }   10:{ i1; i2 } → 12:{  }
 [alias] Summary of function jfla:
-  formals: s  i1  i2  b    locals:     returns: <none>
-  state: { s->a; i1; i2 }
+  formals: s  i1  i2  b    returns: <none>    state: { s->a; i1; i2 }
 [alias] analysing function: main
 [alias] analysing instruction: int u = 11;
 [alias] May-aliases after instruction  int u = 11;  are  <none>
@@ -172,8 +171,6 @@
   36:{  } -b→ 39:{  }   37:{  } → 28:{ v }   39:{  } → 24:{ u }
   41:{ s1 } → 36:{  }   48:{  } → 28:{ v }
 [alias] Summary of function main:
-  formals: 
-  locals: u  v  t→{ v }  a→{ v }  b→{ u }  c→{ v }  w→{ a }  
-          s1  __retres
-  returns: __retres    state: { s1->b; b }  { *w; s1->a; t; a; c }
+  formals:     returns: __retres
+  state: { s1->b; b }  { *w; s1->a; t; a; c }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla_2.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla_2.res.oracle
index 80f9a7728679884b7ec8b6c7521e554fda8002b6..769efeed723c2b2da1f61d3ca187a1aa52535647 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla_2.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla_2.res.oracle
@@ -32,7 +32,7 @@
   0:{ res } → 1:{  }   1:{  } -fst→ 2:{  }   1:{  } -snd→ 4:{ b }
   2:{  } → 3:{  }   4:{ b } → 5:{  }
 [alias] Summary of function create_str_t:
-  formals: va  b    locals: res    returns: res    state: { res->snd; b }
+  formals: va  b    returns: res    state: { res->snd; b }
 [alias] analysing function: jfla
 [alias] analysing instruction: *(s->snd) = *(s->fst);
 [alias] May-aliases after instruction  *(s->snd) = *(s->fst);  are  <none>
@@ -49,8 +49,7 @@
 [alias] May-alias graph at the end of function jfla:
   8:{ s } → 9:{  }   9:{  } -fst→ 10:{ i1; i2 }   10:{ i1; i2 } → 12:{  }
 [alias] Summary of function jfla:
-  formals: s  i1  i2  b    locals:     returns: <none>
-  state: { s->fst; i1; i2 }
+  formals: s  i1  i2  b    returns: <none>    state: { s->fst; i1; i2 }
 [alias] analysing function: main
 [alias] analysing instruction: int u = 11;
 [alias] May-aliases after instruction  int u = 11;  are  <none>
@@ -215,9 +214,6 @@
   52:{  } -fst→ 53:{  }   52:{  } -snd→ 55:{  }   53:{  } → 54:{  }
   55:{  } → 33:{ v }   57:{ s2 } → 52:{  }   64:{  } → 33:{ v }
 [alias] Summary of function main:
-  formals: 
-  locals: u  v  t→{ v }  a→{ v }  b→{ u }  c→{ v }  x→{ a }
-           y→{ b }  z→{ c }  s1  s2  __retres
-  returns: __retres
+  formals:     returns: __retres
   state: { *x; *z; s1->fst; s2->snd; t; a; c }  { *y; s1->snd; b }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla_3.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla_3.res.oracle
index e0708f5178f3bcbffeb48387d62f6cece379851b..5237ddd1cfe5950a50994b9475242ff8931d059f 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla_3.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/ex_jfla_3.res.oracle
@@ -30,8 +30,7 @@
   7:{ i2 } → 0:{ fst; __retres }
 [alias] Summary of function jfla:
   formals: fst  snd  i1→{ fst; __retres }  i2→{ fst; __retres }  bo
-  locals: __retres    returns: __retres
-  state: { i1; i2 }  { *i1; *i2; fst; __retres }
+  returns: __retres    state: { i1; i2 }  { *i1; *i2; fst; __retres }
 [alias] analysing function: main
 [alias] analysing instruction: int u = 11;
 [alias] May-aliases after instruction  int u = 11;  are  <none>
@@ -201,11 +200,7 @@
   47:{ t } → 35:{ u; v }   48:{ s1 } → 52:{ s }   51:{ s2 } → 52:{ s }
   52:{ s } -fst→ 34:{ a; b; c }   52:{ s } -snd→ 47:{ t }
 [alias] Summary of function main:
-  formals: 
-  locals: u  v  t→{ u; v }  a→{ u; v }  b→{ u; v }  c→{ u; v }
-           x→{ a; b; c }  y→{ a; b; c }  z→{ a; b; c }  s  s1→{ s }
-           s2→{ s }  __retres
-  returns: __retres
+  formals:     returns: __retres
   state: { x; y; z }
          { *x; *y; *z; s1->fst; s1->snd; s2->fst; s2->snd; t; a; b; c; 
            s.fst; s.snd }
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/gzip124.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/gzip124.res.oracle
index c9b292917e69718c011c987f22259551d6c661ac..2b5f051f79fac140c48681375ab0b95ae221d013 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/gzip124.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/gzip124.res.oracle
@@ -25,6 +25,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ p } → 1:{  }   2:{ prev } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: __retres  prev  p  tmp_0    returns: __retres
-  state: { prev; p }
+  formals:     returns: __retres    state: { prev; p }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/origin.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/origin.res.oracle
index be7875287efb9f0ae1bbc3147ca6ec5278e4b34f..32f600115b8584bdd15261cae93e8887982b4f0f 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/origin.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/origin.res.oracle
@@ -24,6 +24,5 @@
 [alias] May-alias graph at the end of function f:
   0:{ tmp } → 1:{ f }   4:{ v } -t→ 5:{  }   5:{  } → 0:{ tmp }
 [alias] Summary of function f:
-  formals:     locals: g  tmp→{ f }    returns: <none>
-  state: { v.t[0..]; tmp }
+  formals:     returns: <none>    state: { v.t[0..]; tmp }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/origin_simpl.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/origin_simpl.res.oracle
index a2bd76c05c80833b047d65bf7ccc14832534c631..c2c8ab976e07eaa3512215cc56e5a9eeba759cae 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/origin_simpl.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/origin_simpl.res.oracle
@@ -13,5 +13,5 @@
 [alias] May-alias graph at the end of function f:
   0:{ tmp } → 1:{  }   2:{ t } → 0:{ tmp }
 [alias] Summary of function f:
-  formals:     locals: tmp    returns: <none>    state: { t[0..]; tmp }
+  formals:     returns: <none>    state: { t[0..]; tmp }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/records.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/records.res.oracle
index 5050d1dd8387a04c8393b9c5657d8b580c8780dd..af00a8c8d9577a3453f8fa8e8d6e22ba8b0a37bb 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/records.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/records.res.oracle
@@ -47,6 +47,6 @@
   9:{ z; q } → 10:{ t }   10:{ t } -field→ 13:{ a; b; n }
   13:{ a; b; n } → 14:{ x }
 [alias] Summary of function main:
-  formals:     locals: __retres    returns: __retres
+  formals:     returns: __retres
   state: { z; q }  { z->field; q->field; a; b; n; t.field }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/reduce_by_valid.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/reduce_by_valid.res.oracle
index 4578be9b90595f900b17939cc99db92fcb83c5ed..df25a14949b787d251929bde47d8b0b3e01912f3 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/reduce_by_valid.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/reduce_by_valid.res.oracle
@@ -30,6 +30,5 @@
 [alias] May-alias graph at the end of function f:
   4:{ p } → 5:{ f; q }   5:{ f; q } → 5:{ f; q }
 [alias] Summary of function f:
-  formals:     locals: q→{ f; q }  p→{ f; q }    returns: <none>
-  state: { *p; f; q; p }
+  formals:     returns: <none>    state: { *p; f; q; p }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/semver.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/semver.res.oracle
index 6e3f2b39e12d1f8c65cea91c82debacb92653fac..7bf7a22a6e989a9581fa2b070758dab947eacdb9 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/semver.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/semver.res.oracle
@@ -19,5 +19,5 @@
 [alias] May-alias graph at the end of function main:
   <empty>
 [alias] Summary of function main:
-  formals:     locals: __retres    returns: __retres    state: <none>
+  formals:     returns: __retres    state: <none>
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/tkn-2.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/tkn-2.res.oracle
index 35600d0739a0721e456e21efd979fc4a9b5f597f..de858332e91e2b3c1c536ed852507fc8d0320fc6 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/tkn-2.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/tkn-2.res.oracle
@@ -15,5 +15,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ a } → 1:{  }   2:{  } → 0:{ a }
 [alias] Summary of function main:
-  formals:     locals: a  __retres    returns: __retres    state: <none>
+  formals:     returns: __retres    state: <none>
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/union_readback.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/union_readback.res.oracle
index 65fd01657cfc7543f63f1485564c7e6d61b5ea38..d22df63bf32b5fbf441192ad58bde54b468fab61 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/union_readback.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/union_readback.res.oracle
@@ -11,6 +11,5 @@
   0:{ flag } -r→ 1:{  }   1:{  } -v→ 2:{ o }   2:{ o } → 4:{  }
   4:{  } → 5:{  }
 [alias] Summary of function f:
-  formals: o    locals: flag    returns: <none>
-  state: { o; flag.r.v }  { *o; *(flag.r.v) }
+  formals: o    returns: <none>    state: { o; flag.r.v }  { *o; *(flag.r.v) }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/fixed_bugs/oracle/union_vmap.res.oracle b/src/plugins/alias/tests/fixed_bugs/oracle/union_vmap.res.oracle
index 3c37afd71491354a207c3f83f0d2c4cd509cf2aa..ad021ebd893df1e93035660331c2ecabcfbdd3d9 100644
--- a/src/plugins/alias/tests/fixed_bugs/oracle/union_vmap.res.oracle
+++ b/src/plugins/alias/tests/fixed_bugs/oracle/union_vmap.res.oracle
@@ -6,7 +6,7 @@
 [alias] May-alias graph at the end of function CPS_SplitWord:
   <empty>
 [alias] Summary of function CPS_SplitWord:
-  formals: line    locals:     returns: line    state: <none>
+  formals: line    returns: line    state: <none>
 [alias:unsafe-cast] union_vmap.c:11: Warning: 
   unsafe cast from char const * to char *; analysis may be unsound
 [alias] May-aliases after instruction  char *s2 = CPS_SplitWord((char *)"a");  are
@@ -32,12 +32,11 @@
 [alias] May-alias graph at the end of function CPS_ParseKey:
   4:{ s2; s3 } → 3:{  }   10:{ key } → 4:{ s2; s3 }
 [alias] Summary of function CPS_ParseKey:
-  formals:     locals: key→{ s2; s3 }  s2  s3    returns: <none>
-  state: { *key; s2; s3 }
+  formals:     returns: <none>    state: { *key; s2; s3 }
 [alias] analysing function: CPS_SplitWord
 [alias] May-aliases at the end of function CPS_SplitWord: <none>
 [alias] May-alias graph at the end of function CPS_SplitWord:
   <empty>
 [alias] Summary of function CPS_SplitWord:
-  formals: line    locals:     returns: line    state: <none>
+  formals: line    returns: line    state: <none>
 [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 ed3c157e85e957ff8ccf8b5fef56a7a10b1efac7..feef21de948540d1a6480d1ac2757742ee430c41 100644
--- a/src/plugins/alias/tests/offsets/oracle/array1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/array1.res.oracle
@@ -29,6 +29,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ x } → 6:{  }   2:{ tab } → 6:{  }   5:{ y } → 6:{  }
 [alias] Summary of function main:
-  formals:     locals: tab  x  y  __retres    returns: __retres
-  state: { tab; x; y }
+  formals:     returns: __retres    state: { tab; x; y }
 [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 cf84f25b94e8346cef08431aca4e2b65ec6b38f5..175b930c1c3150571ccb15d3c06a0f88d8c7456b 100644
--- a/src/plugins/alias/tests/offsets/oracle/array2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/array2.res.oracle
@@ -25,6 +25,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ x } → 1:{  }   1:{  } → 2:{  }   3:{ mat } → 1:{  }
 [alias] Summary of function main:
-  formals:     locals: mat  x  y  __retres    returns: __retres
-  state: { mat; x }  { *x; mat[0..] }
+  formals:     returns: __retres    state: { mat; x }  { *x; mat[0..] }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/array3.res.oracle b/src/plugins/alias/tests/offsets/oracle/array3.res.oracle
index 471e5d1851c186029cbbf42af1ba95ce6e63a2c6..6a9db912e09ad8e8ccbb8adc25f7b7adbd51f77b 100644
--- a/src/plugins/alias/tests/offsets/oracle/array3.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/array3.res.oracle
@@ -27,6 +27,5 @@
 [alias] May-alias graph at the end of function main:
   2:{ x; y } → 3:{  }   4:{ mat } → 2:{ x; y }
 [alias] Summary of function main:
-  formals:     locals: mat→{ x; y }  x  y  __retres    returns: __retres
-  state: { mat[0..]; x; y }
+  formals:     returns: __retres    state: { mat[0..]; x; y }
 [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 e4249a441adbca262ad33717131d29672f517128..eb369e1766727fac32f06d465c96237522042a18 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse1.res.oracle
@@ -28,6 +28,5 @@
 [alias] May-alias graph at the end of function main:
   <empty>
 [alias] Summary of function main:
-  formals:     locals: tab  x  i  __retres    returns: __retres
-  state: <none>
+  formals:     returns: __retres    state: <none>
 [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 07d8fde2b7c278965a45dd7769a59a4d2ca6bbd1..4cfb490989c591e340e2339761fb7814e3fc6887 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse2.res.oracle
@@ -25,5 +25,5 @@
 [alias] May-alias graph at the end of function main:
   <empty>
 [alias] Summary of function main:
-  formals:     locals: mat  i  __retres    returns: __retres    state: <none>
+  formals:     returns: __retres    state: <none>
 [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 225de1d34179bcc8c8ba62d337eda2675cf72d43..eefdb1052d6d022860ce659f51a5f69d94dea793 100644
--- a/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/collapse3.res.oracle
@@ -25,5 +25,5 @@
 [alias] May-alias graph at the end of function main:
   <empty>
 [alias] Summary of function main:
-  formals:     locals: mat  i  __retres    returns: __retres    state: <none>
+  formals:     returns: __retres    state: <none>
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/jfla_running_ex.res.oracle b/src/plugins/alias/tests/offsets/oracle/jfla_running_ex.res.oracle
index 5e6496f281b96cace2f6d812b6669d9c88ed5e47..f7a7e1c869d4df4f2acff0b693a447f12f8c295a 100644
--- a/src/plugins/alias/tests/offsets/oracle/jfla_running_ex.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/jfla_running_ex.res.oracle
@@ -30,8 +30,7 @@
   7:{ i2 } → 0:{ fst; __retres }
 [alias] Summary of function jfla:
   formals: fst  snd  i1→{ fst; __retres }  i2→{ fst; __retres }  bo
-  locals: __retres    returns: __retres
-  state: { i1; i2 }  { *i1; *i2; fst; __retres }
+  returns: __retres    state: { i1; i2 }  { *i1; *i2; fst; __retres }
 [alias] analysing function: main
 [alias] analysing instruction: int u = 11;
 [alias] May-aliases after instruction  int u = 11;  are  <none>
@@ -127,11 +126,7 @@
   47:{ t } → 35:{ u; v }   48:{ s1 } → 52:{ s }   51:{ s2 } → 52:{ s }
   52:{ s } -fst→ 34:{ a; b; c }   52:{ s } -snd→ 47:{ t }
 [alias] Summary of function main:
-  formals: 
-  locals: u  v  t→{ u; v }  a→{ u; v }  b→{ u; v }  c→{ u; v }
-           x→{ a; b; c }  y→{ a; b; c }  z→{ a; b; c }  s  s1→{ s }
-           s2→{ s }
-  returns: <none>
+  formals:     returns: <none>
   state: { x; y; z }
          { *x; *y; *z; s1->fst; s1->snd; s2->fst; s2->snd; t; a; b; c; 
            s.fst; s.snd }
diff --git a/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle b/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
index 8de6368366f950eb896184536bdc513deee950f9..f9bd813190c345c46dd5df0a24f27e1ae9707ec1 100644
--- a/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/nested1.res.oracle
@@ -134,8 +134,7 @@
   18:{  } → 2:{ x1; x2 }   20:{ b } → 16:{  }   21:{ z1 } → 8:{  }
   22:{ a } → 14:{  }
 [alias] Summary of function main:
-  formals:     locals: x1  x2  tab_y  z1  z2  t  a  b  __retres
-  returns: __retres
+  formals:     returns: __retres
   state: { (t->t)->s; z1->s; z2->s; tab_y[0..] }  { t->t; z1 }
          { (t->t)->c; z1->c; t->d; a }  { z2->c; b }
 [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 70e6a01b0b6101393531c5154539fa9f84d14429..85015cf9c50e50606ab4352c4a8c0b61ea586f17 100644
--- a/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/nested2.res.oracle
@@ -84,7 +84,7 @@
   3:{  } -t→ 13:{ z1 }   3:{  } -d→ 14:{ a }   6:{  } → 7:{  }
   7:{  } → 8:{ x1; x2 }   13:{ z1 } → 1:{  }   14:{ a } → 5:{  }
 [alias] Summary of function main:
-  formals:     locals: x1  x2  z1  t  a  __retres    returns: __retres
+  formals:     returns: __retres
   state: { t->t; z1 }  { (t->t)->c; z1->c; t->d; a }  { (t->t)->s; z1->s }
          { (t->t)->s[0..]; z1->s[0..] }
 [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 ec9e2cf954ad39bf8f260d9742d651784504a9ac..e637a626f9b16410fe49a58e18203b19e122598e 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure1.res.oracle
@@ -34,6 +34,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ p_x; p_y } → 1:{ x; y }
 [alias] Summary of function main:
-  formals:     locals: x  y  p_x→{ x; y }  p_y→{ x; y }  __retres
-  returns: __retres    state: { p_x; p_y }
+  formals:     returns: __retres    state: { p_x; p_y }
 [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 494d53e438c9ef59f8f78eb0246b1b0db2364f53..b278d558f710585ab6b6063d25fe40f7be6335b2 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure2.res.oracle
@@ -31,6 +31,5 @@
 [alias] May-alias graph at the end of function main:
   0:{ y } -s→ 1:{  }   1:{  } → 2:{ x1; x2 }
 [alias] Summary of function main:
-  formals:     locals: x1  x2  y  __retres    returns: __retres
-  state: <none>
+  formals:     returns: __retres    state: <none>
 [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 c948e22897254774906fd24da36eeb3bfae23b77..2b7b2eb6949cf5f3dfd5dedffd72c02d3da00860 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure3.res.oracle
@@ -43,6 +43,5 @@
   0:{ y1; y2 } -s→ 1:{  }   1:{  } → 2:{ x1; x2 }   8:{ z } -t→ 9:{  }
   9:{  } → 0:{ y1; y2 }
 [alias] Summary of function main:
-  formals:     locals: x1  x2  y1  y2  z  __retres    returns: __retres
-  state: { (z.t)->s; y1.s; y2.s }
+  formals:     returns: __retres    state: { (z.t)->s; y1.s; y2.s }
 [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 494f0550054e5102ded232507dcbeb837279ce81..6a11ec706edc4f080c198122381ea9542094cf2e 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure4.res.oracle
@@ -41,6 +41,5 @@
 [alias] May-alias graph at the end of function main:
   2:{ z } → 3:{  }   3:{  } -s→ 6:{ y1 }   6:{ y1 } → 1:{ x1 }
 [alias] Summary of function main:
-  formals:     locals: x1  x2  y1→{ x1 }  z  __retres    returns: __retres
-  state: { z->s; y1 }
+  formals:     returns: __retres    state: { z->s; y1 }
 [alias] Analysis complete
diff --git a/src/plugins/alias/tests/offsets/oracle/structure5.res.oracle b/src/plugins/alias/tests/offsets/oracle/structure5.res.oracle
index 93f0980905f5396583070a4a86dd29b4cd9967ac..efd088f070c7ee0d048c76e31d7ffa1e665d8c84 100644
--- a/src/plugins/alias/tests/offsets/oracle/structure5.res.oracle
+++ b/src/plugins/alias/tests/offsets/oracle/structure5.res.oracle
@@ -81,7 +81,6 @@
   5:{  } -t→ 12:{ z }   5:{  } -d→ 13:{ a }   10:{ y1 } → 1:{ x1 }
   12:{ z } → 3:{  }   13:{ a } → 7:{  }
 [alias] Summary of function main:
-  formals:     locals: x1  x2  y1→{ x1 }  z  t  a  __retres
-  returns: __retres
+  formals:     returns: __retres
   state: { (t->t)->s; z->s; y1 }  { t->t; z }  { (t->t)->c; z->c; t->d; a }
 [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 d0c1c5e7a0b09d37fc3565a45ad8f280e9337a97..3adc34389ba645190b0b6bedee1fe44d73c660a3 100644
--- a/src/plugins/alias/tests/real_world/oracle/example1.res.oracle
+++ b/src/plugins/alias/tests/real_world/oracle/example1.res.oracle
@@ -100,8 +100,7 @@
 [alias] May-alias graph at the end of function f1:
   <empty>
 [alias] Summary of function f1:
-  formals: x    locals: tmp  idata  odata  idx  tmp_1  __retres
-  returns: __retres    state: <none>
+  formals: x    returns: __retres    state: <none>
 [alias] analysing function: f2
 [alias] analysing instruction: ty *tmp = x;
 [alias] May-aliases after instruction  ty *tmp = x;  are  { x; tmp }
@@ -186,8 +185,7 @@
 [alias] May-alias graph at the end of function f2:
   <empty>
 [alias] Summary of function f2:
-  formals: x    locals: tmp  idx  idata  odata  __retres
-  returns: __retres    state: <none>
+  formals: x    returns: __retres    state: <none>
 [alias] analysing function: main
 [alias] analysing instruction: a = (ty *)malloc(sizeof(ty));
 [alias] May-aliases after instruction  a = (ty *)malloc(sizeof(ty));  are  <none>
@@ -317,8 +315,7 @@
   30:{ b } → 31:{  }   31:{  } -n1→ 50:{  }   31:{  } -n2→ 51:{  }
   50:{  } → 39:{  }   51:{  } → 41:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  i  __retres    returns: __retres
-  state: { a->n1; b->n1 }  { a->n2; b->n2 }
+  formals:     returns: __retres    state: { a->n1; b->n1 }  { a->n2; b->n2 }
 [alias] analysing function: swap
 [alias] May-aliases at the end of function swap: <none>
 [alias] May-alias graph at the end of function swap:
diff --git a/src/plugins/alias/tests/real_world/oracle/example2.res.oracle b/src/plugins/alias/tests/real_world/oracle/example2.res.oracle
index 768b61717d00c4da2ed1d9a5387e6f14784d5cab..0ef06bd90acc8ce5bb80ae121d8bc442f832ab25 100644
--- a/src/plugins/alias/tests/real_world/oracle/example2.res.oracle
+++ b/src/plugins/alias/tests/real_world/oracle/example2.res.oracle
@@ -122,8 +122,7 @@
   4:{ idata } → 5:{  }   6:{  } → 4:{ idata }   8:{ odata } → 9:{  }
   10:{  } → 8:{ odata }
 [alias] Summary of function f1:
-  formals: x    locals: tmp  idata  odata  idx  i  tmp_1  __retres
-  returns: __retres
+  formals: x    returns: __retres
   state: { x; tmp }  { x->t2; tmp->t2 }  { x->t2[0..]; tmp->t2[0..]; idata }
          { x->t1; tmp->t1 }  { x->t1[0..]; tmp->t1[0..]; odata }
 [alias] analysing function: f2
@@ -232,8 +231,7 @@
   18:{ idata } → 19:{  }   20:{  } → 18:{ idata }
   22:{ odata } → 23:{  }   24:{  } → 22:{ odata }
 [alias] Summary of function f2:
-  formals: x    locals: tmp  idx  idata  odata  i  __retres
-  returns: __retres
+  formals: x    returns: __retres
   state: { x; tmp }  { x->t1; tmp->t1 }  { x->t1[0..]; tmp->t1[0..]; idata }
          { x->t2; tmp->t2 }  { x->t2[0..]; tmp->t2[0..]; odata }
 [alias] analysing function: main
@@ -379,8 +377,7 @@
   62:{  } → 60:{  }   70:{  } → 71:{  }   72:{  } → 70:{  }
   74:{  } → 75:{  }   76:{  } → 74:{  }
 [alias] Summary of function main:
-  formals:     locals: a  b  i  __retres    returns: __retres
-  state: { a->n1; b->n1 }  { a->n2; b->n2 }
+  formals:     returns: __retres    state: { a->n1; b->n1 }  { a->n2; b->n2 }
 [alias] analysing function: swap
 [alias] May-aliases at the end of function swap: <none>
 [alias] May-alias graph at the end of function swap:
diff --git a/src/plugins/alias/tests/real_world/oracle/function1_v2.res.oracle b/src/plugins/alias/tests/real_world/oracle/function1_v2.res.oracle
index 4c9f5449cd5123a644d2ec8833d8546141eab840..23d94fe8cb7ae6d16a7ca4ab9535253349a572cf 100644
--- a/src/plugins/alias/tests/real_world/oracle/function1_v2.res.oracle
+++ b/src/plugins/alias/tests/real_world/oracle/function1_v2.res.oracle
@@ -8,7 +8,7 @@
 [alias] May-alias graph at the end of function alias:
   0:{ x } → 1:{  }   1:{  } → 2:{  }   3:{ y } → 1:{  }
 [alias] Summary of function alias:
-  formals: x  y    locals:     returns: <none>    state: { x; y }  { *x; *y }
+  formals: x  y    returns: <none>    state: { x; y }  { *x; *y }
 [alias] analysing function: main
 [alias] analysing instruction: int *a = malloc(sizeof(int));
 [alias] May-aliases after instruction  int *a = malloc(sizeof(int));  are  <none>
@@ -41,5 +41,5 @@
 [alias] May-alias graph at the end of function main:
   6:{ a; b } → 7:{  }   14:{  } → 6:{ a; b }   15:{  } → 6:{ a; b }
 [alias] Summary of function main:
-  formals:     locals: a  b  __retres    returns: __retres    state: { a; b }
+  formals:     returns: __retres    state: { a; b }
 [alias] Analysis complete