Update test results.

10 files changed, 63 insertions, 1439 deletions

diff --git a/test/crashtest2-01.txt b/test/crashtest2-01.txt
index 661dff0..0215804 100644
--- a/test/crashtest2-01.txt
+++ b/test/crashtest2-01.txt
@@ -7014,11 +7014,6 @@ function_decl _mm_malloc /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:
    decl_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 40:9 - statement
     var_decl ptr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 40:9 - operand
     - isUsed: 1
-     integer_cst 64 - decl size
-     pointer_type - var type
-      void_type - nested type
-       type_decl void <built-in> 0:0 - type name
-       - isAutogenerated: 1
    if_stmt - statement
     eq_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 41:17 - condition
      - isUsed: 1
@@ -7076,11 +7071,6 @@ function_decl _mm_malloc /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:
        addr_expr - arg
         var_decl ptr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 40:9 - operand
         - isUsed: 1
-         integer_cst 64 - decl size
-         pointer_type - var type
-          void_type - nested type
-           type_decl void <built-in> 0:0 - type name
-           - isAutogenerated: 1
        - isUsed: 1
        parm_decl alignment /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:33 - arg
         integer_type - decl type
@@ -7111,11 +7101,6 @@ function_decl _mm_malloc /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:
        integer_cst 64 - decl size
       var_decl ptr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 40:9 - operand
       - isUsed: 1
-       integer_cst 64 - decl size
-       pointer_type - var type
-        void_type - nested type
-         type_decl void <built-in> 0:0 - type name
-         - isAutogenerated: 1
     return_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 48:12 - else
      init_expr - operand
       result_decl /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:42 - operand
@@ -7129,11 +7114,6 @@ function_decl _mm_malloc /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 38:
   block - operand
    var_decl ptr /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 40:9 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    pointer_type - var type
-     void_type - nested type
-      type_decl void <built-in> 0:0 - type name
-      - isAutogenerated: 1
 function_decl _mm_free /usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h 52:1
  function_type - function type
   void_type - function return type
@@ -7194,17 +7174,13 @@ function_decl _mm_undefined_ps crashtest2.h 107:1
   var_decl __Y crashtest2.h 109:10 - operand
   - isUsed: 1
    integer_cst 128 - decl size
-   Unsupported node type: vector_type - var type - operand
    var_decl __Y crashtest2.h 109:10 - initial
    - isUsed: 1
+   Unsupported node type: vector_type - var type - operand
   statement_list - operand
    decl_expr crashtest2.h 109:16 - statement
     var_decl __Y crashtest2.h 109:10 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
-     var_decl __Y crashtest2.h 109:10 - initial
-     - isUsed: 1
    return_expr crashtest2.h 110:10 - statement
     init_expr - operand
      result_decl crashtest2.h 107:23 - operand
@@ -7213,17 +7189,9 @@ function_decl _mm_undefined_ps crashtest2.h 107:1
       integer_cst 128 - decl size
      var_decl __Y crashtest2.h 109:10 - operand
      - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - operand
-      var_decl __Y crashtest2.h 109:10 - initial
-      - isUsed: 1
   block - operand
    var_decl __Y crashtest2.h 109:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    var_decl __Y crashtest2.h 109:10 - initial
-    - isUsed: 1
 function_decl _mm_setzero_ps crashtest2.h 115:1
 - isExternal: 1
 - isPublic: 1
@@ -10871,8 +10839,6 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
    decl_expr crashtest2.h 644:10 - statement
     var_decl __sign crashtest2.h 644:10 - operand
     - isUsed: 1
-     integer_cst 64 - decl size
-     Unsupported node type: vector_type - var type - operand
    decl_expr crashtest2.h 645:10 - statement
     var_decl __hisi crashtest2.h 645:10 - operand
     - isUsed: 1
@@ -10904,8 +10870,6 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
       modify_expr - operand
        var_decl __sign crashtest2.h 644:10 - operand
        - isUsed: 1
-        integer_cst 64 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 651:35 - operand
        - function: LOAD_LANES - operand
         Unsupported node type: vector_cst - arg - operand
@@ -10916,8 +10880,6 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
       modify_expr - operand
        var_decl __losi crashtest2.h 645:18 - operand
        - isUsed: 1
-        integer_cst 64 - decl size
-        Unsupported node type: vector_type - var type - operand
        Unsupported node type: view_convert_expr - operand - operand
    cleanup_point_expr crashtest2.h 655:67 - statement
     expr_stmt - operand
@@ -10925,8 +10887,6 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
       modify_expr - operand
        var_decl __hisi crashtest2.h 645:10 - operand
        - isUsed: 1
-        integer_cst 64 - decl size
-        Unsupported node type: vector_type - var type - operand
        Unsupported node type: view_convert_expr - operand - operand
    cleanup_point_expr crashtest2.h 658:38 - statement
     expr_stmt - operand
@@ -10934,8 +10894,6 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
       modify_expr - operand
        var_decl __zero crashtest2.h 646:10 - operand
        - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 658:36 - operand
        - function: LOAD_LANES - operand
    cleanup_point_expr crashtest2.h 659:50 - statement
@@ -10944,36 +10902,24 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
       modify_expr - operand
        var_decl __ra crashtest2.h 646:18 - operand
        - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 659:34 - operand
        - function: LOAD_LANES - operand
         var_decl __zero crashtest2.h 646:10 - arg
         - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
         var_decl __losi crashtest2.h 645:18 - arg
         - isUsed: 1
-         integer_cst 64 - decl size
-         Unsupported node type: vector_type - var type - arg
    cleanup_point_expr crashtest2.h 660:48 - statement
     expr_stmt - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __rb crashtest2.h 646:24 - operand
        - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 660:34 - operand
        - function: LOAD_LANES - operand
         var_decl __ra crashtest2.h 646:18 - arg
         - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
         var_decl __hisi crashtest2.h 645:10 - arg
         - isUsed: 1
-         integer_cst 64 - decl size
-         Unsupported node type: vector_type - var type - arg
    return_expr crashtest2.h 662:53 - statement
     init_expr - operand
      result_decl crashtest2.h 642:26 - operand
@@ -10984,37 +10930,21 @@ function_decl _mm_cvtpi16_ps crashtest2.h 642:1
      - function: LOAD_LANES - operand
       var_decl __ra crashtest2.h 646:18 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
       var_decl __rb crashtest2.h 646:24 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
   block - operand
    var_decl __sign crashtest2.h 644:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __hisi crashtest2.h 645:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __losi crashtest2.h 645:18 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __zero crashtest2.h 646:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __ra crashtest2.h 646:18 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __rb crashtest2.h 646:24 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
 function_decl _mm_cvtpu16_ps crashtest2.h 667:1
 - isExternal: 1
 - isPublic: 1
@@ -11049,8 +10979,6 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
    decl_expr crashtest2.h 669:10 - statement
     var_decl __hisi crashtest2.h 669:10 - operand
     - isUsed: 1
-     integer_cst 64 - decl size
-     Unsupported node type: vector_type - var type - operand
    decl_expr crashtest2.h 669:18 - statement
     var_decl __losi crashtest2.h 669:18 - operand
     - isUsed: 1
@@ -11077,8 +11005,6 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
       modify_expr - operand
        var_decl __losi crashtest2.h 669:18 - operand
        - isUsed: 1
-        integer_cst 64 - decl size
-        Unsupported node type: vector_type - var type - operand
        Unsupported node type: view_convert_expr - operand - operand
    cleanup_point_expr crashtest2.h 674:72 - statement
     expr_stmt - operand
@@ -11086,8 +11012,6 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
       modify_expr - operand
        var_decl __hisi crashtest2.h 669:10 - operand
        - isUsed: 1
-        integer_cst 64 - decl size
-        Unsupported node type: vector_type - var type - operand
        Unsupported node type: view_convert_expr - operand - operand
    cleanup_point_expr crashtest2.h 677:38 - statement
     expr_stmt - operand
@@ -11095,8 +11019,6 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
       modify_expr - operand
        var_decl __zero crashtest2.h 670:10 - operand
        - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 677:36 - operand
        - function: LOAD_LANES - operand
    cleanup_point_expr crashtest2.h 678:50 - statement
@@ -11105,36 +11027,24 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
       modify_expr - operand
        var_decl __ra crashtest2.h 670:18 - operand
        - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 678:34 - operand
        - function: LOAD_LANES - operand
         var_decl __zero crashtest2.h 670:10 - arg
         - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
         var_decl __losi crashtest2.h 669:18 - arg
         - isUsed: 1
-         integer_cst 64 - decl size
-         Unsupported node type: vector_type - var type - arg
    cleanup_point_expr crashtest2.h 679:48 - statement
     expr_stmt - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __rb crashtest2.h 670:24 - operand
        - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 679:34 - operand
        - function: LOAD_LANES - operand
         var_decl __ra crashtest2.h 670:18 - arg
         - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
         var_decl __hisi crashtest2.h 669:10 - arg
         - isUsed: 1
-         integer_cst 64 - decl size
-         Unsupported node type: vector_type - var type - arg
    return_expr crashtest2.h 681:53 - statement
     init_expr - operand
      result_decl crashtest2.h 667:26 - operand
@@ -11145,33 +11055,19 @@ function_decl _mm_cvtpu16_ps crashtest2.h 667:1
      - function: LOAD_LANES - operand
       var_decl __ra crashtest2.h 670:18 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
       var_decl __rb crashtest2.h 670:24 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
   block - operand
    var_decl __hisi crashtest2.h 669:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __losi crashtest2.h 669:18 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __zero crashtest2.h 670:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __ra crashtest2.h 670:18 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __rb crashtest2.h 670:24 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
 function_decl _mm_cvtpi8_ps crashtest2.h 686:1
 - isExternal: 1
 - isPublic: 1
@@ -11206,16 +11102,12 @@ function_decl _mm_cvtpi8_ps crashtest2.h 686:1
    decl_expr crashtest2.h 688:10 - statement
     var_decl __sign crashtest2.h 688:10 - operand
     - isUsed: 1
-     integer_cst 64 - decl size
-     Unsupported node type: vector_type - var type - operand
    cleanup_point_expr crashtest2.h 693:61 - statement
     expr_stmt - operand
      convert_expr - expresssion
       modify_expr - operand
        var_decl __sign crashtest2.h 688:10 - operand
        - isUsed: 1
-        integer_cst 64 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 693:35 - operand
        - function: LOAD_LANES - operand
         Unsupported node type: vector_cst - arg - operand
