diff --git a/infer/src/backend/preanal.ml b/infer/src/backend/preanal.ml
index a8eb70634..463e48e97 100644
--- a/infer/src/backend/preanal.ml
+++ b/infer/src/backend/preanal.ml
@@ -323,10 +323,16 @@ let analyze_and_annotate_proc cfg tenv pname pdesc =
       if !dead_pvars_added < dead_pvars_limit
       then add_dead_pvars_after_conditionals_join cfg n dead_pvars_to_add);
 
-  IList.iter (fun n -> (* generate nullify instructions *)
-      let dead_pvs_after = Cfg.Node.get_dead_pvars n true in
-      let dead_pvs_before = Cfg.Node.get_dead_pvars n false in
-      node_add_nullify_instrs n dead_pvs_after dead_pvs_before)
+  IList.iter
+    (fun n -> (* generate nullify instructions *)
+       match Cfg.Node.get_kind n with
+       | Cfg.Node.Start_node _ ->
+           (* avoid nullifying declared locals/params *)
+           ()
+       | _ ->
+           let dead_pvs_after = Cfg.Node.get_dead_pvars n true in
+           let dead_pvs_before = Cfg.Node.get_dead_pvars n false in
+           node_add_nullify_instrs n dead_pvs_after dead_pvs_before)
     (Cfg.Procdesc.get_nodes pdesc);
   Table.reset ()
 