@@ -11245,8 +11137,6 @@ function_decl _mm_cvtpi8_ps crashtest2.h 686:1
   block - operand
    var_decl __sign crashtest2.h 688:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
 function_decl _mm_cvtpu8_ps crashtest2.h 703:1
 - isExternal: 1
 - isPublic: 1
@@ -11335,49 +11225,34 @@ function_decl _mm_cvtpi32x2_ps crashtest2.h 711:1
    decl_expr crashtest2.h 713:44 - statement
     var_decl __zero crashtest2.h 713:10 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
    cleanup_point_expr crashtest2.h 713:44 - statement
     expr_stmt - operand
      convert_expr - expresssion
       init_expr - operand
        var_decl __zero crashtest2.h 713:10 - operand
        - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr crashtest2.h 713:43 - operand
        - function: LOAD_LANES - operand
    decl_expr crashtest2.h 714:62 - statement
     var_decl __sfa crashtest2.h 714:10 - operand
     - isUsed: 1
      integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
      call_expr crashtest2.h 714:42 - initial
      - function: LOAD_LANES - initial
       var_decl __zero crashtest2.h 713:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
       Unsupported node type: non_lvalue_expr - arg - initial
+     Unsupported node type: vector_type - var type - operand
    decl_expr crashtest2.h 715:61 - statement
     var_decl __sfb crashtest2.h 715:10 - operand
     - isUsed: 1
      integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
      call_expr crashtest2.h 715:42 - initial
      - function: LOAD_LANES - initial
       var_decl __sfa crashtest2.h 714:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       call_expr crashtest2.h 714:42 - initial
-       - function: LOAD_LANES - initial
-        var_decl __zero crashtest2.h 713:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-        Unsupported node type: non_lvalue_expr - arg - initial
       Unsupported node type: non_lvalue_expr - arg - initial
+     Unsupported node type: vector_type - var type - operand
    return_expr crashtest2.h 716:55 - statement
     init_expr - operand
      result_decl crashtest2.h 711:38 - operand
@@ -11388,67 +11263,15 @@ function_decl _mm_cvtpi32x2_ps crashtest2.h 711:1
      - function: LOAD_LANES - operand
       var_decl __sfa crashtest2.h 714:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       call_expr crashtest2.h 714:42 - initial
-       - function: LOAD_LANES - initial
-        var_decl __zero crashtest2.h 713:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-        Unsupported node type: non_lvalue_expr - arg - initial
       var_decl __sfb crashtest2.h 715:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       call_expr crashtest2.h 715:42 - initial
-       - function: LOAD_LANES - initial
-        var_decl __sfa crashtest2.h 714:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-         call_expr crashtest2.h 714:42 - initial
-         - function: LOAD_LANES - initial
-          var_decl __zero crashtest2.h 713:10 - arg
-          - isUsed: 1
-           integer_cst 128 - decl size
-           Unsupported node type: vector_type - var type - arg
-          Unsupported node type: non_lvalue_expr - arg - initial
-        Unsupported node type: non_lvalue_expr - arg - initial
   block - operand
    var_decl __zero crashtest2.h 713:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
    var_decl __sfa crashtest2.h 714:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    call_expr crashtest2.h 714:42 - initial
-    - function: LOAD_LANES - initial
-     var_decl __zero crashtest2.h 713:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-     Unsupported node type: non_lvalue_expr - arg - initial
    var_decl __sfb crashtest2.h 715:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    call_expr crashtest2.h 715:42 - initial
-    - function: LOAD_LANES - initial
-     var_decl __sfa crashtest2.h 714:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      call_expr crashtest2.h 714:42 - initial
-      - function: LOAD_LANES - initial
-       var_decl __zero crashtest2.h 713:10 - arg
-       - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - arg
-       Unsupported node type: non_lvalue_expr - arg - initial
-     Unsupported node type: non_lvalue_expr - arg - initial
 function_decl _mm_cvtps_pi16 crashtest2.h 721:1
 - isExternal: 1
 - isPublic: 1
@@ -11478,74 +11301,42 @@ function_decl _mm_cvtps_pi16 crashtest2.h 721:1
   var_decl __hisf crashtest2.h 723:10 - operand
   - isUsed: 1
    integer_cst 128 - decl size
-   Unsupported node type: vector_type - var type - operand
    - isUsed: 1
    parm_decl __A crashtest2.h 721:23 - initial
+   Unsupported node type: vector_type - var type - operand
   statement_list - operand
    decl_expr crashtest2.h 723:27 - statement
     var_decl __hisf crashtest2.h 723:10 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
-     - isUsed: 1
-     parm_decl __A crashtest2.h 721:23 - initial
    decl_expr crashtest2.h 724:57 - statement
     var_decl __losf crashtest2.h 724:10 - operand
     - isUsed: 1
      integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
      call_expr crashtest2.h 724:42 - initial
      - function: LOAD_LANES - initial
       var_decl __hisf crashtest2.h 723:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       - isUsed: 1
-       parm_decl __A crashtest2.h 721:23 - initial
       var_decl __hisf crashtest2.h 723:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       - isUsed: 1
-       parm_decl __A crashtest2.h 721:23 - initial
+     Unsupported node type: vector_type - var type - operand
    decl_expr crashtest2.h 725:50 - statement
     var_decl __hisi crashtest2.h 725:10 - operand
     - isUsed: 1
      integer_cst 64 - decl size
-     Unsupported node type: vector_type - var type - operand
      call_expr crashtest2.h 725:43 - initial
      - function: LOAD_LANES - initial
       var_decl __hisf crashtest2.h 723:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       - isUsed: 1
-       parm_decl __A crashtest2.h 721:23 - initial
+     Unsupported node type: vector_type - var type - operand
    decl_expr crashtest2.h 726:50 - statement
     var_decl __losi crashtest2.h 726:10 - operand
     - isUsed: 1
      integer_cst 64 - decl size
-     Unsupported node type: vector_type - var type - operand
      call_expr crashtest2.h 726:43 - initial
      - function: LOAD_LANES - initial
       var_decl __losf crashtest2.h 724:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       call_expr crashtest2.h 724:42 - initial
-       - function: LOAD_LANES - initial
-        var_decl __hisf crashtest2.h 723:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-         - isUsed: 1
-         parm_decl __A crashtest2.h 721:23 - initial
-        var_decl __hisf crashtest2.h 723:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-         - isUsed: 1
-         parm_decl __A crashtest2.h 721:23 - initial
+     Unsupported node type: vector_type - var type - operand
    return_expr crashtest2.h 727:57 - statement
     init_expr - operand
      result_decl crashtest2.h 721:26 - operand
@@ -11556,64 +11347,12 @@ function_decl _mm_cvtps_pi16 crashtest2.h 721:1
   block - operand
    var_decl __hisf crashtest2.h 723:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    - isUsed: 1
-    parm_decl __A crashtest2.h 721:23 - initial
    var_decl __losf crashtest2.h 724:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    call_expr crashtest2.h 724:42 - initial
-    - function: LOAD_LANES - initial
-     var_decl __hisf crashtest2.h 723:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      - isUsed: 1
-      parm_decl __A crashtest2.h 721:23 - initial
-     var_decl __hisf crashtest2.h 723:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      - isUsed: 1
-      parm_decl __A crashtest2.h 721:23 - initial
    var_decl __hisi crashtest2.h 725:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    call_expr crashtest2.h 725:43 - initial
-    - function: LOAD_LANES - initial
-     var_decl __hisf crashtest2.h 723:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      - isUsed: 1
-      parm_decl __A crashtest2.h 721:23 - initial
    var_decl __losi crashtest2.h 726:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    call_expr crashtest2.h 726:43 - initial
-    - function: LOAD_LANES - initial
-     var_decl __losf crashtest2.h 724:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      call_expr crashtest2.h 724:42 - initial
-      - function: LOAD_LANES - initial
-       var_decl __hisf crashtest2.h 723:10 - arg
-       - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - arg
-        - isUsed: 1
-        parm_decl __A crashtest2.h 721:23 - initial
-       var_decl __hisf crashtest2.h 723:10 - arg
-       - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - arg
-        - isUsed: 1
-        parm_decl __A crashtest2.h 721:23 - initial
 function_decl _mm_cvtps_pi8 crashtest2.h 732:1
 - isExternal: 1
 - isPublic: 1
@@ -11648,16 +11387,12 @@ function_decl _mm_cvtps_pi8 crashtest2.h 732:1
    decl_expr crashtest2.h 734:46 - statement
     var_decl __tmp crashtest2.h 734:10 - operand
     - isUsed: 1
-     integer_cst 64 - decl size
-     Unsupported node type: vector_type - var type - operand
    cleanup_point_expr crashtest2.h 734:46 - statement
     expr_stmt - operand
      convert_expr - expresssion
       init_expr - operand
        var_decl __tmp crashtest2.h 734:10 - operand
        - isUsed: 1
-        integer_cst 64 - decl size
-        Unsupported node type: vector_type - var type - operand
        Unsupported node type: view_convert_expr - operand - operand
    return_expr crashtest2.h 735:61 - statement
     init_expr - operand
@@ -11669,8 +11404,6 @@ function_decl _mm_cvtps_pi8 crashtest2.h 732:1
   block - operand
    var_decl __tmp crashtest2.h 734:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    Unsupported node type: vector_type - var type - block vars
 function_decl _mm_unpackhi_ps crashtest2.h 753:1
 - isExternal: 1
 - isPublic: 1
@@ -12921,7 +12654,6 @@ function_decl _mm_loadr_ps crashtest2.h 936:1
   var_decl __tmp crashtest2.h 938:10 - operand
   - isUsed: 1
    integer_cst 128 - decl size
-   Unsupported node type: vector_type - var type - operand
    indirect_ref - initial
     nop_expr - operand
      - isUsed: 1
@@ -12929,19 +12661,11 @@ function_decl _mm_loadr_ps crashtest2.h 936:1
       pointer_type - decl type
        Unsupported node type: real_type - nested type - decl type
       integer_cst 64 - parm size
+   Unsupported node type: vector_type - var type - operand
   statement_list - operand
    decl_expr crashtest2.h 938:29 - statement
     var_decl __tmp crashtest2.h 938:10 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
-     indirect_ref - initial
-      nop_expr - operand
-       - isUsed: 1
-       parm_decl __P crashtest2.h 936:28 - operand
-        pointer_type - decl type
-         Unsupported node type: real_type - nested type - decl type
-        integer_cst 64 - parm size
    return_expr crashtest2.h 939:77 - statement
     init_expr - operand
      result_decl crashtest2.h 936:31 - operand
@@ -12952,39 +12676,12 @@ function_decl _mm_loadr_ps crashtest2.h 936:1
      - function: LOAD_LANES - operand
       var_decl __tmp crashtest2.h 938:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       indirect_ref - initial
-        nop_expr - operand
-         - isUsed: 1
-         parm_decl __P crashtest2.h 936:28 - operand
-          pointer_type - decl type
-           Unsupported node type: real_type - nested type - decl type
-          integer_cst 64 - parm size
       var_decl __tmp crashtest2.h 938:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       indirect_ref - initial
-        nop_expr - operand
-         - isUsed: 1
-         parm_decl __P crashtest2.h 936:28 - operand
-          pointer_type - decl type
-           Unsupported node type: real_type - nested type - decl type
-          integer_cst 64 - parm size
       integer_cst 27 - arg
   block - operand
    var_decl __tmp crashtest2.h 938:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    indirect_ref - initial
-     nop_expr - operand
-      - isUsed: 1
-      parm_decl __P crashtest2.h 936:28 - operand
-       pointer_type - decl type
-        Unsupported node type: real_type - nested type - decl type
-       integer_cst 64 - parm size
 function_decl _mm_set_ps crashtest2.h 944:1
 - isExternal: 1
 - isPublic: 1
@@ -13332,37 +13029,25 @@ function_decl _mm_store1_ps crashtest2.h 985:1
   var_decl __va crashtest2.h 987:10 - operand
   - isUsed: 1
    integer_cst 128 - decl size
-   Unsupported node type: vector_type - var type - operand
    - isUsed: 1
    parm_decl __A crashtest2.h 985:35 - initial
+   Unsupported node type: vector_type - var type - operand
   statement_list - operand
    decl_expr crashtest2.h 987:25 - statement
     var_decl __va crashtest2.h 987:10 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
-     - isUsed: 1
-     parm_decl __A crashtest2.h 985:35 - initial
    decl_expr crashtest2.h 988:74 - statement
     var_decl __tmp crashtest2.h 988:10 - operand
     - isUsed: 1
      integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
      call_expr crashtest2.h 988:40 - initial
      - function: LOAD_LANES - initial
       var_decl __va crashtest2.h 987:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       - isUsed: 1
-       parm_decl __A crashtest2.h 985:35 - initial
       var_decl __va crashtest2.h 987:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       - isUsed: 1
-       parm_decl __A crashtest2.h 985:35 - initial
       integer_cst 0 - arg
+     Unsupported node type: vector_type - var type - operand
    cleanup_point_expr crashtest2.h 989:29 - statement
     expr_stmt - operand
      call_expr crashtest2.h 989:17 - expresssion
@@ -13374,49 +13059,11 @@ function_decl _mm_store1_ps crashtest2.h 985:1
        integer_cst 64 - parm size
       var_decl __tmp crashtest2.h 988:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       call_expr crashtest2.h 988:40 - initial
-       - function: LOAD_LANES - initial
-        var_decl __va crashtest2.h 987:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-         - isUsed: 1
-         parm_decl __A crashtest2.h 985:35 - initial
-        var_decl __va crashtest2.h 987:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-         - isUsed: 1
-         parm_decl __A crashtest2.h 985:35 - initial
-        integer_cst 0 - arg
   block - operand
    var_decl __va crashtest2.h 987:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    - isUsed: 1
-    parm_decl __A crashtest2.h 985:35 - initial
    var_decl __tmp crashtest2.h 988:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    call_expr crashtest2.h 988:40 - initial
-    - function: LOAD_LANES - initial
-     var_decl __va crashtest2.h 987:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      - isUsed: 1
-      parm_decl __A crashtest2.h 985:35 - initial
-     var_decl __va crashtest2.h 987:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      - isUsed: 1
-      parm_decl __A crashtest2.h 985:35 - initial
-     integer_cst 0 - arg
 function_decl _mm_store_ps1 crashtest2.h 993:1
 - isExternal: 1
 - isPublic: 1
@@ -13506,37 +13153,25 @@ function_decl _mm_storer_ps crashtest2.h 1000:1
   var_decl __va crashtest2.h 1002:10 - operand
   - isUsed: 1
    integer_cst 128 - decl size
-   Unsupported node type: vector_type - var type - operand
    - isUsed: 1
    parm_decl __A crashtest2.h 1000:35 - initial
+   Unsupported node type: vector_type - var type - operand
   statement_list - operand
    decl_expr crashtest2.h 1002:25 - statement
     var_decl __va crashtest2.h 1002:10 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
-     - isUsed: 1
-     parm_decl __A crashtest2.h 1000:35 - initial
    decl_expr crashtest2.h 1003:74 - statement
     var_decl __tmp crashtest2.h 1003:10 - operand
     - isUsed: 1
      integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
      call_expr crashtest2.h 1003:40 - initial
      - function: LOAD_LANES - initial
       var_decl __va crashtest2.h 1002:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       - isUsed: 1
-       parm_decl __A crashtest2.h 1000:35 - initial
       var_decl __va crashtest2.h 1002:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       - isUsed: 1
-       parm_decl __A crashtest2.h 1000:35 - initial
       integer_cst 27 - arg
+     Unsupported node type: vector_type - var type - operand
    cleanup_point_expr crashtest2.h 1004:28 - statement
     expr_stmt - operand
      call_expr crashtest2.h 1004:16 - expresssion
@@ -13548,49 +13183,11 @@ function_decl _mm_storer_ps crashtest2.h 1000:1
        integer_cst 64 - parm size
       var_decl __tmp crashtest2.h 1003:10 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
-       call_expr crashtest2.h 1003:40 - initial
-       - function: LOAD_LANES - initial
-        var_decl __va crashtest2.h 1002:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-         - isUsed: 1
-         parm_decl __A crashtest2.h 1000:35 - initial
-        var_decl __va crashtest2.h 1002:10 - arg
-        - isUsed: 1
-         integer_cst 128 - decl size
-         Unsupported node type: vector_type - var type - arg
-         - isUsed: 1
-         parm_decl __A crashtest2.h 1000:35 - initial
-        integer_cst 27 - arg
   block - operand
    var_decl __va crashtest2.h 1002:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    - isUsed: 1
-    parm_decl __A crashtest2.h 1000:35 - initial
    var_decl __tmp crashtest2.h 1003:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    call_expr crashtest2.h 1003:40 - initial
-    - function: LOAD_LANES - initial
-     var_decl __va crashtest2.h 1002:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      - isUsed: 1
-      parm_decl __A crashtest2.h 1000:35 - initial
-     var_decl __va crashtest2.h 1002:10 - arg
-     - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - arg
-      - isUsed: 1
-      parm_decl __A crashtest2.h 1000:35 - initial
-     integer_cst 27 - arg
 function_decl _mm_move_ss crashtest2.h 1009:1
 - isExternal: 1
 - isPublic: 1
@@ -14938,17 +14535,13 @@ function_decl _mm_undefined_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin
   var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:11 - operand
   - isUsed: 1
    integer_cst 128 - decl size
-   Unsupported node type: vector_type - var type - operand
    var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:11 - initial
    - isUsed: 1
+   Unsupported node type: vector_type - var type - operand
   statement_list - operand
    decl_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:17 - statement
     var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:11 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
-     var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:11 - initial
-     - isUsed: 1
    return_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 98:10 - statement
     init_expr - operand
      result_decl /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 95:23 - operand
@@ -14957,17 +14550,9 @@ function_decl _mm_undefined_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin
       integer_cst 128 - decl size
      var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:11 - operand
      - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - operand
-      var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:11 - initial
-      - isUsed: 1
   block - operand
    var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:11 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 97:11 - initial
-    - isUsed: 1
 function_decl _mm_setzero_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 103:1
 - isExternal: 1
 - isPublic: 1
@@ -15285,16 +14870,12 @@ function_decl _mm_loadr_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1
    decl_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:35 - statement
     var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:11 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
    cleanup_point_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:35 - statement
     expr_stmt - operand
      convert_expr - expresssion
       init_expr - operand
        var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:11 - operand
        - isUsed: 1
-        integer_cst 128 - decl size
-        Unsupported node type: vector_type - var type - operand
        call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:31 - operand
        - function: LOAD_LANES - operand
         - isUsed: 1
@@ -15312,18 +14893,12 @@ function_decl _mm_loadr_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 1
      - function: LOAD_LANES - operand
       var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:11 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
       var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:11 - arg
       - isUsed: 1
-       integer_cst 128 - decl size
-       Unsupported node type: vector_type - var type - arg
       integer_cst 1 - arg
   block - operand
    var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 153:11 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
 function_decl _mm_store_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 159:1
 - isExternal: 1
 - isPublic: 1
@@ -16381,21 +15956,15 @@ function_decl _mm_sqrt_sd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 29
   var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 298:10 - operand
   - isUsed: 1
    integer_cst 128 - decl size
-   Unsupported node type: vector_type - var type - operand
    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 298:39 - initial
    - function: LOAD_LANES - initial
     Unsupported node type: non_lvalue_expr - arg - initial
     Unsupported node type: non_lvalue_expr - arg - initial
+   Unsupported node type: vector_type - var type - operand
   statement_list - operand
    decl_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 298:64 - statement
     var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 298:10 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
-     call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 298:39 - initial
-     - function: LOAD_LANES - initial
-      Unsupported node type: non_lvalue_expr - arg - initial
-      Unsupported node type: non_lvalue_expr - arg - initial
    return_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 299:55 - statement
     init_expr - operand
      result_decl /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 296:38 - operand
@@ -16408,12 +15977,6 @@ function_decl _mm_sqrt_sd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 29
   block - operand
    var_decl __tmp /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 298:10 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    call_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 298:39 - initial
-    - function: LOAD_LANES - initial
-     Unsupported node type: non_lvalue_expr - arg - initial
-     Unsupported node type: non_lvalue_expr - arg - initial
 function_decl _mm_min_pd /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 303:1
 - isExternal: 1
 - isPublic: 1
@@ -21278,17 +20841,13 @@ function_decl _mm_undefined_si128 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmint
   var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:11 - operand
   - isUsed: 1
    integer_cst 128 - decl size
-   Unsupported node type: vector_type - var type - operand
    var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:11 - initial
    - isUsed: 1
+   Unsupported node type: vector_type - var type - operand
   statement_list - operand
    decl_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:17 - statement
     var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:11 - operand
     - isUsed: 1
-     integer_cst 128 - decl size
-     Unsupported node type: vector_type - var type - operand
-     var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:11 - initial
-     - isUsed: 1
    return_expr /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 748:10 - statement
     init_expr - operand
      result_decl /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 745:26 - operand