diff --git a/infer/tests/codetoanalyze/c/frontend/arithmetic/compound_assignment.c.dot b/infer/tests/codetoanalyze/c/frontend/arithmetic/compound_assignment.c.dot
index 31dcfb8c5..34c454fc8 100644
--- a/infer/tests/codetoanalyze/c/frontend/arithmetic/compound_assignment.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/arithmetic/compound_assignment.c.dot
@@ -54,7 +54,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int  x:double  \n   DECLARE_LOCALS(&return,&b,&x); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int  x:double  \n   DECLARE_LOCALS(&return,&b,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 15 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/arithmetic/int_const.c.dot b/infer/tests/codetoanalyze/c/frontend/arithmetic/int_const.c.dot
index 1d641a7cb..c748caf46 100644
--- a/infer/tests/codetoanalyze/c/frontend/arithmetic/int_const.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/arithmetic/int_const.c.dot
@@ -18,7 +18,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  overflow_int:int  large_int:int  d:long double  c:float * b:int * a:int  \n   DECLARE_LOCALS(&return,&overflow_int,&large_int,&d,&c,&b,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&c,false); [line 10]\n  NULLIFY(&d,false); [line 10]\n  NULLIFY(&large_int,false); [line 10]\n  NULLIFY(&overflow_int,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  overflow_int:int  large_int:int  d:long double  c:float * b:int * a:int  \n   DECLARE_LOCALS(&return,&overflow_int,&large_int,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 6 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/arithmetic/plus_expr.c.dot b/infer/tests/codetoanalyze/c/frontend/arithmetic/plus_expr.c.dot
index 74dec03c9..419ea1961 100644
--- a/infer/tests/codetoanalyze/c/frontend/arithmetic/plus_expr.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/arithmetic/plus_expr.c.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  z:int  x:int  \n   DECLARE_LOCALS(&return,&z,&x); [line 10]\n  NULLIFY(&x,false); [line 10]\n  NULLIFY(&z,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  z:int  x:int  \n   DECLARE_LOCALS(&return,&z,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/arithmetic/unary.c.dot b/infer/tests/codetoanalyze/c/frontend/arithmetic/unary.c.dot
index 610197f7d..e064751ff 100644
--- a/infer/tests/codetoanalyze/c/frontend/arithmetic/unary.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/arithmetic/unary.c.dot
@@ -54,7 +54,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int * a:int  y:int  x:int  \n   DECLARE_LOCALS(&return,&b,&a,&y,&x); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n  NULLIFY(&y,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int * a:int  y:int  x:int  \n   DECLARE_LOCALS(&return,&b,&a,&y,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 15 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/booleans/condition_as_param.c.dot b/infer/tests/codetoanalyze/c/frontend/booleans/condition_as_param.c.dot
index 6685bb64a..4cb35e1a7 100644
--- a/infer/tests/codetoanalyze/c/frontend/booleans/condition_as_param.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/booleans/condition_as_param.c.dot
@@ -10,14 +10,14 @@ digraph iCFG {
 4 [label="4: Exit main \n  " color=yellow style=filled]
 	
 
-3 [label="3: Start main\nFormals: \nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 12]\n  NULLIFY(&x,false); [line 12]\n " color=yellow style=filled]
+3 [label="3: Start main\nFormals: \nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 12]\n " color=yellow style=filled]
 	
 
 	 3 -> 6 ;
 2 [label="2: Exit check \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start check\nFormals:  x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&x,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start check\nFormals:  x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/c_prototype/prototype.c.dot b/infer/tests/codetoanalyze/c/frontend/c_prototype/prototype.c.dot
index 7fafe25a7..9068d3899 100644
--- a/infer/tests/codetoanalyze/c/frontend/c_prototype/prototype.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/c_prototype/prototype.c.dot
@@ -21,7 +21,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  total:int  \n   DECLARE_LOCALS(&return,&total); [line 17]\n  NULLIFY(&total,false); [line 17]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  total:int  \n   DECLARE_LOCALS(&return,&total); [line 17]\n " color=yellow style=filled]
 	
 
 	 1 -> 7 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/comma/comma.c.dot b/infer/tests/codetoanalyze/c/frontend/comma/comma.c.dot
index a46467d61..e6d8789e8 100644
--- a/infer/tests/codetoanalyze/c/frontend/comma/comma.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/comma/comma.c.dot
@@ -22,7 +22,7 @@ digraph iCFG {
 14 [label="14: Exit comma_3 \n  " color=yellow style=filled]
 	
 
-13 [label="13: Start comma_3\nFormals: \nLocals:  d:int  c:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&d,&c,&b,&a); [line 22]\n  NULLIFY(&a,false); [line 22]\n  NULLIFY(&b,false); [line 22]\n  NULLIFY(&c,false); [line 22]\n  NULLIFY(&d,false); [line 22]\n " color=yellow style=filled]
+13 [label="13: Start comma_3\nFormals: \nLocals:  d:int  c:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&d,&c,&b,&a); [line 22]\n " color=yellow style=filled]
 	
 
 	 13 -> 19 ;
@@ -45,7 +45,7 @@ digraph iCFG {
 8 [label="8: Exit comma_2 \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start comma_2\nFormals: \nLocals:  d:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&d,&b,&a); [line 16]\n  NULLIFY(&a,false); [line 16]\n  NULLIFY(&b,false); [line 16]\n  NULLIFY(&d,false); [line 16]\n " color=yellow style=filled]
+7 [label="7: Start comma_2\nFormals: \nLocals:  d:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&d,&b,&a); [line 16]\n " color=yellow style=filled]
 	
 
 	 7 -> 12 ;
@@ -68,7 +68,7 @@ digraph iCFG {
 2 [label="2: Exit comma_1 \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start comma_1\nFormals: \nLocals:  d:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&d,&b,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&d,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start comma_1\nFormals: \nLocals:  d:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&d,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 6 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/binary_operator.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/binary_operator.c.dot
index 63a486f67..b40e905ac 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/binary_operator.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/binary_operator.c.dot
@@ -193,7 +193,7 @@ digraph iCFG {
 2 [label="2: Exit binop_with_side_effects \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start binop_with_side_effects\nFormals:  z:int \nLocals:  y3:int  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$4:int  y2:int  SIL_temp_conditional___n$8:int  y1:int  SIL_temp_conditional___n$12:int  SIL_temp_conditional___n$16:int  SIL_temp_conditional___n$20:int  x3:int  SIL_temp_conditional___n$24:int  x2:int  SIL_temp_conditional___n$28:int  x1:int  \n   DECLARE_LOCALS(&return,&y3,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$4,&y2,&SIL_temp_conditional___n$8,&y1,&SIL_temp_conditional___n$12,&SIL_temp_conditional___n$16,&SIL_temp_conditional___n$20,&x3,&SIL_temp_conditional___n$24,&x2,&SIL_temp_conditional___n$28,&x1); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$12,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$16,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$20,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$24,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$28,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$4,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$8,false); [line 10]\n  NULLIFY(&x1,false); [line 10]\n  NULLIFY(&x2,false); [line 10]\n  NULLIFY(&x3,false); [line 10]\n  NULLIFY(&y1,false); [line 10]\n  NULLIFY(&y2,false); [line 10]\n  NULLIFY(&y3,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start binop_with_side_effects\nFormals:  z:int \nLocals:  y3:int  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$4:int  y2:int  SIL_temp_conditional___n$8:int  y1:int  SIL_temp_conditional___n$12:int  SIL_temp_conditional___n$16:int  SIL_temp_conditional___n$20:int  x3:int  SIL_temp_conditional___n$24:int  x2:int  SIL_temp_conditional___n$28:int  x1:int  \n   DECLARE_LOCALS(&return,&y3,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$4,&y2,&SIL_temp_conditional___n$8,&y1,&SIL_temp_conditional___n$12,&SIL_temp_conditional___n$16,&SIL_temp_conditional___n$20,&x3,&SIL_temp_conditional___n$24,&x2,&SIL_temp_conditional___n$28,&x1); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 44 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/cond2.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/cond2.c.dot
index 759be9b34..6b1344a72 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/cond2.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/cond2.c.dot
@@ -81,7 +81,7 @@ digraph iCFG {
 39 [label="39: Exit bar \n  " color=yellow style=filled]
 	
 
-38 [label="38: Start bar\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$1:int  SIL_temp_conditional___n$5:int  y:int  x:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$1,&SIL_temp_conditional___n$5,&y,&x); [line 21]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 21]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 21]\n  NULLIFY(&SIL_temp_conditional___n$5,false); [line 21]\n  NULLIFY(&x,false); [line 21]\n  NULLIFY(&y,false); [line 21]\n " color=yellow style=filled]
+38 [label="38: Start bar\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$1:int  SIL_temp_conditional___n$5:int  y:int  x:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$1,&SIL_temp_conditional___n$5,&y,&x); [line 21]\n " color=yellow style=filled]
 	
 
 	 38 -> 53 ;
@@ -235,7 +235,7 @@ digraph iCFG {
 2 [label="2: Exit foo \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start foo\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$3:int  n:int  SIL_temp_conditional___n$6:int  y:int  x:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$3,&n,&SIL_temp_conditional___n$6,&y,&x); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$6,false); [line 10]\n  NULLIFY(&n,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n  NULLIFY(&y,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start foo\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$3:int  n:int  SIL_temp_conditional___n$6:int  y:int  x:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$3,&n,&SIL_temp_conditional___n$6,&y,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 37 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/conditional_operator.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/conditional_operator.c.dot
index 182b3803e..ce5af8c6d 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/conditional_operator.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/conditional_operator.c.dot
@@ -31,7 +31,7 @@ digraph iCFG {
 59 [label="59: Exit test7 \n  " color=yellow style=filled]
 	
 
-58 [label="58: Start test7\nFormals:  b:int \nLocals:  SIL_temp_conditional___n$2:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2); [line 35]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 35]\n  NULLIFY(&b,false); [line 35]\n " color=yellow style=filled]
+58 [label="58: Start test7\nFormals:  b:int \nLocals:  SIL_temp_conditional___n$2:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2); [line 35]\n " color=yellow style=filled]
 	
 
 	 58 -> 65 ;
@@ -66,7 +66,7 @@ digraph iCFG {
 50 [label="50: Exit test6 \n  " color=yellow style=filled]
 	
 
-49 [label="49: Start test6\nFormals:  p:int *\nLocals:  z:int  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&z,&SIL_temp_conditional___n$1); [line 30]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 30]\n  NULLIFY(&z,false); [line 30]\n " color=yellow style=filled]
+49 [label="49: Start test6\nFormals:  p:int *\nLocals:  z:int  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&z,&SIL_temp_conditional___n$1); [line 30]\n " color=yellow style=filled]
 	
 
 	 49 -> 53 ;
@@ -103,7 +103,7 @@ digraph iCFG {
 41 [label="41: Exit test5 \n  " color=yellow style=filled]
 	
 
-40 [label="40: Start test5\nFormals:  b:int \nLocals:  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$1); [line 28]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 28]\n " color=yellow style=filled]
+40 [label="40: Start test5\nFormals:  b:int \nLocals:  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$1); [line 28]\n " color=yellow style=filled]
 	
 
 	 40 -> 47 ;
@@ -139,7 +139,7 @@ digraph iCFG {
 32 [label="32: Exit test4 \n  " color=yellow style=filled]
 	
 
-31 [label="31: Start test4\nFormals:  b:int \nLocals:  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$1); [line 26]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 26]\n " color=yellow style=filled]
+31 [label="31: Start test4\nFormals:  b:int \nLocals:  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$1); [line 26]\n " color=yellow style=filled]
 	
 
 	 31 -> 38 ;
@@ -179,7 +179,7 @@ digraph iCFG {
 22 [label="22: Exit test3 \n  " color=yellow style=filled]
 	
 
-21 [label="21: Start test3\nFormals:  b:int \nLocals:  x:int  SIL_temp_conditional___n$2:int  \n   DECLARE_LOCALS(&return,&x,&SIL_temp_conditional___n$2); [line 21]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 21]\n  NULLIFY(&x,false); [line 21]\n " color=yellow style=filled]
+21 [label="21: Start test3\nFormals:  b:int \nLocals:  x:int  SIL_temp_conditional___n$2:int  \n   DECLARE_LOCALS(&return,&x,&SIL_temp_conditional___n$2); [line 21]\n " color=yellow style=filled]
 	
 
 	 21 -> 29 ;
@@ -214,7 +214,7 @@ digraph iCFG {
 13 [label="13: Exit test1 \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start test1\nFormals:  b:int \nLocals:  x:int  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&x,&SIL_temp_conditional___n$1); [line 16]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 16]\n  NULLIFY(&x,false); [line 16]\n " color=yellow style=filled]
+12 [label="12: Start test1\nFormals:  b:int \nLocals:  x:int  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&x,&SIL_temp_conditional___n$1); [line 16]\n " color=yellow style=filled]
 	
 
 	 12 -> 16 ;
@@ -246,7 +246,7 @@ digraph iCFG {
 5 [label="5: Exit test \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start test\nFormals:  b:int \nLocals:  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 14]\n " color=yellow style=filled]
+4 [label="4: Start test\nFormals:  b:int \nLocals:  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0); [line 14]\n " color=yellow style=filled]
 	
 
 	 4 -> 7 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/function_call.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/function_call.c.dot
index 5a8cb2cf4..083b89ba8 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/function_call.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/function_call.c.dot
@@ -68,7 +68,7 @@ digraph iCFG {
 51 [label="51: Exit fun_ifthenelse4 \n  " color=yellow style=filled]
 	
 
-50 [label="50: Start fun_ifthenelse4\nFormals: \nLocals:  SIL_temp_conditional___n$0:_fn_ (*) SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$4:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$4); [line 20]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 20]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 20]\n  NULLIFY(&SIL_temp_conditional___n$4,false); [line 20]\n " color=yellow style=filled]
+50 [label="50: Start fun_ifthenelse4\nFormals: \nLocals:  SIL_temp_conditional___n$0:_fn_ (*) SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$4:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$4); [line 20]\n " color=yellow style=filled]
 	
 
 	 50 -> 53 ;
@@ -142,7 +142,7 @@ digraph iCFG {
 33 [label="33: Exit fun_ifthenelse3 \n  " color=yellow style=filled]
 	
 
-32 [label="32: Start fun_ifthenelse3\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$4:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$4); [line 18]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 18]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 18]\n  NULLIFY(&SIL_temp_conditional___n$4,false); [line 18]\n " color=yellow style=filled]
+32 [label="32: Start fun_ifthenelse3\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$4:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$4); [line 18]\n " color=yellow style=filled]
 	
 
 	 32 -> 35 ;
@@ -237,7 +237,7 @@ digraph iCFG {
 10 [label="10: Exit fun_ifthenelse2 \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start fun_ifthenelse2\nFormals: \nLocals:  SIL_temp_conditional___n$0:_fn_ (*) SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$4:int  SIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$4,&SIL_temp_conditional___n$6); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$4,false); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$6,false); [line 14]\n " color=yellow style=filled]
+9 [label="9: Start fun_ifthenelse2\nFormals: \nLocals:  SIL_temp_conditional___n$0:_fn_ (*) SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$4:int  SIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$4,&SIL_temp_conditional___n$6); [line 14]\n " color=yellow style=filled]
 	
 
 	 9 -> 12 ;
@@ -269,7 +269,7 @@ digraph iCFG {
 2 [label="2: Exit fun_ifthenelse1 \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start fun_ifthenelse1\nFormals: \nLocals:  SIL_temp_conditional___n$0:_fn_ (*) \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0); [line 12]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start fun_ifthenelse1\nFormals: \nLocals:  SIL_temp_conditional___n$0:_fn_ (*) \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/if_short_circuit.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/if_short_circuit.c.dot
index 6d84dd479..b6561fe89 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/if_short_circuit.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/if_short_circuit.c.dot
@@ -137,7 +137,7 @@ digraph iCFG {
 63 [label="63: Exit main \n  " color=yellow style=filled]
 	
 
-62 [label="62: Start main\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$3:int  SIL_temp_conditional___n$7:int  block_size:char * spec:char * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$3,&SIL_temp_conditional___n$7,&block_size,&spec); [line 42]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 42]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 42]\n  NULLIFY(&SIL_temp_conditional___n$7,false); [line 42]\n  NULLIFY(&block_size,false); [line 42]\n  NULLIFY(&spec,false); [line 42]\n " color=yellow style=filled]
+62 [label="62: Start main\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$3:int  SIL_temp_conditional___n$7:int  block_size:char * spec:char * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$3,&SIL_temp_conditional___n$7,&block_size,&spec); [line 42]\n " color=yellow style=filled]
 	
 
 	 62 -> 95 ;
@@ -254,7 +254,7 @@ digraph iCFG {
 35 [label="35: Exit test_loop \n  " color=yellow style=filled]
 	
 
-34 [label="34: Start test_loop\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$3:int  SIL_temp_conditional___n$7:int  block_size:char * spec:char * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$3,&SIL_temp_conditional___n$7,&block_size,&spec); [line 29]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 29]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 29]\n  NULLIFY(&SIL_temp_conditional___n$7,false); [line 29]\n  NULLIFY(&block_size,false); [line 29]\n  NULLIFY(&spec,false); [line 29]\n " color=yellow style=filled]
+34 [label="34: Start test_loop\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$3:int  SIL_temp_conditional___n$7:int  block_size:char * spec:char * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$3,&SIL_temp_conditional___n$7,&block_size,&spec); [line 29]\n " color=yellow style=filled]
 	
 
 	 34 -> 61 ;
@@ -340,7 +340,7 @@ digraph iCFG {
 14 [label="14: Exit shortcircuit_and \n  " color=yellow style=filled]
 	
 
-13 [label="13: Start shortcircuit_and\nFormals:  x:int *\nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$3:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$3); [line 21]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 21]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 21]\n " color=yellow style=filled]
+13 [label="13: Start shortcircuit_and\nFormals:  x:int *\nLocals:  SIL_temp_conditional___n$0:int  SIL_temp_conditional___n$3:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$3); [line 21]\n " color=yellow style=filled]
 	
 
 	 13 -> 18 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/int_negation.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/int_negation.c.dot
index 11bbb4e8a..d8fa9442e 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/int_negation.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/int_negation.c.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 28 [label="28: Exit neg \n  " color=yellow style=filled]
 	
 
-27 [label="27: Start neg\nFormals:  x:int \nLocals:  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0); [line 29]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 29]\n " color=yellow style=filled]
+27 [label="27: Start neg\nFormals:  x:int \nLocals:  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0); [line 29]\n " color=yellow style=filled]
 	
 
 	 27 -> 30 ;
@@ -83,7 +83,7 @@ digraph iCFG {
 14 [label="14: Exit baz \n  " color=yellow style=filled]
 	
 
-13 [label="13: Start baz\nFormals:  x:int \nLocals:  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0); [line 20]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 20]\n " color=yellow style=filled]
+13 [label="13: Start baz\nFormals:  x:int \nLocals:  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0); [line 20]\n " color=yellow style=filled]
 	
 
 	 13 -> 18 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/member_access.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/member_access.c.dot
index 7ffdc2a92..8cb7af21a 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/member_access.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/member_access.c.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 18 [label="18: Exit access_field_in_ife_branch \n  " color=yellow style=filled]
 	
 
-17 [label="17: Start access_field_in_ife_branch\nFormals: \nLocals:  z:int  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&z,&SIL_temp_conditional___n$0); [line 22]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 22]\n  NULLIFY(&z,false); [line 22]\n " color=yellow style=filled]
+17 [label="17: Start access_field_in_ife_branch\nFormals: \nLocals:  z:int  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&z,&SIL_temp_conditional___n$0); [line 22]\n " color=yellow style=filled]
 	
 
 	 17 -> 20 ;
@@ -58,7 +58,7 @@ digraph iCFG {
 10 [label="10: Exit call_ife_then_access_field \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start call_ife_then_access_field\nFormals: \nLocals:  z:int  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&z,&SIL_temp_conditional___n$0); [line 20]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 20]\n  NULLIFY(&z,false); [line 20]\n " color=yellow style=filled]
+9 [label="9: Start call_ife_then_access_field\nFormals: \nLocals:  z:int  SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&z,&SIL_temp_conditional___n$0); [line 20]\n " color=yellow style=filled]
 	
 
 	 9 -> 12 ;
@@ -90,7 +90,7 @@ digraph iCFG {
 2 [label="2: Exit ife_then_access_field \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start ife_then_access_field\nFormals:  p:struct s * q:struct s *\nLocals:  z:int  SIL_temp_conditional___n$0:struct s * \n   DECLARE_LOCALS(&return,&z,&SIL_temp_conditional___n$0); [line 16]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 16]\n  NULLIFY(&z,false); [line 16]\n " color=yellow style=filled]
+1 [label="1: Start ife_then_access_field\nFormals:  p:struct s * q:struct s *\nLocals:  z:int  SIL_temp_conditional___n$0:struct s * \n   DECLARE_LOCALS(&return,&z,&SIL_temp_conditional___n$0); [line 16]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/preincrement.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/preincrement.c.dot
index 4563adc10..4dd689a08 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/preincrement.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/preincrement.c.dot
@@ -102,7 +102,7 @@ digraph iCFG {
 2 [label="2: Exit preincrement \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start preincrement\nFormals:  p:struct s *\nLocals:  SIL_temp_conditional___n$0:struct s * SIL_temp_conditional___n$4:int  SIL_temp_conditional___n$8:int  SIL_temp_conditional___n$11:struct s * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$4,&SIL_temp_conditional___n$8,&SIL_temp_conditional___n$11); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$11,false); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$4,false); [line 14]\n  NULLIFY(&SIL_temp_conditional___n$8,false); [line 14]\n " color=yellow style=filled]
+1 [label="1: Start preincrement\nFormals:  p:struct s *\nLocals:  SIL_temp_conditional___n$0:struct s * SIL_temp_conditional___n$4:int  SIL_temp_conditional___n$8:int  SIL_temp_conditional___n$11:struct s * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&SIL_temp_conditional___n$4,&SIL_temp_conditional___n$8,&SIL_temp_conditional___n$11); [line 14]\n " color=yellow style=filled]
 	
 
 	 1 -> 26 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/conditional_operator/unary_operator.c.dot b/infer/tests/codetoanalyze/c/frontend/conditional_operator/unary_operator.c.dot
index 5e0203ec6..e76b03628 100644
--- a/infer/tests/codetoanalyze/c/frontend/conditional_operator/unary_operator.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/conditional_operator/unary_operator.c.dot
@@ -76,7 +76,7 @@ digraph iCFG {
 2 [label="2: Exit dereference_ifthenelse \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start dereference_ifthenelse\nFormals:  p:int *\nLocals:  SIL_temp_conditional___n$0:int * y:int  SIL_temp_conditional___n$5:int * SIL_temp_conditional___n$10:int * x:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&y,&SIL_temp_conditional___n$5,&SIL_temp_conditional___n$10,&x); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$10,false); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$5,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n  NULLIFY(&y,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start dereference_ifthenelse\nFormals:  p:int *\nLocals:  SIL_temp_conditional___n$0:int * y:int  SIL_temp_conditional___n$5:int * SIL_temp_conditional___n$10:int * x:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&y,&SIL_temp_conditional___n$5,&SIL_temp_conditional___n$10,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 16 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/enumeration/enum.c.dot b/infer/tests/codetoanalyze/c/frontend/enumeration/enum.c.dot
index 9c091fd85..f423b3ae7 100644
--- a/infer/tests/codetoanalyze/c/frontend/enumeration/enum.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/enumeration/enum.c.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  i:int  today:int  \n   DECLARE_LOCALS(&return,&i,&today); [line 20]\n  NULLIFY(&i,false); [line 20]\n  NULLIFY(&today,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  i:int  today:int  \n   DECLARE_LOCALS(&return,&i,&today); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 8 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/enumeration/enum_bitmask.c.dot b/infer/tests/codetoanalyze/c/frontend/enumeration/enum_bitmask.c.dot
index e300c49ab..b807db275 100644
--- a/infer/tests/codetoanalyze/c/frontend/enumeration/enum_bitmask.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/enumeration/enum_bitmask.c.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  option2:int  option1:int  \n   DECLARE_LOCALS(&return,&option2,&option1); [line 15]\n  NULLIFY(&option1,false); [line 15]\n  NULLIFY(&option2,false); [line 15]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  option2:int  option1:int  \n   DECLARE_LOCALS(&return,&option2,&option1); [line 15]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/enumeration/other_enum.c.dot b/infer/tests/codetoanalyze/c/frontend/enumeration/other_enum.c.dot
index d147ebeac..8acfcd99a 100644
--- a/infer/tests/codetoanalyze/c/frontend/enumeration/other_enum.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/enumeration/other_enum.c.dot
@@ -39,7 +39,7 @@ digraph iCFG {
 11 [label="11: Exit test \n  " color=yellow style=filled]
 	
 
-10 [label="10: Start test\nFormals: \nLocals:  foo_a:int  foo_g:int  \n   DECLARE_LOCALS(&return,&foo_a,&foo_g); [line 22]\n  NULLIFY(&foo_a,false); [line 22]\n  NULLIFY(&foo_g,false); [line 22]\n " color=yellow style=filled]
+10 [label="10: Start test\nFormals: \nLocals:  foo_a:int  foo_g:int  \n   DECLARE_LOCALS(&return,&foo_a,&foo_g); [line 22]\n " color=yellow style=filled]
 	
 
 	 10 -> 20 ;
@@ -74,7 +74,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  foo_g:int  foo_f:int  foo_e:int  foo_d:int  foo_c:int  foo_b:int  foo_a:int  \n   DECLARE_LOCALS(&return,&foo_g,&foo_f,&foo_e,&foo_d,&foo_c,&foo_b,&foo_a); [line 12]\n  NULLIFY(&foo_a,false); [line 12]\n  NULLIFY(&foo_b,false); [line 12]\n  NULLIFY(&foo_c,false); [line 12]\n  NULLIFY(&foo_d,false); [line 12]\n  NULLIFY(&foo_e,false); [line 12]\n  NULLIFY(&foo_f,false); [line 12]\n  NULLIFY(&foo_g,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  foo_g:int  foo_f:int  foo_e:int  foo_d:int  foo_c:int  foo_b:int  foo_a:int  \n   DECLARE_LOCALS(&return,&foo_g,&foo_f,&foo_e,&foo_d,&foo_c,&foo_b,&foo_a); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 9 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/gotostmt/goto_ex.c.dot b/infer/tests/codetoanalyze/c/frontend/gotostmt/goto_ex.c.dot
index ed276426c..7e8dde460 100644
--- a/infer/tests/codetoanalyze/c/frontend/gotostmt/goto_ex.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/gotostmt/goto_ex.c.dot
@@ -127,7 +127,7 @@ digraph iCFG {
 222 [label="222: Exit g8 \n  " color=yellow style=filled]
 	
 
-221 [label="221: Start g8\nFormals:  q:int \nLocals:  v:int  k:int  j:int  i:int  \n   DECLARE_LOCALS(&return,&v,&k,&j,&i); [line 169]\n  NULLIFY(&i,false); [line 169]\n  NULLIFY(&j,false); [line 169]\n  NULLIFY(&k,false); [line 169]\n  NULLIFY(&v,false); [line 169]\n " color=yellow style=filled]
+221 [label="221: Start g8\nFormals:  q:int \nLocals:  v:int  k:int  j:int  i:int  \n   DECLARE_LOCALS(&return,&v,&k,&j,&i); [line 169]\n " color=yellow style=filled]
 	
 
 	 221 -> 252 ;
@@ -246,7 +246,7 @@ digraph iCFG {
 193 [label="193: Exit g7 \n  " color=yellow style=filled]
 	
 
-192 [label="192: Start g7\nFormals: \nLocals:  v:int  k:int  j:int  i:int  \n   DECLARE_LOCALS(&return,&v,&k,&j,&i); [line 146]\n  NULLIFY(&i,false); [line 146]\n  NULLIFY(&j,false); [line 146]\n  NULLIFY(&k,false); [line 146]\n  NULLIFY(&v,false); [line 146]\n " color=yellow style=filled]
+192 [label="192: Start g7\nFormals: \nLocals:  v:int  k:int  j:int  i:int  \n   DECLARE_LOCALS(&return,&v,&k,&j,&i); [line 146]\n " color=yellow style=filled]
 	
 
 	 192 -> 220 ;
@@ -378,7 +378,7 @@ digraph iCFG {
 161 [label="161: Exit g6 \n  " color=yellow style=filled]
 	
 
-160 [label="160: Start g6\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$3:int  SIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$3,&SIL_temp_conditional___n$6); [line 124]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 124]\n  NULLIFY(&SIL_temp_conditional___n$6,false); [line 124]\n  NULLIFY(&a,false); [line 124]\n " color=yellow style=filled]
+160 [label="160: Start g6\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$3:int  SIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$3,&SIL_temp_conditional___n$6); [line 124]\n " color=yellow style=filled]
 	
 
 	 160 -> 172 ;
@@ -510,7 +510,7 @@ digraph iCFG {
 129 [label="129: Exit g5 \n  " color=yellow style=filled]
 	
 
-128 [label="128: Start g5\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$3:int  SIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$3,&SIL_temp_conditional___n$6); [line 102]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 102]\n  NULLIFY(&SIL_temp_conditional___n$6,false); [line 102]\n  NULLIFY(&a,false); [line 102]\n " color=yellow style=filled]
+128 [label="128: Start g5\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$3:int  SIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$3,&SIL_temp_conditional___n$6); [line 102]\n " color=yellow style=filled]
 	
 
 	 128 -> 140 ;
@@ -646,7 +646,7 @@ digraph iCFG {
 96 [label="96: Exit g4 \n  " color=yellow style=filled]
 	
 
-95 [label="95: Start g4\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$4:int  SIL_temp_conditional___n$7:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$4,&SIL_temp_conditional___n$7); [line 81]\n  NULLIFY(&SIL_temp_conditional___n$4,false); [line 81]\n  NULLIFY(&SIL_temp_conditional___n$7,false); [line 81]\n  NULLIFY(&a,false); [line 81]\n " color=yellow style=filled]
+95 [label="95: Start g4\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$4:int  SIL_temp_conditional___n$7:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$4,&SIL_temp_conditional___n$7); [line 81]\n " color=yellow style=filled]
 	
 
 	 95 -> 108 ;
@@ -786,7 +786,7 @@ digraph iCFG {
 62 [label="62: Exit g3 \n  " color=yellow style=filled]
 	
 
-61 [label="61: Start g3\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$4:int  SIL_temp_conditional___n$7:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$4,&SIL_temp_conditional___n$7); [line 59]\n  NULLIFY(&SIL_temp_conditional___n$4,false); [line 59]\n  NULLIFY(&SIL_temp_conditional___n$7,false); [line 59]\n  NULLIFY(&a,false); [line 59]\n " color=yellow style=filled]
+61 [label="61: Start g3\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$4:int  SIL_temp_conditional___n$7:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$4,&SIL_temp_conditional___n$7); [line 59]\n " color=yellow style=filled]
 	
 
 	 61 -> 75 ;
@@ -926,7 +926,7 @@ digraph iCFG {
 28 [label="28: Exit g2 \n  " color=yellow style=filled]
 	
 
-27 [label="27: Start g2\nFormals: \nLocals:  SIL_temp_conditional___n$1:int  SIL_temp_conditional___n$4:int  a:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$1,&SIL_temp_conditional___n$4,&a); [line 37]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 37]\n  NULLIFY(&SIL_temp_conditional___n$4,false); [line 37]\n  NULLIFY(&a,false); [line 37]\n " color=yellow style=filled]
+27 [label="27: Start g2\nFormals: \nLocals:  SIL_temp_conditional___n$1:int  SIL_temp_conditional___n$4:int  a:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$1,&SIL_temp_conditional___n$4,&a); [line 37]\n " color=yellow style=filled]
 	
 
 	 27 -> 60 ;
@@ -970,7 +970,7 @@ digraph iCFG {
 17 [label="17: Exit g1 \n  " color=yellow style=filled]
 	
 
-16 [label="16: Start g1\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 26]\n  NULLIFY(&a,false); [line 26]\n " color=yellow style=filled]
+16 [label="16: Start g1\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 26]\n " color=yellow style=filled]
 	
 
 	 16 -> 26 ;
@@ -1018,7 +1018,7 @@ digraph iCFG {
 5 [label="5: Exit g0 \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start g0\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 14]\n  NULLIFY(&a,false); [line 14]\n " color=yellow style=filled]
+4 [label="4: Start g0\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 14]\n " color=yellow style=filled]
 	
 
 	 4 -> 15 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/initialization/array_initlistexpr.c.dot b/infer/tests/codetoanalyze/c/frontend/initialization/array_initlistexpr.c.dot
index 9f5b11e1a..d5fa26949 100644
--- a/infer/tests/codetoanalyze/c/frontend/initialization/array_initlistexpr.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/initialization/array_initlistexpr.c.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  a:int [2][3] z:int  \n   DECLARE_LOCALS(&return,&a,&z); [line 10]\n  NULLIFY(&a,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  a:int [2][3] z:int  \n   DECLARE_LOCALS(&return,&a,&z); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/initialization/struct_initlistexpr.c.dot b/infer/tests/codetoanalyze/c/frontend/initialization/struct_initlistexpr.c.dot
index 97180c88b..851a6357f 100644
--- a/infer/tests/codetoanalyze/c/frontend/initialization/struct_initlistexpr.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/initialization/struct_initlistexpr.c.dot
@@ -51,7 +51,7 @@ digraph iCFG {
 5 [label="5: Exit main \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start main\nFormals: \nLocals:  p:struct Point  \n   DECLARE_LOCALS(&return,&p); [line 17]\n  NULLIFY(&p,false); [line 17]\n " color=yellow style=filled]
+4 [label="4: Start main\nFormals: \nLocals:  p:struct Point  \n   DECLARE_LOCALS(&return,&p); [line 17]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/do_while.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/do_while.c.dot
index 6a8991e86..b48bce533 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/do_while.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/do_while.c.dot
@@ -35,7 +35,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int  a:int  \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&b,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int  a:int  \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 10 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/do_while_condition_side_effects.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/do_while_condition_side_effects.c.dot
index ff988fe74..43ac0afc0 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/do_while_condition_side_effects.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/do_while_condition_side_effects.c.dot
@@ -35,7 +35,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int  a:int  \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&b,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int  a:int  \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 10 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/do_while_nested.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/do_while_nested.c.dot
index 36d8c22bc..aa0d830a9 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/do_while_nested.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/do_while_nested.c.dot
@@ -56,7 +56,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int  a:int  \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&b,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int  a:int  \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 15 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/for_condition_side_effects.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/for_condition_side_effects.c.dot
index 9110984d4..d1773ff83 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/for_condition_side_effects.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/for_condition_side_effects.c.dot
@@ -43,7 +43,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int  i:int  j:int  \n   DECLARE_LOCALS(&return,&b,&i,&j); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&i,false); [line 10]\n  NULLIFY(&j,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int  i:int  j:int  \n   DECLARE_LOCALS(&return,&b,&i,&j); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 12 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/for_nested.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/for_nested.c.dot
index fe29aedee..053b8da1e 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/for_nested.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/for_nested.c.dot
@@ -64,7 +64,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  i:int  j:int  k:int  \n   DECLARE_LOCALS(&return,&i,&j,&k); [line 10]\n  NULLIFY(&i,false); [line 10]\n  NULLIFY(&j,false); [line 10]\n  NULLIFY(&k,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  i:int  j:int  k:int  \n   DECLARE_LOCALS(&return,&i,&j,&k); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 17 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition.c.dot
index 9be8b6dc3..193147a26 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition.c.dot
@@ -35,7 +35,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int  j:int  \n   DECLARE_LOCALS(&return,&b,&j); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&j,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int  j:int  \n   DECLARE_LOCALS(&return,&b,&j); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 10 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr.c.dot
index 77e6a048d..2722f86ac 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr.c.dot
@@ -31,7 +31,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int  j:int  \n   DECLARE_LOCALS(&return,&b,&j); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&j,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int  j:int  \n   DECLARE_LOCALS(&return,&b,&j); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 9 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr_body.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr_body.c.dot
index 5194b8d74..cbbf35a0b 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr_body.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/for_no_condition_incr_body.c.dot
@@ -27,7 +27,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  d:int  \n   DECLARE_LOCALS(&return,&d); [line 10]\n  NULLIFY(&d,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  d:int  \n   DECLARE_LOCALS(&return,&d); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 8 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/for_only_body.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/for_only_body.c.dot
index 5e3d1871c..0a048a6bd 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/for_only_body.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/for_only_body.c.dot
@@ -27,7 +27,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  i:int  \n   DECLARE_LOCALS(&return,&i); [line 10]\n  NULLIFY(&i,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  i:int  \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 8 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/for_simple.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/for_simple.c.dot
index f38f18d3b..a52f70e20 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/for_simple.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/for_simple.c.dot
@@ -39,7 +39,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  i:int  j:int  \n   DECLARE_LOCALS(&return,&i,&j); [line 10]\n  NULLIFY(&i,false); [line 10]\n  NULLIFY(&j,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  i:int  j:int  \n   DECLARE_LOCALS(&return,&i,&j); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 11 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/for_while_nested.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/for_while_nested.c.dot
index 81e3eaeed..5b9951125 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/for_while_nested.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/for_while_nested.c.dot
@@ -56,7 +56,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  i:int  k:int  \n   DECLARE_LOCALS(&return,&i,&k); [line 10]\n  NULLIFY(&i,false); [line 10]\n  NULLIFY(&k,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  i:int  k:int  \n   DECLARE_LOCALS(&return,&i,&k); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 15 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/while.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/while.c.dot
index 2c07cff57..e486f8b8b 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/while.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/while.c.dot
@@ -31,7 +31,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  i:int  \n   DECLARE_LOCALS(&return,&i); [line 10]\n  NULLIFY(&i,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  i:int  \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 9 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/while_condition_side_effects.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/while_condition_side_effects.c.dot
index 45e0b1399..49088489a 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/while_condition_side_effects.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/while_condition_side_effects.c.dot
@@ -31,7 +31,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  i:int  \n   DECLARE_LOCALS(&return,&i); [line 10]\n  NULLIFY(&i,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  i:int  \n   DECLARE_LOCALS(&return,&i); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 9 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/while_nested.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/while_nested.c.dot
index 45db423e8..bac07d54a 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/while_nested.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/while_nested.c.dot
@@ -56,7 +56,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  k:int  i:int  \n   DECLARE_LOCALS(&return,&k,&i); [line 10]\n  NULLIFY(&i,false); [line 10]\n  NULLIFY(&k,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  k:int  i:int  \n   DECLARE_LOCALS(&return,&k,&i); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 15 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/loops/while_with_continue_and_break.c.dot b/infer/tests/codetoanalyze/c/frontend/loops/while_with_continue_and_break.c.dot
index f699cc3ea..262775520 100644
--- a/infer/tests/codetoanalyze/c/frontend/loops/while_with_continue_and_break.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/loops/while_with_continue_and_break.c.dot
@@ -74,7 +74,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 10]\n  NULLIFY(&x,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 19 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/nestedoperators/assign_with_increment.c.dot b/infer/tests/codetoanalyze/c/frontend/nestedoperators/assign_with_increment.c.dot
index 769f402a3..9ef27bf6f 100644
--- a/infer/tests/codetoanalyze/c/frontend/nestedoperators/assign_with_increment.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/nestedoperators/assign_with_increment.c.dot
@@ -22,7 +22,7 @@ digraph iCFG {
 2 [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start test\nFormals: \nLocals:  e:int  d:int  c:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&e,&d,&c,&b,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&c,false); [line 10]\n  NULLIFY(&d,false); [line 10]\n  NULLIFY(&e,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start test\nFormals: \nLocals:  e:int  d:int  c:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&e,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 7 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/nestedoperators/assign_with_increment.cpp.dot b/infer/tests/codetoanalyze/c/frontend/nestedoperators/assign_with_increment.cpp.dot
index ead90f928..cdd262ad5 100644
--- a/infer/tests/codetoanalyze/c/frontend/nestedoperators/assign_with_increment.cpp.dot
+++ b/infer/tests/codetoanalyze/c/frontend/nestedoperators/assign_with_increment.cpp.dot
@@ -22,7 +22,7 @@ digraph iCFG {
 2 [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start test\nFormals: \nLocals:  e:int  d:int  c:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&e,&d,&c,&b,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&b,false); [line 10]\n  NULLIFY(&c,false); [line 10]\n  NULLIFY(&d,false); [line 10]\n  NULLIFY(&e,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start test\nFormals: \nLocals:  e:int  d:int  c:int  b:int  a:int  \n   DECLARE_LOCALS(&return,&e,&d,&c,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 7 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/nestedoperators/gnuexpr.c.dot b/infer/tests/codetoanalyze/c/frontend/nestedoperators/gnuexpr.c.dot
index 96d14c7ee..72af84e99 100644
--- a/infer/tests/codetoanalyze/c/frontend/nestedoperators/gnuexpr.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/nestedoperators/gnuexpr.c.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 7 [label="7: Exit test \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start test\nFormals:  p:int *\nLocals:  y:int  x:int  \n   DECLARE_LOCALS(&return,&y,&x); [line 20]\n  NULLIFY(&x,false); [line 20]\n  NULLIFY(&y,false); [line 20]\n " color=yellow style=filled]
+6 [label="6: Start test\nFormals:  p:int *\nLocals:  y:int  x:int  \n   DECLARE_LOCALS(&return,&y,&x); [line 20]\n " color=yellow style=filled]
 	
 
 	 6 -> 8 ;
@@ -25,7 +25,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  X:int  y:int  \n   DECLARE_LOCALS(&return,&X,&y); [line 10]\n  NULLIFY(&X,false); [line 10]\n  NULLIFY(&y,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  X:int  y:int  \n   DECLARE_LOCALS(&return,&X,&y); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/nestedoperators/nestedassignment.c.dot b/infer/tests/codetoanalyze/c/frontend/nestedoperators/nestedassignment.c.dot
index c6be6eb01..c329663e6 100644
--- a/infer/tests/codetoanalyze/c/frontend/nestedoperators/nestedassignment.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/nestedoperators/nestedassignment.c.dot
@@ -30,7 +30,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  t:double  s:double  r:double  q:double  x:double  \n   DECLARE_LOCALS(&return,&t,&s,&r,&q,&x); [line 10]\n  NULLIFY(&q,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  t:double  s:double  r:double  q:double  x:double  \n   DECLARE_LOCALS(&return,&t,&s,&r,&q,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 9 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.c.dot b/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.c.dot
index b2f4652bc..b175ed8d0 100644
--- a/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.c.dot
@@ -22,7 +22,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  l:int  \n   DECLARE_LOCALS(&return,&l); [line 29]\n  NULLIFY(&l,false); [line 29]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  l:int  \n   DECLARE_LOCALS(&return,&l); [line 29]\n " color=yellow style=filled]
 	
 
 	 1 -> 7 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.cpp.dot b/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.cpp.dot
index f19c14ee5..1108a8244 100644
--- a/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.cpp.dot
+++ b/infer/tests/codetoanalyze/c/frontend/nestedoperators/union.cpp.dot
@@ -22,14 +22,14 @@ digraph iCFG {
 4 [label="4: Exit main \n  " color=yellow style=filled]
 	
 
-3 [label="3: Start main\nFormals: \nLocals:  l:int  \n   DECLARE_LOCALS(&return,&l); [line 29]\n  NULLIFY(&l,false); [line 29]\n " color=yellow style=filled]
+3 [label="3: Start main\nFormals: \nLocals:  l:int  \n   DECLARE_LOCALS(&return,&l); [line 29]\n " color=yellow style=filled]
 	
 
 	 3 -> 9 ;
 2 [label="2: Exit (anonymous union at infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1)_ \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start (anonymous union at infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1)_\nFormals:  this:class (anonymous union at infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1) *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n  NULLIFY(&this,false); [line 17]\n " color=yellow style=filled]
+1 [label="1: Start (anonymous union at infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1)_\nFormals:  this:class (anonymous union at infer_tests_codetoanalyze_c_frontend_nestedoperators_union.cpp:17:1) *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/switchstmt/switch.c.dot b/infer/tests/codetoanalyze/c/frontend/switchstmt/switch.c.dot
index cf347ef24..22b5bdadc 100644
--- a/infer/tests/codetoanalyze/c/frontend/switchstmt/switch.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/switchstmt/switch.c.dot
@@ -52,7 +52,7 @@ digraph iCFG {
 183 [label="183: Exit m11 \n  " color=yellow style=filled]
 	
 
-182 [label="182: Start m11\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  value:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&value); [line 191]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 191]\n  NULLIFY(&value,false); [line 191]\n " color=yellow style=filled]
+182 [label="182: Start m11\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  value:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&value); [line 191]\n " color=yellow style=filled]
 	
 
 	 182 -> 195 ;
@@ -71,7 +71,7 @@ digraph iCFG {
 178 [label="178: Exit m10 \n  " color=yellow style=filled]
 	
 
-177 [label="177: Start m10\nFormals: \nLocals:  value:int  \n   DECLARE_LOCALS(&return,&value); [line 185]\n  NULLIFY(&value,false); [line 185]\n " color=yellow style=filled]
+177 [label="177: Start m10\nFormals: \nLocals:  value:int  \n   DECLARE_LOCALS(&return,&value); [line 185]\n " color=yellow style=filled]
 	
 
 	 177 -> 181 ;
@@ -90,7 +90,7 @@ digraph iCFG {
 173 [label="173: Exit m9 \n  " color=yellow style=filled]
 	
 
-172 [label="172: Start m9\nFormals: \nLocals:  value:int  \n   DECLARE_LOCALS(&return,&value); [line 179]\n  NULLIFY(&value,false); [line 179]\n " color=yellow style=filled]
+172 [label="172: Start m9\nFormals: \nLocals:  value:int  \n   DECLARE_LOCALS(&return,&value); [line 179]\n " color=yellow style=filled]
 	
 
 	 172 -> 176 ;
@@ -211,7 +211,7 @@ digraph iCFG {
 144 [label="144: Exit m8 \n  " color=yellow style=filled]
 	
 
-143 [label="143: Start m8\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$1:int  z:int  something:int  value:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$1,&z,&something,&value); [line 157]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 157]\n  NULLIFY(&a,false); [line 157]\n  NULLIFY(&something,false); [line 157]\n  NULLIFY(&value,false); [line 157]\n  NULLIFY(&z,false); [line 157]\n " color=yellow style=filled]
+143 [label="143: Start m8\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$1:int  z:int  something:int  value:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$1,&z,&something,&value); [line 157]\n " color=yellow style=filled]
 	
 
 	 143 -> 171 ;
@@ -282,7 +282,7 @@ digraph iCFG {
 127 [label="127: Exit m7 \n  " color=yellow style=filled]
 	
 
-126 [label="126: Start m7\nFormals: \nLocals:  z:int  something:int  value:int  \n   DECLARE_LOCALS(&return,&z,&something,&value); [line 139]\n  NULLIFY(&something,false); [line 139]\n  NULLIFY(&value,false); [line 139]\n  NULLIFY(&z,false); [line 139]\n " color=yellow style=filled]
+126 [label="126: Start m7\nFormals: \nLocals:  z:int  something:int  value:int  \n   DECLARE_LOCALS(&return,&z,&something,&value); [line 139]\n " color=yellow style=filled]
 	
 
 	 126 -> 142 ;
@@ -389,7 +389,7 @@ digraph iCFG {
 101 [label="101: Exit m6 \n  " color=yellow style=filled]
 	
 
-100 [label="100: Start m6\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  z:int  something:int  value:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&z,&something,&value); [line 119]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 119]\n  NULLIFY(&something,false); [line 119]\n  NULLIFY(&value,false); [line 119]\n  NULLIFY(&z,false); [line 119]\n " color=yellow style=filled]
+100 [label="100: Start m6\nFormals: \nLocals:  SIL_temp_conditional___n$0:int  z:int  something:int  value:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$0,&z,&something,&value); [line 119]\n " color=yellow style=filled]
 	
 
 	 100 -> 122 ;
@@ -450,7 +450,7 @@ digraph iCFG {
 86 [label="86: Exit m5 \n  " color=yellow style=filled]
 	
 
-85 [label="85: Start m5\nFormals: \nLocals:  x:int  value:int  \n   DECLARE_LOCALS(&return,&x,&value); [line 103]\n  NULLIFY(&value,false); [line 103]\n  NULLIFY(&x,false); [line 103]\n " color=yellow style=filled]
+85 [label="85: Start m5\nFormals: \nLocals:  x:int  value:int  \n   DECLARE_LOCALS(&return,&x,&value); [line 103]\n " color=yellow style=filled]
 	
 
 	 85 -> 99 ;
@@ -541,7 +541,7 @@ digraph iCFG {
 64 [label="64: Exit m4 \n  " color=yellow style=filled]
 	
 
-63 [label="63: Start m4\nFormals: \nLocals:  something:int  z:int  x:int  value:int  \n   DECLARE_LOCALS(&return,&something,&z,&x,&value); [line 78]\n  NULLIFY(&something,false); [line 78]\n  NULLIFY(&value,false); [line 78]\n  NULLIFY(&x,false); [line 78]\n  NULLIFY(&z,false); [line 78]\n " color=yellow style=filled]
+63 [label="63: Start m4\nFormals: \nLocals:  something:int  z:int  x:int  value:int  \n   DECLARE_LOCALS(&return,&something,&z,&x,&value); [line 78]\n " color=yellow style=filled]
 	
 
 	 63 -> 84 ;
@@ -612,7 +612,7 @@ digraph iCFG {
 47 [label="47: Exit m3 \n  " color=yellow style=filled]
 	
 
-46 [label="46: Start m3\nFormals: \nLocals:  z:int  something:int  value:int  \n   DECLARE_LOCALS(&return,&z,&something,&value); [line 60]\n  NULLIFY(&something,false); [line 60]\n  NULLIFY(&value,false); [line 60]\n  NULLIFY(&z,false); [line 60]\n " color=yellow style=filled]
+46 [label="46: Start m3\nFormals: \nLocals:  z:int  something:int  value:int  \n   DECLARE_LOCALS(&return,&z,&something,&value); [line 60]\n " color=yellow style=filled]
 	
 
 	 46 -> 62 ;
@@ -703,7 +703,7 @@ digraph iCFG {
 25 [label="25: Exit m2 \n  " color=yellow style=filled]
 	
 
-24 [label="24: Start m2\nFormals: \nLocals:  something:int  z:int  x:int  value:int  \n   DECLARE_LOCALS(&return,&something,&z,&x,&value); [line 35]\n  NULLIFY(&something,false); [line 35]\n  NULLIFY(&value,false); [line 35]\n  NULLIFY(&x,false); [line 35]\n  NULLIFY(&z,false); [line 35]\n " color=yellow style=filled]
+24 [label="24: Start m2\nFormals: \nLocals:  something:int  z:int  x:int  value:int  \n   DECLARE_LOCALS(&return,&something,&z,&x,&value); [line 35]\n " color=yellow style=filled]
 	
 
 	 24 -> 45 ;
@@ -798,7 +798,7 @@ digraph iCFG {
 2 [label="2: Exit m1 \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start m1\nFormals: \nLocals:  x:int  value:int  \n   DECLARE_LOCALS(&return,&x,&value); [line 12]\n  NULLIFY(&value,false); [line 12]\n  NULLIFY(&x,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start m1\nFormals: \nLocals:  x:int  value:int  \n   DECLARE_LOCALS(&return,&x,&value); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 23 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/types/struct.c.dot b/infer/tests/codetoanalyze/c/frontend/types/struct.c.dot
index 706d425aa..a8aa39663 100644
--- a/infer/tests/codetoanalyze/c/frontend/types/struct.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/types/struct.c.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 2 [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start test\nFormals: \nLocals:  x:struct X  \n   DECLARE_LOCALS(&return,&x); [line 15]\n  NULLIFY(&x,false); [line 15]\n " color=yellow style=filled]
+1 [label="1: Start test\nFormals: \nLocals:  x:struct X  \n   DECLARE_LOCALS(&return,&x); [line 15]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/unusual_exps/generic_exp.c.dot b/infer/tests/codetoanalyze/c/frontend/unusual_exps/generic_exp.c.dot
index d40e4667a..177cd3d73 100644
--- a/infer/tests/codetoanalyze/c/frontend/unusual_exps/generic_exp.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/unusual_exps/generic_exp.c.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 2 [label="2: Exit test_typename \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start test_typename\nFormals: \nLocals:  z:int  x:int  y:int  s:char  \n   DECLARE_LOCALS(&return,&z,&x,&y,&s); [line 12]\n  NULLIFY(&s,false); [line 12]\n  NULLIFY(&x,false); [line 12]\n  NULLIFY(&y,false); [line 12]\n  NULLIFY(&z,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start test_typename\nFormals: \nLocals:  z:int  x:int  y:int  s:char  \n   DECLARE_LOCALS(&return,&z,&x,&y,&s); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/c/frontend/unusual_stmts/asm.c.dot b/infer/tests/codetoanalyze/c/frontend/unusual_stmts/asm.c.dot
index 0131eb708..21df99f3a 100644
--- a/infer/tests/codetoanalyze/c/frontend/unusual_stmts/asm.c.dot
+++ b/infer/tests/codetoanalyze/c/frontend/unusual_stmts/asm.c.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 6 [label="6: Exit main \n  " color=yellow style=filled]
 	
 
-5 [label="5: Start main\nFormals: \nLocals:  dst:int  src:int  \n   DECLARE_LOCALS(&return,&dst,&src); [line 19]\n  NULLIFY(&src,false); [line 19]\n " color=yellow style=filled]
+5 [label="5: Start main\nFormals: \nLocals:  dst:int  src:int  \n   DECLARE_LOCALS(&return,&dst,&src); [line 19]\n " color=yellow style=filled]
 	
 
 	 5 -> 9 ;
diff --git a/infer/tests/codetoanalyze/cpp/errors/npe/method_call.cpp.dot b/infer/tests/codetoanalyze/cpp/errors/npe/method_call.cpp.dot
index b10973fc2..01a1d80c8 100644
--- a/infer/tests/codetoanalyze/cpp/errors/npe/method_call.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/errors/npe/method_call.cpp.dot
@@ -28,7 +28,7 @@ digraph iCFG {
 15 [label="15: Exit XForward_call \n  " color=yellow style=filled]
 	
 
-14 [label="14: Start XForward_call\nFormals:  this:class XForward *\nLocals:  \n   DECLARE_LOCALS(&return); [line 31]\n  NULLIFY(&this,false); [line 31]\n " color=yellow style=filled]
+14 [label="14: Start XForward_call\nFormals:  this:class XForward *\nLocals:  \n   DECLARE_LOCALS(&return); [line 31]\n " color=yellow style=filled]
 	
 
 	 14 -> 16 ;
@@ -65,7 +65,7 @@ digraph iCFG {
 5 [label="5: Exit npe_call \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start npe_call\nFormals: \nLocals:  x:class X * \n   DECLARE_LOCALS(&return,&x); [line 15]\n  NULLIFY(&x,false); [line 15]\n " color=yellow style=filled]
+4 [label="4: Start npe_call\nFormals: \nLocals:  x:class X * \n   DECLARE_LOCALS(&return,&x); [line 15]\n " color=yellow style=filled]
 	
 
 	 4 -> 7 ;
@@ -76,7 +76,7 @@ digraph iCFG {
 2 [label="2: Exit X_call \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X_call\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n  NULLIFY(&this,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start X_call\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/builtin/new.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/builtin/new.cpp.dot
index 5dddbef8b..8b82f23d9 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/builtin/new.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/builtin/new.cpp.dot
@@ -18,7 +18,7 @@ digraph iCFG {
 2 [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start test\nFormals: \nLocals:  i:int * x:int  \n   DECLARE_LOCALS(&return,&i,&x); [line 10]\n  NULLIFY(&i,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start test\nFormals: \nLocals:  i:int * x:int  \n   DECLARE_LOCALS(&return,&i,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 6 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/conditional/binary_conditional.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/conditional/binary_conditional.cpp.dot
index 43fe45b8f..04267dcbe 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/conditional/binary_conditional.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/conditional/binary_conditional.cpp.dot
@@ -35,7 +35,7 @@ digraph iCFG {
 26 [label="26: Exit conditional \n  " color=yellow style=filled]
 	
 
-25 [label="25: Start conditional\nFormals: \nLocals:  x:class X  SIL_materialize_temp__n$0:class X  SIL_temp_conditional___n$1:class X  __temp_return_n$3:class X  SIL_materialize_temp__n$5:class X  a:class X  \n   DECLARE_LOCALS(&return,&x,&SIL_materialize_temp__n$0,&SIL_temp_conditional___n$1,&__temp_return_n$3,&SIL_materialize_temp__n$5,&a); [line 25]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 25]\n " color=yellow style=filled]
+25 [label="25: Start conditional\nFormals: \nLocals:  x:class X  SIL_materialize_temp__n$0:class X  SIL_temp_conditional___n$1:class X  __temp_return_n$3:class X  SIL_materialize_temp__n$5:class X  a:class X  \n   DECLARE_LOCALS(&return,&x,&SIL_materialize_temp__n$0,&SIL_temp_conditional___n$1,&__temp_return_n$3,&SIL_materialize_temp__n$5,&a); [line 25]\n " color=yellow style=filled]
 	
 
 	 25 -> 34 ;
@@ -79,7 +79,7 @@ digraph iCFG {
 15 [label="15: Exit binaryConditional \n  " color=yellow style=filled]
 	
 
-14 [label="14: Start binaryConditional\nFormals: \nLocals:  x:class X  SIL_materialize_temp__n$0:class X  SIL_temp_conditional___n$2:class X  SIL_materialize_temp__n$4:class X  a:class X  \n   DECLARE_LOCALS(&return,&x,&SIL_materialize_temp__n$0,&SIL_temp_conditional___n$2,&SIL_materialize_temp__n$4,&a); [line 20]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 20]\n " color=yellow style=filled]
+14 [label="14: Start binaryConditional\nFormals: \nLocals:  x:class X  SIL_materialize_temp__n$0:class X  SIL_temp_conditional___n$2:class X  SIL_materialize_temp__n$4:class X  a:class X  \n   DECLARE_LOCALS(&return,&x,&SIL_materialize_temp__n$0,&SIL_temp_conditional___n$2,&SIL_materialize_temp__n$4,&a); [line 20]\n " color=yellow style=filled]
 	
 
 	 14 -> 24 ;
@@ -101,21 +101,21 @@ digraph iCFG {
 9 [label="9: Exit X_X \n  " color=yellow style=filled]
 	
 
-8 [label="8: Start X_X\nFormals:  this:class X * __param_0:class X &\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&__param_0,false); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+8 [label="8: Start X_X\nFormals:  this:class X * __param_0:class X &\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 8 -> 9 ;
 7 [label="7: Exit X_X \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start X_X\nFormals:  this:class X * __param_0:class X &\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&__param_0,false); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+6 [label="6: Start X_X\nFormals:  this:class X * __param_0:class X &\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 6 -> 7 ;
 5 [label="5: Exit X_X \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+4 [label="4: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 4 -> 5 ;
@@ -126,7 +126,7 @@ digraph iCFG {
 2 [label="2: Exit X_operator bool \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X_operator bool\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&this,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start X_operator bool\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/conditional/lvalue_conditional.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/conditional/lvalue_conditional.cpp.dot
index 00378f59a..a39a90e69 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/conditional/lvalue_conditional.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/conditional/lvalue_conditional.cpp.dot
@@ -118,7 +118,7 @@ digraph iCFG {
 34 [label="34: Exit div_temp_lvalue \n  " color=yellow style=filled]
 	
 
-33 [label="33: Start div_temp_lvalue\nFormals:  a:int  b:int \nLocals:  r:int & SIL_materialize_temp__n$2:int  SIL_temp_conditional___n$3:int  \n   DECLARE_LOCALS(&return,&r,&SIL_materialize_temp__n$2,&SIL_temp_conditional___n$3); [line 28]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 28]\n  NULLIFY(&r,false); [line 28]\n " color=yellow style=filled]
+33 [label="33: Start div_temp_lvalue\nFormals:  a:int  b:int \nLocals:  r:int & SIL_materialize_temp__n$2:int  SIL_temp_conditional___n$3:int  \n   DECLARE_LOCALS(&return,&r,&SIL_materialize_temp__n$2,&SIL_temp_conditional___n$3); [line 28]\n " color=yellow style=filled]
 	
 
 	 33 -> 37 ;
@@ -163,7 +163,7 @@ digraph iCFG {
 23 [label="23: Exit assign_conditional \n  " color=yellow style=filled]
 	
 
-22 [label="22: Start assign_conditional\nFormals:  a:int \nLocals:  SIL_temp_conditional___n$1:int & v2:int  v1:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$1,&v2,&v1); [line 22]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 22]\n " color=yellow style=filled]
+22 [label="22: Start assign_conditional\nFormals:  a:int \nLocals:  SIL_temp_conditional___n$1:int & v2:int  v1:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$1,&v2,&v1); [line 22]\n " color=yellow style=filled]
 	
 
 	 22 -> 32 ;
@@ -203,7 +203,7 @@ digraph iCFG {
 13 [label="13: Exit choose_rvalue \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start choose_rvalue\nFormals:  a:int \nLocals:  v3:int  SIL_temp_conditional___n$1:int  v1:int  \n   DECLARE_LOCALS(&return,&v3,&SIL_temp_conditional___n$1,&v1); [line 16]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 16]\n  NULLIFY(&v1,false); [line 16]\n  NULLIFY(&v3,false); [line 16]\n " color=yellow style=filled]
+12 [label="12: Start choose_rvalue\nFormals:  a:int \nLocals:  v3:int  SIL_temp_conditional___n$1:int  v1:int  \n   DECLARE_LOCALS(&return,&v3,&SIL_temp_conditional___n$1,&v1); [line 16]\n " color=yellow style=filled]
 	
 
 	 12 -> 21 ;
@@ -247,7 +247,7 @@ digraph iCFG {
 2 [label="2: Exit choose_lvalue \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start choose_lvalue\nFormals:  a:int \nLocals:  v3:int  SIL_temp_conditional___n$1:int & v2:int  v1:int  \n   DECLARE_LOCALS(&return,&v3,&SIL_temp_conditional___n$1,&v2,&v1); [line 10]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 10]\n  NULLIFY(&v3,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start choose_lvalue\nFormals:  a:int \nLocals:  v3:int  SIL_temp_conditional___n$1:int & v2:int  v1:int  \n   DECLARE_LOCALS(&return,&v3,&SIL_temp_conditional___n$1,&v2,&v1); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 11 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_array.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_array.cpp.dot
index b09571540..78a69f663 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_array.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_array.cpp.dot
@@ -29,7 +29,7 @@ digraph iCFG {
 24 [label="24: Exit initialization_c_style \n  " color=yellow style=filled]
 	
 
-23 [label="23: Start initialization_c_style\nFormals: \nLocals:  z2:class Z  z:class Z [2] \n   DECLARE_LOCALS(&return,&z2,&z); [line 32]\n  NULLIFY(&z,false); [line 32]\n " color=yellow style=filled]
+23 [label="23: Start initialization_c_style\nFormals: \nLocals:  z2:class Z  z:class Z [2] \n   DECLARE_LOCALS(&return,&z2,&z); [line 32]\n " color=yellow style=filled]
 	
 
 	 23 -> 26 ;
@@ -51,7 +51,7 @@ digraph iCFG {
 18 [label="18: Exit Z_Z \n  " color=yellow style=filled]
 	
 
-17 [label="17: Start Z_Z\nFormals:  this:class Z *\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n  NULLIFY(&this,false); [line 27]\n " color=yellow style=filled]
+17 [label="17: Start Z_Z\nFormals:  this:class Z *\nLocals:  \n   DECLARE_LOCALS(&return); [line 27]\n " color=yellow style=filled]
 	
 
 	 17 -> 18 ;
@@ -99,7 +99,7 @@ digraph iCFG {
 5 [label="5: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start Person_Person\nFormals:  this:class Person *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n  NULLIFY(&this,false); [line 13]\n " color=yellow style=filled]
+4 [label="4: Start Person_Person\nFormals:  this:class Person *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 4 -> 5 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_init.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_init.cpp.dot
index fc71c64ae..299be9673 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_init.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_init.cpp.dot
@@ -22,7 +22,7 @@ digraph iCFG {
 39 [label="39: Exit f_f2_div1 \n  " color=yellow style=filled]
 	
 
-38 [label="38: Start f_f2_div1\nFormals: \nLocals:  v3:int  v2:int  v:int  b:class B  \n   DECLARE_LOCALS(&return,&v3,&v2,&v,&b); [line 54]\n  NULLIFY(&v,false); [line 54]\n  NULLIFY(&v2,false); [line 54]\n  NULLIFY(&v3,false); [line 54]\n " color=yellow style=filled]
+38 [label="38: Start f_f2_div1\nFormals: \nLocals:  v3:int  v2:int  v:int  b:class B  \n   DECLARE_LOCALS(&return,&v3,&v2,&v,&b); [line 54]\n " color=yellow style=filled]
 	
 
 	 38 -> 44 ;
@@ -41,7 +41,7 @@ digraph iCFG {
 34 [label="34: Exit delegate_constr_f2_div0 \n  " color=yellow style=filled]
 	
 
-33 [label="33: Start delegate_constr_f2_div0\nFormals: \nLocals:  v:int  b:class B  \n   DECLARE_LOCALS(&return,&v,&b); [line 48]\n  NULLIFY(&v,false); [line 48]\n " color=yellow style=filled]
+33 [label="33: Start delegate_constr_f2_div0\nFormals: \nLocals:  v:int  b:class B  \n   DECLARE_LOCALS(&return,&v,&b); [line 48]\n " color=yellow style=filled]
 	
 
 	 33 -> 37 ;
@@ -60,7 +60,7 @@ digraph iCFG {
 29 [label="29: Exit delegate_constr_f_div0 \n  " color=yellow style=filled]
 	
 
-28 [label="28: Start delegate_constr_f_div0\nFormals: \nLocals:  v:int  b:class B  \n   DECLARE_LOCALS(&return,&v,&b); [line 42]\n  NULLIFY(&v,false); [line 42]\n " color=yellow style=filled]
+28 [label="28: Start delegate_constr_f_div0\nFormals: \nLocals:  v:int  b:class B  \n   DECLARE_LOCALS(&return,&v,&b); [line 42]\n " color=yellow style=filled]
 	
 
 	 28 -> 32 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_new.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_new.cpp.dot
index bb9c6b18d..a3545b18b 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_new.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_new.cpp.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 95 [label="95: Exit matrix_of_person \n  " color=yellow style=filled]
 	
 
-94 [label="94: Start matrix_of_person\nFormals: \nLocals:  tarray:class Person ** \n   DECLARE_LOCALS(&return,&tarray); [line 96]\n  NULLIFY(&tarray,false); [line 96]\n " color=yellow style=filled]
+94 [label="94: Start matrix_of_person\nFormals: \nLocals:  tarray:class Person ** \n   DECLARE_LOCALS(&return,&tarray); [line 96]\n " color=yellow style=filled]
 	
 
 	 94 -> 97 ;
@@ -21,7 +21,7 @@ digraph iCFG {
 92 [label="92: Exit array_of_person_with_constant_size \n  " color=yellow style=filled]
 	
 
-91 [label="91: Start array_of_person_with_constant_size\nFormals: \nLocals:  tarray:class Person * \n   DECLARE_LOCALS(&return,&tarray); [line 93]\n  NULLIFY(&tarray,false); [line 93]\n " color=yellow style=filled]
+91 [label="91: Start array_of_person_with_constant_size\nFormals: \nLocals:  tarray:class Person * \n   DECLARE_LOCALS(&return,&tarray); [line 93]\n " color=yellow style=filled]
 	
 
 	 91 -> 93 ;
@@ -57,7 +57,7 @@ digraph iCFG {
 83 [label="83: Exit array_of_class_with_not_constant_size \n  " color=yellow style=filled]
 	
 
-82 [label="82: Start array_of_class_with_not_constant_size\nFormals: \nLocals:  tarray:class Person * SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&tarray,&SIL_temp_conditional___n$0); [line 88]\n  NULLIFY(&SIL_temp_conditional___n$0,false); [line 88]\n  NULLIFY(&tarray,false); [line 88]\n " color=yellow style=filled]
+82 [label="82: Start array_of_class_with_not_constant_size\nFormals: \nLocals:  tarray:class Person * SIL_temp_conditional___n$0:int  \n   DECLARE_LOCALS(&return,&tarray,&SIL_temp_conditional___n$0); [line 88]\n " color=yellow style=filled]
 	
 
 	 82 -> 85 ;
@@ -72,7 +72,7 @@ digraph iCFG {
 79 [label="79: Exit int_array_init \n  " color=yellow style=filled]
 	
 
-78 [label="78: Start int_array_init\nFormals: \nLocals:  arr:int * \n   DECLARE_LOCALS(&return,&arr); [line 82]\n  NULLIFY(&arr,false); [line 82]\n " color=yellow style=filled]
+78 [label="78: Start int_array_init\nFormals: \nLocals:  arr:int * \n   DECLARE_LOCALS(&return,&arr); [line 82]\n " color=yellow style=filled]
 	
 
 	 78 -> 81 ;
@@ -120,7 +120,7 @@ digraph iCFG {
 67 [label="67: Exit int_array \n  " color=yellow style=filled]
 	
 
-66 [label="66: Start int_array\nFormals: \nLocals:  x2:int * SIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&x2,&SIL_temp_conditional___n$6); [line 75]\n  NULLIFY(&SIL_temp_conditional___n$6,false); [line 75]\n  NULLIFY(&x2,false); [line 75]\n " color=yellow style=filled]
+66 [label="66: Start int_array\nFormals: \nLocals:  x2:int * SIL_temp_conditional___n$6:int  \n   DECLARE_LOCALS(&return,&x2,&SIL_temp_conditional___n$6); [line 75]\n " color=yellow style=filled]
 	
 
 	 66 -> 72 ;
@@ -164,7 +164,7 @@ digraph iCFG {
 56 [label="56: Exit constructor_nodes \n  " color=yellow style=filled]
 	
 
-55 [label="55: Start constructor_nodes\nFormals: \nLocals:  p:class Person * SIL_temp_conditional___n$3:int  z:int  \n   DECLARE_LOCALS(&return,&p,&SIL_temp_conditional___n$3,&z); [line 69]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 69]\n  NULLIFY(&p,false); [line 69]\n  NULLIFY(&z,false); [line 69]\n " color=yellow style=filled]
+55 [label="55: Start constructor_nodes\nFormals: \nLocals:  p:class Person * SIL_temp_conditional___n$3:int  z:int  \n   DECLARE_LOCALS(&return,&p,&SIL_temp_conditional___n$3,&z); [line 69]\n " color=yellow style=filled]
 	
 
 	 55 -> 65 ;
@@ -212,7 +212,7 @@ digraph iCFG {
 44 [label="44: Exit int_init_nodes \n  " color=yellow style=filled]
 	
 
-43 [label="43: Start int_init_nodes\nFormals: \nLocals:  x:int * SIL_temp_conditional___n$3:int  y:int * z:int  \n   DECLARE_LOCALS(&return,&x,&SIL_temp_conditional___n$3,&y,&z); [line 62]\n  NULLIFY(&SIL_temp_conditional___n$3,false); [line 62]\n  NULLIFY(&x,false); [line 62]\n  NULLIFY(&y,false); [line 62]\n  NULLIFY(&z,false); [line 62]\n " color=yellow style=filled]
+43 [label="43: Start int_init_nodes\nFormals: \nLocals:  x:int * SIL_temp_conditional___n$3:int  y:int * z:int  \n   DECLARE_LOCALS(&return,&x,&SIL_temp_conditional___n$3,&y,&z); [line 62]\n " color=yellow style=filled]
 	
 
 	 43 -> 54 ;
@@ -227,7 +227,7 @@ digraph iCFG {
 40 [label="40: Exit int_init_empty_list_new \n  " color=yellow style=filled]
 	
 
-39 [label="39: Start int_init_empty_list_new\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 57]\n  NULLIFY(&x1,false); [line 57]\n " color=yellow style=filled]
+39 [label="39: Start int_init_empty_list_new\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 57]\n " color=yellow style=filled]
 	
 
 	 39 -> 42 ;
@@ -242,7 +242,7 @@ digraph iCFG {
 36 [label="36: Exit int_init_empty_list \n  " color=yellow style=filled]
 	
 
-35 [label="35: Start int_init_empty_list\nFormals: \nLocals:  x1:int  \n   DECLARE_LOCALS(&return,&x1); [line 52]\n  NULLIFY(&x1,false); [line 52]\n " color=yellow style=filled]
+35 [label="35: Start int_init_empty_list\nFormals: \nLocals:  x1:int  \n   DECLARE_LOCALS(&return,&x1); [line 52]\n " color=yellow style=filled]
 	
 
 	 35 -> 38 ;
@@ -257,7 +257,7 @@ digraph iCFG {
 32 [label="32: Exit int_init_empty \n  " color=yellow style=filled]
 	
 
-31 [label="31: Start int_init_empty\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 47]\n  NULLIFY(&x1,false); [line 47]\n " color=yellow style=filled]
+31 [label="31: Start int_init_empty\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 47]\n " color=yellow style=filled]
 	
 
 	 31 -> 34 ;
@@ -272,7 +272,7 @@ digraph iCFG {
 28 [label="28: Exit float_init_number \n  " color=yellow style=filled]
 	
 
-27 [label="27: Start float_init_number\nFormals: \nLocals:  x1:float * \n   DECLARE_LOCALS(&return,&x1); [line 42]\n  NULLIFY(&x1,false); [line 42]\n " color=yellow style=filled]
+27 [label="27: Start float_init_number\nFormals: \nLocals:  x1:float * \n   DECLARE_LOCALS(&return,&x1); [line 42]\n " color=yellow style=filled]
 	
 
 	 27 -> 30 ;
@@ -287,7 +287,7 @@ digraph iCFG {
 24 [label="24: Exit int_init_number \n  " color=yellow style=filled]
 	
 
-23 [label="23: Start int_init_number\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 37]\n  NULLIFY(&x1,false); [line 37]\n " color=yellow style=filled]
+23 [label="23: Start int_init_number\nFormals: \nLocals:  x1:int * \n   DECLARE_LOCALS(&return,&x1); [line 37]\n " color=yellow style=filled]
 	
 
 	 23 -> 26 ;
@@ -302,7 +302,7 @@ digraph iCFG {
 20 [label="20: Exit constructor_3_args_new_div0 \n  " color=yellow style=filled]
 	
 
-19 [label="19: Start constructor_3_args_new_div0\nFormals: \nLocals:  p:class Person * \n   DECLARE_LOCALS(&return,&p); [line 32]\n  NULLIFY(&p,false); [line 32]\n " color=yellow style=filled]
+19 [label="19: Start constructor_3_args_new_div0\nFormals: \nLocals:  p:class Person * \n   DECLARE_LOCALS(&return,&p); [line 32]\n " color=yellow style=filled]
 	
 
 	 19 -> 22 ;
@@ -317,7 +317,7 @@ digraph iCFG {
 16 [label="16: Exit constructor_1_arg_new_div0 \n  " color=yellow style=filled]
 	
 
-15 [label="15: Start constructor_1_arg_new_div0\nFormals: \nLocals:  p:class Person * \n   DECLARE_LOCALS(&return,&p); [line 27]\n  NULLIFY(&p,false); [line 27]\n " color=yellow style=filled]
+15 [label="15: Start constructor_1_arg_new_div0\nFormals: \nLocals:  p:class Person * \n   DECLARE_LOCALS(&return,&p); [line 27]\n " color=yellow style=filled]
 	
 
 	 15 -> 18 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_with_body.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_with_body.cpp.dot
index 0c095c9fd..783942443 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_with_body.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/constructors/constructor_with_body.cpp.dot
@@ -59,7 +59,7 @@ digraph iCFG {
 11 [label="11: Exit X_X \n  " color=yellow style=filled]
 	
 
-10 [label="10: Start X_X\nFormals:  this:class X * a:int  b:int \nLocals:  c:int  \n   DECLARE_LOCALS(&return,&c); [line 22]\n  NULLIFY(&c,false); [line 22]\n " color=yellow style=filled]
+10 [label="10: Start X_X\nFormals:  this:class X * a:int  b:int \nLocals:  c:int  \n   DECLARE_LOCALS(&return,&c); [line 22]\n " color=yellow style=filled]
 	
 
 	 10 -> 14 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/constructors/copy_move_constructor.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/constructors/copy_move_constructor.cpp.dot
index d7c5f1bc3..fce60e384 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/constructors/copy_move_constructor.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/constructors/copy_move_constructor.cpp.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 59 [label="59: Exit copyY_moveY_div1 \n  " color=yellow style=filled]
 	
 
-58 [label="58: Start copyY_moveY_div1\nFormals: \nLocals:  d2:int  __temp_return_n$3:class Y  d1:int  y2:class Y  y1:class Y  \n   DECLARE_LOCALS(&return,&d2,&__temp_return_n$3,&d1,&y2,&y1); [line 72]\n  NULLIFY(&d1,false); [line 72]\n  NULLIFY(&d2,false); [line 72]\n " color=yellow style=filled]
+58 [label="58: Start copyY_moveY_div1\nFormals: \nLocals:  d2:int  __temp_return_n$3:class Y  d1:int  y2:class Y  y1:class Y  \n   DECLARE_LOCALS(&return,&d2,&__temp_return_n$3,&d1,&y2,&y1); [line 72]\n " color=yellow style=filled]
 	
 
 	 58 -> 65 ;
@@ -57,7 +57,7 @@ digraph iCFG {
 51 [label="51: Exit copyX_moveX_div1 \n  " color=yellow style=filled]
 	
 
-50 [label="50: Start copyX_moveX_div1\nFormals: \nLocals:  d2:int  __temp_return_n$3:class X  d1:int  x2:class X  x1:class X  \n   DECLARE_LOCALS(&return,&d2,&__temp_return_n$3,&d1,&x2,&x1); [line 63]\n  NULLIFY(&d1,false); [line 63]\n  NULLIFY(&d2,false); [line 63]\n " color=yellow style=filled]
+50 [label="50: Start copyX_moveX_div1\nFormals: \nLocals:  d2:int  __temp_return_n$3:class X  d1:int  x2:class X  x1:class X  \n   DECLARE_LOCALS(&return,&d2,&__temp_return_n$3,&d1,&x2,&x1); [line 63]\n " color=yellow style=filled]
 	
 
 	 50 -> 57 ;
@@ -211,7 +211,7 @@ digraph iCFG {
 10 [label="10: Exit Y_Y \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start Y_Y\nFormals:  this:class Y *\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n  NULLIFY(&this,false); [line 21]\n " color=yellow style=filled]
+9 [label="9: Start Y_Y\nFormals:  this:class Y *\nLocals:  \n   DECLARE_LOCALS(&return); [line 21]\n " color=yellow style=filled]
 	
 
 	 9 -> 10 ;
@@ -240,7 +240,7 @@ digraph iCFG {
 2 [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n  NULLIFY(&this,false); [line 13]\n " color=yellow style=filled]
+1 [label="1: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/constructors/std_init_list.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/constructors/std_init_list.cpp.dot
index ee8415895..5d94b1edb 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/constructors/std_init_list.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/constructors/std_init_list.cpp.dot
@@ -38,7 +38,7 @@ digraph iCFG {
 2 [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X_X\nFormals:  this:class X * list:class std::initializer_list<int> \nLocals:  i:int * \n   DECLARE_LOCALS(&return,&i); [line 14]\n  NULLIFY(&i,false); [line 14]\n  NULLIFY(&this,false); [line 14]\n " color=yellow style=filled]
+1 [label="1: Start X_X\nFormals:  this:class X * list:class std::initializer_list<int> \nLocals:  i:int * \n   DECLARE_LOCALS(&return,&i); [line 14]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/constructors/temp_object.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/constructors/temp_object.cpp.dot
index 7105f6f59..08058e77d 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/constructors/temp_object.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/constructors/temp_object.cpp.dot
@@ -142,7 +142,7 @@ digraph iCFG {
 5 [label="5: Exit X_X \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start X_X\nFormals:  this:class X * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n  NULLIFY(&b,false); [line 12]\n " color=yellow style=filled]
+4 [label="4: Start X_X\nFormals:  this:class X * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot
index 3a226f345..efb654d3e 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot
@@ -24,7 +24,7 @@ digraph iCFG {
 2 [label="2: Exit X_~X \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X_~X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&this,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start X_~X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/pseudo_destructor_expr.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/pseudo_destructor_expr.cpp.dot
index 34b6fa467..ca8408df8 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/pseudo_destructor_expr.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/pseudo_destructor_expr.cpp.dot
@@ -25,7 +25,7 @@ digraph iCFG {
 7 [label="7: Exit destroy<int *> \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start destroy<int *>\nFormals:  ptr:int **\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&ptr,false); [line 18]\n " color=yellow style=filled]
+6 [label="6: Start destroy<int *>\nFormals:  ptr:int **\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 6 -> 9 ;
@@ -44,7 +44,7 @@ digraph iCFG {
 2 [label="2: Exit f \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start f\nFormals:  p:int *\nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 11]\n  NULLIFY(&x,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start f\nFormals:  p:int *\nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/include_header/include_only.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/include_header/include_only.cpp.dot
index 43c38a01b..85de69a75 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/include_header/include_only.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/include_header/include_only.cpp.dot
@@ -17,7 +17,7 @@ digraph iCFG {
 2 [label="2: Exit A_div0 \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_div0\nFormals:  this:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&this,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start A_div0\nFormals:  this:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot
index afd66ddbc..eaeac4691 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot
@@ -87,7 +87,7 @@ digraph iCFG {
 13 [label="13: Exit B<A>_B \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start B<A>_B\nFormals:  this:class B<A> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n  NULLIFY(&this,false); [line 15]\n " color=yellow style=filled]
+12 [label="12: Start B<A>_B\nFormals:  this:class B<A> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 12 -> 13 ;
@@ -98,14 +98,14 @@ digraph iCFG {
 10 [label="10: Exit B<A>_div0 \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start B<A>_div0\nFormals:  this:class B<A> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n  NULLIFY(&this,false); [line 16]\n " color=yellow style=filled]
+9 [label="9: Start B<A>_div0\nFormals:  this:class B<A> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
 	 9 -> 11 ;
 8 [label="8: Exit B<int>_B \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start B<int>_B\nFormals:  this:class B<int> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n  NULLIFY(&this,false); [line 15]\n " color=yellow style=filled]
+7 [label="7: Start B<int>_B\nFormals:  this:class B<int> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 7 -> 8 ;
@@ -116,7 +116,7 @@ digraph iCFG {
 5 [label="5: Exit B<int>_div0 \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start B<int>_div0\nFormals:  this:class B<int> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n  NULLIFY(&this,false); [line 16]\n " color=yellow style=filled]
+4 [label="4: Start B<int>_div0\nFormals:  this:class B<int> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -127,7 +127,7 @@ digraph iCFG {
 2 [label="2: Exit A_div0 \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_div0\nFormals:  this:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&this,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start A_div0\nFormals:  this:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/keywords/self_parameter.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/keywords/self_parameter.cpp.dot
index 2684572d8..1bc47367d 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/keywords/self_parameter.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/keywords/self_parameter.cpp.dot
@@ -28,7 +28,7 @@ digraph iCFG {
 2 [label="2: Exit A_meth_with_self \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_meth_with_self\nFormals:  this:class A * self:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n  NULLIFY(&this,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start A_meth_with_self\nFormals:  this:class A * self:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot
index ab2ddcca7..9f727912a 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/literals/scalar_value_init.cpp.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 17 [label="17: Exit test \n  " color=yellow style=filled]
 	
 
-16 [label="16: Start test\nFormals: \nLocals:  f2:float  x:int  fp:float * f:float  i:int  \n   DECLARE_LOCALS(&return,&f2,&x,&fp,&f,&i); [line 17]\n  NULLIFY(&f,false); [line 17]\n  NULLIFY(&f2,false); [line 17]\n  NULLIFY(&fp,false); [line 17]\n  NULLIFY(&i,false); [line 17]\n  NULLIFY(&x,false); [line 17]\n " color=yellow style=filled]
+16 [label="16: Start test\nFormals: \nLocals:  f2:float  x:int  fp:float * f:float  i:int  \n   DECLARE_LOCALS(&return,&f2,&x,&fp,&f,&i); [line 17]\n " color=yellow style=filled]
 	
 
 	 16 -> 23 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
index 9ee425a8c..25d2f1fc7 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
@@ -47,7 +47,7 @@ digraph iCFG {
 32 [label="32: Exit test \n  " color=yellow style=filled]
 	
 
-31 [label="31: Start test\nFormals: \nLocals:  __end:class iterator  SIL_materialize_temp__n$0:class iterator  __begin:class iterator  SIL_materialize_temp__n$4:class iterator  __temp_return_n$9:class iterator  __temp_construct_n$10:class iterator  __temp_construct_n$11:class iterator  temp:int  value:int  __range:class vec & vector:class vec  \n   DECLARE_LOCALS(&return,&__end,&SIL_materialize_temp__n$0,&__begin,&SIL_materialize_temp__n$4,&__temp_return_n$9,&__temp_construct_n$10,&__temp_construct_n$11,&temp,&value,&__range,&vector); [line 35]\n  NULLIFY(&__range,false); [line 35]\n  NULLIFY(&temp,false); [line 35]\n  NULLIFY(&value,false); [line 35]\n " color=yellow style=filled]
+31 [label="31: Start test\nFormals: \nLocals:  __end:class iterator  SIL_materialize_temp__n$0:class iterator  __begin:class iterator  SIL_materialize_temp__n$4:class iterator  __temp_return_n$9:class iterator  __temp_construct_n$10:class iterator  __temp_construct_n$11:class iterator  temp:int  value:int  __range:class vec & vector:class vec  \n   DECLARE_LOCALS(&return,&__end,&SIL_materialize_temp__n$0,&__begin,&SIL_materialize_temp__n$4,&__temp_return_n$9,&__temp_construct_n$10,&__temp_construct_n$11,&temp,&value,&__range,&vector); [line 35]\n " color=yellow style=filled]
 	
 
 	 31 -> 43 ;
@@ -121,7 +121,7 @@ digraph iCFG {
 12 [label="12: Exit iterator_iterator \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start iterator_iterator\nFormals:  this:class iterator *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&this,false); [line 11]\n " color=yellow style=filled]
+11 [label="11: Start iterator_iterator\nFormals:  this:class iterator *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 11 -> 12 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/methods/conversion_operator.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/methods/conversion_operator.cpp.dot
index 69bc53a3c..5c250156a 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/methods/conversion_operator.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/methods/conversion_operator.cpp.dot
@@ -35,7 +35,7 @@ digraph iCFG {
 53 [label="53: Exit branch_div1 \n  " color=yellow style=filled]
 	
 
-52 [label="52: Start branch_div1\nFormals: \nLocals:  v:int  x:class X  \n   DECLARE_LOCALS(&return,&v,&x); [line 61]\n  NULLIFY(&v,false); [line 61]\n " color=yellow style=filled]
+52 [label="52: Start branch_div1\nFormals: \nLocals:  v:int  x:class X  \n   DECLARE_LOCALS(&return,&v,&x); [line 61]\n " color=yellow style=filled]
 	
 
 	 52 -> 61 ;
@@ -75,7 +75,7 @@ digraph iCFG {
 43 [label="43: Exit branch_no_div \n  " color=yellow style=filled]
 	
 
-42 [label="42: Start branch_no_div\nFormals: \nLocals:  v:int  x:class X  \n   DECLARE_LOCALS(&return,&v,&x); [line 52]\n  NULLIFY(&v,false); [line 52]\n " color=yellow style=filled]
+42 [label="42: Start branch_no_div\nFormals: \nLocals:  v:int  x:class X  \n   DECLARE_LOCALS(&return,&v,&x); [line 52]\n " color=yellow style=filled]
 	
 
 	 42 -> 51 ;
@@ -123,7 +123,7 @@ digraph iCFG {
 31 [label="31: Exit y_branch_div0 \n  " color=yellow style=filled]
 	
 
-30 [label="30: Start y_branch_div0\nFormals: \nLocals:  __temp_construct_n$0:class X  SIL_materialize_temp__n$1:class X  __temp_construct_n$5:class X  SIL_materialize_temp__n$6:class X  v:int  __temp_construct_n$11:class X  SIL_materialize_temp__n$12:class X  y:class Y  \n   DECLARE_LOCALS(&return,&__temp_construct_n$0,&SIL_materialize_temp__n$1,&__temp_construct_n$5,&SIL_materialize_temp__n$6,&v,&__temp_construct_n$11,&SIL_materialize_temp__n$12,&y); [line 41]\n  NULLIFY(&v,false); [line 41]\n " color=yellow style=filled]
+30 [label="30: Start y_branch_div0\nFormals: \nLocals:  __temp_construct_n$0:class X  SIL_materialize_temp__n$1:class X  __temp_construct_n$5:class X  SIL_materialize_temp__n$6:class X  v:int  __temp_construct_n$11:class X  SIL_materialize_temp__n$12:class X  y:class Y  \n   DECLARE_LOCALS(&return,&__temp_construct_n$0,&SIL_materialize_temp__n$1,&__temp_construct_n$5,&SIL_materialize_temp__n$6,&v,&__temp_construct_n$11,&SIL_materialize_temp__n$12,&y); [line 41]\n " color=yellow style=filled]
 	
 
 	 30 -> 41 ;
@@ -163,14 +163,14 @@ digraph iCFG {
 21 [label="21: Exit branch_div0 \n  " color=yellow style=filled]
 	
 
-20 [label="20: Start branch_div0\nFormals: \nLocals:  v:int  x:class X  \n   DECLARE_LOCALS(&return,&v,&x); [line 32]\n  NULLIFY(&v,false); [line 32]\n " color=yellow style=filled]
+20 [label="20: Start branch_div0\nFormals: \nLocals:  v:int  x:class X  \n   DECLARE_LOCALS(&return,&v,&x); [line 32]\n " color=yellow style=filled]
 	
 
 	 20 -> 29 ;
 19 [label="19: Exit Y_Y \n  " color=yellow style=filled]
 	
 
-18 [label="18: Start Y_Y\nFormals:  this:class Y *\nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n  NULLIFY(&this,false); [line 25]\n " color=yellow style=filled]
+18 [label="18: Start Y_Y\nFormals:  this:class Y *\nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n " color=yellow style=filled]
 	
 
 	 18 -> 19 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/methods/default_parameters.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/methods/default_parameters.cpp.dot
index 23ea92b8a..a28583c9c 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/methods/default_parameters.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/methods/default_parameters.cpp.dot
@@ -25,7 +25,7 @@ digraph iCFG {
 2 [label="2: Exit A_fun_default \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_fun_default\nFormals:  this:class A * a:int  b:int  c:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n  NULLIFY(&this,false); [line 13]\n " color=yellow style=filled]
+1 [label="1: Start A_fun_default\nFormals:  this:class A * a:int  b:int  c:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/methods/inline_method.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/methods/inline_method.cpp.dot
index 744e81a3b..0971fcb05 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/methods/inline_method.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/methods/inline_method.cpp.dot
@@ -25,7 +25,7 @@ digraph iCFG {
 5 [label="5: Exit A_fun \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start A_fun\nFormals:  this:class A *\nLocals:  c:int  \n   DECLARE_LOCALS(&return,&c); [line 16]\n  NULLIFY(&c,false); [line 16]\n  NULLIFY(&this,false); [line 16]\n " color=yellow style=filled]
+4 [label="4: Start A_fun\nFormals:  this:class A *\nLocals:  c:int  \n   DECLARE_LOCALS(&return,&c); [line 16]\n " color=yellow style=filled]
 	
 
 	 4 -> 7 ;
@@ -36,7 +36,7 @@ digraph iCFG {
 2 [label="2: Exit A::AIn_fun \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A::AIn_fun\nFormals:  this:class A::AIn *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n  NULLIFY(&this,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start A::AIn_fun\nFormals:  this:class A::AIn *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/methods/overloading.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/methods/overloading.cpp.dot
index 5e53cdfa9..cd7057a24 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/methods/overloading.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/methods/overloading.cpp.dot
@@ -21,7 +21,7 @@ digraph iCFG {
 5 [label="5: Exit A_fun \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start A_fun\nFormals:  this:class A * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n  NULLIFY(&this,false); [line 17]\n " color=yellow style=filled]
+4 [label="4: Start A_fun\nFormals:  this:class A * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -32,7 +32,7 @@ digraph iCFG {
 2 [label="2: Exit A_fun \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_fun\nFormals:  this:class A * a:int  b:int  c:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n  NULLIFY(&this,false); [line 15]\n " color=yellow style=filled]
+1 [label="1: Start A_fun\nFormals:  this:class A * a:int  b:int  c:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/methods/return_struct.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/methods/return_struct.cpp.dot
index 95a1b00df..1e6a67838 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/methods/return_struct.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/methods/return_struct.cpp.dot
@@ -25,7 +25,7 @@ digraph iCFG {
 7 [label="7: Exit A_get \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start A_get\nFormals:  this:class A * p:int  __return_param:class X *\nLocals:  x:class X  \n   DECLARE_LOCALS(&return,&x); [line 15]\n  NULLIFY(&p,false); [line 15]\n  NULLIFY(&this,false); [line 15]\n " color=yellow style=filled]
+6 [label="6: Start A_get\nFormals:  this:class A * p:int  __return_param:class X *\nLocals:  x:class X  \n   DECLARE_LOCALS(&return,&x); [line 15]\n " color=yellow style=filled]
 	
 
 	 6 -> 9 ;
@@ -43,7 +43,7 @@ digraph iCFG {
 2 [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/methods/virtual_methods.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/methods/virtual_methods.cpp.dot
index a3941da4d..6dcd4d8b4 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/methods/virtual_methods.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/methods/virtual_methods.cpp.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 51 [label="51: Exit call_virtual_destructor \n  " color=yellow style=filled]
 	
 
-50 [label="50: Start call_virtual_destructor\nFormals: \nLocals:  trgl:class Polygon * \n   DECLARE_LOCALS(&return,&trgl); [line 70]\n  NULLIFY(&trgl,false); [line 70]\n " color=yellow style=filled]
+50 [label="50: Start call_virtual_destructor\nFormals: \nLocals:  trgl:class Polygon * \n   DECLARE_LOCALS(&return,&trgl); [line 70]\n " color=yellow style=filled]
 	
 
 	 50 -> 53 ;
@@ -37,7 +37,7 @@ digraph iCFG {
 44 [label="44: Exit tri_not_virtual_area \n  " color=yellow style=filled]
 	
 
-43 [label="43: Start tri_not_virtual_area\nFormals: \nLocals:  ppoly2:class Polygon * poly:class Polygon  trgl:class Triangle  \n   DECLARE_LOCALS(&return,&ppoly2,&poly,&trgl); [line 59]\n  NULLIFY(&ppoly2,false); [line 59]\n " color=yellow style=filled]
+43 [label="43: Start tri_not_virtual_area\nFormals: \nLocals:  ppoly2:class Polygon * poly:class Polygon  trgl:class Triangle  \n   DECLARE_LOCALS(&return,&ppoly2,&poly,&trgl); [line 59]\n " color=yellow style=filled]
 	
 
 	 43 -> 49 ;
@@ -56,7 +56,7 @@ digraph iCFG {
 39 [label="39: Exit poly_area \n  " color=yellow style=filled]
 	
 
-38 [label="38: Start poly_area\nFormals: \nLocals:  ppoly3:class Polygon * poly:class Polygon  \n   DECLARE_LOCALS(&return,&ppoly3,&poly); [line 53]\n  NULLIFY(&ppoly3,false); [line 53]\n " color=yellow style=filled]
+38 [label="38: Start poly_area\nFormals: \nLocals:  ppoly3:class Polygon * poly:class Polygon  \n   DECLARE_LOCALS(&return,&ppoly3,&poly); [line 53]\n " color=yellow style=filled]
 	
 
 	 38 -> 42 ;
@@ -83,7 +83,7 @@ digraph iCFG {
 32 [label="32: Exit tri_area \n  " color=yellow style=filled]
 	
 
-31 [label="31: Start tri_area\nFormals: \nLocals:  ppoly2:class Polygon * poly:class Polygon  trgl:class Triangle  \n   DECLARE_LOCALS(&return,&ppoly2,&poly,&trgl); [line 45]\n  NULLIFY(&ppoly2,false); [line 45]\n " color=yellow style=filled]
+31 [label="31: Start tri_area\nFormals: \nLocals:  ppoly2:class Polygon * poly:class Polygon  trgl:class Triangle  \n   DECLARE_LOCALS(&return,&ppoly2,&poly,&trgl); [line 45]\n " color=yellow style=filled]
 	
 
 	 31 -> 37 ;
@@ -106,7 +106,7 @@ digraph iCFG {
 26 [label="26: Exit rect_area \n  " color=yellow style=filled]
 	
 
-25 [label="25: Start rect_area\nFormals: \nLocals:  ppoly1:class Polygon * rect:class Rectangle  \n   DECLARE_LOCALS(&return,&ppoly1,&rect); [line 38]\n  NULLIFY(&ppoly1,false); [line 38]\n " color=yellow style=filled]
+25 [label="25: Start rect_area\nFormals: \nLocals:  ppoly1:class Polygon * rect:class Rectangle  \n   DECLARE_LOCALS(&return,&ppoly1,&rect); [line 38]\n " color=yellow style=filled]
 	
 
 	 25 -> 30 ;
@@ -132,14 +132,14 @@ digraph iCFG {
 19 [label="19: Exit Triangle_area \n  " color=yellow style=filled]
 	
 
-18 [label="18: Start Triangle_area\nFormals:  this:class Triangle *\nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 32]\n  NULLIFY(&x,false); [line 32]\n " color=yellow style=filled]
+18 [label="18: Start Triangle_area\nFormals:  this:class Triangle *\nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 32]\n " color=yellow style=filled]
 	
 
 	 18 -> 21 ;
 17 [label="17: Exit Triangle_~Triangle \n  " color=yellow style=filled]
 	
 
-16 [label="16: Start Triangle_~Triangle\nFormals:  this:class Triangle *\nLocals:  \n   DECLARE_LOCALS(&return); [line 31]\n  NULLIFY(&this,false); [line 31]\n " color=yellow style=filled]
+16 [label="16: Start Triangle_~Triangle\nFormals:  this:class Triangle *\nLocals:  \n   DECLARE_LOCALS(&return); [line 31]\n " color=yellow style=filled]
 	
 
 	 16 -> 17 ;
@@ -168,7 +168,7 @@ digraph iCFG {
 9 [label="9: Exit Polygon_Polygon \n  " color=yellow style=filled]
 	
 
-8 [label="8: Start Polygon_Polygon\nFormals:  this:class Polygon *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+8 [label="8: Start Polygon_Polygon\nFormals:  this:class Polygon *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 8 -> 9 ;
@@ -179,7 +179,7 @@ digraph iCFG {
 6 [label="6: Exit Polygon_area \n  " color=yellow style=filled]
 	
 
-5 [label="5: Start Polygon_area\nFormals:  this:class Polygon *\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n  NULLIFY(&this,false); [line 20]\n " color=yellow style=filled]
+5 [label="5: Start Polygon_area\nFormals:  this:class Polygon *\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
 	
 
 	 5 -> 7 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/namespace/global_variable.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/namespace/global_variable.cpp.dot
index 018e93eae..7d0df5126 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/namespace/global_variable.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/namespace/global_variable.cpp.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 12 [label="12: Exit div0_static_field_member_access \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start div0_static_field_member_access\nFormals:  a:class f1::A * b:class C *\nLocals:  \n   DECLARE_LOCALS(&return); [line 40]\n  NULLIFY(&a,false); [line 40]\n  NULLIFY(&b,false); [line 40]\n " color=yellow style=filled]
+11 [label="11: Start div0_static_field_member_access\nFormals:  a:class f1::A * b:class C *\nLocals:  \n   DECLARE_LOCALS(&return); [line 40]\n " color=yellow style=filled]
 	
 
 	 11 -> 15 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/namespace/namespace.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/namespace/namespace.cpp.dot
index 90a2bbd17..b9a0f9c86 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/namespace/namespace.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/namespace/namespace.cpp.dot
@@ -42,14 +42,14 @@ digraph iCFG {
 14 [label="14: Exit main \n  " color=yellow style=filled]
 	
 
-13 [label="13: Start main\nFormals: \nLocals:  rect2:class foo::Rectangle  rect1:class bar::Rectangle  x:class foo::my_record  j:double  i:int  \n   DECLARE_LOCALS(&return,&rect2,&rect1,&x,&j,&i); [line 41]\n  NULLIFY(&i,false); [line 41]\n  NULLIFY(&j,false); [line 41]\n " color=yellow style=filled]
+13 [label="13: Start main\nFormals: \nLocals:  rect2:class foo::Rectangle  rect1:class bar::Rectangle  x:class foo::my_record  j:double  i:int  \n   DECLARE_LOCALS(&return,&rect2,&rect1,&x,&j,&i); [line 41]\n " color=yellow style=filled]
 	
 
 	 13 -> 24 ;
 12 [label="12: Exit bar::Rectangle_Rectangle \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start bar::Rectangle_Rectangle\nFormals:  this:class bar::Rectangle *\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n  NULLIFY(&this,false); [line 32]\n " color=yellow style=filled]
+11 [label="11: Start bar::Rectangle_Rectangle\nFormals:  this:class bar::Rectangle *\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n " color=yellow style=filled]
 	
 
 	 11 -> 12 ;
@@ -67,7 +67,7 @@ digraph iCFG {
 7 [label="7: Exit foo::Rectangle_Rectangle \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start foo::Rectangle_Rectangle\nFormals:  this:class foo::Rectangle *\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n  NULLIFY(&this,false); [line 19]\n " color=yellow style=filled]
+6 [label="6: Start foo::Rectangle_Rectangle\nFormals:  this:class foo::Rectangle *\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
 	 6 -> 7 ;
@@ -85,7 +85,7 @@ digraph iCFG {
 2 [label="2: Exit foo::my_record_ \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start foo::my_record_\nFormals:  this:class foo::my_record *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n  NULLIFY(&this,false); [line 13]\n " color=yellow style=filled]
+1 [label="1: Start foo::my_record_\nFormals:  this:class foo::my_record *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_for.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_for.cpp.dot
index 2f014459c..28e44470e 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_for.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_for.cpp.dot
@@ -35,7 +35,7 @@ digraph iCFG {
 12 [label="12: Exit init_with_scoped_var \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start init_with_scoped_var\nFormals: \nLocals:  i:int  x:int  result:int  \n   DECLARE_LOCALS(&return,&i,&x,&result); [line 17]\n  NULLIFY(&i,false); [line 17]\n  NULLIFY(&result,false); [line 17]\n  NULLIFY(&x,false); [line 17]\n " color=yellow style=filled]
+11 [label="11: Start init_with_scoped_var\nFormals: \nLocals:  i:int  x:int  result:int  \n   DECLARE_LOCALS(&return,&i,&x,&result); [line 17]\n " color=yellow style=filled]
 	
 
 	 11 -> 20 ;
@@ -75,7 +75,7 @@ digraph iCFG {
 2 [label="2: Exit simple_init \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start simple_init\nFormals: \nLocals:  i:int  x:int  result:int  \n   DECLARE_LOCALS(&return,&i,&x,&result); [line 10]\n  NULLIFY(&i,false); [line 10]\n  NULLIFY(&result,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start simple_init\nFormals: \nLocals:  i:int  x:int  result:int  \n   DECLARE_LOCALS(&return,&i,&x,&result); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 10 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_if.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_if.cpp.dot
index 54769bac5..40a9ea81f 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_if.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_if.cpp.dot
@@ -31,7 +31,7 @@ digraph iCFG {
 66 [label="66: Exit simple_init_null_deref \n  " color=yellow style=filled]
 	
 
-65 [label="65: Start simple_init_null_deref\nFormals: \nLocals:  p:int * \n   DECLARE_LOCALS(&return,&p); [line 56]\n  NULLIFY(&p,false); [line 56]\n " color=yellow style=filled]
+65 [label="65: Start simple_init_null_deref\nFormals: \nLocals:  p:int * \n   DECLARE_LOCALS(&return,&p); [line 56]\n " color=yellow style=filled]
 	
 
 	 65 -> 71 ;
@@ -67,7 +67,7 @@ digraph iCFG {
 57 [label="57: Exit reference_init_div0 \n  " color=yellow style=filled]
 	
 
-56 [label="56: Start reference_init_div0\nFormals: \nLocals:  a:int & r:int  \n   DECLARE_LOCALS(&return,&a,&r); [line 48]\n  NULLIFY(&a,false); [line 48]\n " color=yellow style=filled]
+56 [label="56: Start reference_init_div0\nFormals: \nLocals:  a:int & r:int  \n   DECLARE_LOCALS(&return,&a,&r); [line 48]\n " color=yellow style=filled]
 	
 
 	 56 -> 64 ;
@@ -119,7 +119,7 @@ digraph iCFG {
 44 [label="44: Exit conditional_init_div0 \n  " color=yellow style=filled]
 	
 
-43 [label="43: Start conditional_init_div0\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$1); [line 42]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 42]\n  NULLIFY(&a,false); [line 42]\n " color=yellow style=filled]
+43 [label="43: Start conditional_init_div0\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$1:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$1); [line 42]\n " color=yellow style=filled]
 	
 
 	 43 -> 50 ;
@@ -152,7 +152,7 @@ digraph iCFG {
 36 [label="36: Exit function_call_init_div0 \n  " color=yellow style=filled]
 	
 
-35 [label="35: Start function_call_init_div0\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 36]\n  NULLIFY(&a,false); [line 36]\n " color=yellow style=filled]
+35 [label="35: Start function_call_init_div0\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 36]\n " color=yellow style=filled]
 	
 
 	 35 -> 41 ;
@@ -220,7 +220,7 @@ digraph iCFG {
 19 [label="19: Exit simple_inif_elseif_div0 \n  " color=yellow style=filled]
 	
 
-18 [label="18: Start simple_inif_elseif_div0\nFormals: \nLocals:  a:int  b:int  \n   DECLARE_LOCALS(&return,&a,&b); [line 24]\n  NULLIFY(&a,false); [line 24]\n  NULLIFY(&b,false); [line 24]\n " color=yellow style=filled]
+18 [label="18: Start simple_inif_elseif_div0\nFormals: \nLocals:  a:int  b:int  \n   DECLARE_LOCALS(&return,&a,&b); [line 24]\n " color=yellow style=filled]
 	
 
 	 18 -> 24 ;
@@ -256,7 +256,7 @@ digraph iCFG {
 10 [label="10: Exit simple_init_div0 \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start simple_init_div0\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 16]\n  NULLIFY(&a,false); [line 16]\n " color=yellow style=filled]
+9 [label="9: Start simple_init_div0\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 16]\n " color=yellow style=filled]
 	
 
 	 9 -> 15 ;
@@ -288,7 +288,7 @@ digraph iCFG {
 2 [label="2: Exit simple_init_div1 \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start simple_init_div1\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start simple_init_div1\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 7 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_switch.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_switch.cpp.dot
index df3ffaad8..f0bc03081 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_switch.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_switch.cpp.dot
@@ -53,7 +53,7 @@ digraph iCFG {
 2 [label="2: Exit get \n   REMOVE_TEMPS(n$0); [line 20]\n " color=yellow style=filled]
 	
 
-1 [label="1: Start get\nFormals:  a:int \nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 10]\n  NULLIFY(&x,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start get\nFormals:  a:int \nLocals:  x:int  \n   DECLARE_LOCALS(&return,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_while.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_while.cpp.dot
index b195cc935..b6f78b218 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_while.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/var_decl_inside_while.cpp.dot
@@ -64,7 +64,7 @@ digraph iCFG {
 13 [label="13: Exit conditional_assignment \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start conditional_assignment\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$1:int  result:int  x:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$1,&result,&x); [line 20]\n  NULLIFY(&SIL_temp_conditional___n$1,false); [line 20]\n  NULLIFY(&a,false); [line 20]\n  NULLIFY(&result,false); [line 20]\n  NULLIFY(&x,false); [line 20]\n " color=yellow style=filled]
+12 [label="12: Start conditional_assignment\nFormals: \nLocals:  a:int  SIL_temp_conditional___n$1:int  result:int  x:int  \n   DECLARE_LOCALS(&return,&a,&SIL_temp_conditional___n$1,&result,&x); [line 20]\n " color=yellow style=filled]
 	
 
 	 12 -> 28 ;
@@ -108,7 +108,7 @@ digraph iCFG {
 2 [label="2: Exit simple_assignment \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start simple_assignment\nFormals: \nLocals:  a:int  result:int  x:int  \n   DECLARE_LOCALS(&return,&a,&result,&x); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&result,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start simple_assignment\nFormals: \nLocals:  a:int  result:int  x:int  \n   DECLARE_LOCALS(&return,&a,&result,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 11 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/box.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/box.cpp.dot
index 801947a75..db0ab19cb 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/box.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/box.cpp.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 2 [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start test\nFormals: \nLocals:  p:int * r:int & v:int  \n   DECLARE_LOCALS(&return,&p,&r,&v); [line 10]\n  NULLIFY(&p,false); [line 10]\n  NULLIFY(&r,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start test\nFormals: \nLocals:  p:int * r:int & v:int  \n   DECLARE_LOCALS(&return,&p,&r,&v); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/increment.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/increment.cpp.dot
index 92f46b5b3..01a773652 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/increment.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/increment.cpp.dot
@@ -18,7 +18,7 @@ digraph iCFG {
 7 [label="7: Exit using_ref \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start using_ref\nFormals: \nLocals:  q:int & r:int & vr:int & v:int  \n   DECLARE_LOCALS(&return,&q,&r,&vr,&v); [line 16]\n  NULLIFY(&q,false); [line 16]\n  NULLIFY(&r,false); [line 16]\n  NULLIFY(&vr,false); [line 16]\n " color=yellow style=filled]
+6 [label="6: Start using_ref\nFormals: \nLocals:  q:int & r:int & vr:int & v:int  \n   DECLARE_LOCALS(&return,&q,&r,&vr,&v); [line 16]\n " color=yellow style=filled]
 	
 
 	 6 -> 11 ;
@@ -37,7 +37,7 @@ digraph iCFG {
 2 [label="2: Exit using_value \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start using_value\nFormals: \nLocals:  q:int & r:int & v:int  \n   DECLARE_LOCALS(&return,&q,&r,&v); [line 10]\n  NULLIFY(&q,false); [line 10]\n  NULLIFY(&r,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start using_value\nFormals: \nLocals:  q:int & r:int & v:int  \n   DECLARE_LOCALS(&return,&q,&r,&v); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/init.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/init.cpp.dot
index b9f03354e..953001293 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/init.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/init.cpp.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 12 [label="12: Exit init_from_ptr \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start init_from_ptr\nFormals:  par:int *\nLocals:  p:int * d:int & v:int  \n   DECLARE_LOCALS(&return,&p,&d,&v); [line 22]\n  NULLIFY(&d,false); [line 22]\n  NULLIFY(&p,false); [line 22]\n  NULLIFY(&v,false); [line 22]\n " color=yellow style=filled]
+11 [label="11: Start init_from_ptr\nFormals:  par:int *\nLocals:  p:int * d:int & v:int  \n   DECLARE_LOCALS(&return,&p,&d,&v); [line 22]\n " color=yellow style=filled]
 	
 
 	 11 -> 15 ;
@@ -33,7 +33,7 @@ digraph iCFG {
 7 [label="7: Exit init_from_val \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start init_from_val\nFormals:  par:int \nLocals:  p:int * d:int & v:int  \n   DECLARE_LOCALS(&return,&p,&d,&v); [line 16]\n  NULLIFY(&d,false); [line 16]\n  NULLIFY(&p,false); [line 16]\n  NULLIFY(&v,false); [line 16]\n " color=yellow style=filled]
+6 [label="6: Start init_from_val\nFormals:  par:int \nLocals:  p:int * d:int & v:int  \n   DECLARE_LOCALS(&return,&p,&d,&v); [line 16]\n " color=yellow style=filled]
 	
 
 	 6 -> 10 ;
@@ -52,7 +52,7 @@ digraph iCFG {
 2 [label="2: Exit init_from_ref \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start init_from_ref\nFormals:  par:int &\nLocals:  p:int * d:int & v:int  \n   DECLARE_LOCALS(&return,&p,&d,&v); [line 10]\n  NULLIFY(&d,false); [line 10]\n  NULLIFY(&p,false); [line 10]\n  NULLIFY(&v,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start init_from_ref\nFormals:  par:int &\nLocals:  p:int * d:int & v:int  \n   DECLARE_LOCALS(&return,&p,&d,&v); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/member_access.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/member_access.cpp.dot
index 51520ed37..784399635 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/member_access.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/member_access.cpp.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 9 [label="9: Exit access_ptr \n  " color=yellow style=filled]
 	
 
-8 [label="8: Start access_ptr\nFormals:  x:class X *\nLocals:  c:int  f:int  \n   DECLARE_LOCALS(&return,&c,&f); [line 20]\n  NULLIFY(&c,false); [line 20]\n  NULLIFY(&f,false); [line 20]\n " color=yellow style=filled]
+8 [label="8: Start access_ptr\nFormals:  x:class X *\nLocals:  c:int  f:int  \n   DECLARE_LOCALS(&return,&c,&f); [line 20]\n " color=yellow style=filled]
 	
 
 	 8 -> 11 ;
@@ -25,7 +25,7 @@ digraph iCFG {
 5 [label="5: Exit access_ref \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start access_ref\nFormals:  x:class X &\nLocals:  c:int  f:int  \n   DECLARE_LOCALS(&return,&c,&f); [line 15]\n  NULLIFY(&c,false); [line 15]\n  NULLIFY(&f,false); [line 15]\n " color=yellow style=filled]
+4 [label="4: Start access_ref\nFormals:  x:class X &\nLocals:  c:int  f:int  \n   DECLARE_LOCALS(&return,&c,&f); [line 15]\n " color=yellow style=filled]
 	
 
 	 4 -> 7 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/member_access_from_return.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/member_access_from_return.cpp.dot
index da28c11e9..c64e44a56 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/member_access_from_return.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/member_access_from_return.cpp.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 17 [label="17: Exit test_ptr \n  " color=yellow style=filled]
 	
 
-16 [label="16: Start test_ptr\nFormals: \nLocals:  c:int  f:int  \n   DECLARE_LOCALS(&return,&c,&f); [line 24]\n  NULLIFY(&c,false); [line 24]\n  NULLIFY(&f,false); [line 24]\n " color=yellow style=filled]
+16 [label="16: Start test_ptr\nFormals: \nLocals:  c:int  f:int  \n   DECLARE_LOCALS(&return,&c,&f); [line 24]\n " color=yellow style=filled]
 	
 
 	 16 -> 19 ;
@@ -25,7 +25,7 @@ digraph iCFG {
 13 [label="13: Exit test_ref \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start test_ref\nFormals: \nLocals:  c:int  f:int  \n   DECLARE_LOCALS(&return,&c,&f); [line 19]\n  NULLIFY(&c,false); [line 19]\n  NULLIFY(&f,false); [line 19]\n " color=yellow style=filled]
+12 [label="12: Start test_ref\nFormals: \nLocals:  c:int  f:int  \n   DECLARE_LOCALS(&return,&c,&f); [line 19]\n " color=yellow style=filled]
 	
 
 	 12 -> 15 ;
@@ -54,7 +54,7 @@ digraph iCFG {
 5 [label="5: Exit X_X \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+4 [label="4: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 4 -> 5 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/nested_assignment.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/nested_assignment.cpp.dot
index be8daf242..6db45fad0 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/nested_assignment.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/nested_assignment.cpp.dot
@@ -18,7 +18,7 @@ digraph iCFG {
 12 [label="12: Exit crazy_nested \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start crazy_nested\nFormals: \nLocals:  ref_from_ref:int & ref_from_val:int & b:int  a:int  \n   DECLARE_LOCALS(&return,&ref_from_ref,&ref_from_val,&b,&a); [line 22]\n  NULLIFY(&b,false); [line 22]\n  NULLIFY(&ref_from_ref,false); [line 22]\n  NULLIFY(&ref_from_val,false); [line 22]\n " color=yellow style=filled]
+11 [label="11: Start crazy_nested\nFormals: \nLocals:  ref_from_ref:int & ref_from_val:int & b:int  a:int  \n   DECLARE_LOCALS(&return,&ref_from_ref,&ref_from_val,&b,&a); [line 22]\n " color=yellow style=filled]
 	
 
 	 11 -> 16 ;
@@ -37,7 +37,7 @@ digraph iCFG {
 7 [label="7: Exit nested \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start nested\nFormals: \nLocals:  ref_from_ref:int & ref_from_val:int & a:int  \n   DECLARE_LOCALS(&return,&ref_from_ref,&ref_from_val,&a); [line 16]\n  NULLIFY(&ref_from_ref,false); [line 16]\n  NULLIFY(&ref_from_val,false); [line 16]\n " color=yellow style=filled]
+6 [label="6: Start nested\nFormals: \nLocals:  ref_from_ref:int & ref_from_val:int & a:int  \n   DECLARE_LOCALS(&return,&ref_from_ref,&ref_from_val,&a); [line 16]\n " color=yellow style=filled]
 	
 
 	 6 -> 10 ;
@@ -56,7 +56,7 @@ digraph iCFG {
 2 [label="2: Exit normal \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start normal\nFormals: \nLocals:  ref_from_ref:int & ref_from_val:int & a:int  \n   DECLARE_LOCALS(&return,&ref_from_ref,&ref_from_val,&a); [line 10]\n  NULLIFY(&ref_from_ref,false); [line 10]\n  NULLIFY(&ref_from_val,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start normal\nFormals: \nLocals:  ref_from_ref:int & ref_from_val:int & a:int  \n   DECLARE_LOCALS(&return,&ref_from_ref,&ref_from_val,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/reference_field.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/reference_field.cpp.dot
index e2942702f..5adb4a80c 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/reference_field.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/reference_field.cpp.dot
@@ -448,7 +448,7 @@ digraph iCFG {
 2 [label="2: Exit X_X \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/reference_struct_e2e.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/reference_struct_e2e.cpp.dot
index 2125fd9de..53a32d40e 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/reference_struct_e2e.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/reference_struct_e2e.cpp.dot
@@ -430,7 +430,7 @@ digraph iCFG {
 11 [label="11: Exit X_X \n  " color=yellow style=filled]
 	
 
-10 [label="10: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+10 [label="10: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 10 -> 11 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/reference_type_e2e.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/reference_type_e2e.cpp.dot
index e3bf6d50d..10ab6228f 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/reference_type_e2e.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/reference_type_e2e.cpp.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 50 [label="50: Exit ref_div1_nested_assignment \n  " color=yellow style=filled]
 	
 
-49 [label="49: Start ref_div1_nested_assignment\nFormals: \nLocals:  r2:int & r1:int & b:int  a:int  \n   DECLARE_LOCALS(&return,&r2,&r1,&b,&a); [line 62]\n  NULLIFY(&b,false); [line 62]\n  NULLIFY(&r1,false); [line 62]\n  NULLIFY(&r2,false); [line 62]\n " color=yellow style=filled]
+49 [label="49: Start ref_div1_nested_assignment\nFormals: \nLocals:  r2:int & r1:int & b:int  a:int  \n   DECLARE_LOCALS(&return,&r2,&r1,&b,&a); [line 62]\n " color=yellow style=filled]
 	
 
 	 49 -> 56 ;
@@ -57,7 +57,7 @@ digraph iCFG {
 42 [label="42: Exit ref_div0_nested_assignment \n  " color=yellow style=filled]
 	
 
-41 [label="41: Start ref_div0_nested_assignment\nFormals: \nLocals:  r2:int & r1:int & b:int  a:int  \n   DECLARE_LOCALS(&return,&r2,&r1,&b,&a); [line 53]\n  NULLIFY(&b,false); [line 53]\n  NULLIFY(&r1,false); [line 53]\n  NULLIFY(&r2,false); [line 53]\n " color=yellow style=filled]
+41 [label="41: Start ref_div0_nested_assignment\nFormals: \nLocals:  r2:int & r1:int & b:int  a:int  \n   DECLARE_LOCALS(&return,&r2,&r1,&b,&a); [line 53]\n " color=yellow style=filled]
 	
 
 	 41 -> 48 ;
@@ -80,7 +80,7 @@ digraph iCFG {
 36 [label="36: Exit ref_div0_function_temp_var \n  " color=yellow style=filled]
 	
 
-35 [label="35: Start ref_div0_function_temp_var\nFormals: \nLocals:  r:int & a:int  \n   DECLARE_LOCALS(&return,&r,&a); [line 46]\n  NULLIFY(&r,false); [line 46]\n " color=yellow style=filled]
+35 [label="35: Start ref_div0_function_temp_var\nFormals: \nLocals:  r:int & a:int  \n   DECLARE_LOCALS(&return,&r,&a); [line 46]\n " color=yellow style=filled]
 	
 
 	 35 -> 40 ;
@@ -122,7 +122,7 @@ digraph iCFG {
 25 [label="25: Exit ref_div0 \n  " color=yellow style=filled]
 	
 
-24 [label="24: Start ref_div0\nFormals: \nLocals:  r:int & a:int  \n   DECLARE_LOCALS(&return,&r,&a); [line 33]\n  NULLIFY(&r,false); [line 33]\n " color=yellow style=filled]
+24 [label="24: Start ref_div0\nFormals: \nLocals:  r:int & a:int  \n   DECLARE_LOCALS(&return,&r,&a); [line 33]\n " color=yellow style=filled]
 	
 
 	 24 -> 29 ;
@@ -145,7 +145,7 @@ digraph iCFG {
 19 [label="19: Exit ptr_div0_function_temp_var \n  " color=yellow style=filled]
 	
 
-18 [label="18: Start ptr_div0_function_temp_var\nFormals: \nLocals:  r:int * a:int  \n   DECLARE_LOCALS(&return,&r,&a); [line 26]\n  NULLIFY(&r,false); [line 26]\n " color=yellow style=filled]
+18 [label="18: Start ptr_div0_function_temp_var\nFormals: \nLocals:  r:int * a:int  \n   DECLARE_LOCALS(&return,&r,&a); [line 26]\n " color=yellow style=filled]
 	
 
 	 18 -> 23 ;
@@ -187,7 +187,7 @@ digraph iCFG {
 8 [label="8: Exit ptr_div0 \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start ptr_div0\nFormals: \nLocals:  p:int * a:int  \n   DECLARE_LOCALS(&return,&p,&a); [line 13]\n  NULLIFY(&p,false); [line 13]\n " color=yellow style=filled]
+7 [label="7: Start ptr_div0\nFormals: \nLocals:  p:int * a:int  \n   DECLARE_LOCALS(&return,&p,&a); [line 13]\n " color=yellow style=filled]
 	
 
 	 7 -> 12 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/temporary_lvalue.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/temporary_lvalue.cpp.dot
index ae1a992d9..dbd99b349 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/temporary_lvalue.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/temporary_lvalue.cpp.dot
@@ -36,7 +36,7 @@ digraph iCFG {
 5 [label="5: Exit div0_init_expr \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start div0_init_expr\nFormals: \nLocals:  a:int & SIL_materialize_temp__n$2:int  \n   DECLARE_LOCALS(&return,&a,&SIL_materialize_temp__n$2); [line 12]\n  NULLIFY(&a,false); [line 12]\n " color=yellow style=filled]
+4 [label="4: Start div0_init_expr\nFormals: \nLocals:  a:int & SIL_materialize_temp__n$2:int  \n   DECLARE_LOCALS(&return,&a,&SIL_materialize_temp__n$2); [line 12]\n " color=yellow style=filled]
 	
 
 	 4 -> 7 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/reference/unbox.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/reference/unbox.cpp.dot
index 359104dca..dc2c69edf 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/reference/unbox.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/reference/unbox.cpp.dot
@@ -22,7 +22,7 @@ digraph iCFG {
 18 [label="18: Exit unbox_ptr \n  " color=yellow style=filled]
 	
 
-17 [label="17: Start unbox_ptr\nFormals: \nLocals:  p:int * a:int  \n   DECLARE_LOCALS(&return,&p,&a); [line 27]\n  NULLIFY(&p,false); [line 27]\n " color=yellow style=filled]
+17 [label="17: Start unbox_ptr\nFormals: \nLocals:  p:int * a:int  \n   DECLARE_LOCALS(&return,&p,&a); [line 27]\n " color=yellow style=filled]
 	
 
 	 17 -> 23 ;
@@ -49,7 +49,7 @@ digraph iCFG {
 11 [label="11: Exit unbox_ref \n  " color=yellow style=filled]
 	
 
-10 [label="10: Start unbox_ref\nFormals: \nLocals:  r:int & a:int  \n   DECLARE_LOCALS(&return,&r,&a); [line 17]\n  NULLIFY(&r,false); [line 17]\n " color=yellow style=filled]
+10 [label="10: Start unbox_ref\nFormals: \nLocals:  r:int & a:int  \n   DECLARE_LOCALS(&return,&r,&a); [line 17]\n " color=yellow style=filled]
 	
 
 	 10 -> 16 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/templates/class_template_instantiate.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/templates/class_template_instantiate.cpp.dot
index 8de0378a2..574554a44 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/templates/class_template_instantiate.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/templates/class_template_instantiate.cpp.dot
@@ -83,7 +83,7 @@ digraph iCFG {
 8 [label="8: Exit Choose2_extra \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start Choose2_extra\nFormals:  this:class Choose2 * a:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&this,false); [line 18]\n " color=yellow style=filled]
+7 [label="7: Start Choose2_extra\nFormals:  this:class Choose2 * a:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 7 -> 9 ;
@@ -94,7 +94,7 @@ digraph iCFG {
 5 [label="5: Exit Choose2_div \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start Choose2_div\nFormals:  this:class Choose2 * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n  NULLIFY(&a,false); [line 15]\n  NULLIFY(&this,false); [line 15]\n " color=yellow style=filled]
+4 [label="4: Start Choose2_div\nFormals:  this:class Choose2 * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -105,7 +105,7 @@ digraph iCFG {
 2 [label="2: Exit Choose1_div \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start Choose1_div\nFormals:  this:class Choose1 * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&b,false); [line 11]\n  NULLIFY(&this,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start Choose1_div\nFormals:  this:class Choose1 * a:int  b:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/templates/function.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/templates/function.cpp.dot
index ace846a4d..42e2ec9da 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/templates/function.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/templates/function.cpp.dot
@@ -136,7 +136,7 @@ digraph iCFG {
 13 [label="13: Exit X3_X3 \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start X3_X3\nFormals:  this:class X3 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&this,false); [line 18]\n " color=yellow style=filled]
+12 [label="12: Start X3_X3\nFormals:  this:class X3 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 12 -> 13 ;
@@ -147,7 +147,7 @@ digraph iCFG {
 10 [label="10: Exit X3_get \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start X3_get\nFormals:  this:class X3 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n  NULLIFY(&this,false); [line 19]\n " color=yellow style=filled]
+9 [label="9: Start X3_get\nFormals:  this:class X3 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
 	 9 -> 11 ;
@@ -158,14 +158,14 @@ digraph iCFG {
 7 [label="7: Exit X2_getVal \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start X2_getVal\nFormals:  this:class X2 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n  NULLIFY(&this,false); [line 15]\n " color=yellow style=filled]
+6 [label="6: Start X2_getVal\nFormals:  this:class X2 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 6 -> 8 ;
 5 [label="5: Exit X1_X1 \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start X1_X1\nFormals:  this:class X1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+4 [label="4: Start X1_X1\nFormals:  this:class X1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 4 -> 5 ;
@@ -176,7 +176,7 @@ digraph iCFG {
 2 [label="2: Exit X1_getVal \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X1_getVal\nFormals:  this:class X1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&this,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start X1_getVal\nFormals:  this:class X1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/templates/method.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/templates/method.cpp.dot
index 6f36cb15d..aca0595c8 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/templates/method.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/templates/method.cpp.dot
@@ -132,7 +132,7 @@ digraph iCFG {
 41 [label="41: Exit GetterTempl<X1>_GetterTempl \n  " color=yellow style=filled]
 	
 
-40 [label="40: Start GetterTempl<X1>_GetterTempl\nFormals:  this:class GetterTempl<X1> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 30]\n  NULLIFY(&this,false); [line 30]\n " color=yellow style=filled]
+40 [label="40: Start GetterTempl<X1>_GetterTempl\nFormals:  this:class GetterTempl<X1> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 30]\n " color=yellow style=filled]
 	
 
 	 40 -> 41 ;
@@ -143,14 +143,14 @@ digraph iCFG {
 38 [label="38: Exit GetterTempl<X1>_get<X1> \n  " color=yellow style=filled]
 	
 
-37 [label="37: Start GetterTempl<X1>_get<X1>\nFormals:  this:class GetterTempl<X1> * t:class X1 & s:class X1 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n  NULLIFY(&this,false); [line 32]\n " color=yellow style=filled]
+37 [label="37: Start GetterTempl<X1>_get<X1>\nFormals:  this:class GetterTempl<X1> * t:class X1 & s:class X1 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n " color=yellow style=filled]
 	
 
 	 37 -> 39 ;
 36 [label="36: Exit GetterTempl<X2>_GetterTempl \n  " color=yellow style=filled]
 	
 
-35 [label="35: Start GetterTempl<X2>_GetterTempl\nFormals:  this:class GetterTempl<X2> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 30]\n  NULLIFY(&this,false); [line 30]\n " color=yellow style=filled]
+35 [label="35: Start GetterTempl<X2>_GetterTempl\nFormals:  this:class GetterTempl<X2> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 30]\n " color=yellow style=filled]
 	
 
 	 35 -> 36 ;
@@ -161,7 +161,7 @@ digraph iCFG {
 33 [label="33: Exit GetterTempl<X2>_get<X1> \n  " color=yellow style=filled]
 	
 
-32 [label="32: Start GetterTempl<X2>_get<X1>\nFormals:  this:class GetterTempl<X2> * t:class X2 & s:class X1 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n  NULLIFY(&this,false); [line 32]\n " color=yellow style=filled]
+32 [label="32: Start GetterTempl<X2>_get<X1>\nFormals:  this:class GetterTempl<X2> * t:class X2 & s:class X1 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n " color=yellow style=filled]
 	
 
 	 32 -> 34 ;
@@ -172,14 +172,14 @@ digraph iCFG {
 30 [label="30: Exit GetterTempl<X2>_get<X2> \n  " color=yellow style=filled]
 	
 
-29 [label="29: Start GetterTempl<X2>_get<X2>\nFormals:  this:class GetterTempl<X2> * t:class X2 & s:class X2 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n  NULLIFY(&this,false); [line 32]\n " color=yellow style=filled]
+29 [label="29: Start GetterTempl<X2>_get<X2>\nFormals:  this:class GetterTempl<X2> * t:class X2 & s:class X2 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n " color=yellow style=filled]
 	
 
 	 29 -> 31 ;
 28 [label="28: Exit GetterTempl<X3>_GetterTempl \n  " color=yellow style=filled]
 	
 
-27 [label="27: Start GetterTempl<X3>_GetterTempl\nFormals:  this:class GetterTempl<X3> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 30]\n  NULLIFY(&this,false); [line 30]\n " color=yellow style=filled]
+27 [label="27: Start GetterTempl<X3>_GetterTempl\nFormals:  this:class GetterTempl<X3> *\nLocals:  \n   DECLARE_LOCALS(&return); [line 30]\n " color=yellow style=filled]
 	
 
 	 27 -> 28 ;
@@ -190,14 +190,14 @@ digraph iCFG {
 25 [label="25: Exit GetterTempl<X3>_get<X2> \n  " color=yellow style=filled]
 	
 
-24 [label="24: Start GetterTempl<X3>_get<X2>\nFormals:  this:class GetterTempl<X3> * t:class X3 & s:class X2 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n  NULLIFY(&this,false); [line 32]\n " color=yellow style=filled]
+24 [label="24: Start GetterTempl<X3>_get<X2>\nFormals:  this:class GetterTempl<X3> * t:class X3 & s:class X2 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n " color=yellow style=filled]
 	
 
 	 24 -> 26 ;
 23 [label="23: Exit Getter_Getter \n  " color=yellow style=filled]
 	
 
-22 [label="22: Start Getter_Getter\nFormals:  this:class Getter *\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n  NULLIFY(&this,false); [line 22]\n " color=yellow style=filled]
+22 [label="22: Start Getter_Getter\nFormals:  this:class Getter *\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
 	
 
 	 22 -> 23 ;
@@ -208,7 +208,7 @@ digraph iCFG {
 20 [label="20: Exit Getter_get<X1> \n  " color=yellow style=filled]
 	
 
-19 [label="19: Start Getter_get<X1>\nFormals:  this:class Getter * s:class X1 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n  NULLIFY(&this,false); [line 24]\n " color=yellow style=filled]
+19 [label="19: Start Getter_get<X1>\nFormals:  this:class Getter * s:class X1 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
 	
 
 	 19 -> 21 ;
@@ -219,14 +219,14 @@ digraph iCFG {
 17 [label="17: Exit Getter_get<X2> \n  " color=yellow style=filled]
 	
 
-16 [label="16: Start Getter_get<X2>\nFormals:  this:class Getter * s:class X2 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n  NULLIFY(&this,false); [line 24]\n " color=yellow style=filled]
+16 [label="16: Start Getter_get<X2>\nFormals:  this:class Getter * s:class X2 &\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
 	
 
 	 16 -> 18 ;
 15 [label="15: Exit X3_X3 \n  " color=yellow style=filled]
 	
 
-14 [label="14: Start X3_X3\nFormals:  this:class X3 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&this,false); [line 18]\n " color=yellow style=filled]
+14 [label="14: Start X3_X3\nFormals:  this:class X3 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 14 -> 15 ;
@@ -237,14 +237,14 @@ digraph iCFG {
 12 [label="12: Exit X3_get \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start X3_get\nFormals:  this:class X3 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n  NULLIFY(&this,false); [line 19]\n " color=yellow style=filled]
+11 [label="11: Start X3_get\nFormals:  this:class X3 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
 	 11 -> 13 ;
 10 [label="10: Exit X2_X2 \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start X2_X2\nFormals:  this:class X2 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n  NULLIFY(&this,false); [line 14]\n " color=yellow style=filled]
+9 [label="9: Start X2_X2\nFormals:  this:class X2 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 9 -> 10 ;
@@ -255,14 +255,14 @@ digraph iCFG {
 7 [label="7: Exit X2_get \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start X2_get\nFormals:  this:class X2 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n  NULLIFY(&this,false); [line 15]\n " color=yellow style=filled]
+6 [label="6: Start X2_get\nFormals:  this:class X2 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 15]\n " color=yellow style=filled]
 	
 
 	 6 -> 8 ;
 5 [label="5: Exit X1_X1 \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start X1_X1\nFormals:  this:class X1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+4 [label="4: Start X1_X1\nFormals:  this:class X1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 4 -> 5 ;
@@ -273,7 +273,7 @@ digraph iCFG {
 2 [label="2: Exit X1_get \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X1_get\nFormals:  this:class X1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&this,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start X1_get\nFormals:  this:class X1 *\nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/templates/sizeof_pack.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/templates/sizeof_pack.cpp.dot
index 818ca6980..6ac74b156 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/templates/sizeof_pack.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/templates/sizeof_pack.cpp.dot
@@ -27,7 +27,7 @@ digraph iCFG {
 5 [label="5: Exit hash_combine_generic<MyHasher, int, int, int> \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start hash_combine_generic<MyHasher, int, int, int>\nFormals:  t:int & ts:int & ts:int &\nLocals:  seed:int  \n   DECLARE_LOCALS(&return,&seed); [line 15]\n  NULLIFY(&seed,false); [line 15]\n  NULLIFY(&ts,false); [line 15]\n " color=yellow style=filled]
+4 [label="4: Start hash_combine_generic<MyHasher, int, int, int>\nFormals:  t:int & ts:int & ts:int &\nLocals:  seed:int  \n   DECLARE_LOCALS(&return,&seed); [line 15]\n " color=yellow style=filled]
 	
 
 	 4 -> 11 ;
@@ -38,7 +38,7 @@ digraph iCFG {
 2 [label="2: Exit MyHasher_hash \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start MyHasher_hash\nFormals:  t:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n  NULLIFY(&t,false); [line 11]\n " color=yellow style=filled]
+1 [label="1: Start MyHasher_hash\nFormals:  t:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 11]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/types/casts.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/types/casts.cpp.dot
index 565bb4a70..cf178f1a3 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/types/casts.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/types/casts.cpp.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 5 [label="5: Exit functional_cast \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start functional_cast\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 15]\n  NULLIFY(&a,false); [line 15]\n " color=yellow style=filled]
+4 [label="4: Start functional_cast\nFormals: \nLocals:  a:int  \n   DECLARE_LOCALS(&return,&a); [line 15]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -17,7 +17,7 @@ digraph iCFG {
 2 [label="2: Exit stat_cast \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start stat_cast\nFormals: \nLocals:  la:long long  a:int  \n   DECLARE_LOCALS(&return,&la,&a); [line 10]\n  NULLIFY(&la,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start stat_cast\nFormals: \nLocals:  la:long long  a:int  \n   DECLARE_LOCALS(&return,&la,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/types/functions.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/types/functions.cpp.dot
index 901a601a6..4f93f3211 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/types/functions.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/types/functions.cpp.dot
@@ -44,7 +44,7 @@ digraph iCFG {
 8 [label="8: Exit fun_ignore_param \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start fun_ignore_param\nFormals:  a:int  __param_1:int  __param_2:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n  NULLIFY(&__param_1,false); [line 16]\n  NULLIFY(&__param_2,false); [line 16]\n " color=yellow style=filled]
+7 [label="7: Start fun_ignore_param\nFormals:  a:int  __param_1:int  __param_2:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 16]\n " color=yellow style=filled]
 	
 
 	 7 -> 9 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/types/inheritance.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/types/inheritance.cpp.dot
index 789fbbb4d..52c23f911 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/types/inheritance.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/types/inheritance.cpp.dot
@@ -38,7 +38,7 @@ digraph iCFG {
 16 [label="16: Exit call_static_methods \n  " color=yellow style=filled]
 	
 
-15 [label="15: Start call_static_methods\nFormals: \nLocals:  s2:class Sub * s1:class Base * b:class Base * \n   DECLARE_LOCALS(&return,&s2,&s1,&b); [line 21]\n  NULLIFY(&b,false); [line 21]\n  NULLIFY(&s1,false); [line 21]\n  NULLIFY(&s2,false); [line 21]\n " color=yellow style=filled]
+15 [label="15: Start call_static_methods\nFormals: \nLocals:  s2:class Sub * s1:class Base * b:class Base * \n   DECLARE_LOCALS(&return,&s2,&s1,&b); [line 21]\n " color=yellow style=filled]
 	
 
 	 15 -> 25 ;
@@ -60,14 +60,14 @@ digraph iCFG {
 10 [label="10: Exit Sub_fun_redefine \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start Sub_fun_redefine\nFormals:  this:class Sub *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&this,false); [line 18]\n " color=yellow style=filled]
+9 [label="9: Start Sub_fun_redefine\nFormals:  this:class Sub *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 9 -> 11 ;
 8 [label="8: Exit Base_Base \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start Base_Base\nFormals:  this:class Base *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n  NULLIFY(&this,false); [line 10]\n " color=yellow style=filled]
+7 [label="7: Start Base_Base\nFormals:  this:class Base *\nLocals:  \n   DECLARE_LOCALS(&return); [line 10]\n " color=yellow style=filled]
 	
 
 	 7 -> 8 ;
@@ -78,7 +78,7 @@ digraph iCFG {
 5 [label="5: Exit Base_fun_redefine \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start Base_fun_redefine\nFormals:  this:class Base *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n  NULLIFY(&this,false); [line 13]\n " color=yellow style=filled]
+4 [label="4: Start Base_fun_redefine\nFormals:  this:class Base *\nLocals:  \n   DECLARE_LOCALS(&return); [line 13]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -89,7 +89,7 @@ digraph iCFG {
 2 [label="2: Exit Base_fun \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start Base_fun\nFormals:  this:class Base *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n  NULLIFY(&this,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start Base_fun\nFormals:  this:class Base *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/types/inheritance_field.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/types/inheritance_field.cpp.dot
index f732e1ae0..fd4f8a8ee 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/types/inheritance_field.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/types/inheritance_field.cpp.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 38 [label="38: Exit div1_cast \n  " color=yellow style=filled]
 	
 
-37 [label="37: Start div1_cast\nFormals:  s:class Sub *\nLocals:  b:class Base1 * \n   DECLARE_LOCALS(&return,&b); [line 66]\n  NULLIFY(&b,false); [line 66]\n " color=yellow style=filled]
+37 [label="37: Start div1_cast\nFormals:  s:class Sub *\nLocals:  b:class Base1 * \n   DECLARE_LOCALS(&return,&b); [line 66]\n " color=yellow style=filled]
 	
 
 	 37 -> 41 ;
@@ -86,7 +86,7 @@ digraph iCFG {
 19 [label="19: Exit div0_cast_ref \n  " color=yellow style=filled]
 	
 
-18 [label="18: Start div0_cast_ref\nFormals:  s:class Sub \nLocals:  b:class Base1 & \n   DECLARE_LOCALS(&return,&b); [line 43]\n  NULLIFY(&b,false); [line 43]\n " color=yellow style=filled]
+18 [label="18: Start div0_cast_ref\nFormals:  s:class Sub \nLocals:  b:class Base1 & \n   DECLARE_LOCALS(&return,&b); [line 43]\n " color=yellow style=filled]
 	
 
 	 18 -> 22 ;
@@ -105,7 +105,7 @@ digraph iCFG {
 14 [label="14: Exit div0_cast \n  " color=yellow style=filled]
 	
 
-13 [label="13: Start div0_cast\nFormals:  s:class Sub *\nLocals:  b:class Base1 * \n   DECLARE_LOCALS(&return,&b); [line 37]\n  NULLIFY(&b,false); [line 37]\n " color=yellow style=filled]
+13 [label="13: Start div0_cast\nFormals:  s:class Sub *\nLocals:  b:class Base1 * \n   DECLARE_LOCALS(&return,&b); [line 37]\n " color=yellow style=filled]
 	
 
 	 13 -> 17 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/types/operator_overload.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/types/operator_overload.cpp.dot
index a0a26cd56..4d1a0a2c9 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/types/operator_overload.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/types/operator_overload.cpp.dot
@@ -32,7 +32,7 @@ digraph iCFG {
 19 [label="19: Exit div0_method \n  " color=yellow style=filled]
 	
 
-18 [label="18: Start div0_method\nFormals:  x:class X &\nLocals:  v:int  \n   DECLARE_LOCALS(&return,&v); [line 34]\n  NULLIFY(&v,false); [line 34]\n " color=yellow style=filled]
+18 [label="18: Start div0_method\nFormals:  x:class X &\nLocals:  v:int  \n   DECLARE_LOCALS(&return,&v); [line 34]\n " color=yellow style=filled]
 	
 
 	 18 -> 21 ;
@@ -47,7 +47,7 @@ digraph iCFG {
 15 [label="15: Exit div0_function_op \n  " color=yellow style=filled]
 	
 
-14 [label="14: Start div0_function_op\nFormals:  x:class X &\nLocals:  v:int  \n   DECLARE_LOCALS(&return,&v); [line 28]\n  NULLIFY(&v,false); [line 28]\n " color=yellow style=filled]
+14 [label="14: Start div0_function_op\nFormals:  x:class X &\nLocals:  v:int  \n   DECLARE_LOCALS(&return,&v); [line 28]\n " color=yellow style=filled]
 	
 
 	 14 -> 17 ;
@@ -73,7 +73,7 @@ digraph iCFG {
 8 [label="8: Exit div0_method_op \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start div0_method_op\nFormals:  x:class X &\nLocals:  v:int  \n   DECLARE_LOCALS(&return,&v); [line 20]\n  NULLIFY(&v,false); [line 20]\n " color=yellow style=filled]
+7 [label="7: Start div0_method_op\nFormals:  x:class X &\nLocals:  v:int  \n   DECLARE_LOCALS(&return,&v); [line 20]\n " color=yellow style=filled]
 	
 
 	 7 -> 10 ;
@@ -84,7 +84,7 @@ digraph iCFG {
 5 [label="5: Exit operator* \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start operator*\nFormals:  x1:class X & v:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&x1,false); [line 18]\n " color=yellow style=filled]
+4 [label="4: Start operator*\nFormals:  x1:class X & v:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -95,7 +95,7 @@ digraph iCFG {
 2 [label="2: Exit X_operator[] \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start X_operator[]\nFormals:  this:class X * x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n  NULLIFY(&this,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start X_operator[]\nFormals:  this:class X * x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/types/struct_forward_declare.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/types/struct_forward_declare.cpp.dot
index 305d46ad4..23ed03a6d 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/types/struct_forward_declare.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/types/struct_forward_declare.cpp.dot
@@ -110,7 +110,7 @@ digraph iCFG {
 13 [label="13: Exit Z_Z \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start Z_Z\nFormals:  this:class Z *\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n  NULLIFY(&this,false); [line 26]\n " color=yellow style=filled]
+12 [label="12: Start Z_Z\nFormals:  this:class Z *\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n " color=yellow style=filled]
 	
 
 	 12 -> 13 ;
@@ -132,14 +132,14 @@ digraph iCFG {
 7 [label="7: Exit fun_with_Z \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start fun_with_Z\nFormals:  z1:class Z *\nLocals:  z2:class Z * \n   DECLARE_LOCALS(&return,&z2); [line 24]\n  NULLIFY(&z2,false); [line 24]\n " color=yellow style=filled]
+6 [label="6: Start fun_with_Z\nFormals:  z1:class Z *\nLocals:  z2:class Z * \n   DECLARE_LOCALS(&return,&z2); [line 24]\n " color=yellow style=filled]
 	
 
 	 6 -> 8 ;
 5 [label="5: Exit X_X \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n  NULLIFY(&this,false); [line 17]\n " color=yellow style=filled]
+4 [label="4: Start X_X\nFormals:  this:class X *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 4 -> 5 ;
diff --git a/infer/tests/codetoanalyze/cpp/frontend/types/typeid_expr.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/types/typeid_expr.cpp.dot
index 79ac4d8d8..82e10cc9a 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/types/typeid_expr.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/types/typeid_expr.cpp.dot
@@ -134,7 +134,7 @@ digraph iCFG {
 37 [label="37: Exit employee_typeid \n  " color=yellow style=filled]
 	
 
-36 [label="36: Start employee_typeid\nFormals: \nLocals:  ptr:class Person * employee:class Employee  \n   DECLARE_LOCALS(&return,&ptr,&employee); [line 39]\n  NULLIFY(&ptr,false); [line 39]\n " color=yellow style=filled]
+36 [label="36: Start employee_typeid\nFormals: \nLocals:  ptr:class Person * employee:class Employee  \n   DECLARE_LOCALS(&return,&ptr,&employee); [line 39]\n " color=yellow style=filled]
 	
 
 	 36 -> 46 ;
@@ -186,7 +186,7 @@ digraph iCFG {
 24 [label="24: Exit person_typeid_name \n  " color=yellow style=filled]
 	
 
-23 [label="23: Start person_typeid_name\nFormals: \nLocals:  person_type_info:char * t_type_info:char * t:int  person:class Person  \n   DECLARE_LOCALS(&return,&person_type_info,&t_type_info,&t,&person); [line 28]\n  NULLIFY(&person_type_info,false); [line 28]\n  NULLIFY(&t,false); [line 28]\n  NULLIFY(&t_type_info,false); [line 28]\n " color=yellow style=filled]
+23 [label="23: Start person_typeid_name\nFormals: \nLocals:  person_type_info:char * t_type_info:char * t:int  person:class Person  \n   DECLARE_LOCALS(&return,&person_type_info,&t_type_info,&t,&person); [line 28]\n " color=yellow style=filled]
 	
 
 	 23 -> 35 ;
@@ -230,7 +230,7 @@ digraph iCFG {
 13 [label="13: Exit person_typeid \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start person_typeid\nFormals: \nLocals:  t:int  person:class Person  \n   DECLARE_LOCALS(&return,&t,&person); [line 19]\n  NULLIFY(&t,false); [line 19]\n " color=yellow style=filled]
+12 [label="12: Start person_typeid\nFormals: \nLocals:  t:int  person:class Person  \n   DECLARE_LOCALS(&return,&t,&person); [line 19]\n " color=yellow style=filled]
 	
 
 	 12 -> 22 ;
@@ -248,28 +248,28 @@ digraph iCFG {
 8 [label="8: Exit Employee_~Employee \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start Employee_~Employee\nFormals:  this:class Employee *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n  NULLIFY(&this,false); [line 17]\n " color=yellow style=filled]
+7 [label="7: Start Employee_~Employee\nFormals:  this:class Employee *\nLocals:  \n   DECLARE_LOCALS(&return); [line 17]\n " color=yellow style=filled]
 	
 
 	 7 -> 8 ;
 6 [label="6: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-5 [label="5: Start Person_Person\nFormals:  this:class Person *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n  NULLIFY(&this,false); [line 12]\n " color=yellow style=filled]
+5 [label="5: Start Person_Person\nFormals:  this:class Person *\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 5 -> 6 ;
 4 [label="4: Exit Person_Person \n  " color=yellow style=filled]
 	
 
-3 [label="3: Start Person_Person\nFormals:  this:class Person * __param_0:class Person &\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n  NULLIFY(&__param_0,false); [line 12]\n  NULLIFY(&this,false); [line 12]\n " color=yellow style=filled]
+3 [label="3: Start Person_Person\nFormals:  this:class Person * __param_0:class Person &\nLocals:  \n   DECLARE_LOCALS(&return); [line 12]\n " color=yellow style=filled]
 	
 
 	 3 -> 4 ;
 2 [label="2: Exit Person_~Person \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start Person_~Person\nFormals:  this:class Person *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n  NULLIFY(&this,false); [line 14]\n " color=yellow style=filled]
+1 [label="1: Start Person_~Person\nFormals:  this:class Person *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 1 -> 2 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/category_procdesc/EOCPerson.dot b/infer/tests/codetoanalyze/objc/errors/category_procdesc/EOCPerson.dot
index ea392e410..44aa188d3 100644
--- a/infer/tests/codetoanalyze/objc/errors/category_procdesc/EOCPerson.dot
+++ b/infer/tests/codetoanalyze/objc/errors/category_procdesc/EOCPerson.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 5 [label="5: Exit EOCPerson_takeVacationFromWork \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start EOCPerson_takeVacationFromWork\nFormals:  self:class EOCPerson *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&self,false); [line 18]\n " color=yellow style=filled]
+4 [label="4: Start EOCPerson_takeVacationFromWork\nFormals:  self:class EOCPerson *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -17,7 +17,7 @@ digraph iCFG {
 2 [label="2: Exit EOCPerson_performDaysWork \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start EOCPerson_performDaysWork\nFormals:  self:class EOCPerson *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n  NULLIFY(&self,false); [line 14]\n " color=yellow style=filled]
+1 [label="1: Start EOCPerson_performDaysWork\nFormals:  self:class EOCPerson *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/category_procdesc/main.dot b/infer/tests/codetoanalyze/objc/errors/category_procdesc/main.dot
index 97c086921..2c39d8de8 100644
--- a/infer/tests/codetoanalyze/objc/errors/category_procdesc/main.dot
+++ b/infer/tests/codetoanalyze/objc/errors/category_procdesc/main.dot
@@ -18,7 +18,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  x:int * person:class EOCPerson * \n   DECLARE_LOCALS(&return,&x,&person); [line 12]\n  NULLIFY(&person,false); [line 12]\n  NULLIFY(&x,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  x:int * person:class EOCPerson * \n   DECLARE_LOCALS(&return,&x,&person); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 6 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/field_superclass/SuperExample.dot b/infer/tests/codetoanalyze/objc/errors/field_superclass/SuperExample.dot
index c822e3ce0..b7b77f5e7 100644
--- a/infer/tests/codetoanalyze/objc/errors/field_superclass/SuperExample.dot
+++ b/infer/tests/codetoanalyze/objc/errors/field_superclass/SuperExample.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 10 [label="10: Exit main \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start main\nFormals:  argc:int  argv:char **\nLocals:  a:struct objc_object * \n   DECLARE_LOCALS(&return,&a); [line 40]\n  NULLIFY(&a,false); [line 40]\n  NULLIFY(&argc,false); [line 40]\n  NULLIFY(&argv,false); [line 40]\n " color=yellow style=filled]
+9 [label="9: Start main\nFormals:  argc:int  argv:char **\nLocals:  a:struct objc_object * \n   DECLARE_LOCALS(&return,&a); [line 40]\n " color=yellow style=filled]
 	
 
 	 9 -> 12 ;
@@ -40,7 +40,7 @@ digraph iCFG {
 2 [label="2: Exit B_init \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start B_init\nFormals:  self:class B *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&self,false); [line 18]\n " color=yellow style=filled]
+1 [label="1: Start B_init\nFormals:  self:class B *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/ArcExample.dot b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/ArcExample.dot
index ff0c3827b..74bbc835a 100644
--- a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/ArcExample.dot
+++ b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/ArcExample.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 6 [label="6: Exit A_newS \n  " color=yellow style=filled]
 	
 
-5 [label="5: Start A_newS\nFormals:  self:class A *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 28]\n  NULLIFY(&s,false); [line 28]\n  NULLIFY(&self,false); [line 28]\n " color=yellow style=filled]
+5 [label="5: Start A_newS\nFormals:  self:class A *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 28]\n " color=yellow style=filled]
 	
 
 	 5 -> 8 ;
@@ -25,7 +25,7 @@ digraph iCFG {
 2 [label="2: Exit A_getS \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_getS\nFormals:  self:class A *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 22]\n  NULLIFY(&s,false); [line 22]\n  NULLIFY(&self,false); [line 22]\n " color=yellow style=filled]
+1 [label="1: Start A_getS\nFormals:  self:class A *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 22]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/AutoreleaseExample.dot b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/AutoreleaseExample.dot
index 40c0c9369..d41d67038 100644
--- a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/AutoreleaseExample.dot
+++ b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/AutoreleaseExample.dot
@@ -18,7 +18,7 @@ digraph iCFG {
 33 [label="33: Exit test3 \n  " color=yellow style=filled]
 	
 
-32 [label="32: Start test3\nFormals: \nLocals:  c:class NSString * string:class NSString * pool:class NSAutoreleasePool * \n   DECLARE_LOCALS(&return,&c,&string,&pool); [line 59]\n  NULLIFY(&c,false); [line 59]\n  NULLIFY(&pool,false); [line 59]\n  NULLIFY(&string,false); [line 59]\n " color=yellow style=filled]
+32 [label="32: Start test3\nFormals: \nLocals:  c:class NSString * string:class NSString * pool:class NSAutoreleasePool * \n   DECLARE_LOCALS(&return,&c,&string,&pool); [line 59]\n " color=yellow style=filled]
 	
 
 	 32 -> 37 ;
@@ -115,7 +115,7 @@ digraph iCFG {
 8 [label="8: Exit createA \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start createA\nFormals: \nLocals:  s1:class A * \n   DECLARE_LOCALS(&return,&s1); [line 29]\n  NULLIFY(&s1,false); [line 29]\n " color=yellow style=filled]
+7 [label="7: Start createA\nFormals: \nLocals:  s1:class A * \n   DECLARE_LOCALS(&return,&s1); [line 29]\n " color=yellow style=filled]
 	
 
 	 7 -> 10 ;
@@ -130,7 +130,7 @@ digraph iCFG {
 4 [label="4: Exit A_main \n  " color=yellow style=filled]
 	
 
-3 [label="3: Start A_main\nFormals:  self:class A *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 22]\n  NULLIFY(&s,false); [line 22]\n  NULLIFY(&self,false); [line 22]\n " color=yellow style=filled]
+3 [label="3: Start A_main\nFormals:  self:class A *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 22]\n " color=yellow style=filled]
 	
 
 	 3 -> 6 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/MemoryLeakExample.dot b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/MemoryLeakExample.dot
index a22d6f3df..487dbe7e9 100644
--- a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/MemoryLeakExample.dot
+++ b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/MemoryLeakExample.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 67 [label="67: Exit __objc_anonymous_block_MemoryLeakExample_blockFreeNoLeakTODO______2 \n  " color=yellow style=filled]
 	
 
-66 [label="66: Start __objc_anonymous_block_MemoryLeakExample_blockFreeNoLeakTODO______2\nFormals:  x:int *\nLocals:  i:int \nCaptured:  x:int * \n   DECLARE_LOCALS(&return,&i); [line 105]\n  NULLIFY(&i,false); [line 105]\n " color=yellow style=filled]
+66 [label="66: Start __objc_anonymous_block_MemoryLeakExample_blockFreeNoLeakTODO______2\nFormals:  x:int *\nLocals:  i:int \nCaptured:  x:int * \n   DECLARE_LOCALS(&return,&i); [line 105]\n " color=yellow style=filled]
 	
 
 	 66 -> 70 ;
@@ -37,7 +37,7 @@ digraph iCFG {
 64 [label="64: Exit MemoryLeakExample_blockFreeNoLeakTODO \n  " color=yellow style=filled]
 	
 
-63 [label="63: Start MemoryLeakExample_blockFreeNoLeakTODO\nFormals:  self:class MemoryLeakExample *\nLocals:  blk:_fn_ (*) x:int * \n   DECLARE_LOCALS(&return,&blk,&x); [line 102]\n  NULLIFY(&blk,false); [line 102]\n  NULLIFY(&self,false); [line 102]\n  NULLIFY(&x,false); [line 102]\n " color=yellow style=filled]
+63 [label="63: Start MemoryLeakExample_blockFreeNoLeakTODO\nFormals:  self:class MemoryLeakExample *\nLocals:  blk:_fn_ (*) x:int * \n   DECLARE_LOCALS(&return,&blk,&x); [line 102]\n " color=yellow style=filled]
 	
 
 	 63 -> 73 ;
@@ -71,7 +71,7 @@ digraph iCFG {
 55 [label="55: Exit MemoryLeakExample_blockCapturedVarLeak \n  " color=yellow style=filled]
 	
 
-54 [label="54: Start MemoryLeakExample_blockCapturedVarLeak\nFormals:  self:class MemoryLeakExample *\nLocals:  blk:_fn_ (*) x:int * \n   DECLARE_LOCALS(&return,&blk,&x); [line 93]\n  NULLIFY(&blk,false); [line 93]\n  NULLIFY(&self,false); [line 93]\n  NULLIFY(&x,false); [line 93]\n " color=yellow style=filled]
+54 [label="54: Start MemoryLeakExample_blockCapturedVarLeak\nFormals:  self:class MemoryLeakExample *\nLocals:  blk:_fn_ (*) x:int * \n   DECLARE_LOCALS(&return,&blk,&x); [line 93]\n " color=yellow style=filled]
 	
 
 	 54 -> 62 ;
@@ -90,7 +90,7 @@ digraph iCFG {
 50 [label="50: Exit MemoryLeakExample_regularLeak \n  " color=yellow style=filled]
 	
 
-49 [label="49: Start MemoryLeakExample_regularLeak\nFormals:  self:class MemoryLeakExample *\nLocals:  x:int * \n   DECLARE_LOCALS(&return,&x); [line 87]\n  NULLIFY(&self,false); [line 87]\n  NULLIFY(&x,false); [line 87]\n " color=yellow style=filled]
+49 [label="49: Start MemoryLeakExample_regularLeak\nFormals:  self:class MemoryLeakExample *\nLocals:  x:int * \n   DECLARE_LOCALS(&return,&x); [line 87]\n " color=yellow style=filled]
 	
 
 	 49 -> 53 ;
@@ -105,7 +105,7 @@ digraph iCFG {
 46 [label="46: Exit MemoryLeakExample_testFBColorCreateWithGray \n  " color=yellow style=filled]
 	
 
-45 [label="45: Start MemoryLeakExample_testFBColorCreateWithGray\nFormals:  self:class MemoryLeakExample *\nLocals:  borderColor:struct CGColor * \n   DECLARE_LOCALS(&return,&borderColor); [line 82]\n  NULLIFY(&borderColor,false); [line 82]\n  NULLIFY(&self,false); [line 82]\n " color=yellow style=filled]
+45 [label="45: Start MemoryLeakExample_testFBColorCreateWithGray\nFormals:  self:class MemoryLeakExample *\nLocals:  borderColor:struct CGColor * \n   DECLARE_LOCALS(&return,&borderColor); [line 82]\n " color=yellow style=filled]
 	
 
 	 45 -> 48 ;
@@ -120,7 +120,7 @@ digraph iCFG {
 42 [label="42: Exit MemoryLeakExample_testImageRefRelease \n  " color=yellow style=filled]
 	
 
-41 [label="41: Start MemoryLeakExample_testImageRefRelease\nFormals: \nLocals:  newImage:struct CGImage * \n   DECLARE_LOCALS(&return,&newImage); [line 75]\n  NULLIFY(&newImage,false); [line 75]\n " color=yellow style=filled]
+41 [label="41: Start MemoryLeakExample_testImageRefRelease\nFormals: \nLocals:  newImage:struct CGImage * \n   DECLARE_LOCALS(&return,&newImage); [line 75]\n " color=yellow style=filled]
 	
 
 	 41 -> 44 ;
@@ -135,7 +135,7 @@ digraph iCFG {
 38 [label="38: Exit MemoryLeakExample_test2NoLeak \n  " color=yellow style=filled]
 	
 
-37 [label="37: Start MemoryLeakExample_test2NoLeak\nFormals: \nLocals:  allowedPublicKey:struct __SecKey * \n   DECLARE_LOCALS(&return,&allowedPublicKey); [line 70]\n  NULLIFY(&allowedPublicKey,false); [line 70]\n " color=yellow style=filled]
+37 [label="37: Start MemoryLeakExample_test2NoLeak\nFormals: \nLocals:  allowedPublicKey:struct __SecKey * \n   DECLARE_LOCALS(&return,&allowedPublicKey); [line 70]\n " color=yellow style=filled]
 	
 
 	 37 -> 40 ;
@@ -165,7 +165,7 @@ digraph iCFG {
 30 [label="30: Exit MemoryLeakExample_createCloseCrossGlyphNoLeak: \n  " color=yellow style=filled]
 	
 
-29 [label="29: Start MemoryLeakExample_createCloseCrossGlyphNoLeak:\nFormals:  rect:struct CGRect \nLocals:  path1:struct CGPath * lineThickness:double  \n   DECLARE_LOCALS(&return,&path1,&lineThickness); [line 58]\n  NULLIFY(&lineThickness,false); [line 58]\n  NULLIFY(&path1,false); [line 58]\n " color=yellow style=filled]
+29 [label="29: Start MemoryLeakExample_createCloseCrossGlyphNoLeak:\nFormals:  rect:struct CGRect \nLocals:  path1:struct CGPath * lineThickness:double  \n   DECLARE_LOCALS(&return,&path1,&lineThickness); [line 58]\n " color=yellow style=filled]
 	
 
 	 29 -> 33 ;
@@ -195,7 +195,7 @@ digraph iCFG {
 22 [label="22: Exit MemoryLeakExample_test1NoLeak \n  " color=yellow style=filled]
 	
 
-21 [label="21: Start MemoryLeakExample_test1NoLeak\nFormals: \nLocals:  framesetter:struct __CTFramesetter * \n   DECLARE_LOCALS(&return,&framesetter); [line 48]\n  NULLIFY(&framesetter,false); [line 48]\n " color=yellow style=filled]
+21 [label="21: Start MemoryLeakExample_test1NoLeak\nFormals: \nLocals:  framesetter:struct __CTFramesetter * \n   DECLARE_LOCALS(&return,&framesetter); [line 48]\n " color=yellow style=filled]
 	
 
 	 21 -> 24 ;
@@ -221,7 +221,7 @@ digraph iCFG {
 15 [label="15: Exit MemoryLeakExample_measureFrameSizeForTextNoLeak \n  " color=yellow style=filled]
 	
 
-14 [label="14: Start MemoryLeakExample_measureFrameSizeForTextNoLeak\nFormals: \nLocals:  maString:struct __CFAttributedString * \n   DECLARE_LOCALS(&return,&maString); [line 38]\n  NULLIFY(&maString,false); [line 38]\n " color=yellow style=filled]
+14 [label="14: Start MemoryLeakExample_measureFrameSizeForTextNoLeak\nFormals: \nLocals:  maString:struct __CFAttributedString * \n   DECLARE_LOCALS(&return,&maString); [line 38]\n " color=yellow style=filled]
 	
 
 	 14 -> 17 ;
@@ -247,7 +247,7 @@ digraph iCFG {
 8 [label="8: Exit MemoryLeakExample_test \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start MemoryLeakExample_test\nFormals:  self:class MemoryLeakExample *\nLocals:  shadowPath:struct CGPath * \n   DECLARE_LOCALS(&return,&shadowPath); [line 28]\n  NULLIFY(&shadowPath,false); [line 28]\n " color=yellow style=filled]
+7 [label="7: Start MemoryLeakExample_test\nFormals:  self:class MemoryLeakExample *\nLocals:  shadowPath:struct CGPath * \n   DECLARE_LOCALS(&return,&shadowPath); [line 28]\n " color=yellow style=filled]
 	
 
 	 7 -> 10 ;
@@ -270,7 +270,7 @@ digraph iCFG {
 2 [label="2: Exit MemoryLeakExample_layoutSubviews \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start MemoryLeakExample_layoutSubviews\nFormals:  self:class MemoryLeakExample *\nLocals:  shadowPath:struct CGPath * attachmentContainerView:class UIView * \n   DECLARE_LOCALS(&return,&shadowPath,&attachmentContainerView); [line 19]\n  NULLIFY(&attachmentContainerView,false); [line 19]\n  NULLIFY(&self,false); [line 19]\n  NULLIFY(&shadowPath,false); [line 19]\n " color=yellow style=filled]
+1 [label="1: Start MemoryLeakExample_layoutSubviews\nFormals:  self:class MemoryLeakExample *\nLocals:  shadowPath:struct CGPath * attachmentContainerView:class UIView * \n   DECLARE_LOCALS(&return,&shadowPath,&attachmentContainerView); [line 19]\n " color=yellow style=filled]
 	
 
 	 1 -> 6 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/RetainReleaseExample.dot b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/RetainReleaseExample.dot
index c6074171e..a51817b8b 100644
--- a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/RetainReleaseExample.dot
+++ b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/RetainReleaseExample.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 2 [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start test\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 20]\n  NULLIFY(&a,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start test\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/RetainReleaseExample2.dot b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/RetainReleaseExample2.dot
index 32c1fd55c..3252e18b8 100644
--- a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/RetainReleaseExample2.dot
+++ b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/RetainReleaseExample2.dot
@@ -42,7 +42,7 @@ digraph iCFG {
 23 [label="23: Exit test6 \n  " color=yellow style=filled]
 	
 
-22 [label="22: Start test6\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 56]\n  NULLIFY(&a,false); [line 56]\n " color=yellow style=filled]
+22 [label="22: Start test6\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 56]\n " color=yellow style=filled]
 	
 
 	 22 -> 26 ;
@@ -57,7 +57,7 @@ digraph iCFG {
 19 [label="19: Exit test5 \n  " color=yellow style=filled]
 	
 
-18 [label="18: Start test5\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 50]\n  NULLIFY(&a,false); [line 50]\n " color=yellow style=filled]
+18 [label="18: Start test5\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 50]\n " color=yellow style=filled]
 	
 
 	 18 -> 21 ;
@@ -72,7 +72,7 @@ digraph iCFG {
 15 [label="15: Exit test4 \n  " color=yellow style=filled]
 	
 
-14 [label="14: Start test4\nFormals: \nLocals:  b:class A * \n   DECLARE_LOCALS(&return,&b); [line 43]\n  NULLIFY(&b,false); [line 43]\n " color=yellow style=filled]
+14 [label="14: Start test4\nFormals: \nLocals:  b:class A * \n   DECLARE_LOCALS(&return,&b); [line 43]\n " color=yellow style=filled]
 	
 
 	 14 -> 17 ;
@@ -83,7 +83,7 @@ digraph iCFG {
 12 [label="12: Exit test3 \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start test3\nFormals: \nLocals:  b:class A * \n   DECLARE_LOCALS(&return,&b); [line 40]\n  NULLIFY(&b,false); [line 40]\n " color=yellow style=filled]
+11 [label="11: Start test3\nFormals: \nLocals:  b:class A * \n   DECLARE_LOCALS(&return,&b); [line 40]\n " color=yellow style=filled]
 	
 
 	 11 -> 13 ;
@@ -98,7 +98,7 @@ digraph iCFG {
 8 [label="8: Exit test2 \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start test2\nFormals: \nLocals:  b:class A * \n   DECLARE_LOCALS(&return,&b); [line 33]\n  NULLIFY(&b,false); [line 33]\n " color=yellow style=filled]
+7 [label="7: Start test2\nFormals: \nLocals:  b:class A * \n   DECLARE_LOCALS(&return,&b); [line 33]\n " color=yellow style=filled]
 	
 
 	 7 -> 10 ;
@@ -121,7 +121,7 @@ digraph iCFG {
 2 [label="2: Exit test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start test\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 24]\n  NULLIFY(&a,false); [line 24]\n " color=yellow style=filled]
+1 [label="1: Start test\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 24]\n " color=yellow style=filled]
 	
 
 	 1 -> 6 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/TollBridgeExample.dot b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/TollBridgeExample.dot
index 186fd75dc..c411623ee 100644
--- a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/TollBridgeExample.dot
+++ b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/TollBridgeExample.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 21 [label="21: Exit bridgeDictionaryNoLeak \n  " color=yellow style=filled]
 	
 
-20 [label="20: Start bridgeDictionaryNoLeak\nFormals: \nLocals:  dict:struct __CFDictionary * bufferAttributes:class NSDictionary * \n   DECLARE_LOCALS(&return,&dict,&bufferAttributes); [line 44]\n  NULLIFY(&bufferAttributes,false); [line 44]\n  NULLIFY(&dict,false); [line 44]\n " color=yellow style=filled]
+20 [label="20: Start bridgeDictionaryNoLeak\nFormals: \nLocals:  dict:struct __CFDictionary * bufferAttributes:class NSDictionary * \n   DECLARE_LOCALS(&return,&dict,&bufferAttributes); [line 44]\n " color=yellow style=filled]
 	
 
 	 20 -> 23 ;
@@ -36,7 +36,7 @@ digraph iCFG {
 14 [label="14: Exit TollBridgeExample__readHTTPHeader \n  " color=yellow style=filled]
 	
 
-13 [label="13: Start TollBridgeExample__readHTTPHeader\nFormals:  self:class TollBridgeExample *\nLocals:  ref:struct __CFDictionary * \n   DECLARE_LOCALS(&return,&ref); [line 34]\n  NULLIFY(&ref,false); [line 34]\n  NULLIFY(&self,false); [line 34]\n " color=yellow style=filled]
+13 [label="13: Start TollBridgeExample__readHTTPHeader\nFormals:  self:class TollBridgeExample *\nLocals:  ref:struct __CFDictionary * \n   DECLARE_LOCALS(&return,&ref); [line 34]\n " color=yellow style=filled]
 	
 
 	 13 -> 16 ;
@@ -51,7 +51,7 @@ digraph iCFG {
 10 [label="10: Exit TollBridgeExample_brideRetained \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start TollBridgeExample_brideRetained\nFormals:  self:class TollBridgeExample *\nLocals:  a:struct __CFLocale * observer:struct objc_object * \n   DECLARE_LOCALS(&return,&a,&observer); [line 29]\n  NULLIFY(&a,false); [line 29]\n  NULLIFY(&observer,false); [line 29]\n  NULLIFY(&self,false); [line 29]\n " color=yellow style=filled]
+9 [label="9: Start TollBridgeExample_brideRetained\nFormals:  self:class TollBridgeExample *\nLocals:  a:struct __CFLocale * observer:struct objc_object * \n   DECLARE_LOCALS(&return,&a,&observer); [line 29]\n " color=yellow style=filled]
 	
 
 	 9 -> 12 ;
@@ -66,7 +66,7 @@ digraph iCFG {
 6 [label="6: Exit TollBridgeExample_bridge \n  " color=yellow style=filled]
 	
 
-5 [label="5: Start TollBridgeExample_bridge\nFormals:  self:class TollBridgeExample *\nLocals:  a:class NSLocale * nameRef:struct __CFLocale * \n   DECLARE_LOCALS(&return,&a,&nameRef); [line 24]\n  NULLIFY(&a,false); [line 24]\n  NULLIFY(&nameRef,false); [line 24]\n  NULLIFY(&self,false); [line 24]\n " color=yellow style=filled]
+5 [label="5: Start TollBridgeExample_bridge\nFormals:  self:class TollBridgeExample *\nLocals:  a:class NSLocale * nameRef:struct __CFLocale * \n   DECLARE_LOCALS(&return,&a,&nameRef); [line 24]\n " color=yellow style=filled]
 	
 
 	 5 -> 8 ;
@@ -81,7 +81,7 @@ digraph iCFG {
 2 [label="2: Exit TollBridgeExample_bridgeTransfer \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start TollBridgeExample_bridgeTransfer\nFormals:  self:class TollBridgeExample *\nLocals:  a:class NSLocale * nameRef:struct __CFLocale * \n   DECLARE_LOCALS(&return,&a,&nameRef); [line 19]\n  NULLIFY(&a,false); [line 19]\n  NULLIFY(&nameRef,false); [line 19]\n  NULLIFY(&self,false); [line 19]\n " color=yellow style=filled]
+1 [label="1: Start TollBridgeExample_bridgeTransfer\nFormals:  self:class TollBridgeExample *\nLocals:  a:class NSLocale * nameRef:struct __CFLocale * \n   DECLARE_LOCALS(&return,&a,&nameRef); [line 19]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/arc_methods.dot b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/arc_methods.dot
index a61b92c81..7c7fc2222 100644
--- a/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/arc_methods.dot
+++ b/infer/tests/codetoanalyze/objc/errors/memory_leaks_benchmark/arc_methods.dot
@@ -22,7 +22,7 @@ digraph iCFG {
 10 [label="10: Exit main \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start main\nFormals: \nLocals:  ab:class A * a2:class A * aa:class A * a1:class A * \n   DECLARE_LOCALS(&return,&ab,&a2,&aa,&a1); [line 35]\n  NULLIFY(&a1,false); [line 35]\n  NULLIFY(&a2,false); [line 35]\n  NULLIFY(&aa,false); [line 35]\n  NULLIFY(&ab,false); [line 35]\n " color=yellow style=filled]
+9 [label="9: Start main\nFormals: \nLocals:  ab:class A * a2:class A * aa:class A * a1:class A * \n   DECLARE_LOCALS(&return,&ab,&a2,&aa,&a1); [line 35]\n " color=yellow style=filled]
 	
 
 	 9 -> 15 ;
@@ -37,7 +37,7 @@ digraph iCFG {
 6 [label="6: Exit A_someA \n  " color=yellow style=filled]
 	
 
-5 [label="5: Start A_someA\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 27]\n  NULLIFY(&a,false); [line 27]\n " color=yellow style=filled]
+5 [label="5: Start A_someA\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 27]\n " color=yellow style=filled]
 	
 
 	 5 -> 8 ;
@@ -52,7 +52,7 @@ digraph iCFG {
 2 [label="2: Exit A_newA \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_newA\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 22]\n  NULLIFY(&a,false); [line 22]\n " color=yellow style=filled]
+1 [label="1: Start A_newA\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 22]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/npe/Nonnull_attribute_example.dot b/infer/tests/codetoanalyze/objc/errors/npe/Nonnull_attribute_example.dot
index 43914ef0e..482da3be1 100644
--- a/infer/tests/codetoanalyze/objc/errors/npe/Nonnull_attribute_example.dot
+++ b/infer/tests/codetoanalyze/objc/errors/npe/Nonnull_attribute_example.dot
@@ -33,7 +33,7 @@ digraph iCFG {
 5 [label="5: Exit C_initWithCoder:and: \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start C_initWithCoder:and:\nFormals:  self:class C * aDecoder:class NSString * a:class A *\nLocals:  y:int  a1:class A * \n   DECLARE_LOCALS(&return,&y,&a1); [line 38]\n  NULLIFY(&a1,false); [line 38]\n  NULLIFY(&aDecoder,false); [line 38]\n  NULLIFY(&y,false); [line 38]\n " color=yellow style=filled]
+4 [label="4: Start C_initWithCoder:and:\nFormals:  self:class C * aDecoder:class NSString * a:class A *\nLocals:  y:int  a1:class A * \n   DECLARE_LOCALS(&return,&y,&a1); [line 38]\n " color=yellow style=filled]
 	
 
 	 4 -> 9 ;
@@ -44,7 +44,7 @@ digraph iCFG {
 2 [label="2: Exit A_getA \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_getA\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n  NULLIFY(&self,false); [line 25]\n " color=yellow style=filled]
+1 [label="1: Start A_getA\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 25]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/npe/npe_malloc.dot b/infer/tests/codetoanalyze/objc/errors/npe/npe_malloc.dot
index ca1a7e105..247ef9841 100644
--- a/infer/tests/codetoanalyze/objc/errors/npe/npe_malloc.dot
+++ b/infer/tests/codetoanalyze/objc/errors/npe/npe_malloc.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 2 [label="2: Exit C_test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start C_test\nFormals:  self:class C *\nLocals:  person:struct Person * \n   DECLARE_LOCALS(&return,&person); [line 24]\n  NULLIFY(&person,false); [line 24]\n  NULLIFY(&self,false); [line 24]\n " color=yellow style=filled]
+1 [label="1: Start C_test\nFormals:  self:class C *\nLocals:  person:struct Person * \n   DECLARE_LOCALS(&return,&person); [line 24]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/objc/errors/protocol_procdesc/main.dot b/infer/tests/codetoanalyze/objc/errors/protocol_procdesc/main.dot
index 228edb403..88de26089 100644
--- a/infer/tests/codetoanalyze/objc/errors/protocol_procdesc/main.dot
+++ b/infer/tests/codetoanalyze/objc/errors/protocol_procdesc/main.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  bike:class Bicycle * \n   DECLARE_LOCALS(&return,&bike); [line 12]\n  NULLIFY(&bike,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  bike:class Bicycle * \n   DECLARE_LOCALS(&return,&bike); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 5 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/assertions/NSAssert_example.dot b/infer/tests/codetoanalyze/objc/frontend/assertions/NSAssert_example.dot
index f493c13c6..17796a5c3 100644
--- a/infer/tests/codetoanalyze/objc/frontend/assertions/NSAssert_example.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/assertions/NSAssert_example.dot
@@ -115,7 +115,7 @@ digraph iCFG {
 78 [label="78: Exit test2 \n  " color=yellow style=filled]
 	
 
-77 [label="77: Start test2\nFormals:  target:class A *\nLocals:  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$10:class NSString * __assert_file__:class NSString * SIL_temp_conditional___n$17:class NSString * __assert_fn__:class NSString * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$10,&__assert_file__,&SIL_temp_conditional___n$17,&__assert_fn__); [line 35]\n  NULLIFY(&SIL_temp_conditional___n$10,false); [line 35]\n  NULLIFY(&SIL_temp_conditional___n$17,false); [line 35]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 35]\n  NULLIFY(&__assert_file__,false); [line 35]\n  NULLIFY(&__assert_fn__,false); [line 35]\n " color=yellow style=filled]
+77 [label="77: Start test2\nFormals:  target:class A *\nLocals:  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$10:class NSString * __assert_file__:class NSString * SIL_temp_conditional___n$17:class NSString * __assert_fn__:class NSString * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$10,&__assert_file__,&SIL_temp_conditional___n$17,&__assert_fn__); [line 35]\n " color=yellow style=filled]
 	
 
 	 77 -> 80 ;
@@ -239,7 +239,7 @@ digraph iCFG {
 48 [label="48: Exit test1 \n  " color=yellow style=filled]
 	
 
-47 [label="47: Start test1\nFormals:  target:class A *\nLocals:  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$9:class NSString * __assert_file__:class NSString * SIL_temp_conditional___n$16:class NSString * __assert_fn__:class NSString * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$9,&__assert_file__,&SIL_temp_conditional___n$16,&__assert_fn__); [line 30]\n  NULLIFY(&SIL_temp_conditional___n$16,false); [line 30]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 30]\n  NULLIFY(&SIL_temp_conditional___n$9,false); [line 30]\n  NULLIFY(&__assert_file__,false); [line 30]\n  NULLIFY(&__assert_fn__,false); [line 30]\n " color=yellow style=filled]
+47 [label="47: Start test1\nFormals:  target:class A *\nLocals:  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$9:class NSString * __assert_file__:class NSString * SIL_temp_conditional___n$16:class NSString * __assert_fn__:class NSString * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$9,&__assert_file__,&SIL_temp_conditional___n$16,&__assert_fn__); [line 30]\n " color=yellow style=filled]
 	
 
 	 47 -> 50 ;
@@ -334,7 +334,7 @@ digraph iCFG {
 25 [label="25: Exit A_initWithRequest: \n  " color=yellow style=filled]
 	
 
-24 [label="24: Start A_initWithRequest:\nFormals:  self:class A * a:class A *\nLocals:  SIL_temp_conditional___n$19:int  SIL_temp_conditional___n$27:class NSString * __assert_file__:class NSString * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$19,&SIL_temp_conditional___n$27,&__assert_file__); [line 23]\n  NULLIFY(&SIL_temp_conditional___n$19,false); [line 23]\n  NULLIFY(&SIL_temp_conditional___n$27,false); [line 23]\n  NULLIFY(&__assert_file__,false); [line 23]\n  NULLIFY(&self,false); [line 23]\n " color=yellow style=filled]
+24 [label="24: Start A_initWithRequest:\nFormals:  self:class A * a:class A *\nLocals:  SIL_temp_conditional___n$19:int  SIL_temp_conditional___n$27:class NSString * __assert_file__:class NSString * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$19,&SIL_temp_conditional___n$27,&__assert_file__); [line 23]\n " color=yellow style=filled]
 	
 
 	 24 -> 27 ;
@@ -429,7 +429,7 @@ digraph iCFG {
 2 [label="2: Exit A_addTarget: \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_addTarget:\nFormals:  self:class A * target:class A *\nLocals:  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$10:class NSString * __assert_file__:class NSString * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$10,&__assert_file__); [line 18]\n  NULLIFY(&SIL_temp_conditional___n$10,false); [line 18]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 18]\n  NULLIFY(&__assert_file__,false); [line 18]\n  NULLIFY(&self,false); [line 18]\n " color=yellow style=filled]
+1 [label="1: Start A_addTarget:\nFormals:  self:class A * target:class A *\nLocals:  SIL_temp_conditional___n$2:int  SIL_temp_conditional___n$10:class NSString * __assert_file__:class NSString * \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2,&SIL_temp_conditional___n$10,&__assert_file__); [line 18]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/BlockVar.dot b/infer/tests/codetoanalyze/objc/frontend/block/BlockVar.dot
index 72ebd123f..35f5c11b3 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/BlockVar.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/BlockVar.dot
@@ -33,7 +33,7 @@ digraph iCFG {
 46 [label="46: Exit BlockVar_capturedNoNullDeref \n  " color=yellow style=filled]
 	
 
-45 [label="45: Start BlockVar_capturedNoNullDeref\nFormals:  self:class BlockVar *\nLocals:  my_block:_fn_ (*) x:int * i:int  \n   DECLARE_LOCALS(&return,&my_block,&x,&i); [line 56]\n  NULLIFY(&my_block,false); [line 56]\n  NULLIFY(&self,false); [line 56]\n  NULLIFY(&x,false); [line 56]\n " color=yellow style=filled]
+45 [label="45: Start BlockVar_capturedNoNullDeref\nFormals:  self:class BlockVar *\nLocals:  my_block:_fn_ (*) x:int * i:int  \n   DECLARE_LOCALS(&return,&my_block,&x,&i); [line 56]\n " color=yellow style=filled]
 	
 
 	 45 -> 54 ;
@@ -63,7 +63,7 @@ digraph iCFG {
 38 [label="38: Exit BlockVar_capturedNullDeref \n  " color=yellow style=filled]
 	
 
-37 [label="37: Start BlockVar_capturedNullDeref\nFormals:  self:class BlockVar *\nLocals:  my_block:_fn_ (*) x:int * \n   DECLARE_LOCALS(&return,&my_block,&x); [line 48]\n  NULLIFY(&my_block,false); [line 48]\n  NULLIFY(&self,false); [line 48]\n  NULLIFY(&x,false); [line 48]\n " color=yellow style=filled]
+37 [label="37: Start BlockVar_capturedNullDeref\nFormals:  self:class BlockVar *\nLocals:  my_block:_fn_ (*) x:int * \n   DECLARE_LOCALS(&return,&my_block,&x); [line 48]\n " color=yellow style=filled]
 	
 
 	 37 -> 44 ;
@@ -97,7 +97,7 @@ digraph iCFG {
 29 [label="29: Exit BlockVar_blockPostOk \n  " color=yellow style=filled]
 	
 
-28 [label="28: Start BlockVar_blockPostOk\nFormals:  self:class BlockVar *\nLocals:  my_block:_fn_ (*) x:int * i:int  \n   DECLARE_LOCALS(&return,&my_block,&x,&i); [line 39]\n  NULLIFY(&my_block,false); [line 39]\n  NULLIFY(&self,false); [line 39]\n  NULLIFY(&x,false); [line 39]\n " color=yellow style=filled]
+28 [label="28: Start BlockVar_blockPostOk\nFormals:  self:class BlockVar *\nLocals:  my_block:_fn_ (*) x:int * i:int  \n   DECLARE_LOCALS(&return,&my_block,&x,&i); [line 39]\n " color=yellow style=filled]
 	
 
 	 28 -> 36 ;
@@ -127,7 +127,7 @@ digraph iCFG {
 21 [label="21: Exit BlockVar_blockPostBad \n  " color=yellow style=filled]
 	
 
-20 [label="20: Start BlockVar_blockPostBad\nFormals:  self:class BlockVar *\nLocals:  my_block:_fn_ (*) x:int * \n   DECLARE_LOCALS(&return,&my_block,&x); [line 31]\n  NULLIFY(&my_block,false); [line 31]\n  NULLIFY(&self,false); [line 31]\n  NULLIFY(&x,false); [line 31]\n " color=yellow style=filled]
+20 [label="20: Start BlockVar_blockPostBad\nFormals:  self:class BlockVar *\nLocals:  my_block:_fn_ (*) x:int * \n   DECLARE_LOCALS(&return,&my_block,&x); [line 31]\n " color=yellow style=filled]
 	
 
 	 20 -> 27 ;
@@ -146,7 +146,7 @@ digraph iCFG {
 16 [label="16: Exit __objc_anonymous_block_BlockVar_navigateToURLInBackground______1 \n  " color=yellow style=filled]
 	
 
-15 [label="15: Start __objc_anonymous_block_BlockVar_navigateToURLInBackground______1\nFormals:  a:int  b:int \nLocals:  res:int  \n   DECLARE_LOCALS(&return,&res); [line 19]\n  NULLIFY(&res,false); [line 19]\n " color=yellow style=filled]
+15 [label="15: Start __objc_anonymous_block_BlockVar_navigateToURLInBackground______1\nFormals:  a:int  b:int \nLocals:  res:int  \n   DECLARE_LOCALS(&return,&res); [line 19]\n " color=yellow style=filled]
 	
 
 	 15 -> 18 ;
@@ -190,7 +190,7 @@ digraph iCFG {
 5 [label="5: Exit BlockVar_navigateToURLInBackground \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start BlockVar_navigateToURLInBackground\nFormals: \nLocals:  p:int * x:int  addBlock:_fn_ (*) \n   DECLARE_LOCALS(&return,&p,&x,&addBlock); [line 18]\n  NULLIFY(&addBlock,false); [line 18]\n  NULLIFY(&p,false); [line 18]\n  NULLIFY(&x,false); [line 18]\n " color=yellow style=filled]
+4 [label="4: Start BlockVar_navigateToURLInBackground\nFormals: \nLocals:  p:int * x:int  addBlock:_fn_ (*) \n   DECLARE_LOCALS(&return,&p,&x,&addBlock); [line 18]\n " color=yellow style=filled]
 	
 
 	 4 -> 19 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/block-it.dot b/infer/tests/codetoanalyze/objc/frontend/block/block-it.dot
index 5756e7113..83709ca93 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/block-it.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/block-it.dot
@@ -34,7 +34,7 @@ digraph iCFG {
 46 [label="46: Exit __objc_anonymous_block_MyBlock_array_trans______2 \n  " color=yellow style=filled]
 	
 
-45 [label="45: Start __objc_anonymous_block_MyBlock_array_trans______2\nFormals:  object:struct objc_object * idx:unsigned long  stop:_Bool *\nLocals:  ShouldStop:int  \n   DECLARE_LOCALS(&return,&ShouldStop); [line 40]\n  NULLIFY(&idx,false); [line 40]\n  NULLIFY(&object,false); [line 40]\n " color=yellow style=filled]
+45 [label="45: Start __objc_anonymous_block_MyBlock_array_trans______2\nFormals:  object:struct objc_object * idx:unsigned long  stop:_Bool *\nLocals:  ShouldStop:int  \n   DECLARE_LOCALS(&return,&ShouldStop); [line 40]\n " color=yellow style=filled]
 	
 
 	 45 -> 49 ;
@@ -104,7 +104,7 @@ digraph iCFG {
 29 [label="29: Exit MyBlock_array_trans \n  " color=yellow style=filled]
 	
 
-28 [label="28: Start MyBlock_array_trans\nFormals:  self:class MyBlock *\nLocals:  idx:unsigned long  object:struct objc_object * stop:_Bool * enumerateObjectsUsingBlock:_fn_ (*) objects:class NSArray * a:class NSArray * \n   DECLARE_LOCALS(&return,&idx,&object,&stop,&enumerateObjectsUsingBlock,&objects,&a); [line 32]\n  NULLIFY(&a,false); [line 32]\n  NULLIFY(&enumerateObjectsUsingBlock,false); [line 32]\n  NULLIFY(&idx,false); [line 32]\n  NULLIFY(&object,false); [line 32]\n  NULLIFY(&objects,false); [line 32]\n  NULLIFY(&self,false); [line 32]\n  NULLIFY(&stop,false); [line 32]\n " color=yellow style=filled]
+28 [label="28: Start MyBlock_array_trans\nFormals:  self:class MyBlock *\nLocals:  idx:unsigned long  object:struct objc_object * stop:_Bool * enumerateObjectsUsingBlock:_fn_ (*) objects:class NSArray * a:class NSArray * \n   DECLARE_LOCALS(&return,&idx,&object,&stop,&enumerateObjectsUsingBlock,&objects,&a); [line 32]\n " color=yellow style=filled]
 	
 
 	 28 -> 54 ;
@@ -143,7 +143,7 @@ digraph iCFG {
 19 [label="19: Exit __objc_anonymous_block_MyBlock_array______1 \n  " color=yellow style=filled]
 	
 
-18 [label="18: Start __objc_anonymous_block_MyBlock_array______1\nFormals:  object:struct objc_object * idx:unsigned long  stop:_Bool *\nLocals:  ShouldStop:int  \n   DECLARE_LOCALS(&return,&ShouldStop); [line 21]\n  NULLIFY(&idx,false); [line 21]\n  NULLIFY(&object,false); [line 21]\n " color=yellow style=filled]
+18 [label="18: Start __objc_anonymous_block_MyBlock_array______1\nFormals:  object:struct objc_object * idx:unsigned long  stop:_Bool *\nLocals:  ShouldStop:int  \n   DECLARE_LOCALS(&return,&ShouldStop); [line 21]\n " color=yellow style=filled]
 	
 
 	 18 -> 22 ;
@@ -213,7 +213,7 @@ digraph iCFG {
 2 [label="2: Exit MyBlock_array \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start MyBlock_array\nFormals:  self:class MyBlock *\nLocals:  idx:unsigned long  object:struct objc_object * stop:_Bool * infer___objc_anonymous_block_MyBlock_array______1:_fn_ (*) objects:class NSArray * a:class NSArray * \n   DECLARE_LOCALS(&return,&idx,&object,&stop,&infer___objc_anonymous_block_MyBlock_array______1,&objects,&a); [line 18]\n  NULLIFY(&a,false); [line 18]\n  NULLIFY(&idx,false); [line 18]\n  NULLIFY(&infer___objc_anonymous_block_MyBlock_array______1,false); [line 18]\n  NULLIFY(&object,false); [line 18]\n  NULLIFY(&objects,false); [line 18]\n  NULLIFY(&self,false); [line 18]\n  NULLIFY(&stop,false); [line 18]\n " color=yellow style=filled]
+1 [label="1: Start MyBlock_array\nFormals:  self:class MyBlock *\nLocals:  idx:unsigned long  object:struct objc_object * stop:_Bool * infer___objc_anonymous_block_MyBlock_array______1:_fn_ (*) objects:class NSArray * a:class NSArray * \n   DECLARE_LOCALS(&return,&idx,&object,&stop,&infer___objc_anonymous_block_MyBlock_array______1,&objects,&a); [line 18]\n " color=yellow style=filled]
 	
 
 	 1 -> 27 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/block.dot b/infer/tests/codetoanalyze/objc/frontend/block/block.dot
index ee1ee858b..2cb239437 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/block.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/block.dot
@@ -52,7 +52,7 @@ digraph iCFG {
 12 [label="12: Exit __objc_anonymous_block_main1______2 \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start __objc_anonymous_block_main1______2\nFormals:  x:int  c:int  d:int \nLocals:  bla:int  add2:int  addblock2:_fn_ (*)\nCaptured:  x:int  \n   DECLARE_LOCALS(&return,&bla,&add2,&addblock2); [line 18]\n  NULLIFY(&add2,false); [line 18]\n  NULLIFY(&addblock2,false); [line 18]\n  NULLIFY(&bla,false); [line 18]\n  NULLIFY(&d,false); [line 18]\n " color=yellow style=filled]
+11 [label="11: Start __objc_anonymous_block_main1______2\nFormals:  x:int  c:int  d:int \nLocals:  bla:int  add2:int  addblock2:_fn_ (*)\nCaptured:  x:int  \n   DECLARE_LOCALS(&return,&bla,&add2,&addblock2); [line 18]\n " color=yellow style=filled]
 	
 
 	 11 -> 19 ;
@@ -71,7 +71,7 @@ digraph iCFG {
 7 [label="7: Exit __objc_anonymous_block_main1______1 \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start __objc_anonymous_block_main1______1\nFormals:  e:int  f:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 34]\n  NULLIFY(&f,false); [line 34]\n " color=yellow style=filled]
+6 [label="6: Start __objc_anonymous_block_main1______1\nFormals:  e:int  f:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 34]\n " color=yellow style=filled]
 	
 
 	 6 -> 8 ;
@@ -90,7 +90,7 @@ digraph iCFG {
 2 [label="2: Exit main1 \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main1\nFormals:  y:int \nLocals:  addblock:_fn_ (*) add2:int  add1:int  x:int  \n   DECLARE_LOCALS(&return,&addblock,&add2,&add1,&x); [line 10]\n  NULLIFY(&add1,false); [line 10]\n  NULLIFY(&add2,false); [line 10]\n  NULLIFY(&addblock,false); [line 10]\n  NULLIFY(&x,false); [line 10]\n  NULLIFY(&y,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main1\nFormals:  y:int \nLocals:  addblock:_fn_ (*) add2:int  add1:int  x:int  \n   DECLARE_LOCALS(&return,&addblock,&add2,&add1,&x); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 22 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/block_no_args.dot b/infer/tests/codetoanalyze/objc/frontend/block/block_no_args.dot
index 064295179..694f7eb2d 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/block_no_args.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/block_no_args.dot
@@ -62,7 +62,7 @@ digraph iCFG {
 2 [label="2: Exit My_manager_m \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start My_manager_m\nFormals:  self:class My_manager *\nLocals:  p:int * z:int  b:_fn_ (*) \n   DECLARE_LOCALS(&return,&p,&z,&b); [line 21]\n  NULLIFY(&b,false); [line 21]\n  NULLIFY(&p,false); [line 21]\n  NULLIFY(&self,false); [line 21]\n  NULLIFY(&z,false); [line 21]\n " color=yellow style=filled]
+1 [label="1: Start My_manager_m\nFormals:  self:class My_manager *\nLocals:  p:int * z:int  b:_fn_ (*) \n   DECLARE_LOCALS(&return,&p,&z,&b); [line 21]\n " color=yellow style=filled]
 	
 
 	 1 -> 17 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/block_release.dot b/infer/tests/codetoanalyze/objc/frontend/block/block_release.dot
index 7563685ee..a82696252 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/block_release.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/block_release.dot
@@ -38,7 +38,7 @@ digraph iCFG {
 10 [label="10: Exit __objc_anonymous_block_My_manager_blockReleaseTODO______1 \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start __objc_anonymous_block_My_manager_blockReleaseTODO______1\nFormals:  newImage:struct CGImage * a:int \nLocals: \nCaptured:  newImage:struct CGImage * \n   DECLARE_LOCALS(&return); [line 25]\n  NULLIFY(&a,false); [line 25]\n " color=yellow style=filled]
+9 [label="9: Start __objc_anonymous_block_My_manager_blockReleaseTODO______1\nFormals:  newImage:struct CGImage * a:int \nLocals: \nCaptured:  newImage:struct CGImage * \n   DECLARE_LOCALS(&return); [line 25]\n " color=yellow style=filled]
 	
 
 	 9 -> 13 ;
@@ -71,7 +71,7 @@ digraph iCFG {
 2 [label="2: Exit My_manager_blockReleaseTODO \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start My_manager_blockReleaseTODO\nFormals:  self:class My_manager *\nLocals:  newImage:struct CGImage * context:struct CGContext * z:int  b:_fn_ (*) \n   DECLARE_LOCALS(&return,&newImage,&context,&z,&b); [line 20]\n  NULLIFY(&b,false); [line 20]\n  NULLIFY(&context,false); [line 20]\n  NULLIFY(&newImage,false); [line 20]\n  NULLIFY(&self,false); [line 20]\n  NULLIFY(&z,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start My_manager_blockReleaseTODO\nFormals:  self:class My_manager *\nLocals:  newImage:struct CGImage * context:struct CGContext * z:int  b:_fn_ (*) \n   DECLARE_LOCALS(&return,&newImage,&context,&z,&b); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 19 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/dispatch.dot b/infer/tests/codetoanalyze/objc/frontend/block/dispatch.dot
index fbf4d600d..f183dcab7 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/dispatch.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/dispatch.dot
@@ -39,7 +39,7 @@ digraph iCFG {
 18 [label="18: Exit main \n  " color=yellow style=filled]
 	
 
-17 [label="17: Start main\nFormals: \nLocals:  p:int * b:class A * \n   DECLARE_LOCALS(&return,&p,&b); [line 42]\n  NULLIFY(&b,false); [line 42]\n  NULLIFY(&p,false); [line 42]\n " color=yellow style=filled]
+17 [label="17: Start main\nFormals: \nLocals:  p:int * b:class A * \n   DECLARE_LOCALS(&return,&p,&b); [line 42]\n " color=yellow style=filled]
 	
 
 	 17 -> 27 ;
@@ -69,7 +69,7 @@ digraph iCFG {
 10 [label="10: Exit A_trans \n  " color=yellow style=filled]
 	
 
-9 [label="9: Start A_trans\nFormals: \nLocals:  dummy_block:_fn_ (*) \n   DECLARE_LOCALS(&return,&dummy_block); [line 32]\n  NULLIFY(&dummy_block,false); [line 32]\n " color=yellow style=filled]
+9 [label="9: Start A_trans\nFormals: \nLocals:  dummy_block:_fn_ (*) \n   DECLARE_LOCALS(&return,&dummy_block); [line 32]\n " color=yellow style=filled]
 	
 
 	 9 -> 16 ;
@@ -99,7 +99,7 @@ digraph iCFG {
 2 [label="2: Exit A_sharedInstance \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_sharedInstance\nFormals: \nLocals:  infer___objc_anonymous_block_A_sharedInstance______1:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_sharedInstance______1); [line 23]\n  NULLIFY(&infer___objc_anonymous_block_A_sharedInstance______1,false); [line 23]\n " color=yellow style=filled]
+1 [label="1: Start A_sharedInstance\nFormals: \nLocals:  infer___objc_anonymous_block_A_sharedInstance______1:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_sharedInstance______1); [line 23]\n " color=yellow style=filled]
 	
 
 	 1 -> 8 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/dispatch_examples.dot b/infer/tests/codetoanalyze/objc/frontend/block/dispatch_examples.dot
index 5f638b1e5..b992862b3 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/dispatch_examples.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/dispatch_examples.dot
@@ -33,7 +33,7 @@ digraph iCFG {
 52 [label="52: Exit A_dispatch_barrier_example \n  " color=yellow style=filled]
 	
 
-51 [label="51: Start A_dispatch_barrier_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_barrier_example______6:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_barrier_example______6); [line 71]\n  NULLIFY(&infer___objc_anonymous_block_A_dispatch_barrier_example______6,false); [line 71]\n " color=yellow style=filled]
+51 [label="51: Start A_dispatch_barrier_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_barrier_example______6:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_barrier_example______6); [line 71]\n " color=yellow style=filled]
 	
 
 	 51 -> 60 ;
@@ -71,7 +71,7 @@ digraph iCFG {
 42 [label="42: Exit A_dispatch_group_notify_example \n  " color=yellow style=filled]
 	
 
-41 [label="41: Start A_dispatch_group_notify_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_group_notify_example______5:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_group_notify_example______5); [line 62]\n  NULLIFY(&infer___objc_anonymous_block_A_dispatch_group_notify_example______5,false); [line 62]\n " color=yellow style=filled]
+41 [label="41: Start A_dispatch_group_notify_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_group_notify_example______5:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_group_notify_example______5); [line 62]\n " color=yellow style=filled]
 	
 
 	 41 -> 50 ;
@@ -109,7 +109,7 @@ digraph iCFG {
 32 [label="32: Exit A_dispatch_group_example \n  " color=yellow style=filled]
 	
 
-31 [label="31: Start A_dispatch_group_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_group_example______4:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_group_example______4); [line 53]\n  NULLIFY(&infer___objc_anonymous_block_A_dispatch_group_example______4,false); [line 53]\n " color=yellow style=filled]
+31 [label="31: Start A_dispatch_group_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_group_example______4:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_group_example______4); [line 53]\n " color=yellow style=filled]
 	
 
 	 31 -> 40 ;
@@ -147,7 +147,7 @@ digraph iCFG {
 22 [label="22: Exit A_dispatch_after_example \n  " color=yellow style=filled]
 	
 
-21 [label="21: Start A_dispatch_after_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_after_example______3:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_after_example______3); [line 42]\n  NULLIFY(&infer___objc_anonymous_block_A_dispatch_after_example______3,false); [line 42]\n " color=yellow style=filled]
+21 [label="21: Start A_dispatch_after_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_after_example______3:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_after_example______3); [line 42]\n " color=yellow style=filled]
 	
 
 	 21 -> 30 ;
@@ -185,7 +185,7 @@ digraph iCFG {
 12 [label="12: Exit A_dispatch_async_example \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start A_dispatch_async_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_async_example______2:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_async_example______2); [line 32]\n  NULLIFY(&infer___objc_anonymous_block_A_dispatch_async_example______2,false); [line 32]\n " color=yellow style=filled]
+11 [label="11: Start A_dispatch_async_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_async_example______2:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_async_example______2); [line 32]\n " color=yellow style=filled]
 	
 
 	 11 -> 20 ;
@@ -223,7 +223,7 @@ digraph iCFG {
 2 [label="2: Exit A_dispatch_once_example \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_dispatch_once_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_once_example______1:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_once_example______1); [line 20]\n  NULLIFY(&infer___objc_anonymous_block_A_dispatch_once_example______1,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start A_dispatch_once_example\nFormals: \nLocals:  infer___objc_anonymous_block_A_dispatch_once_example______1:_fn_ (*) \n   DECLARE_LOCALS(&return,&infer___objc_anonymous_block_A_dispatch_once_example______1); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 10 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/retain_cycle.dot b/infer/tests/codetoanalyze/objc/frontend/block/retain_cycle.dot
index 9a79bbc1f..b018408f7 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/retain_cycle.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/retain_cycle.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 16 [label="16: Exit main \n  " color=yellow style=filled]
 	
 
-15 [label="15: Start main\nFormals:  argc:int  argv:char **\nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 61]\n  NULLIFY(&a,false); [line 61]\n  NULLIFY(&argc,false); [line 61]\n  NULLIFY(&argv,false); [line 61]\n " color=yellow style=filled]
+15 [label="15: Start main\nFormals:  argc:int  argv:char **\nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 61]\n " color=yellow style=filled]
 	
 
 	 15 -> 19 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/block/static.dot b/infer/tests/codetoanalyze/objc/frontend/block/static.dot
index 4dcaf712d..3691ec597 100644
--- a/infer/tests/codetoanalyze/objc/frontend/block/static.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/block/static.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 30 [label="30: Exit main \n  " color=yellow style=filled]
 	
 
-29 [label="29: Start main\nFormals:  argc:int  argv:char **\nLocals:  \n   DECLARE_LOCALS(&return); [line 60]\n  NULLIFY(&argc,false); [line 60]\n  NULLIFY(&argv,false); [line 60]\n " color=yellow style=filled]
+29 [label="29: Start main\nFormals:  argc:int  argv:char **\nLocals:  \n   DECLARE_LOCALS(&return); [line 60]\n " color=yellow style=filled]
 	
 
 	 29 -> 31 ;
@@ -51,7 +51,7 @@ digraph iCFG {
 18 [label="18: Exit __objc_anonymous_block_A_test2______3 \n  " color=yellow style=filled]
 	
 
-17 [label="17: Start __objc_anonymous_block_A_test2______3\nFormals: \nLocals:  p:struct objc_object * \n   DECLARE_LOCALS(&return,&p); [line 39]\n  NULLIFY(&p,false); [line 39]\n " color=yellow style=filled]
+17 [label="17: Start __objc_anonymous_block_A_test2______3\nFormals: \nLocals:  p:struct objc_object * \n   DECLARE_LOCALS(&return,&p); [line 39]\n " color=yellow style=filled]
 	
 
 	 17 -> 19 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/boxing/Boxing.dot b/infer/tests/codetoanalyze/objc/frontend/boxing/Boxing.dot
index f68e9ff9b..f2d327021 100644
--- a/infer/tests/codetoanalyze/objc/frontend/boxing/Boxing.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/boxing/Boxing.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 24 [label="24: Exit Boxing_getS \n  " color=yellow style=filled]
 	
 
-23 [label="23: Start Boxing_getS\nFormals:  self:class Boxing *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 41]\n  NULLIFY(&s,false); [line 41]\n  NULLIFY(&self,false); [line 41]\n " color=yellow style=filled]
+23 [label="23: Start Boxing_getS\nFormals:  self:class Boxing *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 41]\n " color=yellow style=filled]
 	
 
 	 23 -> 26 ;
@@ -25,7 +25,7 @@ digraph iCFG {
 20 [label="20: Exit Boxing_getBool \n  " color=yellow style=filled]
 	
 
-19 [label="19: Start Boxing_getBool\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * \n   DECLARE_LOCALS(&return,&n); [line 36]\n  NULLIFY(&n,false); [line 36]\n  NULLIFY(&self,false); [line 36]\n " color=yellow style=filled]
+19 [label="19: Start Boxing_getBool\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * \n   DECLARE_LOCALS(&return,&n); [line 36]\n " color=yellow style=filled]
 	
 
 	 19 -> 22 ;
@@ -40,7 +40,7 @@ digraph iCFG {
 16 [label="16: Exit Boxing_getDouble \n  " color=yellow style=filled]
 	
 
-15 [label="15: Start Boxing_getDouble\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * \n   DECLARE_LOCALS(&return,&n); [line 31]\n  NULLIFY(&n,false); [line 31]\n  NULLIFY(&self,false); [line 31]\n " color=yellow style=filled]
+15 [label="15: Start Boxing_getDouble\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * \n   DECLARE_LOCALS(&return,&n); [line 31]\n " color=yellow style=filled]
 	
 
 	 15 -> 18 ;
@@ -55,7 +55,7 @@ digraph iCFG {
 12 [label="12: Exit Boxing_getFloat \n  " color=yellow style=filled]
 	
 
-11 [label="11: Start Boxing_getFloat\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * \n   DECLARE_LOCALS(&return,&n); [line 26]\n  NULLIFY(&n,false); [line 26]\n  NULLIFY(&self,false); [line 26]\n " color=yellow style=filled]
+11 [label="11: Start Boxing_getFloat\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * \n   DECLARE_LOCALS(&return,&n); [line 26]\n " color=yellow style=filled]
 	
 
 	 11 -> 14 ;
@@ -70,7 +70,7 @@ digraph iCFG {
 8 [label="8: Exit Boxing_getInt \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start Boxing_getInt\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * \n   DECLARE_LOCALS(&return,&n); [line 21]\n  NULLIFY(&n,false); [line 21]\n  NULLIFY(&self,false); [line 21]\n " color=yellow style=filled]
+7 [label="7: Start Boxing_getInt\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * \n   DECLARE_LOCALS(&return,&n); [line 21]\n " color=yellow style=filled]
 	
 
 	 7 -> 10 ;
@@ -93,7 +93,7 @@ digraph iCFG {
 2 [label="2: Exit Boxing_getIntExp \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start Boxing_getIntExp\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * y:int  x:int  \n   DECLARE_LOCALS(&return,&n,&y,&x); [line 14]\n  NULLIFY(&n,false); [line 14]\n  NULLIFY(&self,false); [line 14]\n  NULLIFY(&x,false); [line 14]\n  NULLIFY(&y,false); [line 14]\n " color=yellow style=filled]
+1 [label="1: Start Boxing_getIntExp\nFormals:  self:class Boxing *\nLocals:  n:class NSNumber * y:int  x:int  \n   DECLARE_LOCALS(&return,&n,&y,&x); [line 14]\n " color=yellow style=filled]
 	
 
 	 1 -> 6 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/boxing/array.dot b/infer/tests/codetoanalyze/objc/frontend/boxing/array.dot
index b223aa303..d2148a2ab 100644
--- a/infer/tests/codetoanalyze/objc/frontend/boxing/array.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/boxing/array.dot
@@ -43,7 +43,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  item:class NSString * germanCars:class NSArray * s:class NSString * \n   DECLARE_LOCALS(&return,&item,&germanCars,&s); [line 12]\n  NULLIFY(&germanCars,false); [line 12]\n  NULLIFY(&item,false); [line 12]\n  NULLIFY(&s,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  item:class NSString * germanCars:class NSArray * s:class NSString * \n   DECLARE_LOCALS(&return,&item,&germanCars,&s); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 12 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/boxing/array_literal.dot b/infer/tests/codetoanalyze/objc/frontend/boxing/array_literal.dot
index 07f1669ed..a6c289c17 100644
--- a/infer/tests/codetoanalyze/objc/frontend/boxing/array_literal.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/boxing/array_literal.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 2 [label="2: Exit get_array \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start get_array\nFormals: \nLocals:  animals:class NSArray * \n   DECLARE_LOCALS(&return,&animals); [line 12]\n  NULLIFY(&animals,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start get_array\nFormals: \nLocals:  animals:class NSArray * \n   DECLARE_LOCALS(&return,&animals); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/conditional_operation/ConditionalOperation.dot b/infer/tests/codetoanalyze/objc/frontend/conditional_operation/ConditionalOperation.dot
index e4649cf2f..819acb64b 100644
--- a/infer/tests/codetoanalyze/objc/frontend/conditional_operation/ConditionalOperation.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/conditional_operation/ConditionalOperation.dot
@@ -26,7 +26,7 @@ digraph iCFG {
 5 [label="5: Exit A_test5: \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start A_test5:\nFormals:  self:class A * b:_Bool \nLocals:  SIL_temp_conditional___n$2:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2); [line 23]\n  NULLIFY(&SIL_temp_conditional___n$2,false); [line 23]\n " color=yellow style=filled]
+4 [label="4: Start A_test5:\nFormals:  self:class A * b:_Bool \nLocals:  SIL_temp_conditional___n$2:int  \n   DECLARE_LOCALS(&return,&SIL_temp_conditional___n$2); [line 23]\n " color=yellow style=filled]
 	
 
 	 4 -> 7 ;
@@ -38,7 +38,7 @@ digraph iCFG {
 2 [label="2: Exit A_test4: \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_test4:\nFormals:  self:class A * x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n  NULLIFY(&self,false); [line 19]\n " color=yellow style=filled]
+1 [label="1: Start A_test4:\nFormals:  self:class A * x:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 19]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/exceptions/ExceptionExample.dot b/infer/tests/codetoanalyze/objc/frontend/exceptions/ExceptionExample.dot
index fd76f4b90..1f1312702 100644
--- a/infer/tests/codetoanalyze/objc/frontend/exceptions/ExceptionExample.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/exceptions/ExceptionExample.dot
@@ -27,7 +27,7 @@ digraph iCFG {
 6 [label="6: Exit ExceptionExample_test1 \n  " color=yellow style=filled]
 	
 
-5 [label="5: Start ExceptionExample_test1\nFormals:  self:class ExceptionExample *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 27]\n  NULLIFY(&s,false); [line 27]\n  NULLIFY(&self,false); [line 27]\n " color=yellow style=filled]
+5 [label="5: Start ExceptionExample_test1\nFormals:  self:class ExceptionExample *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 27]\n " color=yellow style=filled]
 	
 
 	 5 -> 12 ;
@@ -42,7 +42,7 @@ digraph iCFG {
 2 [label="2: Exit ExceptionExample_test \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start ExceptionExample_test\nFormals:  self:class ExceptionExample *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 18]\n  NULLIFY(&s,false); [line 18]\n " color=yellow style=filled]
+1 [label="1: Start ExceptionExample_test\nFormals:  self:class ExceptionExample *\nLocals:  s:class NSString * \n   DECLARE_LOCALS(&return,&s); [line 18]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/fast_enumeration/Fast_enumeration.dot b/infer/tests/codetoanalyze/objc/frontend/fast_enumeration/Fast_enumeration.dot
index 358652826..afd12a6c7 100644
--- a/infer/tests/codetoanalyze/objc/frontend/fast_enumeration/Fast_enumeration.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/fast_enumeration/Fast_enumeration.dot
@@ -35,7 +35,7 @@ digraph iCFG {
 13 [label="13: Exit A_while_loop: \n  " color=yellow style=filled]
 	
 
-12 [label="12: Start A_while_loop:\nFormals:  self:class A * items:class NSArray *\nLocals:  item:class NSArray * size:int  \n   DECLARE_LOCALS(&return,&item,&size); [line 25]\n  NULLIFY(&item,false); [line 25]\n  NULLIFY(&self,false); [line 25]\n  NULLIFY(&size,false); [line 25]\n " color=yellow style=filled]
+12 [label="12: Start A_while_loop:\nFormals:  self:class A * items:class NSArray *\nLocals:  item:class NSArray * size:int  \n   DECLARE_LOCALS(&return,&item,&size); [line 25]\n " color=yellow style=filled]
 	
 
 	 12 -> 21 ;
@@ -79,7 +79,7 @@ digraph iCFG {
 2 [label="2: Exit A_fast_loop: \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_fast_loop:\nFormals:  self:class A * items:class NSArray *\nLocals:  item:class NSArray * size:int  \n   DECLARE_LOCALS(&return,&item,&size); [line 17]\n  NULLIFY(&item,false); [line 17]\n  NULLIFY(&self,false); [line 17]\n  NULLIFY(&size,false); [line 17]\n " color=yellow style=filled]
+1 [label="1: Start A_fast_loop:\nFormals:  self:class A * items:class NSArray *\nLocals:  item:class NSArray * size:int  \n   DECLARE_LOCALS(&return,&item,&size); [line 17]\n " color=yellow style=filled]
 	
 
 	 1 -> 11 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/predefined_expr/PredefinedExprExample.dot b/infer/tests/codetoanalyze/objc/frontend/predefined_expr/PredefinedExprExample.dot
index 38d9c0290..4a1fc166b 100644
--- a/infer/tests/codetoanalyze/objc/frontend/predefined_expr/PredefinedExprExample.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/predefined_expr/PredefinedExprExample.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 8 [label="8: Exit A_testFunct \n  " color=yellow style=filled]
 	
 
-7 [label="7: Start A_testFunct\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n  NULLIFY(&self,false); [line 26]\n " color=yellow style=filled]
+7 [label="7: Start A_testFunct\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 26]\n " color=yellow style=filled]
 	
 
 	 7 -> 9 ;
@@ -17,7 +17,7 @@ digraph iCFG {
 5 [label="5: Exit A_testFunction \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start A_testFunction\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n  NULLIFY(&self,false); [line 22]\n " color=yellow style=filled]
+4 [label="4: Start A_testFunction\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 22]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -28,7 +28,7 @@ digraph iCFG {
 2 [label="2: Exit A_testPrettyFunction \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_testPrettyFunction\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&self,false); [line 18]\n " color=yellow style=filled]
+1 [label="1: Start A_testPrettyFunction\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/property/PropertyAttributes.dot b/infer/tests/codetoanalyze/objc/frontend/property/PropertyAttributes.dot
index 75eac941d..19343c3a6 100644
--- a/infer/tests/codetoanalyze/objc/frontend/property/PropertyAttributes.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/property/PropertyAttributes.dot
@@ -18,7 +18,7 @@ digraph iCFG {
 14 [label="14: Exit test \n  " color=yellow style=filled]
 	
 
-13 [label="13: Start test\nFormals:  a2:class A *\nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 38]\n  NULLIFY(&a,false); [line 38]\n " color=yellow style=filled]
+13 [label="13: Start test\nFormals:  a2:class A *\nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 38]\n " color=yellow style=filled]
 	
 
 	 13 -> 18 ;
@@ -58,7 +58,7 @@ digraph iCFG {
 4 [label="4: Exit A_copy \n  " color=yellow style=filled]
 	
 
-3 [label="3: Start A_copy\nFormals:  self:class A *\nLocals:  other:class A * \n   DECLARE_LOCALS(&return,&other); [line 26]\n  NULLIFY(&other,false); [line 26]\n " color=yellow style=filled]
+3 [label="3: Start A_copy\nFormals:  self:class A *\nLocals:  other:class A * \n   DECLARE_LOCALS(&return,&other); [line 26]\n " color=yellow style=filled]
 	
 
 	 3 -> 12 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/property/PropertyImplSetter.dot b/infer/tests/codetoanalyze/objc/frontend/property/PropertyImplSetter.dot
index 180f1661b..770101ac8 100644
--- a/infer/tests/codetoanalyze/objc/frontend/property/PropertyImplSetter.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/property/PropertyImplSetter.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 2 [label="2: Exit PropertyImplSetter_setMaximumFileSize: \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start PropertyImplSetter_setMaximumFileSize:\nFormals:  self:class PropertyImplSetter * newMaximumFileSize:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n  NULLIFY(&newMaximumFileSize,false); [line 14]\n " color=yellow style=filled]
+1 [label="1: Start PropertyImplSetter_setMaximumFileSize:\nFormals:  self:class PropertyImplSetter * newMaximumFileSize:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/property/Property_getter.dot b/infer/tests/codetoanalyze/objc/frontend/property/Property_getter.dot
index 5de4ae770..885854c0e 100644
--- a/infer/tests/codetoanalyze/objc/frontend/property/Property_getter.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/property/Property_getter.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 2 [label="2: Exit A_addTarget: \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start A_addTarget:\nFormals:  self:class A * target:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n  NULLIFY(&self,false); [line 18]\n " color=yellow style=filled]
+1 [label="1: Start A_addTarget:\nFormals:  self:class A * target:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 18]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/property/main_car.dot b/infer/tests/codetoanalyze/objc/frontend/property/main_car.dot
index 05fadf2fb..e9b0ea69e 100644
--- a/infer/tests/codetoanalyze/objc/frontend/property/main_car.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/property/main_car.dot
@@ -18,7 +18,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  honda:class Car * \n   DECLARE_LOCALS(&return,&honda); [line 12]\n  NULLIFY(&honda,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  honda:class Car * \n   DECLARE_LOCALS(&return,&honda); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 6 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/returnstmt/void_return.dot b/infer/tests/codetoanalyze/objc/frontend/returnstmt/void_return.dot
index 0e6bacdfa..cd42d0304 100644
--- a/infer/tests/codetoanalyze/objc/frontend/returnstmt/void_return.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/returnstmt/void_return.dot
@@ -56,7 +56,7 @@ digraph iCFG {
 2 [label="2: Exit MyClass_aMethod \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start MyClass_aMethod\nFormals:  self:class MyClass *\nLocals:  j:int  i:int  \n   DECLARE_LOCALS(&return,&j,&i); [line 18]\n  NULLIFY(&i,false); [line 18]\n  NULLIFY(&j,false); [line 18]\n  NULLIFY(&self,false); [line 18]\n " color=yellow style=filled]
+1 [label="1: Start MyClass_aMethod\nFormals:  self:class MyClass *\nLocals:  j:int  i:int  \n   DECLARE_LOCALS(&return,&j,&i); [line 18]\n " color=yellow style=filled]
 	
 
 	 1 -> 15 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/self_static/Self.dot b/infer/tests/codetoanalyze/objc/frontend/self_static/Self.dot
index b4f159e35..4d5f5fcc6 100644
--- a/infer/tests/codetoanalyze/objc/frontend/self_static/Self.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/self_static/Self.dot
@@ -42,7 +42,7 @@ digraph iCFG {
 42 [label="42: Exit A_loggerName \n  " color=yellow style=filled]
 	
 
-41 [label="41: Start A_loggerName\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 90]\n  NULLIFY(&self,false); [line 90]\n " color=yellow style=filled]
+41 [label="41: Start A_loggerName\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 90]\n " color=yellow style=filled]
 	
 
 	 41 -> 43 ;
@@ -75,7 +75,7 @@ digraph iCFG {
 33 [label="33: Exit A_use_class_in_other_ways: \n  " color=yellow style=filled]
 	
 
-32 [label="32: Start A_use_class_in_other_ways:\nFormals:  self:class A * object:class B *\nLocals:  \n   DECLARE_LOCALS(&return); [line 78]\n  NULLIFY(&self,false); [line 78]\n " color=yellow style=filled]
+32 [label="32: Start A_use_class_in_other_ways:\nFormals:  self:class A * object:class B *\nLocals:  \n   DECLARE_LOCALS(&return); [line 78]\n " color=yellow style=filled]
 	
 
 	 32 -> 34 ;
@@ -90,7 +90,7 @@ digraph iCFG {
 29 [label="29: Exit A_t \n  " color=yellow style=filled]
 	
 
-28 [label="28: Start A_t\nFormals:  self:class A *\nLocals:  b:class B * \n   DECLARE_LOCALS(&return,&b); [line 73]\n  NULLIFY(&b,false); [line 73]\n  NULLIFY(&self,false); [line 73]\n " color=yellow style=filled]
+28 [label="28: Start A_t\nFormals:  self:class A *\nLocals:  b:class B * \n   DECLARE_LOCALS(&return,&b); [line 73]\n " color=yellow style=filled]
 	
 
 	 28 -> 31 ;
@@ -101,7 +101,7 @@ digraph iCFG {
 26 [label="26: Exit A_call_class_instance_with_class_name \n  " color=yellow style=filled]
 	
 
-25 [label="25: Start A_call_class_instance_with_class_name\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 69]\n  NULLIFY(&self,false); [line 69]\n " color=yellow style=filled]
+25 [label="25: Start A_call_class_instance_with_class_name\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 69]\n " color=yellow style=filled]
 	
 
 	 25 -> 27 ;
@@ -112,7 +112,7 @@ digraph iCFG {
 23 [label="23: Exit A_call_class_instance \n  " color=yellow style=filled]
 	
 
-22 [label="22: Start A_call_class_instance\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n  NULLIFY(&self,false); [line 65]\n " color=yellow style=filled]
+22 [label="22: Start A_call_class_instance\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 65]\n " color=yellow style=filled]
 	
 
 	 22 -> 24 ;
@@ -123,7 +123,7 @@ digraph iCFG {
 20 [label="20: Exit A_call_alloc_instance \n  " color=yellow style=filled]
 	
 
-19 [label="19: Start A_call_alloc_instance\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 61]\n  NULLIFY(&self,false); [line 61]\n " color=yellow style=filled]
+19 [label="19: Start A_call_alloc_instance\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 61]\n " color=yellow style=filled]
 	
 
 	 19 -> 21 ;
@@ -170,7 +170,7 @@ digraph iCFG {
 7 [label="7: Exit A_test \n  " color=yellow style=filled]
 	
 
-6 [label="6: Start A_test\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 43]\n  NULLIFY(&self,false); [line 43]\n " color=yellow style=filled]
+6 [label="6: Start A_test\nFormals:  self:class A *\nLocals:  \n   DECLARE_LOCALS(&return); [line 43]\n " color=yellow style=filled]
 	
 
 	 6 -> 7 ;
@@ -181,7 +181,7 @@ digraph iCFG {
 4 [label="4: Exit B_isC: \n  " color=yellow style=filled]
 	
 
-3 [label="3: Start B_isC:\nFormals:  self:class B * aClass:struct objc_class *\nLocals:  \n   DECLARE_LOCALS(&return); [line 23]\n  NULLIFY(&aClass,false); [line 23]\n  NULLIFY(&self,false); [line 23]\n " color=yellow style=filled]
+3 [label="3: Start B_isC:\nFormals:  self:class B * aClass:struct objc_class *\nLocals:  \n   DECLARE_LOCALS(&return); [line 23]\n " color=yellow style=filled]
 	
 
 	 3 -> 5 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/self_static/static.dot b/infer/tests/codetoanalyze/objc/frontend/self_static/static.dot
index 67a980e58..09c42c9c8 100644
--- a/infer/tests/codetoanalyze/objc/frontend/self_static/static.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/self_static/static.dot
@@ -17,7 +17,7 @@ digraph iCFG {
 11 [label="11: Exit MyClass_getX \n  " color=yellow style=filled]
 	
 
-10 [label="10: Start MyClass_getX\nFormals:  self:class MyClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n  NULLIFY(&self,false); [line 32]\n " color=yellow style=filled]
+10 [label="10: Start MyClass_getX\nFormals:  self:class MyClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 32]\n " color=yellow style=filled]
 	
 
 	 10 -> 12 ;
@@ -39,7 +39,7 @@ digraph iCFG {
 5 [label="5: Exit MyClass_anInstanceMethod \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start MyClass_anInstanceMethod\nFormals:  self:class MyClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n  NULLIFY(&self,false); [line 24]\n " color=yellow style=filled]
+4 [label="4: Start MyClass_anInstanceMethod\nFormals:  self:class MyClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 24]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -50,7 +50,7 @@ digraph iCFG {
 2 [label="2: Exit MyClass_aClassMethod \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start MyClass_aClassMethod\nFormals: \nLocals:  myClass:class MyClass * \n   DECLARE_LOCALS(&return,&myClass); [line 20]\n  NULLIFY(&myClass,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start MyClass_aClassMethod\nFormals: \nLocals:  myClass:class MyClass * \n   DECLARE_LOCALS(&return,&myClass); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/strings/string_literal.dot b/infer/tests/codetoanalyze/objc/frontend/strings/string_literal.dot
index 2ec183565..06fee6a74 100644
--- a/infer/tests/codetoanalyze/objc/frontend/strings/string_literal.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/strings/string_literal.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  lastName:class NSString * \n   DECLARE_LOCALS(&return,&lastName); [line 12]\n  NULLIFY(&lastName,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  lastName:class NSString * \n   DECLARE_LOCALS(&return,&lastName); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/subclass/MyClass.dot b/infer/tests/codetoanalyze/objc/frontend/subclass/MyClass.dot
index 5b5e1a2fa..56064d1e4 100644
--- a/infer/tests/codetoanalyze/objc/frontend/subclass/MyClass.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/subclass/MyClass.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 2 [label="2: Exit MyClass_myNumber \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start MyClass_myNumber\nFormals:  self:class MyClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n  NULLIFY(&self,false); [line 14]\n " color=yellow style=filled]
+1 [label="1: Start MyClass_myNumber\nFormals:  self:class MyClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 14]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/subclass/MySubClass.dot b/infer/tests/codetoanalyze/objc/frontend/subclass/MySubClass.dot
index bf63f93ca..bd928834a 100644
--- a/infer/tests/codetoanalyze/objc/frontend/subclass/MySubClass.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/subclass/MySubClass.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 2 [label="2: Exit MySubclass_myNumber \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start MySubclass_myNumber\nFormals:  self:class MySubclass *\nLocals:  subclassNumber:int  \n   DECLARE_LOCALS(&return,&subclassNumber); [line 15]\n  NULLIFY(&subclassNumber,false); [line 15]\n " color=yellow style=filled]
+1 [label="1: Start MySubclass_myNumber\nFormals:  self:class MySubclass *\nLocals:  subclassNumber:int  \n   DECLARE_LOCALS(&return,&subclassNumber); [line 15]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/subclass/main.dot b/infer/tests/codetoanalyze/objc/frontend/subclass/main.dot
index fa5e55385..f076dade4 100644
--- a/infer/tests/codetoanalyze/objc/frontend/subclass/main.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/subclass/main.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 12]\n  NULLIFY(&a,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  a:class A * \n   DECLARE_LOCALS(&return,&a); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/types/attributes.dot b/infer/tests/codetoanalyze/objc/frontend/types/attributes.dot
index 9869dc102..280493217 100644
--- a/infer/tests/codetoanalyze/objc/frontend/types/attributes.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/types/attributes.dot
@@ -50,7 +50,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  aStdRef:class A * anAutoRelRef:class A __autoreleasing * anUnsafeUnretRef:class A __unsafe_unretained * aStrongRef:class A * aWeakRef:class A __weak * \n   DECLARE_LOCALS(&return,&aStdRef,&anAutoRelRef,&anUnsafeUnretRef,&aStrongRef,&aWeakRef); [line 20]\n  NULLIFY(&aStdRef,false); [line 20]\n  NULLIFY(&aStrongRef,false); [line 20]\n  NULLIFY(&aWeakRef,false); [line 20]\n  NULLIFY(&anAutoRelRef,false); [line 20]\n  NULLIFY(&anUnsafeUnretRef,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  aStdRef:class A * anAutoRelRef:class A __autoreleasing * anUnsafeUnretRef:class A __unsafe_unretained * aStrongRef:class A * aWeakRef:class A __weak * \n   DECLARE_LOCALS(&return,&aStdRef,&anAutoRelRef,&anUnsafeUnretRef,&aStrongRef,&aWeakRef); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 14 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/types/void_call.dot b/infer/tests/codetoanalyze/objc/frontend/types/void_call.dot
index 0c8c61964..e8af2b917 100644
--- a/infer/tests/codetoanalyze/objc/frontend/types/void_call.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/types/void_call.dot
@@ -43,7 +43,7 @@ digraph iCFG {
 14 [label="14: Exit main \n  " color=yellow style=filled]
 	
 
-13 [label="13: Start main\nFormals: \nLocals:  o:class AClass * x:int  \n   DECLARE_LOCALS(&return,&o,&x); [line 33]\n  NULLIFY(&o,false); [line 33]\n  NULLIFY(&x,false); [line 33]\n " color=yellow style=filled]
+13 [label="13: Start main\nFormals: \nLocals:  o:class AClass * x:int  \n   DECLARE_LOCALS(&return,&o,&x); [line 33]\n " color=yellow style=filled]
 	
 
 	 13 -> 24 ;
@@ -76,7 +76,7 @@ digraph iCFG {
 5 [label="5: Exit AClass_bar: \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start AClass_bar:\nFormals:  self:class AClass * a:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 23]\n  NULLIFY(&self,false); [line 23]\n " color=yellow style=filled]
+4 [label="4: Start AClass_bar:\nFormals:  self:class AClass * a:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 23]\n " color=yellow style=filled]
 	
 
 	 4 -> 6 ;
@@ -87,7 +87,7 @@ digraph iCFG {
 2 [label="2: Exit AClass_foo: \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start AClass_foo:\nFormals:  self:class AClass * a:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n  NULLIFY(&self,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start AClass_foo:\nFormals:  self:class AClass * a:int \nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/vardecl/aclass.dot b/infer/tests/codetoanalyze/objc/frontend/vardecl/aclass.dot
index 4b4f2490d..632a07938 100644
--- a/infer/tests/codetoanalyze/objc/frontend/vardecl/aclass.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/vardecl/aclass.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 2 [label="2: Exit AClass_sharedInstance \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start AClass_sharedInstance\nFormals:  self:class AClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n  NULLIFY(&self,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start AClass_sharedInstance\nFormals:  self:class AClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/vardecl/aclass_2.dot b/infer/tests/codetoanalyze/objc/frontend/vardecl/aclass_2.dot
index 4b4f2490d..632a07938 100644
--- a/infer/tests/codetoanalyze/objc/frontend/vardecl/aclass_2.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/vardecl/aclass_2.dot
@@ -6,7 +6,7 @@ digraph iCFG {
 2 [label="2: Exit AClass_sharedInstance \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start AClass_sharedInstance\nFormals:  self:class AClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n  NULLIFY(&self,false); [line 20]\n " color=yellow style=filled]
+1 [label="1: Start AClass_sharedInstance\nFormals:  self:class AClass *\nLocals:  \n   DECLARE_LOCALS(&return); [line 20]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/vardecl/initlist.dot b/infer/tests/codetoanalyze/objc/frontend/vardecl/initlist.dot
index 7c834de8c..770393b31 100644
--- a/infer/tests/codetoanalyze/objc/frontend/vardecl/initlist.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/vardecl/initlist.dot
@@ -14,7 +14,7 @@ digraph iCFG {
 5 [label="5: Exit test \n  " color=yellow style=filled]
 	
 
-4 [label="4: Start test\nFormals: \nLocals:  a:class C *[3] c2:class C * c1:class C * \n   DECLARE_LOCALS(&return,&a,&c2,&c1); [line 21]\n  NULLIFY(&a,false); [line 21]\n  NULLIFY(&c1,false); [line 21]\n  NULLIFY(&c2,false); [line 21]\n " color=yellow style=filled]
+4 [label="4: Start test\nFormals: \nLocals:  a:class C *[3] c2:class C * c1:class C * \n   DECLARE_LOCALS(&return,&a,&c2,&c1); [line 21]\n " color=yellow style=filled]
 	
 
 	 4 -> 8 ;
@@ -25,7 +25,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  a:int [2][3] z:int  \n   DECLARE_LOCALS(&return,&a,&z); [line 12]\n  NULLIFY(&a,false); [line 12]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  a:int [2][3] z:int  \n   DECLARE_LOCALS(&return,&a,&z); [line 12]\n " color=yellow style=filled]
 	
 
 	 1 -> 3 ;
diff --git a/infer/tests/codetoanalyze/objc/frontend/vardecl/last_af.dot b/infer/tests/codetoanalyze/objc/frontend/vardecl/last_af.dot
index 59da92c21..3a857e435 100644
--- a/infer/tests/codetoanalyze/objc/frontend/vardecl/last_af.dot
+++ b/infer/tests/codetoanalyze/objc/frontend/vardecl/last_af.dot
@@ -10,7 +10,7 @@ digraph iCFG {
 2 [label="2: Exit main \n  " color=yellow style=filled]
 	
 
-1 [label="1: Start main\nFormals: \nLocals:  b:int  a:int  \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n  NULLIFY(&a,false); [line 10]\n  NULLIFY(&b,false); [line 10]\n " color=yellow style=filled]
+1 [label="1: Start main\nFormals: \nLocals:  b:int  a:int  \n   DECLARE_LOCALS(&return,&b,&a); [line 10]\n " color=yellow style=filled]
 	
 
 	 1 -> 4 ;