@@ -21297,17 +20856,9 @@ function_decl _mm_undefined_si128 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmint
       integer_cst 128 - decl size
      var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:11 - operand
      - isUsed: 1
-      integer_cst 128 - decl size
-      Unsupported node type: vector_type - var type - operand
-      var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:11 - initial
-      - isUsed: 1
   block - operand
    var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:11 - block vars
    - isUsed: 1
-    integer_cst 128 - decl size
-    Unsupported node type: vector_type - var type - block vars
-    var_decl __Y /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 747:11 - initial
-    - isUsed: 1
 function_decl _mm_setzero_si128 /usr/lib/gcc/x86_64-linux-gnu/5/include/emmintrin.h 753:1
 - isExternal: 1
 - isPublic: 1
diff --git a/test/crashtest4-01.txt b/test/crashtest4-01.txt
index 34fbee5..f1577cc 100644
--- a/test/crashtest4-01.txt
+++ b/test/crashtest4-01.txt
@@ -26,23 +26,5 @@ function_decl func crashtest4.cpp 19:6
     - isAutogenerated: 1
   decl_expr crashtest4.cpp 21:11 - operand
    var_decl var1 crashtest4.cpp 21:11 - operand
-    integer_cst 128 - decl size
-    record_type - var type
-     type_decl Test1 crashtest4.cpp 12:7 - type name
-     - isAutogenerated: 1
-     Unsupported node type: field_decl - field - var type
-     Unsupported node type: field_decl - field - var type
-     Unsupported node type: field_decl - field - var type
-     type_decl Test1 crashtest4.cpp 13:1 - field
-     - isAutogenerated: 1
   block - operand
    var_decl var1 crashtest4.cpp 21:11 - block vars
-    integer_cst 128 - decl size
-    record_type - var type
-     type_decl Test1 crashtest4.cpp 12:7 - type name
-     - isAutogenerated: 1
-     Unsupported node type: field_decl - field - var type
-     Unsupported node type: field_decl - field - var type
-     Unsupported node type: field_decl - field - var type
-     type_decl Test1 crashtest4.cpp 13:1 - field
-     - isAutogenerated: 1
diff --git a/test/test1-01.txt b/test/test1-01.txt
index 1af6beb..84d97a1 100644
--- a/test/test1-01.txt
+++ b/test/test1-01.txt
@@ -159,16 +159,6 @@ function_decl main test1.c 14:5
     decl_expr test1.c 17:14 - statement
      var_decl k test1.c 17:14 - operand
      - isUsed: 1
-      integer_cst 8 - decl size
-      integer_type - var type
-      - precisionBits: 8
-      - isChar: 1
-      - signed
-       type_decl char <built-in> 0:0 - type name
-       - isAutogenerated: 1
-       integer_cst 8 - type size
-       integer_cst -128 - min value
-       integer_cst 127 - max value
     decl_expr test1.c 17:17 - statement
      var_decl k2 test1.c 17:17 - operand
       integer_cst 8 - decl size
@@ -189,16 +179,6 @@ function_decl main test1.c 14:5
        addr_expr - arg
         var_decl k test1.c 17:14 - operand
         - isUsed: 1
-         integer_cst 8 - decl size
-         integer_type - var type
-         - precisionBits: 8
-         - isChar: 1
-         - signed
-          type_decl char <built-in> 0:0 - type name
-          - isAutogenerated: 1
-          integer_cst 8 - type size
-          integer_cst -128 - min value
-          integer_cst 127 - max value
     return_expr test1.c 19:9 - statement
      init_expr - operand
       result_decl test1.c 14:10 - operand
@@ -216,27 +196,7 @@ function_decl main test1.c 14:5
    block - operand
     var_decl k test1.c 17:14 - block vars
     - isUsed: 1
-     integer_cst 8 - decl size
-     integer_type - var type
-     - precisionBits: 8
-     - isChar: 1
-     - signed
-      type_decl char <built-in> 0:0 - type name
-      - isAutogenerated: 1
-      integer_cst 8 - type size
-      integer_cst -128 - min value
-      integer_cst 127 - max value
     var_decl k2 test1.c 17:17 - block vars
-     integer_cst 8 - decl size
-     integer_type - var type
-     - precisionBits: 8
-     - isChar: 1
-     - signed
-      type_decl char <built-in> 0:0 - type name
-      - isAutogenerated: 1
-      integer_cst 8 - type size
-      integer_cst -128 - min value
-      integer_cst 127 - max value
   return_expr test1.c 20:1 - statement
    init_expr - operand
     result_decl test1.c 14:10 - operand
@@ -362,6 +322,7 @@ function_decl fun test1.c 21:6
        var_decl c test1.c 3:5 - operand
        - isUsed: 1
         integer_cst 32 - decl size
+        integer_cst 1 - initial
         integer_type - var type
         - precisionBits: 32
         - signed
@@ -370,7 +331,6 @@ function_decl fun test1.c 21:6
          integer_cst 32 - type size
          integer_cst -2147483648 - min value
          integer_cst 2147483647 - max value
-        integer_cst 1 - initial
   cleanup_point_expr test1.c 26:6 - else
    expr_stmt - operand
     convert_expr - expresssion
@@ -461,6 +421,7 @@ function_decl fun1 test1.c 29:5
   var_decl a test1.c 31:6 - operand
   - isUsed: 1
    integer_cst 32 - decl size
+   integer_cst 0 - initial
    integer_type - var type
    - precisionBits: 32
    - signed
@@ -469,27 +430,17 @@ function_decl fun1 test1.c 29:5
     integer_cst 32 - type size
     integer_cst -2147483648 - min value
     integer_cst 2147483647 - max value
-   integer_cst 0 - initial
   statement_list - operand
    cleanup_point_expr test1.c 31:8 - statement
     decl_expr test1.c 31:8 - operand
      var_decl a test1.c 31:6 - operand
      - isUsed: 1
-      integer_cst 32 - decl size
-      integer_type - var type
-      - precisionBits: 32
-      - signed
-       type_decl int <built-in> 0:0 - type name
-       - isAutogenerated: 1
-       integer_cst 32 - type size
-       integer_cst -2147483648 - min value
-       integer_cst 2147483647 - max value
-      integer_cst 0 - initial
    cleanup_point_expr test1.c 31:16 - statement
     decl_expr test1.c 31:16 - operand
      var_decl b test1.c 31:14 - operand
      - isUsed: 1
       integer_cst 32 - decl size
+      integer_cst 1 - initial
       integer_type - var type
       - precisionBits: 32
       - signed
@@ -498,7 +449,6 @@ function_decl fun1 test1.c 29:5
        integer_cst 32 - type size
        integer_cst -2147483648 - min value
        integer_cst 2147483647 - max value
-      integer_cst 1 - initial
    cleanup_point_expr test1.c 32:5 - statement
     expr_stmt - operand
      convert_expr - expresssion
@@ -506,6 +456,7 @@ function_decl fun1 test1.c 29:5
        var_decl c test1.c 3:5 - operand
        - isUsed: 1
         integer_cst 32 - decl size
+        integer_cst 1 - initial
         integer_type - var type
         - precisionBits: 32
         - signed
@@ -514,19 +465,8 @@ function_decl fun1 test1.c 29:5
          integer_cst 32 - type size
          integer_cst -2147483648 - min value
          integer_cst 2147483647 - max value
-        integer_cst 1 - initial
        var_decl b test1.c 31:14 - operand
        - isUsed: 1
-        integer_cst 32 - decl size
-        integer_type - var type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-        integer_cst 1 - initial
    cleanup_point_expr test1.c 33:10 - statement
     expr_stmt - operand
      call_expr test1.c 33:5 - expresssion
@@ -537,16 +477,6 @@ function_decl fun1 test1.c 29:5
     eq_expr test1.c 34:6 - condition
      var_decl a test1.c 31:6 - operand
      - isUsed: 1
-      integer_cst 32 - decl size
-      integer_type - var type
-      - precisionBits: 32
-      - signed
-       type_decl int <built-in> 0:0 - type name
-       - isAutogenerated: 1
-       integer_cst 32 - type size
-       integer_cst -2147483648 - min value
-       integer_cst 2147483647 - max value
-      integer_cst 0 - initial
      integer_cst 0 - operand
     return_expr test1.c 35:12 - then
      init_expr - operand
@@ -564,28 +494,8 @@ function_decl fun1 test1.c 29:5
       plus_expr test1.c 35:11 - operand
        var_decl a test1.c 31:6 - operand
        - isUsed: 1
-        integer_cst 32 - decl size
-        integer_type - var type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-        integer_cst 0 - initial
        var_decl b test1.c 31:14 - operand
        - isUsed: 1
-        integer_cst 32 - decl size
-        integer_type - var type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-        integer_cst 1 - initial
     return_expr test1.c 36:14 - else
      init_expr - operand
       result_decl test1.c 29:30 - operand
@@ -603,28 +513,8 @@ function_decl fun1 test1.c 29:5
   block - operand
    var_decl a test1.c 31:6 - block vars
    - isUsed: 1
-    integer_cst 32 - decl size
-    integer_type - var type
-    - precisionBits: 32
-    - signed
-     type_decl int <built-in> 0:0 - type name
-     - isAutogenerated: 1
-     integer_cst 32 - type size
-     integer_cst -2147483648 - min value
-     integer_cst 2147483647 - max value
-    integer_cst 0 - initial
    var_decl b test1.c 31:14 - block vars
    - isUsed: 1
-    integer_cst 32 - decl size
-    integer_type - var type
-    - precisionBits: 32
-    - signed
-     type_decl int <built-in> 0:0 - type name
-     - isAutogenerated: 1
-     integer_cst 32 - type size
-     integer_cst -2147483648 - min value
-     integer_cst 2147483647 - max value
-    integer_cst 1 - initial
 function_decl fun2 test1.c 38:6
 - isPublic: 1
  function_type - function type
diff --git a/test/test1-02.txt b/test/test1-02.txt
index 43ebba9..9286f89 100644
--- a/test/test1-02.txt
+++ b/test/test1-02.txt
@@ -113,12 +113,6 @@
 8 integer_cst 
 4 decl_expr test1.c
 5 var_decl test1.c
-6 integer_cst 
-6 integer_type 
-7 type_decl <built-in>
-7 integer_cst 
-7 integer_cst 
-7 integer_cst 
 4 decl_expr test1.c
 5 var_decl test1.c
 6 integer_cst 
@@ -133,12 +127,6 @@
 7 integer_cst 
 7 addr_expr 
 8 var_decl test1.c
-9 integer_cst 
-9 integer_type 
-10 type_decl <built-in>
-10 integer_cst 
-10 integer_cst 
-10 integer_cst 
 4 return_expr test1.c
 5 init_expr 
 6 result_decl test1.c
@@ -151,19 +139,7 @@
 6 integer_cst 
 3 block 
 4 var_decl test1.c
-5 integer_cst 
-5 integer_type 
-6 type_decl <built-in>
-6 integer_cst 
-6 integer_cst 
-6 integer_cst 
 4 var_decl test1.c
-5 integer_cst 
-5 integer_type 
-6 type_decl <built-in>
-6 integer_cst 
-6 integer_cst 
-6 integer_cst 
 2 return_expr test1.c
 3 init_expr 
 4 result_decl test1.c
@@ -249,12 +225,12 @@
 9 integer_cst 
 7 var_decl test1.c
 8 integer_cst 
+8 integer_cst 
 8 integer_type 
 9 type_decl <built-in>
 9 integer_cst 
 9 integer_cst 
 9 integer_cst 
-8 integer_cst 
 2 cleanup_point_expr test1.c
 3 expr_stmt 
 4 convert_expr 
@@ -319,53 +295,39 @@
 1 bind_expr test1.c
 2 var_decl test1.c
 3 integer_cst 
+3 integer_cst 
 3 integer_type 
 4 type_decl <built-in>
 4 integer_cst 
 4 integer_cst 
 4 integer_cst 
-3 integer_cst 
 2 statement_list 
 3 cleanup_point_expr test1.c
 4 decl_expr test1.c
 5 var_decl test1.c
-6 integer_cst 
-6 integer_type 
-7 type_decl <built-in>
-7 integer_cst 
-7 integer_cst 
-7 integer_cst 
-6 integer_cst 
 3 cleanup_point_expr test1.c
 4 decl_expr test1.c
 5 var_decl test1.c
 6 integer_cst 
+6 integer_cst 
 6 integer_type 
 7 type_decl <built-in>
 7 integer_cst 
 7 integer_cst 
 7 integer_cst 
-6 integer_cst 
 3 cleanup_point_expr test1.c
 4 expr_stmt 
 5 convert_expr 
 6 modify_expr 
 7 var_decl test1.c
 8 integer_cst 
-8 integer_type 
-9 type_decl <built-in>
-9 integer_cst 
-9 integer_cst 
-9 integer_cst 
-8 integer_cst 
-7 var_decl test1.c
 8 integer_cst 
 8 integer_type 
 9 type_decl <built-in>
 9 integer_cst 
 9 integer_cst 
 9 integer_cst 
-8 integer_cst 
+7 var_decl test1.c
 3 cleanup_point_expr test1.c
 4 expr_stmt 
 5 call_expr test1.c
@@ -374,13 +336,6 @@
 3 if_stmt 
 4 eq_expr test1.c
 5 var_decl test1.c
-6 integer_cst 
-6 integer_type 
-7 type_decl <built-in>
-7 integer_cst 
-7 integer_cst 
-7 integer_cst 
-6 integer_cst 
 5 integer_cst 
 4 return_expr test1.c
 5 init_expr 
@@ -393,21 +348,7 @@
 7 integer_cst 
 6 plus_expr test1.c
 7 var_decl test1.c
-8 integer_cst 
-8 integer_type 
-9 type_decl <built-in>
-9 integer_cst 
-9 integer_cst 
-9 integer_cst 
-8 integer_cst 
 7 var_decl test1.c
-8 integer_cst 
-8 integer_type 
-9 type_decl <built-in>
-9 integer_cst 
-9 integer_cst 
-9 integer_cst 
-8 integer_cst 
 4 return_expr test1.c
 5 init_expr 
 6 result_decl test1.c
@@ -420,21 +361,7 @@
 6 integer_cst 
 2 block 
 3 var_decl test1.c
-4 integer_cst 
-4 integer_type 
-5 type_decl <built-in>
-5 integer_cst 
-5 integer_cst 
-5 integer_cst 
-4 integer_cst 
 3 var_decl test1.c
-4 integer_cst 
-4 integer_type 
-5 type_decl <built-in>
-5 integer_cst 
-5 integer_cst 
-5 integer_cst 
-4 integer_cst 
 0 function_decl test1.c
 1 function_type 
 2 integer_type 
diff --git a/test/test1-03.txt b/test/test1-03.txt
index 91d0ade..afec409 100644
--- a/test/test1-03.txt
+++ b/test/test1-03.txt
@@ -1,10 +1,10 @@
 Allocations before cleanup: 80
 Allocations after cleanup: 0
-Allocations before cleanup: 96
+Allocations before cleanup: 72
 Allocations after cleanup: 0
 Allocations before cleanup: 93
 Allocations after cleanup: 0
-Allocations before cleanup: 168
+Allocations before cleanup: 119
 Allocations after cleanup: 0
 Allocations before cleanup: 50
 Allocations after cleanup: 0
diff --git a/test/test5-01.txt b/test/test5-01.txt
index 3354491..ecc86a8 100644
--- a/test/test5-01.txt
+++ b/test/test5-01.txt
@@ -364,6 +364,7 @@ function_decl func5 test5.c 25:6
   var_decl var1 test5.c 27:9 - operand
   - isUsed: 1
    integer_cst 32 - decl size
+   integer_cst 1 - initial
    integer_type - var type
    - precisionBits: 32
    - signed
@@ -372,22 +373,11 @@ function_decl func5 test5.c 25:6
     integer_cst 32 - type size
     integer_cst -2147483648 - min value
     integer_cst 2147483647 - max value
-   integer_cst 1 - initial
   statement_list - operand
    cleanup_point_expr test5.c 27:16 - statement
     decl_expr test5.c 27:16 - operand
      var_decl var1 test5.c 27:9 - operand
      - isUsed: 1
-      integer_cst 32 - decl size
-      integer_type - var type
-      - precisionBits: 32
-      - signed
-       type_decl int <built-in> 0:0 - type name
-       - isAutogenerated: 1
-       integer_cst 32 - type size
-       integer_cst -2147483648 - min value
-       integer_cst 2147483647 - max value
-      integer_cst 1 - initial
    cleanup_point_expr test5.c 28:22 - statement
     expr_stmt - operand
      convert_expr - expresssion
@@ -411,31 +401,11 @@ function_decl func5 test5.c 25:6
            nop_expr - operand
             var_decl var1 test5.c 27:9 - operand
             - isUsed: 1
-             integer_cst 32 - decl size
-             integer_type - var type
-             - precisionBits: 32
-             - signed
-              type_decl int <built-in> 0:0 - type name
-              - isAutogenerated: 1
-              integer_cst 32 - type size
-              integer_cst -2147483648 - min value
-              integer_cst 2147483647 - max value
-             integer_cst 1 - initial
            integer_cst 4 - operand
        integer_cst 400 - operand
   block - operand
    var_decl var1 test5.c 27:9 - block vars
    - isUsed: 1
-    integer_cst 32 - decl size
-    integer_type - var type
-    - precisionBits: 32
-    - signed
-     type_decl int <built-in> 0:0 - type name
-     - isAutogenerated: 1
-     integer_cst 32 - type size
-     integer_cst -2147483648 - min value
-     integer_cst 2147483647 - max value
-    integer_cst 1 - initial
 function_decl func6 test5.c 31:6
 - isPublic: 1
  function_type - function type
@@ -516,6 +486,8 @@ function_decl func6 test5.c 31:6
   var_decl var2 test5.c 33:10 - operand
   - isUsed: 1
    integer_cst 64 - decl size
+   - isUsed: 1
+   parm_decl b test5.c 31:24 - initial
    pointer_type - var type
     integer_type - nested type
     - precisionBits: 32
@@ -525,24 +497,10 @@ function_decl func6 test5.c 31:6
      integer_cst 32 - type size
      integer_cst -2147483648 - min value
      integer_cst 2147483647 - max value
-   - isUsed: 1
-   parm_decl b test5.c 31:24 - initial
   statement_list - operand
    decl_expr test5.c 33:17 - statement
     var_decl var2 test5.c 33:10 - operand
     - isUsed: 1
-     integer_cst 64 - decl size
-     pointer_type - var type
-      integer_type - nested type
-      - precisionBits: 32
-      - signed
-       type_decl int <built-in> 0:0 - type name
-       - isAutogenerated: 1
-       integer_cst 32 - type size
-       integer_cst -2147483648 - min value
-       integer_cst 2147483647 - max value
-     - isUsed: 1
-     parm_decl b test5.c 31:24 - initial
    cleanup_point_expr test5.c 34:16 - statement
     expr_stmt - operand
      convert_expr - expresssion
@@ -550,34 +508,10 @@ function_decl func6 test5.c 31:6
        indirect_ref - operand
         var_decl var2 test5.c 33:10 - operand
         - isUsed: 1
-         integer_cst 64 - decl size
-         pointer_type - var type
-          integer_type - nested type
-          - precisionBits: 32
-          - signed
-           type_decl int <built-in> 0:0 - type name
-           - isAutogenerated: 1
-           integer_cst 32 - type size
-           integer_cst -2147483648 - min value
-           integer_cst 2147483647 - max value
-         - isUsed: 1
-         parm_decl b test5.c 31:24 - initial
        integer_cst 500 - operand
   block - operand
    var_decl var2 test5.c 33:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    pointer_type - var type
-     integer_type - nested type
-     - precisionBits: 32
-     - signed
-      type_decl int <built-in> 0:0 - type name
-      - isAutogenerated: 1
-      integer_cst 32 - type size
-      integer_cst -2147483648 - min value
-      integer_cst 2147483647 - max value
-    - isUsed: 1
-    parm_decl b test5.c 31:24 - initial
 function_decl func7 test5.c 37:6
 - isPublic: 1
  function_type - function type
@@ -658,15 +592,6 @@ function_decl func7 test5.c 37:6
   var_decl var3 test5.c 39:10 - operand
   - isUsed: 1
    integer_cst 64 - decl size
-   pointer_type - var type
-    integer_type - nested type
-    - precisionBits: 32
-    - signed
-     type_decl int <built-in> 0:0 - type name
-     - isAutogenerated: 1
-     integer_cst 32 - type size
-     integer_cst -2147483648 - min value
-     integer_cst 2147483647 - max value
    pointer_plus_expr test5.c 39:20 - initial
     - isUsed: 1
     parm_decl b test5.c 37:24 - operand
@@ -681,34 +606,19 @@ function_decl func7 test5.c 37:6
        integer_cst 2147483647 - max value
      integer_cst 64 - parm size
     integer_cst 48 - operand
+   pointer_type - var type
+    integer_type - nested type
+    - precisionBits: 32
+    - signed
+     type_decl int <built-in> 0:0 - type name
+     - isAutogenerated: 1
+     integer_cst 32 - type size
+     integer_cst -2147483648 - min value
+     integer_cst 2147483647 - max value
   statement_list - operand
    decl_expr test5.c 39:22 - statement
     var_decl var3 test5.c 39:10 - operand
     - isUsed: 1
-     integer_cst 64 - decl size
-     pointer_type - var type
-      integer_type - nested type
-      - precisionBits: 32
-      - signed
-       type_decl int <built-in> 0:0 - type name
-       - isAutogenerated: 1
-       integer_cst 32 - type size
-       integer_cst -2147483648 - min value
-       integer_cst 2147483647 - max value
-     pointer_plus_expr test5.c 39:20 - initial
-      - isUsed: 1
-      parm_decl b test5.c 37:24 - operand
-       pointer_type - decl type
-        integer_type - nested type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-       integer_cst 64 - parm size
-      integer_cst 48 - operand
    cleanup_point_expr test5.c 40:16 - statement
     expr_stmt - operand
      convert_expr - expresssion
@@ -716,58 +626,10 @@ function_decl func7 test5.c 37:6
        indirect_ref - operand
         var_decl var3 test5.c 39:10 - operand
         - isUsed: 1
-         integer_cst 64 - decl size
-         pointer_type - var type
-          integer_type - nested type
-          - precisionBits: 32
-          - signed
-           type_decl int <built-in> 0:0 - type name
-           - isAutogenerated: 1
-           integer_cst 32 - type size
-           integer_cst -2147483648 - min value
-           integer_cst 2147483647 - max value
-         pointer_plus_expr test5.c 39:20 - initial
-          - isUsed: 1
-          parm_decl b test5.c 37:24 - operand
-           pointer_type - decl type
-            integer_type - nested type
-            - precisionBits: 32
-            - signed
-             type_decl int <built-in> 0:0 - type name
-             - isAutogenerated: 1
-             integer_cst 32 - type size
-             integer_cst -2147483648 - min value
-             integer_cst 2147483647 - max value
-           integer_cst 64 - parm size
-          integer_cst 48 - operand
        integer_cst 600 - operand
   block - operand
    var_decl var3 test5.c 39:10 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    pointer_type - var type
-     integer_type - nested type
-     - precisionBits: 32
-     - signed
-      type_decl int <built-in> 0:0 - type name
-      - isAutogenerated: 1
-      integer_cst 32 - type size
-      integer_cst -2147483648 - min value
-      integer_cst 2147483647 - max value
-    pointer_plus_expr test5.c 39:20 - initial
-     - isUsed: 1
-     parm_decl b test5.c 37:24 - operand
-      pointer_type - decl type
-       integer_type - nested type
-       - precisionBits: 32
-       - signed
-        type_decl int <built-in> 0:0 - type name
-        - isAutogenerated: 1
-        integer_cst 32 - type size
-        integer_cst -2147483648 - min value
-        integer_cst 2147483647 - max value
-      integer_cst 64 - parm size
-     integer_cst 48 - operand
 function_decl func8 test5.c 43:6
 - isPublic: 1
  function_type - function type
@@ -848,16 +710,6 @@ function_decl func8 test5.c 43:6
   var_decl var4 test5.c 45:11 - operand
   - isUsed: 1
    integer_cst 64 - decl size
-   pointer_type - var type
-    pointer_type - nested type
-     integer_type - nested type
-     - precisionBits: 32
-     - signed
-      type_decl int <built-in> 0:0 - type name
-      - isAutogenerated: 1
-      integer_cst 32 - type size
-      integer_cst -2147483648 - min value
-      integer_cst 2147483647 - max value
    addr_expr - initial
     - isUsed: 1
     parm_decl bptr test5.c 43:24 - operand
@@ -871,34 +723,20 @@ function_decl func8 test5.c 43:6
        integer_cst -2147483648 - min value
        integer_cst 2147483647 - max value
      integer_cst 64 - parm size
+   pointer_type - var type
+    pointer_type - nested type
+     integer_type - nested type
+     - precisionBits: 32
+     - signed
+      type_decl int <built-in> 0:0 - type name
+      - isAutogenerated: 1
+      integer_cst 32 - type size
+      integer_cst -2147483648 - min value
+      integer_cst 2147483647 - max value
   statement_list - operand
    decl_expr test5.c 45:19 - statement
     var_decl var4 test5.c 45:11 - operand
     - isUsed: 1
-     integer_cst 64 - decl size
-     pointer_type - var type
-      pointer_type - nested type
-       integer_type - nested type
-       - precisionBits: 32
-       - signed
-        type_decl int <built-in> 0:0 - type name
-        - isAutogenerated: 1
-        integer_cst 32 - type size
-        integer_cst -2147483648 - min value
-        integer_cst 2147483647 - max value
-     addr_expr - initial
-      - isUsed: 1
-      parm_decl bptr test5.c 43:24 - operand
-       pointer_type - decl type
-        integer_type - nested type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-       integer_cst 64 - parm size
    cleanup_point_expr test5.c 46:17 - statement
     expr_stmt - operand
      convert_expr - expresssion
@@ -907,55 +745,7 @@ function_decl func8 test5.c 43:6
         indirect_ref - operand
          var_decl var4 test5.c 45:11 - operand
          - isUsed: 1
-          integer_cst 64 - decl size
-          pointer_type - var type
-           pointer_type - nested type
-            integer_type - nested type
-            - precisionBits: 32
-            - signed
-             type_decl int <built-in> 0:0 - type name
-             - isAutogenerated: 1
-             integer_cst 32 - type size
-             integer_cst -2147483648 - min value
-             integer_cst 2147483647 - max value
-          addr_expr - initial
-           - isUsed: 1
-           parm_decl bptr test5.c 43:24 - operand
-            pointer_type - decl type
-             integer_type - nested type
-             - precisionBits: 32
-             - signed
-              type_decl int <built-in> 0:0 - type name
-              - isAutogenerated: 1
-              integer_cst 32 - type size
-              integer_cst -2147483648 - min value
-              integer_cst 2147483647 - max value
-            integer_cst 64 - parm size
        integer_cst 700 - operand
   block - operand
    var_decl var4 test5.c 45:11 - block vars
    - isUsed: 1
-    integer_cst 64 - decl size
-    pointer_type - var type
-     pointer_type - nested type
-      integer_type - nested type
-      - precisionBits: 32
-      - signed
-       type_decl int <built-in> 0:0 - type name
-       - isAutogenerated: 1
-       integer_cst 32 - type size
-       integer_cst -2147483648 - min value
-       integer_cst 2147483647 - max value
-    addr_expr - initial
-     - isUsed: 1
-     parm_decl bptr test5.c 43:24 - operand
-      pointer_type - decl type
-       integer_type - nested type
-       - precisionBits: 32
-       - signed
-        type_decl int <built-in> 0:0 - type name
-        - isAutogenerated: 1
-        integer_cst 32 - type size
-        integer_cst -2147483648 - min value
-        integer_cst 2147483647 - max value
-      integer_cst 64 - parm size
diff --git a/test/test5-03.txt b/test/test5-03.txt
index b5d9192..deb7b0e 100644
--- a/test/test5-03.txt
+++ b/test/test5-03.txt
@@ -25,13 +25,7 @@ test5.c: In function 'void func7(int, int*, char)':
 test5.c:39:20: warning: Using variable without check for NULL
      int *var3 = 12 + b;
                     ^
-test5.c:39:20: warning: Using variable without check for NULL
-test5.c:39:20: warning: Using variable without check for NULL
-test5.c:39:20: warning: Using variable without check for NULL
 test5.c: In function 'void func8(int, int*, char)':
 test5.c:45:11: warning: Using variable without check for NULL
      int **var4 = &bptr;
            ^
-test5.c:45:11: warning: Using variable without check for NULL
-test5.c:45:11: warning: Using variable without check for NULL
-test5.c:45:11: warning: Using variable without check for NULL
diff --git a/test/test5-05.txt b/test/test5-05.txt
index cfaa5bd..bf2d458 100644
--- a/test/test5-05.txt
+++ b/test/test5-05.txt
@@ -63,23 +63,16 @@ function_decl func5:
 bind_expr : b, 
 var_decl var1: b, 
 integer_cst 32: b, 
+integer_cst 1: b, 
 integer_type : b, 
 type_decl int: b, 
 integer_cst 32: b, 
 integer_cst -2147483648: b, 
 integer_cst 2147483647: b, 
-integer_cst 1: b, 
 statement_list : b, 
 cleanup_point_expr : b, 
 decl_expr : b, 
 var_decl var1: b, 
-integer_cst 32: b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-integer_cst 1: b, 
 cleanup_point_expr : b, 
 expr_stmt : b, 
 convert_expr : b, 
@@ -102,24 +95,10 @@ nop_expr : b,
 mult_expr : b, 
 nop_expr : b, 
 var_decl var1: b, 
-integer_cst 32: b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-integer_cst 1: b, 
 integer_cst 4: b, 
 integer_cst 400: b, 
 block : b, 
 var_decl var1: b, 
-integer_cst 32: b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-integer_cst 1: b, 
 function_decl func6: 
 bind_expr : b, 
 var_decl var2: b, 
@@ -128,25 +107,17 @@ test5.c:33:10: warning: Using variable without check for NULL
      int *var2 = b;
           ^
 integer_cst 64: b, 
+parm_decl b: b, 
 pointer_type : b, 
 integer_type : b, 
 type_decl int: b, 
 integer_cst 32: b, 
 integer_cst -2147483648: b, 
 integer_cst 2147483647: b, 
-parm_decl b: b, 
 statement_list : b, 
 decl_expr : b, 
 var_decl var2: b, 
 test5.c:33:10: warning: Using variable without check for NULL
-integer_cst 64: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-parm_decl b: b, 
 cleanup_point_expr : b, 
 expr_stmt : b, 
 convert_expr : b, 
@@ -154,36 +125,14 @@ modify_expr : b,
 indirect_ref : b, 
 var_decl var2: b, 
 test5.c:33:10: warning: Using variable without check for NULL
-integer_cst 64: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-parm_decl b: b, 
 integer_cst 500: b, 
 block : b, 
 var_decl var2: b, 
 test5.c:33:10: warning: Using variable without check for NULL
-integer_cst 64: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-parm_decl b: b, 
 function_decl func7: 
 bind_expr : b, 
 var_decl var3: b, 
 integer_cst 64: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
 pointer_plus_expr : b, 
 test5.c: In function 'void func7(int, int*, char)':
 test5.c:39:20: warning: Using variable without check for NULL
@@ -198,83 +147,28 @@ integer_cst -2147483648: b,
 integer_cst 2147483647: b, 
 integer_cst 64: b, 
 integer_cst 48: b, 
-statement_list : b, 
-decl_expr : b, 
-var_decl var3: b, 
-integer_cst 64: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-pointer_plus_expr : b, 
-test5.c:39:20: warning: Using variable without check for NULL
-parm_decl b: b, 
 pointer_type : b, 
 integer_type : b, 
 type_decl int: b, 
 integer_cst 32: b, 
 integer_cst -2147483648: b, 
 integer_cst 2147483647: b, 
-integer_cst 64: b, 
-integer_cst 48: b, 
+statement_list : b, 
+decl_expr : b, 
+var_decl var3: b, 
 cleanup_point_expr : b, 
 expr_stmt : b, 
 convert_expr : b, 
 modify_expr : b, 
 indirect_ref : b, 
 var_decl var3: b, 
-integer_cst 64: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-pointer_plus_expr : b, 
-test5.c:39:20: warning: Using variable without check for NULL
-parm_decl b: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-integer_cst 64: b, 
-integer_cst 48: b, 
 integer_cst 600: b, 
 block : b, 
 var_decl var3: b, 
-integer_cst 64: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-pointer_plus_expr : b, 
-test5.c:39:20: warning: Using variable without check for NULL
-parm_decl b: b, 
-pointer_type : b, 
-integer_type : b, 
-type_decl int: b, 
-integer_cst 32: b, 
-integer_cst -2147483648: b, 
-integer_cst 2147483647: b, 
-integer_cst 64: b, 
-integer_cst 48: b, 
 function_decl func8: 
 bind_expr : bptr, 
 var_decl var4: bptr, 
 integer_cst 64: bptr, 
-pointer_type : bptr, 
-pointer_type : bptr, 
-integer_type : bptr, 
-type_decl int: bptr, 
-integer_cst 32: bptr, 
-integer_cst -2147483648: bptr, 
-integer_cst 2147483647: bptr, 
 addr_expr : bptr, 
 test5.c: In function 'void func8(int, int*, char)':
 test5.c:45:11: warning: Using variable without check for NULL
@@ -288,10 +182,6 @@ integer_cst 32: bptr,
 integer_cst -2147483648: bptr, 
 integer_cst 2147483647: bptr, 
 integer_cst 64: bptr, 
-statement_list : bptr, 
-decl_expr : bptr, 
-var_decl var4: bptr, 
-integer_cst 64: bptr, 
 pointer_type : bptr, 
 pointer_type : bptr, 
 integer_type : bptr, 
@@ -299,16 +189,9 @@ type_decl int: bptr,
 integer_cst 32: bptr, 
 integer_cst -2147483648: bptr, 
 integer_cst 2147483647: bptr, 
-addr_expr : bptr, 
-test5.c:45:11: warning: Using variable without check for NULL
-parm_decl bptr: bptr, 
-pointer_type : bptr, 
-integer_type : bptr, 
-type_decl int: bptr, 
-integer_cst 32: bptr, 
-integer_cst -2147483648: bptr, 
-integer_cst 2147483647: bptr, 
-integer_cst 64: bptr, 
+statement_list : bptr, 
+decl_expr : bptr, 
+var_decl var4: bptr, 
 cleanup_point_expr : bptr, 
 expr_stmt : bptr, 
 convert_expr : bptr, 
@@ -316,42 +199,6 @@ modify_expr : bptr,
 indirect_ref : bptr, 
 indirect_ref : bptr, 
 var_decl var4: bptr, 
-integer_cst 64: bptr, 
-pointer_type : bptr, 
-pointer_type : bptr, 
-integer_type : bptr, 
-type_decl int: bptr, 
-integer_cst 32: bptr, 
-integer_cst -2147483648: bptr, 
-integer_cst 2147483647: bptr, 
-addr_expr : bptr, 
-test5.c:45:11: warning: Using variable without check for NULL
-parm_decl bptr: bptr, 
-pointer_type : bptr, 
-integer_type : bptr, 
-type_decl int: bptr, 
-integer_cst 32: bptr, 
-integer_cst -2147483648: bptr, 
-integer_cst 2147483647: bptr, 
-integer_cst 64: bptr, 
 integer_cst 700: bptr, 
 block : bptr, 
 var_decl var4: bptr, 
-integer_cst 64: bptr, 
-pointer_type : bptr, 
-pointer_type : bptr, 
-integer_type : bptr, 
-type_decl int: bptr, 
-integer_cst 32: bptr, 
-integer_cst -2147483648: bptr, 
-integer_cst 2147483647: bptr, 
-addr_expr : bptr, 
-test5.c:45:11: warning: Using variable without check for NULL
-parm_decl bptr: bptr, 
-pointer_type : bptr, 
-integer_type : bptr, 
-type_decl int: bptr, 
-integer_cst 32: bptr, 
-integer_cst -2147483648: bptr, 
-integer_cst 2147483647: bptr, 
-integer_cst 64: bptr, 
diff --git a/test/test6-01.txt b/test/test6-01.txt
index 272d807..6fc2480 100644
--- a/test/test6-01.txt
+++ b/test/test6-01.txt
@@ -413,6 +413,7 @@ function_decl func6 test6.c 48:6
      bind_expr test6.c 53:15 - then
       var_decl k test6.c 52:13 - operand
        integer_cst 32 - decl size
+       integer_cst 10 - initial
        integer_type - var type
        - precisionBits: 32
        - signed
@@ -421,47 +422,16 @@ function_decl func6 test6.c 48:6
         integer_cst 32 - type size
         integer_cst -2147483648 - min value
         integer_cst 2147483647 - max value
-       integer_cst 10 - initial
       statement_list - operand
        cleanup_point_expr test6.c 52:17 - statement
         decl_expr test6.c 52:17 - operand
          var_decl k test6.c 52:13 - operand
-          integer_cst 32 - decl size
-          integer_type - var type
-          - precisionBits: 32
-          - signed
-           type_decl int <built-in> 0:0 - type name
-           - isAutogenerated: 1
-           integer_cst 32 - type size
-           integer_cst -2147483648 - min value
-           integer_cst 2147483647 - max value
-          integer_cst 10 - initial
        return_expr test6.c 53:9 - statement
       block - operand
        var_decl k test6.c 52:13 - block vars
-        integer_cst 32 - decl size
-        integer_type - var type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-        integer_cst 10 - initial
     block - operand
      block - sub block
       var_decl k test6.c 52:13 - block vars
-       integer_cst 32 - decl size
-       integer_type - var type
-       - precisionBits: 32
-       - signed
-        type_decl int <built-in> 0:0 - type name
-        - isAutogenerated: 1
-        integer_cst 32 - type size
-        integer_cst -2147483648 - min value
-        integer_cst 2147483647 - max value
-       integer_cst 10 - initial
    cleanup_point_expr test6.c 56:13 - statement
     expr_stmt - operand
      convert_expr - expresssion
@@ -484,16 +454,6 @@ function_decl func6 test6.c 48:6
    block - sub block
     block - sub block
      var_decl k test6.c 52:13 - block vars
-      integer_cst 32 - decl size
-      integer_type - var type
-      - precisionBits: 32
-      - signed
-       type_decl int <built-in> 0:0 - type name
-       - isAutogenerated: 1
-       integer_cst 32 - type size
-       integer_cst -2147483648 - min value
-       integer_cst 2147483647 - max value
-      integer_cst 10 - initial
 function_decl func7 test6.c 59:6
 - isPublic: 1
  function_type - function type
@@ -556,6 +516,7 @@ function_decl func7 test6.c 59:6
         bind_expr test6.c 66:19 - then
          var_decl k test6.c 65:17 - operand
           integer_cst 32 - decl size
+          integer_cst 10 - initial
           integer_type - var type
           - precisionBits: 32
           - signed
@@ -564,76 +525,25 @@ function_decl func7 test6.c 59:6
            integer_cst 32 - type size
            integer_cst -2147483648 - min value
            integer_cst 2147483647 - max value
-          integer_cst 10 - initial
          statement_list - operand
           cleanup_point_expr test6.c 65:21 - statement
            decl_expr test6.c 65:21 - operand
             var_decl k test6.c 65:17 - operand
-             integer_cst 32 - decl size
-             integer_type - var type
-             - precisionBits: 32
-             - signed
-              type_decl int <built-in> 0:0 - type name
-              - isAutogenerated: 1
-              integer_cst 32 - type size
-              integer_cst -2147483648 - min value
-              integer_cst 2147483647 - max value
-             integer_cst 10 - initial
           return_expr test6.c 66:13 - statement
          block - operand
           var_decl k test6.c 65:17 - block vars
-           integer_cst 32 - decl size
-           integer_type - var type
-           - precisionBits: 32
-           - signed
-            type_decl int <built-in> 0:0 - type name
-            - isAutogenerated: 1
-            integer_cst 32 - type size
-            integer_cst -2147483648 - min value
-            integer_cst 2147483647 - max value
-           integer_cst 10 - initial
        block - operand
         block - sub block
          var_decl k test6.c 65:17 - block vars
-          integer_cst 32 - decl size
-          integer_type - var type
-          - precisionBits: 32
-          - signed
-           type_decl int <built-in> 0:0 - type name
-           - isAutogenerated: 1
-           integer_cst 32 - type size
-           integer_cst -2147483648 - min value
-           integer_cst 2147483647 - max value
-          integer_cst 10 - initial
       block - operand
        block - sub block
         block - sub block
          var_decl k test6.c 65:17 - block vars
-          integer_cst 32 - decl size
-          integer_type - var type
-          - precisionBits: 32
-          - signed
-           type_decl int <built-in> 0:0 - type name
-           - isAutogenerated: 1
-           integer_cst 32 - type size
-           integer_cst -2147483648 - min value
-           integer_cst 2147483647 - max value
-          integer_cst 10 - initial
     block - operand
      block - sub block
       block - sub block
        block - sub block
         var_decl k test6.c 65:17 - block vars
-         integer_cst 32 - decl size
-         integer_type - var type
-         - precisionBits: 32
-         - signed
-          type_decl int <built-in> 0:0 - type name
-          - isAutogenerated: 1
-          integer_cst 32 - type size
-          integer_cst -2147483648 - min value
-          integer_cst 2147483647 - max value
-         integer_cst 10 - initial
    cleanup_point_expr test6.c 70:16 - statement
     expr_stmt - operand
      convert_expr - expresssion
@@ -658,16 +568,6 @@ function_decl func7 test6.c 59:6
      block - sub block
       block - sub block
        var_decl k test6.c 65:17 - block vars
-        integer_cst 32 - decl size
-        integer_type - var type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-        integer_cst 10 - initial
 function_decl func8 test6.c 73:6
 - isPublic: 1
  function_type - function type
@@ -731,6 +631,7 @@ function_decl func8 test6.c 73:6
          bind_expr test6.c 80:23 - then
           var_decl k test6.c 79:17 - operand
            integer_cst 32 - decl size
+           integer_cst 10 - initial
            integer_type - var type
            - precisionBits: 32
            - signed
@@ -739,25 +640,15 @@ function_decl func8 test6.c 73:6
             integer_cst 32 - type size
             integer_cst -2147483648 - min value
             integer_cst 2147483647 - max value
-           integer_cst 10 - initial
           statement_list - operand
            cleanup_point_expr test6.c 79:21 - statement
             decl_expr test6.c 79:21 - operand
              var_decl k test6.c 79:17 - operand
-              integer_cst 32 - decl size
-              integer_type - var type
-              - precisionBits: 32
-              - signed
-               type_decl int <built-in> 0:0 - type name
-               - isAutogenerated: 1
-               integer_cst 32 - type size
-               integer_cst -2147483648 - min value
-               integer_cst 2147483647 - max value
-              integer_cst 10 - initial
            cleanup_point_expr test6.c 80:21 - statement
             decl_expr test6.c 80:21 - operand
              var_decl l test6.c 80:17 - operand
               integer_cst 32 - decl size
+              integer_cst 20 - initial
               integer_type - var type
               - precisionBits: 32
               - signed
@@ -766,106 +657,25 @@ function_decl func8 test6.c 73:6
                integer_cst 32 - type size
                integer_cst -2147483648 - min value
                integer_cst 2147483647 - max value
-              integer_cst 20 - initial
           block - operand
            var_decl k test6.c 79:17 - block vars
-            integer_cst 32 - decl size
-            integer_type - var type
-            - precisionBits: 32
-            - signed
-             type_decl int <built-in> 0:0 - type name
-             - isAutogenerated: 1
-             integer_cst 32 - type size
-             integer_cst -2147483648 - min value
-             integer_cst 2147483647 - max value
-            integer_cst 10 - initial
            var_decl l test6.c 80:17 - block vars
-            integer_cst 32 - decl size
-            integer_type - var type
-            - precisionBits: 32
-            - signed
-             type_decl int <built-in> 0:0 - type name
-             - isAutogenerated: 1
-             integer_cst 32 - type size
-             integer_cst -2147483648 - min value
-             integer_cst 2147483647 - max value
-            integer_cst 20 - initial
         block - operand
          block - sub block
           var_decl k test6.c 79:17 - block vars
-           integer_cst 32 - decl size
-           integer_type - var type
-           - precisionBits: 32
-           - signed
-            type_decl int <built-in> 0:0 - type name
-            - isAutogenerated: 1
-            integer_cst 32 - type size
-            integer_cst -2147483648 - min value
-            integer_cst 2147483647 - max value
-           integer_cst 10 - initial
           var_decl l test6.c 80:17 - block vars
-           integer_cst 32 - decl size
-           integer_type - var type
-           - precisionBits: 32
-           - signed
-            type_decl int <built-in> 0:0 - type name
-            - isAutogenerated: 1
-            integer_cst 32 - type size
-            integer_cst -2147483648 - min value
-            integer_cst 2147483647 - max value
-           integer_cst 20 - initial
        return_expr test6.c 82:9 - statement
       block - operand
        block - sub block
         block - sub block
          var_decl k test6.c 79:17 - block vars
-          integer_cst 32 - decl size
-          integer_type - var type
-          - precisionBits: 32
-          - signed
-           type_decl int <built-in> 0:0 - type name
-           - isAutogenerated: 1
-           integer_cst 32 - type size
-           integer_cst -2147483648 - min value
-           integer_cst 2147483647 - max value
-          integer_cst 10 - initial
          var_decl l test6.c 80:17 - block vars
-          integer_cst 32 - decl size
-          integer_type - var type
-          - precisionBits: 32
-          - signed
-           type_decl int <built-in> 0:0 - type name
-           - isAutogenerated: 1
-           integer_cst 32 - type size
-           integer_cst -2147483648 - min value
-           integer_cst 2147483647 - max value
-          integer_cst 20 - initial
     block - operand
      block - sub block
       block - sub block
        block - sub block
         var_decl k test6.c 79:17 - block vars
-         integer_cst 32 - decl size
-         integer_type - var type
-         - precisionBits: 32
-         - signed
-          type_decl int <built-in> 0:0 - type name
-          - isAutogenerated: 1
-          integer_cst 32 - type size
-          integer_cst -2147483648 - min value
-          integer_cst 2147483647 - max value
-         integer_cst 10 - initial
         var_decl l test6.c 80:17 - block vars
-         integer_cst 32 - decl size
-         integer_type - var type
-         - precisionBits: 32
-         - signed
-          type_decl int <built-in> 0:0 - type name
-          - isAutogenerated: 1
-          integer_cst 32 - type size
-          integer_cst -2147483648 - min value
-          integer_cst 2147483647 - max value
-         integer_cst 20 - initial
    cleanup_point_expr test6.c 85:16 - statement
     expr_stmt - operand
      convert_expr - expresssion
@@ -890,24 +700,4 @@ function_decl func8 test6.c 73:6
      block - sub block
       block - sub block
        var_decl k test6.c 79:17 - block vars
-        integer_cst 32 - decl size
-        integer_type - var type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-        integer_cst 10 - initial
        var_decl l test6.c 80:17 - block vars
-        integer_cst 32 - decl size
-        integer_type - var type
-        - precisionBits: 32
-        - signed
-         type_decl int <built-in> 0:0 - type name
-         - isAutogenerated: 1
-         integer_cst 32 - type size
-         integer_cst -2147483648 - min value
-         integer_cst 2147483647 - max value
-        integer_cst 20 - initial
diff --git a/test/test6-04.txt b/test/test6-04.txt
index 6f568de..b29c99a 100644
--- a/test/test6-04.txt
+++ b/test/test6-04.txt
@@ -111,43 +111,22 @@ if_stmt : a,
 bind_expr : a, 
 var_decl k: a, 
 integer_cst 32: a, 
+integer_cst 10: a, 
 integer_type : a, 
 type_decl int: a, 
 integer_cst 32: a, 
 integer_cst -2147483648: a, 
 integer_cst 2147483647: a, 
-integer_cst 10: a, 
 statement_list : a, 
 cleanup_point_expr : a, 
 decl_expr : a, 
 var_decl k: a, 
-integer_cst 32: a, 
-integer_type : a, 
-type_decl int: a, 
-integer_cst 32: a, 
-integer_cst -2147483648: a, 
-integer_cst 2147483647: a, 
-integer_cst 10: a, 
 return_expr : a, 
 block : a, 
 var_decl k: a, 
-integer_cst 32: a, 
-integer_type : a, 
-type_decl int: a, 
-integer_cst 32: a, 
-integer_cst -2147483648: a, 
-integer_cst 2147483647: a, 
-integer_cst 10: a, 
 block : a, 
 block : 
 var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 10: 
 cleanup_point_expr : a, 
 expr_stmt : 
 convert_expr : 
@@ -166,13 +145,6 @@ block : a,
 block : 
 block : 
 var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 10: 
 function_decl func7: 
 bind_expr : aptr, 
 statement_list : aptr, 
@@ -184,66 +156,31 @@ if_stmt : aptr,
 bind_expr : aptr, 
 var_decl k: aptr, 
 integer_cst 32: aptr, 
+integer_cst 10: aptr, 
 integer_type : aptr, 
 type_decl int: aptr, 
 integer_cst 32: aptr, 
 integer_cst -2147483648: aptr, 
 integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 statement_list : aptr, 
 cleanup_point_expr : aptr, 
 decl_expr : aptr, 
 var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 return_expr : aptr, 
 block : aptr, 
 var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 block : aptr, 
 block : 
 var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 10: 
 block : aptr, 
 block : 
 block : 
 var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 10: 
 block : aptr, 
 block : aptr, 
 block : aptr, 
 block : aptr, 
 var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 cleanup_point_expr : aptr, 
 expr_stmt : aptr, 
 convert_expr : aptr, 
@@ -268,13 +205,6 @@ block : aptr,
 block : aptr, 
 block : aptr, 
 var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 function_decl func8: 
 bind_expr : aptr, 
 statement_list : aptr, 
@@ -287,108 +217,45 @@ if_stmt : aptr,
 bind_expr : aptr, 
 var_decl k: aptr, 
 integer_cst 32: aptr, 
+integer_cst 10: aptr, 
 integer_type : aptr, 
 type_decl int: aptr, 
 integer_cst 32: aptr, 
 integer_cst -2147483648: aptr, 
 integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 statement_list : aptr, 
 cleanup_point_expr : aptr, 
 decl_expr : aptr, 
 var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 cleanup_point_expr : aptr, 
 decl_expr : aptr, 
 var_decl l: aptr, 
 integer_cst 32: aptr, 
+integer_cst 20: aptr, 
 integer_type : aptr, 
 type_decl int: aptr, 
 integer_cst 32: aptr, 
 integer_cst -2147483648: aptr, 
 integer_cst 2147483647: aptr, 
-integer_cst 20: aptr, 
 block : aptr, 
 var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 var_decl l: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 20: aptr, 
 block : aptr, 
 block : aptr, 
 var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 var_decl l: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 20: aptr, 
 return_expr : aptr, 
 block : aptr, 
 block : aptr, 
 block : aptr, 
 var_decl k: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 10: aptr, 
 var_decl l: aptr, 
-integer_cst 32: aptr, 
-integer_type : aptr, 
-type_decl int: aptr, 
-integer_cst 32: aptr, 
-integer_cst -2147483648: aptr, 
-integer_cst 2147483647: aptr, 
-integer_cst 20: aptr, 
 block : aptr, 
 block : 
 block : 
 block : 
 var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 10: 
 var_decl l: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 20: 
 cleanup_point_expr : aptr, 
 expr_stmt : 
 convert_expr : 
@@ -409,18 +276,4 @@ block :
 block : 
 block : 
 var_decl k: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 10: 
 var_decl l: 
-integer_cst 32: 
-integer_type : 
-type_decl int: 
-integer_cst 32: 
-integer_cst -2147483648: 
-integer_cst 2147483647: 
-integer_cst 20: