diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index a0b9eeea..cbb4ef39 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1060,7 +1060,7 @@ default_reporter::report(const class_or_union_diff& d,
 	    {
 	      if ((*it)->to_be_reported())
 		{
-		  represent(*it, ctxt, out, indent + " ");
+		  represent(*it, ctxt, out, indent + "  ");
 		  out << "\n";
 		}
 	    }
@@ -1080,7 +1080,7 @@ default_reporter::report(const class_or_union_diff& d,
 	    {
 	      if ((*it)->to_be_reported())
 		{
-		  represent(*it, ctxt, out, indent + " ");
+		  represent(*it, ctxt, out, indent + "  ");
 		  out << "\n";
 		}
 	    }
@@ -1715,7 +1715,7 @@ default_reporter::report(const var_diff& d, ostream& out,
 	{
 	  RETURN_IF_BEING_REPORTED_OR_WAS_REPORTED_EARLIER2(dif, "type");
 	  out << indent << "type of variable changed:\n";
-	  dif->report(out, indent + " ");
+	  dif->report(out, indent + "  ");
 	}
     }
 }
diff --git a/src/abg-leaf-reporter.cc b/src/abg-leaf-reporter.cc
index f706bd21..fcea2626 100644
--- a/src/abg-leaf-reporter.cc
+++ b/src/abg-leaf-reporter.cc
@@ -648,7 +648,7 @@ leaf_reporter::report(const class_or_union_diff& d,
 	    {
 	      if (diff_to_be_reported((*it).get()))
 		{
-		  represent(*it, ctxt, out, indent + " ",
+		  represent(*it, ctxt, out, indent + "  ",
 			    /*local_only=*/true);
 		  out << "\n";
 		  emitted_data_members_changes = true;
@@ -675,7 +675,7 @@ leaf_reporter::report(const class_or_union_diff& d,
 	    {
 	      if (diff_to_be_reported((*it).get()))
 		{
-		  represent(*it, ctxt, out, indent + " ",
+		  represent(*it, ctxt, out, indent + "  ",
 			    /*local_only=*/true);
 		  out << "\n";
 		  emitted_data_members_changes = true;
@@ -991,7 +991,7 @@ leaf_reporter::report(const var_diff& d,
 	{
 	  RETURN_IF_BEING_REPORTED_OR_WAS_REPORTED_EARLIER2(dif, "type");
 	  out << indent << "type of variable changed:\n";
-	  dif->report(out, indent + " ");
+	  dif->report(out, indent + "  ");
 	}
     }
 }
diff --git a/tests/data/test-abidiff-exit/test-leaf0-report.txt b/tests/data/test-abidiff-exit/test-leaf0-report.txt
index 7d15e28f..a347444c 100644
--- a/tests/data/test-abidiff-exit/test-leaf0-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf0-report.txt
@@ -16,7 +16,7 @@ Removed/Changed/Added variables summary: 0 Removed, 1 Changed, 0 Added variable
   [C] 'int changed_var' was changed to 'long int changed_var':
     size of symbol changed from 4 to 8
     type of variable changed:
-     type name changed from 'int' to 'long int'
-     type size changed from 32 to 64 (in bits)
+      type name changed from 'int' to 'long int'
+      type size changed from 32 to 64 (in bits)
 
 
diff --git a/tests/data/test-abidiff-exit/test-leaf1-report.txt b/tests/data/test-abidiff-exit/test-leaf1-report.txt
index 9da015bf..efa4a31f 100644
--- a/tests/data/test-abidiff-exit/test-leaf1-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf1-report.txt
@@ -32,7 +32,7 @@ Removed/Changed/Added variables summary: 1 Removed, 1 Changed, 1 Added variable
   [C] 'int changed_var' was changed to 'long int changed_var':
     size of symbol changed from 4 to 8
     type of variable changed:
-     type name changed from 'int' to 'long int'
-     type size changed from 32 to 64 (in bits)
+      type name changed from 'int' to 'long int'
+      type size changed from 32 to 64 (in bits)
 
 
diff --git a/tests/data/test-abidiff-exit/test-no-stray-comma-report.txt b/tests/data/test-abidiff-exit/test-no-stray-comma-report.txt
index a66500d5..929c5d85 100644
--- a/tests/data/test-abidiff-exit/test-no-stray-comma-report.txt
+++ b/tests/data/test-abidiff-exit/test-no-stray-comma-report.txt
@@ -6,9 +6,9 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct foo at test-b146198490-v0.cc:1:1' changed:
   type size changed from 32 to 64 (in bits)
   there are data member changes:
-   type 'int[1]' of 'foo::bar' changed:
-     type name changed from 'int[1]' to 'int[2]'
-     array type size changed from 32 to 64
-     array type subrange 1 changed length from 1 to 2
-   and size changed from 32 to 64 (in bits) (by +32 bits)
+    type 'int[1]' of 'foo::bar' changed:
+      type name changed from 'int[1]' to 'int[2]'
+      array type size changed from 32 to 64
+      array type subrange 1 changed length from 1 to 2
+    and size changed from 32 to 64 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index 7e16fe32..8570a984 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -16,46 +16,46 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class sigc::slot_base':
         type size hasn't changed
         1 data member change:
-         type of 'sigc::slot_base::rep_type* sigc::slot_base::rep_' changed:
-           in pointed to type 'typedef sigc::slot_base::rep_type':
-             underlying type 'struct sigc::internal::slot_rep' changed:
-               type size hasn't changed
-               1 base class change:
-                 'struct sigc::trackable' changed:
-                   type size hasn't changed
-                   1 data member change:
-                    type of 'sigc::internal::trackable_callback_list* sigc::trackable::callback_list_' changed:
-                      in pointed to type 'struct sigc::internal::trackable_callback_list':
-                        type size changed from 192 to 256 (in bits)
-                        2 data member changes:
-                         type of 'sigc::internal::trackable_callback_list::callback_list sigc::internal::trackable_callback_list::callbacks_' changed:
-                           underlying type 'class std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
-                             type name changed from 'std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
-                             type size changed from 128 to 192 (in bits)
-                             1 base class change:
-                               'class std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
-                                 type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
-                                 type size changed from 128 to 192 (in bits)
-                                 1 data member change:
-                                  type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed:
-                                    type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl'
+          type of 'sigc::slot_base::rep_type* sigc::slot_base::rep_' changed:
+            in pointed to type 'typedef sigc::slot_base::rep_type':
+              underlying type 'struct sigc::internal::slot_rep' changed:
+                type size hasn't changed
+                1 base class change:
+                  'struct sigc::trackable' changed:
+                    type size hasn't changed
+                    1 data member change:
+                      type of 'sigc::internal::trackable_callback_list* sigc::trackable::callback_list_' changed:
+                        in pointed to type 'struct sigc::internal::trackable_callback_list':
+                          type size changed from 192 to 256 (in bits)
+                          2 data member changes:
+                            type of 'sigc::internal::trackable_callback_list::callback_list sigc::internal::trackable_callback_list::callbacks_' changed:
+                              underlying type 'class std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
+                                type name changed from 'std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
+                                type size changed from 128 to 192 (in bits)
+                                1 base class change:
+                                  'class std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
+                                    type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                     type size changed from 128 to 192 (in bits)
                                     1 data member change:
-                                     type of 'std::__detail::_List_node_base std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed:
-                                       type name changed from 'std::__detail::_List_node_base' to 'std::_List_node<long unsigned int>'
-                                       type size changed from 128 to 192 (in bits)
-                                       1 base class insertion:
-                                         struct std::__detail::_List_node_base
-                                       2 data member deletions:
-                                         'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits)
-                                         'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits)
-                                       1 data member insertion:
-                                         'unsigned long int std::_List_node<long unsigned int>::_M_data', at offset 128 (in bits)
-                                     and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node'
-                                  and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl'
+                                      type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed:
+                                        type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl'
+                                        type size changed from 128 to 192 (in bits)
+                                        1 data member change:
+                                          type of 'std::__detail::_List_node_base std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed:
+                                            type name changed from 'std::__detail::_List_node_base' to 'std::_List_node<long unsigned int>'
+                                            type size changed from 128 to 192 (in bits)
+                                            1 base class insertion:
+                                              struct std::__detail::_List_node_base
+                                            2 data member deletions:
+                                              'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits)
+                                              'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits)
+                                            1 data member insertion:
+                                              'unsigned long int std::_List_node<long unsigned int>::_M_data', at offset 128 (in bits)
+                                          and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node'
+                                      and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl'
 
 
-                         'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
+                            'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
 
 
 
@@ -65,8 +65,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct sigc::connection':
         type size hasn't changed
         1 data member change:
-         type of 'sigc::slot_base* sigc::connection::slot_' changed:
-           pointed to type 'class sigc::slot_base' changed, as reported earlier
+          type of 'sigc::slot_base* sigc::connection::slot_' changed:
+            pointed to type 'class sigc::slot_base' changed, as reported earlier
 
     parameter 1 of type 'const sigc::connection&' has sub-type changes:
       in referenced type 'const sigc::connection':
@@ -118,22 +118,22 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct sigc::internal::signal_impl':
         type size changed from 192 to 256 (in bits)
         1 data member change:
-         type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > sigc::internal::signal_impl::slots_' changed:
-           type name changed from 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >'
-           type size changed from 128 to 192 (in bits)
-           1 base class change:
-             'class std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' changed:
-               type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >'
-               type size changed from 128 to 192 (in bits)
-               1 data member change:
-                type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed:
-                  type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl'
-                  type size changed from 128 to 192 (in bits)
-                  1 data member change:
-                   type of 'std::__detail::_List_node_base std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed:
-                     details were reported earlier
-                   and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node'
-                and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl'
+          type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > sigc::internal::signal_impl::slots_' changed:
+            type name changed from 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >'
+            type size changed from 128 to 192 (in bits)
+            1 base class change:
+              'class std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' changed:
+                type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >'
+                type size changed from 128 to 192 (in bits)
+                1 data member change:
+                  type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed:
+                    type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl'
+                    type size changed from 128 to 192 (in bits)
+                    1 data member change:
+                      type of 'std::__detail::_List_node_base std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed:
+                        details were reported earlier
+                      and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node'
+                  and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl'
 
 
 
@@ -155,8 +155,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             details were reported earlier
 
         1 data member change:
-         type of 'sigc::internal::signal_impl* sigc::signal_base::impl_' changed:
-           pointed to type 'struct sigc::internal::signal_impl' changed, as reported earlier
+          type of 'sigc::internal::signal_impl* sigc::signal_base::impl_' changed:
+            pointed to type 'struct sigc::internal::signal_impl' changed, as reported earlier
 
     parameter 1 of type 'const sigc::signal_base&' has sub-type changes:
       in referenced type 'const sigc::signal_base':
diff --git a/tests/data/test-abidiff/test-struct0-report.txt b/tests/data/test-abidiff/test-struct0-report.txt
index f6c4cece..e22d59b1 100644
--- a/tests/data/test-abidiff/test-struct0-report.txt
+++ b/tests/data/test-abidiff/test-struct0-report.txt
@@ -4,10 +4,10 @@
     1 data member insertion:
       'char s0::m2', at offset 64 (in bits)
     1 data member change:
-     type of 'char s0::m1' changed:
-       type name changed from 'char' to 'unsigned int'
-       type size changed from 8 to 32 (in bits)
-       type alignment changed from 8 to 32
+      type of 'char s0::m1' changed:
+        type name changed from 'char' to 'unsigned int'
+        type size changed from 8 to 32 (in bits)
+        type alignment changed from 8 to 32
 
   's0&' changed:
     referenced type 'class s0' changed, as reported earlier
diff --git a/tests/data/test-abidiff/test-struct1-report.txt b/tests/data/test-abidiff/test-struct1-report.txt
index e334bf1a..242ba321 100644
--- a/tests/data/test-abidiff/test-struct1-report.txt
+++ b/tests/data/test-abidiff/test-struct1-report.txt
@@ -9,12 +9,12 @@
     1 data member insertion:
       'double s0::m01', at offset 128 (in bits)
     2 data member changes:
-     type of 'int s0::m0' changed:
-       type name changed from 'int' to 'char'
-       type size changed from 32 to 8 (in bits)
-       type alignment changed from 32 to 8
+      type of 'int s0::m0' changed:
+        type name changed from 'int' to 'char'
+        type size changed from 32 to 8 (in bits)
+        type alignment changed from 32 to 8
 
-     'unsigned int s0::m2' offset changed from 128 to 192 (in bits) (by +64 bits)
+      'unsigned int s0::m2' offset changed from 128 to 192 (in bits) (by +64 bits)
   'const s0' changed:
     unqualified underlying type 'class s0' changed, as reported earlier
   'const s0*' changed:
diff --git a/tests/data/test-abidiff/test-var0-report.txt b/tests/data/test-abidiff/test-var0-report.txt
index b4c9a38e..996a4dc0 100644
--- a/tests/data/test-abidiff/test-var0-report.txt
+++ b/tests/data/test-abidiff/test-var0-report.txt
@@ -1,6 +1,6 @@
 1 changed declaration:
   'int var' was changed to 'char var':
     type of variable changed:
-     type name changed from 'int' to 'char'
-     type size changed from 32 to 8 (in bits)
-     type alignment changed from 32 to 8
+      type name changed from 'int' to 'char'
+      type size changed from 32 to 8 (in bits)
+      type alignment changed from 32 to 8
diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
index aab271ff..088a0970 100644
--- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
+++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
@@ -90,24 +90,24 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_event_context':
         type size hasn't changed
         2 data member changes:
-         type of 'lttng_event_context_type lttng_event_context::ctx' changed:
-           type size hasn't changed
-           2 enumerator insertions:
-             'lttng_event_context_type::LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL' value '20'
-             'lttng_event_context_type::LTTNG_EVENT_CONTEXT_CALLSTACK_USER' value '21'
-
-
-         type of 'union {lttng_event_perf_counter_ctx perf_counter; struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];} lttng_event_context::u' changed:
-           type name changed from '__anonymous_union__4' to '__anonymous_union__5'
-           type size hasn't changed
-           3 data member changes:
-            name of '__anonymous_union__4::app_ctx' changed to '__anonymous_union__5::app_ctx'
-            name of '__anonymous_union__4::padding' changed to '__anonymous_union__5::padding'
-            name of '__anonymous_union__4::perf_counter' changed to '__anonymous_union__5::perf_counter'
-           type changed from:
-             union {lttng_event_perf_counter_ctx perf_counter; struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
-           to:
-             union {lttng_event_perf_counter_ctx perf_counter; struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
+          type of 'lttng_event_context_type lttng_event_context::ctx' changed:
+            type size hasn't changed
+            2 enumerator insertions:
+              'lttng_event_context_type::LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL' value '20'
+              'lttng_event_context_type::LTTNG_EVENT_CONTEXT_CALLSTACK_USER' value '21'
+
+
+          type of 'union {lttng_event_perf_counter_ctx perf_counter; struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];} lttng_event_context::u' changed:
+            type name changed from '__anonymous_union__4' to '__anonymous_union__5'
+            type size hasn't changed
+            3 data member changes:
+              name of '__anonymous_union__4::app_ctx' changed to '__anonymous_union__5::app_ctx'
+              name of '__anonymous_union__4::padding' changed to '__anonymous_union__5::padding'
+              name of '__anonymous_union__4::perf_counter' changed to '__anonymous_union__5::perf_counter'
+            type changed from:
+              union {lttng_event_perf_counter_ctx perf_counter; struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
+            to:
+              union {lttng_event_perf_counter_ctx perf_counter; struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
 
   [C] 'function lttng_condition_type lttng_condition_get_type(const lttng_condition*)' has some indirect sub-type changes:
     return type changed:
@@ -123,10 +123,10 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_event':
         type size hasn't changed
         1 data member change:
-         type of 'lttng_event_type lttng_event::type' changed:
-           type size hasn't changed
-           1 enumerator insertion:
-             'lttng_event_type::LTTNG_EVENT_USERSPACE_PROBE' value '6'
+          type of 'lttng_event_type lttng_event::type' changed:
+            type size hasn't changed
+            1 enumerator insertion:
+              'lttng_event_type::LTTNG_EVENT_USERSPACE_PROBE' value '6'
 
 
 
@@ -184,8 +184,8 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in pointed to type 'struct lttng_event_field':
           type size hasn't changed
           1 data member change:
-           type of 'lttng_event lttng_event_field::event' changed:
-             details were reported earlier
+            type of 'lttng_event lttng_event_field::event' changed:
+              details were reported earlier
 
 
   [C] 'function int lttng_list_tracepoints(lttng_handle*, lttng_event**)' has some indirect sub-type changes:
@@ -231,101 +231,101 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct filter_parser_ctx':
         type size hasn't changed
         1 data member change:
-         type of 'filter_ast* filter_parser_ctx::ast' changed:
-           in pointed to type 'struct filter_ast':
-             type size changed from 704 to 768 (in bits)
-             2 data member changes:
-              type of 'filter_node filter_ast::root' changed:
-                type size changed from 576 to 640 (in bits)
-                2 data member changes:
-                 type of 'filter_node* filter_node::parent' changed:
-                   pointed to type 'struct filter_node' changed; details are being reported
-
-                 type of 'union {struct {} unknown; struct {filter_node* child;} root; struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression; struct {op_type type; filter_node* lchild; filter_node* rchild;} op; struct {unary_op_type type; filter_node* child;} unary_op;} filter_node::u' changed:
-                   type size changed from 320 to 384 (in bits)
-                   4 data member changes:
-                    type of 'struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression' changed:
+          type of 'filter_ast* filter_parser_ctx::ast' changed:
+            in pointed to type 'struct filter_ast':
+              type size changed from 704 to 768 (in bits)
+              2 data member changes:
+                type of 'filter_node filter_ast::root' changed:
+                  type size changed from 576 to 640 (in bits)
+                  2 data member changes:
+                    type of 'filter_node* filter_node::parent' changed:
+                      pointed to type 'struct filter_node' changed; details are being reported
+
+                    type of 'union {struct {} unknown; struct {filter_node* child;} root; struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression; struct {op_type type; filter_node* lchild; filter_node* rchild;} op; struct {unary_op_type type; filter_node* child;} unary_op;} filter_node::u' changed:
                       type size changed from 320 to 384 (in bits)
-                      1 data member insertion:
-                        'filter_node* next_bracket', at offset 320 (in bits)
-                      5 data member changes:
-                       type of 'ast_link_type post_op' changed:
-                         type size hasn't changed
-                         1 enumerator insertion:
-                           'ast_link_type::AST_LINK_BRACKET' value '3'
+                      4 data member changes:
+                        type of 'struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression' changed:
+                          type size changed from 320 to 384 (in bits)
+                          1 data member insertion:
+                            'filter_node* next_bracket', at offset 320 (in bits)
+                          5 data member changes:
+                            type of 'ast_link_type post_op' changed:
+                              type size hasn't changed
+                              1 enumerator insertion:
+                                'ast_link_type::AST_LINK_BRACKET' value '3'
 
 
-                       type of 'ast_link_type pre_op' changed:
-                         details were reported earlier
+                            type of 'ast_link_type pre_op' changed:
+                              details were reported earlier
 
-                       type of 'union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u' changed:
-                         type size hasn't changed
-                         1 data member change:
-                          type of 'filter_node* child' changed:
-                            pointed to type 'struct filter_node' changed; details are being reported
+                            type of 'union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u' changed:
+                              type size hasn't changed
+                              1 data member change:
+                                type of 'filter_node* child' changed:
+                                  pointed to type 'struct filter_node' changed; details are being reported
 
-                         type changed from:
-                           union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;}
-                         to:
-                           union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;}
-                       type of 'filter_node* prev' changed:
-                         pointed to type 'struct filter_node' changed; details are being reported
+                              type changed from:
+                                union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;}
+                              to:
+                                union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;}
+                            type of 'filter_node* prev' changed:
+                              pointed to type 'struct filter_node' changed; details are being reported
 
-                       type of 'filter_node* next' changed:
-                         pointed to type 'struct filter_node' changed; details are being reported
+                            type of 'filter_node* next' changed:
+                              pointed to type 'struct filter_node' changed; details are being reported
 
 
-                    type of 'struct {op_type type; filter_node* lchild; filter_node* rchild;} op' changed:
-                      type size hasn't changed
-                      3 data member changes:
-                       type of 'op_type type' changed:
-                         type size hasn't changed
-                         5 enumerator deletions:
-                           'op_type::AST_OP_RSHIFT' value '6'
-                           'op_type::AST_OP_LSHIFT' value '7'
-                           'op_type::AST_OP_BIN_AND' value '10'
-                           'op_type::AST_OP_BIN_OR' value '11'
-                           'op_type::AST_OP_BIN_XOR' value '12'
-                         5 enumerator insertions:
-                           'op_type::AST_OP_BIT_RSHIFT' value '6'
-                           'op_type::AST_OP_BIT_LSHIFT' value '7'
-                           'op_type::AST_OP_BIT_AND' value '10'
-                           'op_type::AST_OP_BIT_OR' value '11'
-                           'op_type::AST_OP_BIT_XOR' value '12'
+                        type of 'struct {op_type type; filter_node* lchild; filter_node* rchild;} op' changed:
+                          type size hasn't changed
+                          3 data member changes:
+                            type of 'op_type type' changed:
+                              type size hasn't changed
+                              5 enumerator deletions:
+                                'op_type::AST_OP_RSHIFT' value '6'
+                                'op_type::AST_OP_LSHIFT' value '7'
+                                'op_type::AST_OP_BIN_AND' value '10'
+                                'op_type::AST_OP_BIN_OR' value '11'
+                                'op_type::AST_OP_BIN_XOR' value '12'
+                              5 enumerator insertions:
+                                'op_type::AST_OP_BIT_RSHIFT' value '6'
+                                'op_type::AST_OP_BIT_LSHIFT' value '7'
+                                'op_type::AST_OP_BIT_AND' value '10'
+                                'op_type::AST_OP_BIT_OR' value '11'
+                                'op_type::AST_OP_BIT_XOR' value '12'
 
 
-                       type of 'filter_node* lchild' changed:
-                         pointed to type 'struct filter_node' changed; details are being reported
+                            type of 'filter_node* lchild' changed:
+                              pointed to type 'struct filter_node' changed; details are being reported
 
-                       type of 'filter_node* rchild' changed:
-                         pointed to type 'struct filter_node' changed; details are being reported
+                            type of 'filter_node* rchild' changed:
+                              pointed to type 'struct filter_node' changed; details are being reported
 
 
-                    type of 'struct {filter_node* child;} root' changed:
-                      type size hasn't changed
-                      1 data member change:
-                       type of 'filter_node* child' changed:
-                         pointed to type 'struct filter_node' changed; details are being reported
+                        type of 'struct {filter_node* child;} root' changed:
+                          type size hasn't changed
+                          1 data member change:
+                            type of 'filter_node* child' changed:
+                              pointed to type 'struct filter_node' changed; details are being reported
 
 
-                    type of 'struct {unary_op_type type; filter_node* child;} unary_op' changed:
-                      type size hasn't changed
-                      2 data member changes:
-                       type of 'unary_op_type type' changed:
-                         type size hasn't changed
-                         1 enumerator deletion:
-                           'unary_op_type::AST_UNARY_BIN_NOT' value '4'
-                         1 enumerator insertion:
-                           'unary_op_type::AST_UNARY_BIT_NOT' value '4'
+                        type of 'struct {unary_op_type type; filter_node* child;} unary_op' changed:
+                          type size hasn't changed
+                          2 data member changes:
+                            type of 'unary_op_type type' changed:
+                              type size hasn't changed
+                              1 enumerator deletion:
+                                'unary_op_type::AST_UNARY_BIN_NOT' value '4'
+                              1 enumerator insertion:
+                                'unary_op_type::AST_UNARY_BIT_NOT' value '4'
 
 
-                       type of 'filter_node* child' changed:
-                         pointed to type 'struct filter_node' changed; details are being reported
+                            type of 'filter_node* child' changed:
+                              pointed to type 'struct filter_node' changed; details are being reported
 
 
 
 
-              'cds_list_head filter_ast::allocated_nodes' offset changed from 576 to 640 (in bits) (by +64 bits)
+                'cds_list_head filter_ast::allocated_nodes' offset changed from 576 to 640 (in bits) (by +64 bits)
 
 
   [C] 'function YYSTYPE* lttng_yyget_lval(yyscan_t)' has some indirect sub-type changes:
@@ -334,8 +334,8 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         underlying type 'union YYSTYPE' changed:
           type size hasn't changed
           1 data member change:
-           type of 'filter_node* YYSTYPE::n' changed:
-             pointed to type 'struct filter_node' changed, as reported earlier
+            type of 'filter_node* YYSTYPE::n' changed:
+              pointed to type 'struct filter_node' changed, as reported earlier
 
           type changed from:
             union YYSTYPE{long long int ll; char c; gc_string* gs; filter_node* n;}
diff --git a/tests/data/test-diff-dwarf/test0-report.txt b/tests/data/test-diff-dwarf/test0-report.txt
index 24d5e022..cad7ac78 100644
--- a/tests/data/test-diff-dwarf/test0-report.txt
+++ b/tests/data/test-diff-dwarf/test0-report.txt
@@ -18,6 +18,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
               'unsigned int B0S0::m2', at offset 64 (in bits)
 
         1 data member change:
-         'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
+          'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
 
 
diff --git a/tests/data/test-diff-dwarf/test1-report.txt b/tests/data/test-diff-dwarf/test1-report.txt
index 962bfac5..9c7178f3 100644
--- a/tests/data/test-diff-dwarf/test1-report.txt
+++ b/tests/data/test-diff-dwarf/test1-report.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'unsigned int S::m01', at offset 32 (in bits)
         1 data member change:
-         'int S::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int S::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-dwarf/test10-report.txt b/tests/data/test-diff-dwarf/test10-report.txt
index 84400c29..1745a4fb 100644
--- a/tests/data/test-diff-dwarf/test10-report.txt
+++ b/tests/data/test-diff-dwarf/test10-report.txt
@@ -8,18 +8,18 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 1152 to 1280 (in bits)
         2 data member changes:
-         type of 'int S::m0[5][3]' changed:
-           type name changed from 'int[5][3]' to 'int[5][4]'
-           array type size changed from 256 to 288
-           array type subrange 2 changed length from 3 to 4
+          type of 'int S::m0[5][3]' changed:
+            type name changed from 'int[5][3]' to 'int[5][4]'
+            array type size changed from 256 to 288
+            array type subrange 2 changed length from 3 to 4
 
-         type of 'int* S::m1[10]' changed:
-           array element type 'int*' changed: 
-             in pointed to type 'int':
-               type name changed from 'int' to 'char'
-               type size changed from 32 to 8 (in bits)
-           type name changed from 'int*[10]' to 'char*[10]'
-           type size hasn't changed
-         and offset changed from 512 to 640 (in bits) (by +128 bits)
+          type of 'int* S::m1[10]' changed:
+            array element type 'int*' changed: 
+              in pointed to type 'int':
+                type name changed from 'int' to 'char'
+                type size changed from 32 to 8 (in bits)
+            type name changed from 'int*[10]' to 'char*[10]'
+            type size hasn't changed
+          and offset changed from 512 to 640 (in bits) (by +128 bits)
 
 
diff --git a/tests/data/test-diff-dwarf/test11-report.txt b/tests/data/test-diff-dwarf/test11-report.txt
index 32058bb6..ee5a753d 100644
--- a/tests/data/test-diff-dwarf/test11-report.txt
+++ b/tests/data/test-diff-dwarf/test11-report.txt
@@ -8,15 +8,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 1248 to 1536 (in bits)
         2 data member changes:
-         type of 'int S::m0[5][3]' changed:
-           type name changed from 'int[5][3]' to 'int[6][3]'
-           array type size changed from 256 to 288
-           array type subrange 1 changed length from 5 to 6
+          type of 'int S::m0[5][3]' changed:
+            type name changed from 'int[5][3]' to 'int[6][3]'
+            array type size changed from 256 to 288
+            array type subrange 1 changed length from 5 to 6
 
-         type of 'int S::m1[6][4]' changed:
-           type name changed from 'int[6][4]' to 'int[6][5]'
-           array type size changed from 320 to 352
-           array type subrange 2 changed length from 4 to 5
-         and offset changed from 480 to 576 (in bits) (by +96 bits)
+          type of 'int S::m1[6][4]' changed:
+            type name changed from 'int[6][4]' to 'int[6][5]'
+            array type size changed from 320 to 352
+            array type subrange 2 changed length from 4 to 5
+          and offset changed from 480 to 576 (in bits) (by +96 bits)
 
 
diff --git a/tests/data/test-diff-dwarf/test13-report.txt b/tests/data/test-diff-dwarf/test13-report.txt
index 833879c7..d58b0a8e 100644
--- a/tests/data/test-diff-dwarf/test13-report.txt
+++ b/tests/data/test-diff-dwarf/test13-report.txt
@@ -8,14 +8,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 128 to 192 (in bits)
         3 data member changes:
-         type of 'int S::m0' changed:
-           type name changed from 'int' to 'unsigned int'
-           type size hasn't changed
+          type of 'int S::m0' changed:
+            type name changed from 'int' to 'unsigned int'
+            type size hasn't changed
 
-         type of 'unsigned int S::m2' changed:
-           type name changed from 'unsigned int' to 'long long int'
-           type size changed from 32 to 64 (in bits)
+          type of 'unsigned int S::m2' changed:
+            type name changed from 'unsigned int' to 'long long int'
+            type size changed from 32 to 64 (in bits)
 
-         'unsigned char S::m3' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'unsigned char S::m3' offset changed from 96 to 128 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt b/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
index 63c7ec8c..3df36134 100644
--- a/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
+++ b/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
@@ -19,6 +19,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             details were reported earlier
 
         1 data member change:
-         'int S::m0' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int S::m0' offset changed from 32 to 64 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
index 91b92d20..51b3920b 100644
--- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
@@ -30,19 +30,19 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'class S' has sub-type changes:
       type size hasn't changed
       3 data member changes:
-       type of 'int ()* S::fnptr0' changed:
-         in pointed to type 'function type int ()':
-           parameter 1 of type 'double' was added
+        type of 'int ()* S::fnptr0' changed:
+          in pointed to type 'function type int ()':
+            parameter 1 of type 'double' was added
 
 
-       type of 'int ()* S::fnptr1' changed:
-         in pointed to type 'function type int ()':
-           entity changed from 'function type int ()' to 'void'
-           type size changed from 64 to 0 (in bits)
+        type of 'int ()* S::fnptr1' changed:
+          in pointed to type 'function type int ()':
+            entity changed from 'function type int ()' to 'void'
+            type size changed from 64 to 0 (in bits)
 
-       type of 'int ()* S::fnptr2' changed:
-         entity changed from 'int ()*' to 'int'
-         type size changed from 64 to 32 (in bits)
+        type of 'int ()* S::fnptr2' changed:
+          entity changed from 'int ()*' to 'int'
+          type size changed from 64 to 32 (in bits)
 
 
 
diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
index fcab9120..c8da7868 100644
--- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
@@ -31,20 +31,20 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class S':
         type size hasn't changed
         3 data member changes:
-         type of 'int ()& S::fnref0' changed:
-           in referenced type 'function type int ()':
-             parameter 1 of type 'double' was added
+          type of 'int ()& S::fnref0' changed:
+            in referenced type 'function type int ()':
+              parameter 1 of type 'double' was added
 
 
-         type of 'int ()& S::fnref1' changed:
-           in referenced type 'function type int ()':
-             entity changed from 'function type int ()' to 'int*'
-             type size hasn't changed
+          type of 'int ()& S::fnref1' changed:
+            in referenced type 'function type int ()':
+              entity changed from 'function type int ()' to 'int*'
+              type size hasn't changed
 
-         type of 'int ()& S::fnref2' changed:
-           in referenced type 'function type int ()':
-             entity changed from 'function type int ()' to 'int'
-             type size changed from 64 to 32 (in bits)
+          type of 'int ()& S::fnref2' changed:
+            in referenced type 'function type int ()':
+              entity changed from 'function type int ()' to 'int'
+              type size changed from 64 to 32 (in bits)
 
 
 
diff --git a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
index 3db4c087..0046caae 100644
--- a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
+++ b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
@@ -6,8 +6,8 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
   [C] 'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
     size of symbol changed from 5 to 10
     type of variable changed:
-     type name changed from 'char[5]' to 'char[10]'
-     array type size changed from 40 to 80
-     array type subrange 1 changed length from 5 to 10
+      type name changed from 'char[5]' to 'char[10]'
+      array type size changed from 40 to 80
+      array type subrange 1 changed length from 5 to 10
 
 
diff --git a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
index 3db4c087..0046caae 100644
--- a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
+++ b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
@@ -6,8 +6,8 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
   [C] 'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
     size of symbol changed from 5 to 10
     type of variable changed:
-     type name changed from 'char[5]' to 'char[10]'
-     array type size changed from 40 to 80
-     array type subrange 1 changed length from 5 to 10
+      type name changed from 'char[5]' to 'char[10]'
+      array type size changed from 40 to 80
+      array type subrange 1 changed length from 5 to 10
 
 
diff --git a/tests/data/test-diff-dwarf/test39-union-report-0.txt b/tests/data/test-diff-dwarf/test39-union-report-0.txt
index 2f70de44..4e98e97d 100644
--- a/tests/data/test-diff-dwarf/test39-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test39-union-report-0.txt
@@ -8,10 +8,10 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'union some_union_type':
         type size changed from 64 to 96 (in bits)
         1 data member change:
-         type of 'S some_union_type::m2' changed:
-           type size changed from 64 to 96 (in bits)
-           1 data member insertion:
-             'char S::S_member2', at offset 64 (in bits)
+          type of 'S some_union_type::m2' changed:
+            type size changed from 64 to 96 (in bits)
+            1 data member insertion:
+              'char S::S_member2', at offset 64 (in bits)
 
 
 
diff --git a/tests/data/test-diff-dwarf/test4-report.txt b/tests/data/test-diff-dwarf/test4-report.txt
index e784dde6..42ea4807 100644
--- a/tests/data/test-diff-dwarf/test4-report.txt
+++ b/tests/data/test-diff-dwarf/test4-report.txt
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         type size hasn't changed
         1 data member change:
-         'int C0::m0' access changed from 'private' to 'public'
+          'int C0::m0' access changed from 'private' to 'public'
 
 
diff --git a/tests/data/test-diff-dwarf/test40-report-0.txt b/tests/data/test-diff-dwarf/test40-report-0.txt
index f0f9e1a1..27dd48e4 100644
--- a/tests/data/test-diff-dwarf/test40-report-0.txt
+++ b/tests/data/test-diff-dwarf/test40-report-0.txt
@@ -10,17 +10,17 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member deletion:
           'int S2::to_remove', at offset 0 (in bits)
         2 data member changes:
-         'int S2::m0' offset changed from 32 to 0 (in bits) (by -32 bits)
-         'char S2::m1' offset changed from 64 to 32 (in bits) (by -32 bits)
+          'int S2::m0' offset changed from 32 to 0 (in bits) (by -32 bits)
+          'char S2::m1' offset changed from 64 to 32 (in bits) (by -32 bits)
 
   [C] 'function int baz(S3*)' has some indirect sub-type changes:
     parameter 1 of type 'S3*' has sub-type changes:
       in pointed to type 'struct S3':
         type size hasn't changed
         1 data member change:
-         type of 'int S3::to_change' changed:
-           type name changed from 'int' to 'unsigned int'
-           type size hasn't changed
+          type of 'int S3::to_change' changed:
+            type name changed from 'int' to 'unsigned int'
+            type size hasn't changed
 
 
   [C] 'function int foo(S1*)' has some indirect sub-type changes:
@@ -30,7 +30,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'long long int S1::inserted_member', at offset 0 (in bits)
         2 data member changes:
-         'int S1::m0' offset changed from 0 to 64 (in bits) (by +64 bits)
-         'char S1::m1' offset changed from 32 to 96 (in bits) (by +64 bits)
+          'int S1::m0' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'char S1::m1' offset changed from 32 to 96 (in bits) (by +64 bits)
 
 
diff --git a/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt b/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
index ff0131a4..fd15a239 100644
--- a/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S0':
         type size hasn't changed
         1 data member change:
-         type of 'union {int d; char c;} S0::m0' changed:
-           entity changed from 'union {int d; char c;}' to 'int'
-           type size hasn't changed
+          type of 'union {int d; char c;} S0::m0' changed:
+            entity changed from 'union {int d; char c;}' to 'int'
+            type size hasn't changed
 
 
 
diff --git a/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt b/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
index e43c3a89..4fb2f58e 100644
--- a/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
+++ b/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
@@ -10,15 +10,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char S1::m01', at offset 32 (in bits)
         1 data member change:
-         'char S1::m1' offset changed from 64 to 40 (in bits) (by -24 bits)
+          'char S1::m1' offset changed from 64 to 40 (in bits) (by -24 bits)
         1 data member change:
-         anonymous data member struct {int m0; char m01;} at offset 0 (in bits) became data member 'int S1::m0'
+          anonymous data member struct {int m0; char m01;} at offset 0 (in bits) became data member 'int S1::m0'
 
   [C] 'function void foo(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'struct S0':
         type size hasn't changed
         1 data member change:
-         data member int S0::m0 at offset 0 (in bits) became anonymous data member 'union {int m0; char m01;}'
+          data member int S0::m0 at offset 0 (in bits) became anonymous data member 'union {int m0; char m01;}'
 
 
diff --git a/tests/data/test-diff-dwarf/test46-rust-report-0.txt b/tests/data/test-diff-dwarf/test46-rust-report-0.txt
index 66538cdf..109abd65 100644
--- a/tests/data/test-diff-dwarf/test46-rust-report-0.txt
+++ b/tests/data/test-diff-dwarf/test46-rust-report-0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       1 data member insertion:
         'u32 two::Foo::b', at offset 32 (in bits)
       1 data member change:
-       name of 'one::Foo::a' changed to 'two::Foo::a'
+        name of 'one::Foo::a' changed to 'two::Foo::a'
     parameter 2 of type 'u32' was added
 
 
diff --git a/tests/data/test-diff-dwarf/test5-report.txt b/tests/data/test-diff-dwarf/test5-report.txt
index 74c9e3bf..81a4aa38 100644
--- a/tests/data/test-diff-dwarf/test5-report.txt
+++ b/tests/data/test-diff-dwarf/test5-report.txt
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         type size hasn't changed
         1 data member change:
-         'int C0::m0' access changed from 'private' to 'public'
+          'int C0::m0' access changed from 'private' to 'public'
 
 
diff --git a/tests/data/test-diff-dwarf/test6-report.txt b/tests/data/test-diff-dwarf/test6-report.txt
index 755d37f8..cb7b00b6 100644
--- a/tests/data/test-diff-dwarf/test6-report.txt
+++ b/tests/data/test-diff-dwarf/test6-report.txt
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S0':
         type size hasn't changed
         1 data member change:
-         name of 'S0::m2' changed to 'S0::m12'
+          name of 'S0::m2' changed to 'S0::m12'
 
 
diff --git a/tests/data/test-diff-dwarf/test8-report.txt b/tests/data/test-diff-dwarf/test8-report.txt
index 5adaea5f..8ee5a975 100644
--- a/tests/data/test-diff-dwarf/test8-report.txt
+++ b/tests/data/test-diff-dwarf/test8-report.txt
@@ -15,14 +15,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct B0' changed:
             type size hasn't changed
             1 data member change:
-             'char B0::m0' access changed from 'public' to 'private'
+              'char B0::m0' access changed from 'public' to 'private'
 
         1 base class insertion:
           class B1
         1 data member change:
-         type of 'int S::m0' changed:
-           type name changed from 'int' to 'char'
-           type size changed from 32 to 8 (in bits)
-         and offset changed from 32 to 64 (in bits) (by +32 bits), access changed from 'public' to 'private'
+          type of 'int S::m0' changed:
+            type name changed from 'int' to 'char'
+            type size changed from 32 to 8 (in bits)
+          and offset changed from 32 to 64 (in bits) (by +32 bits), access changed from 'public' to 'private'
 
 
diff --git a/tests/data/test-diff-dwarf/test9-report.txt b/tests/data/test-diff-dwarf/test9-report.txt
index 914841bd..01814b45 100644
--- a/tests/data/test-diff-dwarf/test9-report.txt
+++ b/tests/data/test-diff-dwarf/test9-report.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
   [C] 'int global_var0' was changed to 'char global_var0':
     size of symbol changed from 4 to 1
     type of variable changed:
-     type name changed from 'int' to 'char'
-     type size changed from 32 to 8 (in bits)
+      type name changed from 'int' to 'char'
+      type size changed from 32 to 8 (in bits)
 
 
diff --git a/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt b/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
index 78be7f06..45424dc2 100644
--- a/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
+++ b/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
@@ -12,10 +12,10 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S0' at test45-basic-type-change-v1.cc:8:1:
         type size hasn't changed
         1 data member change:
-         type of 'int* S0::m0' changed:
-           in pointed to type 'int':
-             type name changed from 'int' to 'char'
-             type size changed from 32 to 8 (in bits)
+          type of 'int* S0::m0' changed:
+            in pointed to type 'int':
+              type name changed from 'int' to 'char'
+              type size changed from 32 to 8 (in bits)
 
 
   [C] 'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some indirect sub-type changes:
@@ -27,10 +27,10 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S1' at test45-basic-type-change-v1.cc:13:1:
         type size hasn't changed
         1 data member change:
-         type of 'int* S1::m0' changed:
-           in pointed to type 'int':
-             type name changed from 'int' to 'char'
-             type size changed from 32 to 8 (in bits)
+          type of 'int* S1::m0' changed:
+            in pointed to type 'int':
+              type name changed from 'int' to 'char'
+              type size changed from 32 to 8 (in bits)
 
 
   [C] 'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some indirect sub-type changes:
@@ -40,10 +40,10 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S2' at test45-basic-type-change-v1.cc:18:1:
         type size hasn't changed
         1 data member change:
-         type of 'int* S2::m0' changed:
-           in pointed to type 'int':
-             type name changed from 'int' to 'char'
-             type size changed from 32 to 8 (in bits)
+          type of 'int* S2::m0' changed:
+            in pointed to type 'int':
+              type name changed from 'int' to 'char'
+              type size changed from 32 to 8 (in bits)
 
 
   [C] 'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some indirect sub-type changes:
diff --git a/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt b/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
index e5e4bd30..f442f4d8 100644
--- a/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
+++ b/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
@@ -26,8 +26,8 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct S0 at test45-basic-type-change-v0.cc:8:1' changed:
   type size hasn't changed
   there are data member changes:
-   type 'int*' of 'S0::m0' changed:
-     pointer type changed from: 'int*' to: 'char*'
+    type 'int*' of 'S0::m0' changed:
+      pointer type changed from: 'int*' to: 'char*'
 
 
 
@@ -35,8 +35,8 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct S1 at test45-basic-type-change-v0.cc:13:1' changed:
   type size hasn't changed
   there are data member changes:
-   type 'int*' of 'S1::m0' changed:
-     pointer type changed from: 'int*' to: 'char*'
+    type 'int*' of 'S1::m0' changed:
+      pointer type changed from: 'int*' to: 'char*'
 
 
 
@@ -44,7 +44,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct S2 at test45-basic-type-change-v0.cc:18:1' changed:
   type size hasn't changed
   there are data member changes:
-   type 'int*' of 'S2::m0' changed:
-     pointer type changed from: 'int*' to: 'char*'
+    type 'int*' of 'S2::m0' changed:
+      pointer type changed from: 'int*' to: 'char*'
 
 
diff --git a/tests/data/test-diff-filter/test0-report.txt b/tests/data/test-diff-filter/test0-report.txt
index 0d5d2e52..6967ee31 100644
--- a/tests/data/test-diff-filter/test0-report.txt
+++ b/tests/data/test-diff-filter/test0-report.txt
@@ -17,9 +17,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             1 data member insertion:
               'unsigned int B0S0::m2', at offset 32 (in bits)
             1 data member change:
-             'char B0S0::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+              'char B0S0::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
         1 data member change:
-         'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits)
+          'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-filter/test01-report.txt b/tests/data/test-diff-filter/test01-report.txt
index 0407bd46..ff759af7 100644
--- a/tests/data/test-diff-filter/test01-report.txt
+++ b/tests/data/test-diff-filter/test01-report.txt
@@ -17,9 +17,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             1 data member insertion:
               'unsigned int B0S0::m2', at offset 32 (in bits)
             1 data member change:
-             'char B0S0::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+              'char B0S0::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
         1 data member change:
-         'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
+          'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
 
 
diff --git a/tests/data/test-diff-filter/test1-report.txt b/tests/data/test-diff-filter/test1-report.txt
index 0c1d1911..064b41ec 100644
--- a/tests/data/test-diff-filter/test1-report.txt
+++ b/tests/data/test-diff-filter/test1-report.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char C1::m0', at offset 0 (in bits)
         1 data member change:
-         'int C1::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int C1::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-filter/test13-report.txt b/tests/data/test-diff-filter/test13-report.txt
index 169771ec..6a0f152a 100644
--- a/tests/data/test-diff-filter/test13-report.txt
+++ b/tests/data/test-diff-filter/test13-report.txt
@@ -15,9 +15,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           class B1
         1 data member change:
-         type of 'int S::m0' changed:
-           type name changed from 'int' to 'char'
-           type size changed from 32 to 8 (in bits)
-         and offset changed from 32 to 64 (in bits) (by +32 bits)
+          type of 'int S::m0' changed:
+            type name changed from 'int' to 'char'
+            type size changed from 32 to 8 (in bits)
+          and offset changed from 32 to 64 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-filter/test15-0-report.txt b/tests/data/test-diff-filter/test15-0-report.txt
index 2c162d55..f2d37cb2 100644
--- a/tests/data/test-diff-filter/test15-0-report.txt
+++ b/tests/data/test-diff-filter/test15-0-report.txt
@@ -5,9 +5,9 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
   [C] 'S* var1' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 64 to 96 (in bits)
-       1 data member insertion:
-         'unsigned int S::m2', at offset 64 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 64 to 96 (in bits)
+        1 data member insertion:
+          'unsigned int S::m2', at offset 64 (in bits)
 
 
diff --git a/tests/data/test-diff-filter/test15-1-report.txt b/tests/data/test-diff-filter/test15-1-report.txt
index 82c6575c..ed4825ca 100644
--- a/tests/data/test-diff-filter/test15-1-report.txt
+++ b/tests/data/test-diff-filter/test15-1-report.txt
@@ -5,13 +5,13 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
   [C] 'S* var1' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 64 to 96 (in bits)
-       1 data member insertion:
-         'unsigned int S::m2', at offset 64 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 64 to 96 (in bits)
+        1 data member insertion:
+          'unsigned int S::m2', at offset 64 (in bits)
 
   [C] 'S* var2' was changed:
     type of variable changed:
-     pointed to type 'struct S' changed, as reported earlier
+      pointed to type 'struct S' changed, as reported earlier
 
 
diff --git a/tests/data/test-diff-filter/test16-report-2.txt b/tests/data/test-diff-filter/test16-report-2.txt
index 744bdced..c85d1a84 100644
--- a/tests/data/test-diff-filter/test16-report-2.txt
+++ b/tests/data/test-diff-filter/test16-report-2.txt
@@ -10,8 +10,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'int S::m0', at offset 0 (in bits)
         1 data member change:
-         type of 'S* S::m2' changed:
-           pointed to type 'struct S' changed; details are being reported
-         and offset changed from 0 to 64 (in bits) (by +64 bits)
+          type of 'S* S::m2' changed:
+            pointed to type 'struct S' changed; details are being reported
+          and offset changed from 0 to 64 (in bits) (by +64 bits)
 
 
diff --git a/tests/data/test-diff-filter/test16-report.txt b/tests/data/test-diff-filter/test16-report.txt
index cf2bd81c..80c3f1ec 100644
--- a/tests/data/test-diff-filter/test16-report.txt
+++ b/tests/data/test-diff-filter/test16-report.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'int S::m0', at offset 0 (in bits)
         1 data member change:
-         'S* S::m2' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'S* S::m2' offset changed from 0 to 64 (in bits) (by +64 bits)
 
 
diff --git a/tests/data/test-diff-filter/test17-0-report.txt b/tests/data/test-diff-filter/test17-0-report.txt
index 2d2f8650..a90cab1e 100644
--- a/tests/data/test-diff-filter/test17-0-report.txt
+++ b/tests/data/test-diff-filter/test17-0-report.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'int S::m0', at offset 0 (in bits)
         1 data member change:
-         'S* S::m2' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'S* S::m2' offset changed from 0 to 64 (in bits) (by +64 bits)
 
 
diff --git a/tests/data/test-diff-filter/test17-1-report.txt b/tests/data/test-diff-filter/test17-1-report.txt
index 1c75796c..83a8945c 100644
--- a/tests/data/test-diff-filter/test17-1-report.txt
+++ b/tests/data/test-diff-filter/test17-1-report.txt
@@ -10,9 +10,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'int S::m0', at offset 0 (in bits)
         1 data member change:
-         type of 'S* S::m2' changed:
-           pointed to type 'struct S' changed; details are being reported
-         and offset changed from 0 to 64 (in bits) (by +64 bits)
+          type of 'S* S::m2' changed:
+            pointed to type 'struct S' changed; details are being reported
+          and offset changed from 0 to 64 (in bits) (by +64 bits)
 
   [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
diff --git a/tests/data/test-diff-filter/test18-report.txt b/tests/data/test-diff-filter/test18-report.txt
index 6ade5bdf..2535b4e9 100644
--- a/tests/data/test-diff-filter/test18-report.txt
+++ b/tests/data/test-diff-filter/test18-report.txt
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         1 data member change:
-         type of 'int S::m0' changed:
-           type name changed from 'int' to 'unsigned int'
-           type size hasn't changed
+          type of 'int S::m0' changed:
+            type name changed from 'int' to 'unsigned int'
+            type size hasn't changed
 
 
 
diff --git a/tests/data/test-diff-filter/test2-report.txt b/tests/data/test-diff-filter/test2-report.txt
index 87ef1a4d..78a3c9d3 100644
--- a/tests/data/test-diff-filter/test2-report.txt
+++ b/tests/data/test-diff-filter/test2-report.txt
@@ -21,7 +21,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char C0::m2', at offset 0 (in bits)
         2 data member changes:
-         'E0 C0::m0' offset changed from 0 to 8 (in bits) (by +8 bits)
-         'E1 C0::m1' offset changed from 8 to 16 (in bits) (by +8 bits)
+          'E0 C0::m0' offset changed from 0 to 8 (in bits) (by +8 bits)
+          'E1 C0::m1' offset changed from 8 to 16 (in bits) (by +8 bits)
 
 
diff --git a/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt b/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
index 606c619d..622f6cd4 100644
--- a/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
+++ b/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
@@ -5,7 +5,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
   [C] 'const volatile S* const* const* var0' was changed to 'const volatile typedef_of_S* const* const* var0':
     type of variable changed:
-     in pointed to type 'const volatile S* const* const':
-       'const volatile S* const* const' changed to 'const volatile typedef_of_S* const* const'
+      in pointed to type 'const volatile S* const* const':
+        'const volatile S* const* const' changed to 'const volatile typedef_of_S* const* const'
 
 
diff --git a/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt b/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
index 85125410..08554b4b 100644
--- a/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
+++ b/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
@@ -5,9 +5,9 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
   [C] 'S a[2]' was changed to 'typedef_of_S a[2]':
     type of variable changed:
-     array element type 'struct S' changed: 
-       entity changed from 'struct S' to compatible type 'typedef typedef_of_S'
-     type name changed from 'S[2]' to 'typedef_of_S[2]'
-     type size hasn't changed
+      array element type 'struct S' changed: 
+        entity changed from 'struct S' to compatible type 'typedef typedef_of_S'
+      type name changed from 'S[2]' to 'typedef_of_S[2]'
+      type size hasn't changed
 
 
diff --git a/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt b/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
index dba30227..55249d4f 100644
--- a/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
+++ b/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
@@ -10,8 +10,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char S::m1', at offset 32 (in bits)
         1 data member change:
-         type of 'S* S::m2' changed:
-           pointed to type 'struct S' changed; details are being reported
+          type of 'S* S::m2' changed:
+            pointed to type 'struct S' changed; details are being reported
 
 
 
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
index a226b6c5..fbfae8d4 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
@@ -11,11 +11,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               1 data member changes (1 filtered):
-               type of 'FooStruct::Embedded* S::m1' changed:
-                 in pointed to type 'struct FooStruct::Embedded':
-                   type size hasn't changed
-                   1 data member insertion:
-                     'char FooStruct::Embedded::m1', at offset 32 (in bits)
+                type of 'FooStruct::Embedded* S::m1' changed:
+                  in pointed to type 'struct FooStruct::Embedded':
+                    type size hasn't changed
+                    1 data member insertion:
+                      'char FooStruct::Embedded::m1', at offset 32 (in bits)
 
 
 
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
index 0f032cbd..760576ff 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
@@ -11,15 +11,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               2 data member changes:
-               type of 'FooStruct::Embedded* S::m1' changed:
-                 in pointed to type 'struct FooStruct::Embedded':
-                   type size hasn't changed
-                   1 data member insertion:
-                     'char FooStruct::Embedded::m1', at offset 32 (in bits)
+                type of 'FooStruct::Embedded* S::m1' changed:
+                  in pointed to type 'struct FooStruct::Embedded':
+                    type size hasn't changed
+                    1 data member insertion:
+                      'char FooStruct::Embedded::m1', at offset 32 (in bits)
 
-               type of 'FooStruct::Embedded** S::m2' changed:
-                 in pointed to type 'FooStruct::Embedded*':
-                   pointed to type 'struct FooStruct::Embedded' changed, as reported earlier
+                type of 'FooStruct::Embedded** S::m2' changed:
+                  in pointed to type 'FooStruct::Embedded*':
+                    pointed to type 'struct FooStruct::Embedded' changed, as reported earlier
 
 
 
diff --git a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
index cfbc7918..b9bdb216 100644
--- a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
+++ b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
@@ -15,8 +15,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         1 data member changes (2 filtered):
-         type of 'S0* S::m0' changed:
-           pointed to type 'struct S0' changed, as reported earlier
+          type of 'S0* S::m0' changed:
+            pointed to type 'struct S0' changed, as reported earlier
 
 
 
diff --git a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
index eba592a2..dd5afb5f 100644
--- a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
+++ b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
@@ -21,16 +21,16 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         3 data member changes:
-         type of 'S0* S::m0' changed:
-           pointed to type 'struct S0' changed, as reported earlier
+          type of 'S0* S::m0' changed:
+            pointed to type 'struct S0' changed, as reported earlier
 
-         type of 'S1* S::m1' changed:
-           in pointed to type 'struct S1':
-             entity changed from 'struct S1' to compatible type 'typedef S1Renamed'
+          type of 'S1* S::m1' changed:
+            in pointed to type 'struct S1':
+              entity changed from 'struct S1' to compatible type 'typedef S1Renamed'
 
-         type of 'S2* S::m2' changed:
-           in pointed to type 'struct S2':
-             entity changed from 'struct S2' to compatible type 'typedef S2Renamed'
+          type of 'S2* S::m2' changed:
+            in pointed to type 'struct S2':
+              entity changed from 'struct S2' to compatible type 'typedef S2Renamed'
 
 
 
diff --git a/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt b/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
index a7ee9d55..5a84c530 100644
--- a/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
+++ b/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
@@ -23,6 +23,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             details were reported earlier
 
         1 data member change:
-         'int inherited::m0' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int inherited::m0' offset changed from 32 to 64 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-filter/test3-report.txt b/tests/data/test-diff-filter/test3-report.txt
index ef48956a..ff099fd9 100644
--- a/tests/data/test-diff-filter/test3-report.txt
+++ b/tests/data/test-diff-filter/test3-report.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'int S::m0', at offset 0 (in bits)
         1 data member change:
-         'char S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'char S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index 5def3a08..678c9f61 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1300,14 +1300,14 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
       in pointed to type 'struct VarDesc':
         type size hasn't changed
         1 data member changes (1 filtered):
-         type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
-           type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
-           type size hasn't changed
-           1 data member changes (1 filtered):
-            anonymous data member at offset 0 (in bits) changed from:
-              struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
-            to:
-              struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
+          type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+            type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
+            type size hasn't changed
+            1 data member changes (1 filtered):
+              anonymous data member at offset 0 (in bits) changed from:
+                struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
+              to:
+                struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
 
 
 
@@ -1318,11 +1318,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-           type of 'void ()* InitTableEntry::func' changed:
-             in pointed to type 'function type void ()':
-               parameter 1 of type 'typedef MyoArena' was added
+            type of 'void ()* InitTableEntry::func' changed:
+              in pointed to type 'function type void ()':
+                parameter 1 of type 'typedef MyoArena' was added
 
-           and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
+            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
 
   [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
@@ -1340,97 +1340,97 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits)
             'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits)
           8 data member changes (2 filtered):
-           type of 'Engine& OffloadDescriptor::m_device' changed:
-             in referenced type 'struct Engine':
-               type size changed from 2752 to 5504 (in bits)
-               1 data member deletion:
-                 'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits)
-               7 data member insertions:
-                 'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits)
-                 'StreamMap Engine::m_stream_map', at offset 3072 (in bits)
-                 'mutex_t Engine::m_stream_lock', at offset 3456 (in bits)
-                 'int Engine::m_num_cores', at offset 3776 (in bits)
-                 'int Engine::m_num_threads', at offset 3808 (in bits)
-                 'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits)
-                 'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits)
-               4 data member changes:
-                type of 'Engine::PtrSet Engine::m_ptr_set' changed:
-                  entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable'
-                    type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
-                    type size changed from 384 to 704 (in bits)
-                    1 data member insertion:
-                      'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits)
-                    1 data member change:
-                     type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
-                       typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet
-                       underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' changed:
-                         type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
-                         type size hasn't changed
-                         1 data member change:
-                          type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
-                            entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type'
-                              type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
-                              type size hasn't changed
-                              1 base class deletion:
-                                class std::allocator<std::_Rb_tree_node<PtrData> >
-                              2 data member deletions:
-                                'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                                'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
-                              1 data member change:
-                               type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
-                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
-                                 type size changed from 8 to 384 (in bits)
-                                 1 base class deletion:
-                                   struct std::binary_function<PtrData, PtrData, bool>
-                                 1 base class insertion:
-                                   class std::allocator<std::_Rb_tree_node<PtrData> >
-                                 3 data member insertions:
-                                   'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits)
-                                   'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                                   'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
-                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl'
-                          and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t'
-                     and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list'
+            type of 'Engine& OffloadDescriptor::m_device' changed:
+              in referenced type 'struct Engine':
+                type size changed from 2752 to 5504 (in bits)
+                1 data member deletion:
+                  'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits)
+                7 data member insertions:
+                  'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits)
+                  'StreamMap Engine::m_stream_map', at offset 3072 (in bits)
+                  'mutex_t Engine::m_stream_lock', at offset 3456 (in bits)
+                  'int Engine::m_num_cores', at offset 3776 (in bits)
+                  'int Engine::m_num_threads', at offset 3808 (in bits)
+                  'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits)
+                  'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits)
+                4 data member changes:
+                  type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+                    entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable'
+                      type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
+                      type size changed from 384 to 704 (in bits)
+                      1 data member insertion:
+                        'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits)
+                      1 data member change:
+                        type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                          typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet
+                          underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' changed:
+                            type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
+                            type size hasn't changed
+                            1 data member change:
+                              type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                                entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type'
+                                  type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
+                                  type size hasn't changed
+                                  1 base class deletion:
+                                    class std::allocator<std::_Rb_tree_node<PtrData> >
+                                  2 data member deletions:
+                                    'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
+                                    'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                                  1 data member change:
+                                    type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                                      type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
+                                      type size changed from 8 to 384 (in bits)
+                                      1 base class deletion:
+                                        struct std::binary_function<PtrData, PtrData, bool>
+                                      1 base class insertion:
+                                        class std::allocator<std::_Rb_tree_node<PtrData> >
+                                      3 data member insertions:
+                                        'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits)
+                                        'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
+                                        'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                                    and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl'
+                              and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t'
+                        and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list'
 
-                'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-                'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-                type of 'coifunction* Engine::m_funcs[6]' changed:
-                  type name changed from 'coifunction*[6]' to 'coifunction*[7]'
-                  array type size changed from 384 to 448
-                  array type subrange 1 changed length from 6 to 7
-                and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
+                  'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+                  'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+                  type of 'coifunction* Engine::m_funcs[6]' changed:
+                    type name changed from 'coifunction*[6]' to 'coifunction*[7]'
+                    array type size changed from 384 to 448
+                    array type subrange 1 changed length from 6 to 7
+                  and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
 
-           'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-           'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-           type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
-             in pointed to type 'struct OffloadDescriptor::VarExtra':
-               type size changed from 576 to 640 (in bits)
-               2 data member insertions:
-                 'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits)
-                 'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits)
-               4 data member changes (3 filtered):
-                'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
-                  in pointed to type 'struct CeanReadRanges':
-                    type size changed from 512 to 576 (in bits)
-                    1 data member insertion:
-                      'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits)
-                    7 data member changes:
-                     'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                     'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                     'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
-                and offset changed from 384 to 448 (in bits) (by +64 bits)
-                'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+              in pointed to type 'struct OffloadDescriptor::VarExtra':
+                type size changed from 576 to 640 (in bits)
+                2 data member insertions:
+                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits)
+                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits)
+                4 data member changes (3 filtered):
+                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                    in pointed to type 'struct CeanReadRanges':
+                      type size changed from 512 to 576 (in bits)
+                      1 data member insertion:
+                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits)
+                      7 data member changes:
+                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                  and offset changed from 384 to 448 (in bits) (by +64 bits)
+                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
 
-           'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-           'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-           'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
-           'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
+            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
     return type changed:
@@ -1513,9 +1513,9 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
-     type name changed from 'const char*[6]' to 'const char*[7]'
-     array type size changed from 384 to 448
-     array type subrange 1 changed length from 6 to 7
+      type name changed from 'const char*[6]' to 'const char*[7]'
+      array type size changed from 384 to 448
+      array type subrange 1 changed length from 6 to 7
 
 
 7 Removed function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index 3bc8f6d7..318d0bc2 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1300,14 +1300,14 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
       in pointed to type 'struct VarDesc' at offload_common.h:254:1:
         type size hasn't changed
         1 data member changes (1 filtered):
-         type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
-           type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
-           type size hasn't changed
-           1 data member changes (1 filtered):
-            anonymous data member at offset 0 (in bits) changed from:
-              struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
-            to:
-              struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
+          type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+            type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
+            type size hasn't changed
+            1 data member changes (1 filtered):
+              anonymous data member at offset 0 (in bits) changed from:
+                struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
+              to:
+                struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
 
 
 
@@ -1318,11 +1318,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-           type of 'void ()* InitTableEntry::func' changed:
-             in pointed to type 'function type void ()':
-               parameter 1 of type 'typedef MyoArena' was added
+            type of 'void ()* InitTableEntry::func' changed:
+              in pointed to type 'function type void ()':
+                parameter 1 of type 'typedef MyoArena' was added
 
-           and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
+            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
 
   [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
@@ -1340,97 +1340,97 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits) at offload_host.h:360:1
             'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits) at offload_host.h:362:1
           8 data member changes (2 filtered):
-           type of 'Engine& OffloadDescriptor::m_device' changed:
-             in referenced type 'struct Engine' at offload_engine.h:395:1:
-               type size changed from 2752 to 5504 (in bits)
-               1 data member deletion:
-                 'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits) at offload_engine.h:474:1
-               7 data member insertions:
-                 'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits) at offload_engine.h:630:1
-                 'StreamMap Engine::m_stream_map', at offset 3072 (in bits) at offload_engine.h:637:1
-                 'mutex_t Engine::m_stream_lock', at offset 3456 (in bits) at offload_engine.h:638:1
-                 'int Engine::m_num_cores', at offset 3776 (in bits) at offload_engine.h:639:1
-                 'int Engine::m_num_threads', at offset 3808 (in bits) at offload_engine.h:640:1
-                 'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits) at offload_engine.h:641:1
-                 'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits) at offload_engine.h:644:1
-               4 data member changes:
-                type of 'Engine::PtrSet Engine::m_ptr_set' changed:
-                  entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable' at offload_engine.h:163:1
-                    type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
-                    type size changed from 384 to 704 (in bits)
-                    1 data member insertion:
-                      'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits) at offload_engine.h:204:1
-                    1 data member change:
-                     type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
-                       typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet at offload_engine.h:165:1
-                       underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' at stl_tree.h:357:1 changed:
-                         type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
-                         type size hasn't changed
-                         1 data member change:
-                          type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
-                            entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type' at stl_set.h:115:1
-                              type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
-                              type size hasn't changed
-                              1 base class deletion:
-                                class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
-                              2 data member deletions:
-                                'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits) at stl_tree.h:593:1
-                                'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
-                              1 data member change:
-                               type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
-                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
-                                 type size changed from 8 to 384 (in bits)
-                                 1 base class deletion:
-                                   struct std::binary_function<PtrData, PtrData, bool> at stl_function.h:118:1
-                                 1 base class insertion:
-                                   class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
-                                 3 data member insertions:
-                                   'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits) at stl_tree.h:592:1
-                                   'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits) at stl_tree.h:593:1
-                                   'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
-                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' at stl_tree.h:633:1
-                          and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' at stl_set.h:116:1
-                     and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list' at offload_engine.h:203:1
+            type of 'Engine& OffloadDescriptor::m_device' changed:
+              in referenced type 'struct Engine' at offload_engine.h:395:1:
+                type size changed from 2752 to 5504 (in bits)
+                1 data member deletion:
+                  'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits) at offload_engine.h:474:1
+                7 data member insertions:
+                  'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits) at offload_engine.h:630:1
+                  'StreamMap Engine::m_stream_map', at offset 3072 (in bits) at offload_engine.h:637:1
+                  'mutex_t Engine::m_stream_lock', at offset 3456 (in bits) at offload_engine.h:638:1
+                  'int Engine::m_num_cores', at offset 3776 (in bits) at offload_engine.h:639:1
+                  'int Engine::m_num_threads', at offset 3808 (in bits) at offload_engine.h:640:1
+                  'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits) at offload_engine.h:641:1
+                  'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits) at offload_engine.h:644:1
+                4 data member changes:
+                  type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+                    entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable' at offload_engine.h:163:1
+                      type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
+                      type size changed from 384 to 704 (in bits)
+                      1 data member insertion:
+                        'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits) at offload_engine.h:204:1
+                      1 data member change:
+                        type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                          typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet at offload_engine.h:165:1
+                          underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' at stl_tree.h:357:1 changed:
+                            type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
+                            type size hasn't changed
+                            1 data member change:
+                              type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                                entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type' at stl_set.h:115:1
+                                  type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
+                                  type size hasn't changed
+                                  1 base class deletion:
+                                    class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
+                                  2 data member deletions:
+                                    'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits) at stl_tree.h:593:1
+                                    'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
+                                  1 data member change:
+                                    type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                                      type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
+                                      type size changed from 8 to 384 (in bits)
+                                      1 base class deletion:
+                                        struct std::binary_function<PtrData, PtrData, bool> at stl_function.h:118:1
+                                      1 base class insertion:
+                                        class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
+                                      3 data member insertions:
+                                        'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits) at stl_tree.h:592:1
+                                        'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits) at stl_tree.h:593:1
+                                        'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
+                                    and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' at stl_tree.h:633:1
+                              and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' at stl_set.h:116:1
+                        and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list' at offload_engine.h:203:1
 
-                'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-                'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-                type of 'coifunction* Engine::m_funcs[6]' changed:
-                  type name changed from 'coifunction*[6]' to 'coifunction*[7]'
-                  array type size changed from 384 to 448
-                  array type subrange 1 changed length from 6 to 7
-                and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
+                  'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+                  'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+                  type of 'coifunction* Engine::m_funcs[6]' changed:
+                    type name changed from 'coifunction*[6]' to 'coifunction*[7]'
+                    array type size changed from 384 to 448
+                    array type subrange 1 changed length from 6 to 7
+                  and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
 
-           'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-           'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-           type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
-             in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
-               type size changed from 576 to 640 (in bits)
-               2 data member insertions:
-                 'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits) at offload_host.h:222:1
-                 'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits) at offload_host.h:227:1
-               4 data member changes (3 filtered):
-                'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
-                  in pointed to type 'struct CeanReadRanges' at cean_util.h:58:1:
-                    type size changed from 512 to 576 (in bits)
-                    1 data member insertion:
-                      'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits) at cean_util.h:59:1
-                    7 data member changes:
-                     'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                     'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                     'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
-                and offset changed from 384 to 448 (in bits) (by +64 bits)
-                'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+              in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
+                type size changed from 576 to 640 (in bits)
+                2 data member insertions:
+                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits) at offload_host.h:222:1
+                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits) at offload_host.h:227:1
+                4 data member changes (3 filtered):
+                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                    in pointed to type 'struct CeanReadRanges' at cean_util.h:58:1:
+                      type size changed from 512 to 576 (in bits)
+                      1 data member insertion:
+                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits) at cean_util.h:59:1
+                      7 data member changes:
+                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                  and offset changed from 384 to 448 (in bits) (by +64 bits)
+                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
 
-           'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-           'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-           'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
-           'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
+            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
     return type changed:
@@ -1513,9 +1513,9 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
     size of symbol changed from 48 to 56
     type of variable changed:
-     type name changed from 'const char*[6]' to 'const char*[7]'
-     array type size changed from 384 to 448
-     array type subrange 1 changed length from 6 to 7
+      type name changed from 'const char*[6]' to 'const char*[7]'
+      array type size changed from 384 to 448
+      array type subrange 1 changed length from 6 to 7
 
 
 7 Removed function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index d91de66b..9021bd9d 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1300,14 +1300,14 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
       in pointed to type 'struct VarDesc' at offload_common.h:254:1:
         type size hasn't changed
         1 data member changes (1 filtered):
-         type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
-           type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
-           type size hasn't changed
-           1 data member changes (1 filtered):
-            anonymous data member at offset 0 (in bytes) changed from:
-              struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
-            to:
-              struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
+          type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+            type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
+            type size hasn't changed
+            1 data member changes (1 filtered):
+              anonymous data member at offset 0 (in bytes) changed from:
+                struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
+              to:
+                struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
 
 
 
@@ -1318,11 +1318,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-           type of 'void ()* InitTableEntry::func' changed:
-             in pointed to type 'function type void ()':
-               parameter 1 of type 'typedef MyoArena' was added
+            type of 'void ()* InitTableEntry::func' changed:
+              in pointed to type 'function type void ()':
+                parameter 1 of type 'typedef MyoArena' was added
 
-           and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
+            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
 
   [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
@@ -1340,97 +1340,97 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             'bool OffloadDescriptor::m_traceback_called', at offset 0x11c (in bytes) at offload_host.h:360:1
             'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 0x120 (in bytes) at offload_host.h:362:1
           8 data member changes (2 filtered):
-           type of 'Engine& OffloadDescriptor::m_device' changed:
-             in referenced type 'struct Engine' at offload_engine.h:395:1:
-               type size changed from 0x158 to 0x2b0 (in bytes)
-               1 data member deletion:
-                 'mutex_t Engine::m_ptr_lock', at offset 0xa8 (in bytes) at offload_engine.h:474:1
-               7 data member insertions:
-                 'PtrDataTable Engine::m_targetptr_set', at offset 0xd0 (in bytes) at offload_engine.h:630:1
-                 'StreamMap Engine::m_stream_map', at offset 0x180 (in bytes) at offload_engine.h:637:1
-                 'mutex_t Engine::m_stream_lock', at offset 0x1b0 (in bytes) at offload_engine.h:638:1
-                 'int Engine::m_num_cores', at offset 0x1d8 (in bytes) at offload_engine.h:639:1
-                 'int Engine::m_num_threads', at offset 0x1dc (in bytes) at offload_engine.h:640:1
-                 'std::bitset<1024ul> Engine::m_cpus', at offset 0x1e0 (in bytes) at offload_engine.h:641:1
-                 'DynLibList Engine::m_dyn_libs', at offset 0x260 (in bytes) at offload_engine.h:644:1
-               4 data member changes:
-                type of 'Engine::PtrSet Engine::m_ptr_set' changed:
-                  entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable' at offload_engine.h:163:1
-                    type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
-                    type size changed from 0x30 to 0x58 (in bytes)
-                    1 data member insertion:
-                      'mutex_t PtrDataTable::m_ptr_lock', at offset 0x30 (in bytes) at offload_engine.h:204:1
-                    1 data member change:
-                     type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
-                       typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet at offload_engine.h:165:1
-                       underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' at stl_tree.h:357:1 changed:
-                         type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
-                         type size hasn't changed
-                         1 data member change:
-                          type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
-                            entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type' at stl_set.h:115:1
-                              type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
-                              type size hasn't changed
-                              1 base class deletion:
-                                class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
-                              2 data member deletions:
-                                'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
-                                'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
-                              1 data member change:
-                               type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
-                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
-                                 type size changed from 0x1 to 0x30 (in bytes)
-                                 1 base class deletion:
-                                   struct std::binary_function<PtrData, PtrData, bool> at stl_function.h:118:1
-                                 1 base class insertion:
-                                   class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
-                                 3 data member insertions:
-                                   'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bytes) at stl_tree.h:592:1
-                                   'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
-                                   'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
-                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' at stl_tree.h:633:1
-                          and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' at stl_set.h:116:1
-                     and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list' at offload_engine.h:203:1
+            type of 'Engine& OffloadDescriptor::m_device' changed:
+              in referenced type 'struct Engine' at offload_engine.h:395:1:
+                type size changed from 0x158 to 0x2b0 (in bytes)
+                1 data member deletion:
+                  'mutex_t Engine::m_ptr_lock', at offset 0xa8 (in bytes) at offload_engine.h:474:1
+                7 data member insertions:
+                  'PtrDataTable Engine::m_targetptr_set', at offset 0xd0 (in bytes) at offload_engine.h:630:1
+                  'StreamMap Engine::m_stream_map', at offset 0x180 (in bytes) at offload_engine.h:637:1
+                  'mutex_t Engine::m_stream_lock', at offset 0x1b0 (in bytes) at offload_engine.h:638:1
+                  'int Engine::m_num_cores', at offset 0x1d8 (in bytes) at offload_engine.h:639:1
+                  'int Engine::m_num_threads', at offset 0x1dc (in bytes) at offload_engine.h:640:1
+                  'std::bitset<1024ul> Engine::m_cpus', at offset 0x1e0 (in bytes) at offload_engine.h:641:1
+                  'DynLibList Engine::m_dyn_libs', at offset 0x260 (in bytes) at offload_engine.h:644:1
+                4 data member changes:
+                  type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+                    entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable' at offload_engine.h:163:1
+                      type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
+                      type size changed from 0x30 to 0x58 (in bytes)
+                      1 data member insertion:
+                        'mutex_t PtrDataTable::m_ptr_lock', at offset 0x30 (in bytes) at offload_engine.h:204:1
+                      1 data member change:
+                        type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                          typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet at offload_engine.h:165:1
+                          underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' at stl_tree.h:357:1 changed:
+                            type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
+                            type size hasn't changed
+                            1 data member change:
+                              type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                                entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type' at stl_set.h:115:1
+                                  type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
+                                  type size hasn't changed
+                                  1 base class deletion:
+                                    class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
+                                  2 data member deletions:
+                                    'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
+                                    'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
+                                  1 data member change:
+                                    type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                                      type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
+                                      type size changed from 0x1 to 0x30 (in bytes)
+                                      1 base class deletion:
+                                        struct std::binary_function<PtrData, PtrData, bool> at stl_function.h:118:1
+                                      1 base class insertion:
+                                        class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
+                                      3 data member insertions:
+                                        'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bytes) at stl_tree.h:592:1
+                                        'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
+                                        'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
+                                    and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' at stl_tree.h:633:1
+                              and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' at stl_set.h:116:1
+                        and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list' at offload_engine.h:203:1
 
-                'Engine::SignalMap Engine::m_signal_map' offset changed from 0xd0 to 0x128 (in bytes) (by +0x58 bytes)
-                'mutex_t Engine::m_signal_lock' offset changed from 0x100 to 0x158 (in bytes) (by +0x58 bytes)
-                type of 'coifunction* Engine::m_funcs[6]' changed:
-                  type name changed from 'coifunction*[6]' to 'coifunction*[7]'
-                  array type size changed from 0x180 to 0x1c0
-                  array type subrange 1 changed length from 6 to 7
-                and offset changed from 0x128 to 0x278 (in bytes) (by +0x150 bytes)
+                  'Engine::SignalMap Engine::m_signal_map' offset changed from 0xd0 to 0x128 (in bytes) (by +0x58 bytes)
+                  'mutex_t Engine::m_signal_lock' offset changed from 0x100 to 0x158 (in bytes) (by +0x58 bytes)
+                  type of 'coifunction* Engine::m_funcs[6]' changed:
+                    type name changed from 'coifunction*[6]' to 'coifunction*[7]'
+                    array type size changed from 0x180 to 0x1c0
+                    array type subrange 1 changed length from 6 to 7
+                  and offset changed from 0x128 to 0x278 (in bytes) (by +0x150 bytes)
 
-           'bool OffloadDescriptor::m_is_mandatory' offset changed from 0x28 to 0x29 (in bytes) (by +0x1 bytes)
-           'const bool OffloadDescriptor::m_is_openmp' offset changed from 0x29 to 0x2a (in bytes) (by +0x1 bytes)
-           type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
-             in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
-               type size changed from 0x48 to 0x50 (in bytes)
-               2 data member insertions:
-                 'void* OffloadDescriptor::VarExtra::alloc', at offset 0x28 (in bytes) at offload_host.h:222:1
-                 'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 0x4c (in bytes) at offload_host.h:227:1
-               4 data member changes (3 filtered):
-                'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
-                type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
-                  in pointed to type 'struct CeanReadRanges' at cean_util.h:58:1:
-                    type size changed from 0x40 to 0x48 (in bytes)
-                    1 data member insertion:
-                      'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bytes) at cean_util.h:59:1
-                    7 data member changes:
-                     'void* CeanReadRanges::ptr' offset changed from 0 to 0x8 (in bytes) (by +0x8 bytes)
-                     'int64_t CeanReadRanges::current_number' offset changed from 0x8 to 0x10 (in bytes) (by +0x8 bytes)
-                     'int64_t CeanReadRanges::range_max_number' offset changed from 0x10 to 0x18 (in bytes) (by +0x8 bytes)
-                     'int64_t CeanReadRanges::range_size' offset changed from 0x18 to 0x20 (in bytes) (by +0x8 bytes)
-                     'int CeanReadRanges::last_noncont_ind' offset changed from 0x20 to 0x28 (in bytes) (by +0x8 bytes)
-                     'int64_t CeanReadRanges::init_offset' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
-                     'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
-                and offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
-                'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 0x38 to 0x40 (in bytes) (by +0x8 bytes)
-                'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 0x40 to 0x48 (in bytes) (by +0x8 bytes)
+            'bool OffloadDescriptor::m_is_mandatory' offset changed from 0x28 to 0x29 (in bytes) (by +0x1 bytes)
+            'const bool OffloadDescriptor::m_is_openmp' offset changed from 0x29 to 0x2a (in bytes) (by +0x1 bytes)
+            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+              in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
+                type size changed from 0x48 to 0x50 (in bytes)
+                2 data member insertions:
+                  'void* OffloadDescriptor::VarExtra::alloc', at offset 0x28 (in bytes) at offload_host.h:222:1
+                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 0x4c (in bytes) at offload_host.h:227:1
+                4 data member changes (3 filtered):
+                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
+                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                    in pointed to type 'struct CeanReadRanges' at cean_util.h:58:1:
+                      type size changed from 0x40 to 0x48 (in bytes)
+                      1 data member insertion:
+                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bytes) at cean_util.h:59:1
+                      7 data member changes:
+                        'void* CeanReadRanges::ptr' offset changed from 0 to 0x8 (in bytes) (by +0x8 bytes)
+                        'int64_t CeanReadRanges::current_number' offset changed from 0x8 to 0x10 (in bytes) (by +0x8 bytes)
+                        'int64_t CeanReadRanges::range_max_number' offset changed from 0x10 to 0x18 (in bytes) (by +0x8 bytes)
+                        'int64_t CeanReadRanges::range_size' offset changed from 0x18 to 0x20 (in bytes) (by +0x8 bytes)
+                        'int CeanReadRanges::last_noncont_ind' offset changed from 0x20 to 0x28 (in bytes) (by +0x8 bytes)
+                        'int64_t CeanReadRanges::init_offset' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
+                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
+                  and offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
+                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 0x38 to 0x40 (in bytes) (by +0x8 bytes)
+                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 0x40 to 0x48 (in bytes) (by +0x8 bytes)
 
-           'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 0xf8 to 0x100 (in bytes) (by +0x8 bytes)
-           'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 0x100 to 0x108 (in bytes) (by +0x8 bytes)
-           'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 0x108 to 0x110 (in bytes) (by +0x8 bytes)
-           'bool OffloadDescriptor::m_need_runfunction' offset changed from 0x110 to 0x118 (in bytes) (by +0x8 bytes)
+            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 0xf8 to 0x100 (in bytes) (by +0x8 bytes)
+            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 0x100 to 0x108 (in bytes) (by +0x8 bytes)
+            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 0x108 to 0x110 (in bytes) (by +0x8 bytes)
+            'bool OffloadDescriptor::m_need_runfunction' offset changed from 0x110 to 0x118 (in bytes) (by +0x8 bytes)
 
   [C] 'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
     return type changed:
@@ -1513,9 +1513,9 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
     size of symbol changed from 0x6 to 0x7
     type of variable changed:
-     type name changed from 'const char*[6]' to 'const char*[7]'
-     array type size changed from 0x180 to 0x1c0
-     array type subrange 1 changed length from 6 to 7
+      type name changed from 'const char*[6]' to 'const char*[7]'
+      array type size changed from 0x180 to 0x1c0
+      array type subrange 1 changed length from 6 to 7
 
 
 7 Removed function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
index 795410dc..df13b950 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
@@ -34,12 +34,12 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
         1 data member insertion:
           'void (void*)* __cxxabiv1::__cxa_dependent_exception::__padding', at offset 32 (in bits)
         6 data member changes:
-         'std::unexpected_handler __cxxabiv1::__cxa_dependent_exception::unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
-         'std::terminate_handler __cxxabiv1::__cxa_dependent_exception::terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-         '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
-         'int __cxxabiv1::__cxa_dependent_exception::handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-         '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
-         'int __cxxabiv1::__cxa_dependent_exception::propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
+          'std::unexpected_handler __cxxabiv1::__cxa_dependent_exception::unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'std::terminate_handler __cxxabiv1::__cxa_dependent_exception::terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int __cxxabiv1::__cxa_dependent_exception::handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          'int __cxxabiv1::__cxa_dependent_exception::propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' has some indirect sub-type changes:
     parameter 1 of type 'enum std::regex_constants::error_type' has sub-type changes:
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
index 4ec08fea..6a165d55 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
@@ -34,12 +34,12 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
         1 data member insertion:
           'void (void*)* __cxxabiv1::__cxa_dependent_exception::__padding', at offset 32 (in bits) at unwind-cxx.h:120:1
         6 data member changes:
-         'std::unexpected_handler __cxxabiv1::__cxa_dependent_exception::unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
-         'std::terminate_handler __cxxabiv1::__cxa_dependent_exception::terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-         '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
-         'int __cxxabiv1::__cxa_dependent_exception::handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-         '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
-         'int __cxxabiv1::__cxa_dependent_exception::propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
+          'std::unexpected_handler __cxxabiv1::__cxa_dependent_exception::unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'std::terminate_handler __cxxabiv1::__cxa_dependent_exception::terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int __cxxabiv1::__cxa_dependent_exception::handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          'int __cxxabiv1::__cxa_dependent_exception::propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' at functexcept.cc:139:1 has some indirect sub-type changes:
     parameter 1 of type 'enum std::regex_constants::error_type' has sub-type changes:
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index 306a9863..828e473a 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -216,14 +216,14 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
       in pointed to type 'struct VarDesc':
         type size hasn't changed
         1 data member changes (1 filtered):
-         type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
-           type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
-           type size hasn't changed
-           1 data member changes (1 filtered):
-            anonymous data member at offset 0 (in bits) changed from:
-              struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
-            to:
-              struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
+          type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+            type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
+            type size hasn't changed
+            1 data member changes (1 filtered):
+              anonymous data member at offset 0 (in bits) changed from:
+                struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
+              to:
+                struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
 
 
 
@@ -234,11 +234,11 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-           type of 'void ()* InitTableEntry::func' changed:
-             in pointed to type 'function type void ()':
-               parameter 1 of type 'typedef MyoArena' was added
+            type of 'void ()* InitTableEntry::func' changed:
+              in pointed to type 'function type void ()':
+                parameter 1 of type 'typedef MyoArena' was added
 
-           and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
+            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
 
   [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
@@ -256,97 +256,97 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits)
             'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits)
           8 data member changes (2 filtered):
-           type of 'Engine& OffloadDescriptor::m_device' changed:
-             in referenced type 'struct Engine':
-               type size changed from 2752 to 5504 (in bits)
-               1 data member deletion:
-                 'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits)
-               7 data member insertions:
-                 'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits)
-                 'StreamMap Engine::m_stream_map', at offset 3072 (in bits)
-                 'mutex_t Engine::m_stream_lock', at offset 3456 (in bits)
-                 'int Engine::m_num_cores', at offset 3776 (in bits)
-                 'int Engine::m_num_threads', at offset 3808 (in bits)
-                 'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits)
-                 'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits)
-               4 data member changes:
-                type of 'Engine::PtrSet Engine::m_ptr_set' changed:
-                  entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable'
-                    type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
-                    type size changed from 384 to 704 (in bits)
-                    1 data member insertion:
-                      'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits)
-                    1 data member change:
-                     type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
-                       typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet
-                       underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' changed:
-                         type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
-                         type size hasn't changed
-                         1 data member change:
-                          type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
-                            entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type'
-                              type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
-                              type size hasn't changed
-                              1 base class deletion:
-                                class std::allocator<std::_Rb_tree_node<PtrData> >
-                              2 data member deletions:
-                                'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                                'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
-                              1 data member change:
-                               type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
-                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
-                                 type size changed from 8 to 384 (in bits)
-                                 1 base class deletion:
-                                   struct std::binary_function<PtrData, PtrData, bool>
-                                 1 base class insertion:
-                                   class std::allocator<std::_Rb_tree_node<PtrData> >
-                                 3 data member insertions:
-                                   'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits)
-                                   'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                                   'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
-                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl'
-                          and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t'
-                     and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list'
+            type of 'Engine& OffloadDescriptor::m_device' changed:
+              in referenced type 'struct Engine':
+                type size changed from 2752 to 5504 (in bits)
+                1 data member deletion:
+                  'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits)
+                7 data member insertions:
+                  'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits)
+                  'StreamMap Engine::m_stream_map', at offset 3072 (in bits)
+                  'mutex_t Engine::m_stream_lock', at offset 3456 (in bits)
+                  'int Engine::m_num_cores', at offset 3776 (in bits)
+                  'int Engine::m_num_threads', at offset 3808 (in bits)
+                  'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits)
+                  'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits)
+                4 data member changes:
+                  type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+                    entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable'
+                      type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
+                      type size changed from 384 to 704 (in bits)
+                      1 data member insertion:
+                        'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits)
+                      1 data member change:
+                        type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                          typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet
+                          underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' changed:
+                            type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
+                            type size hasn't changed
+                            1 data member change:
+                              type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                                entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type'
+                                  type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
+                                  type size hasn't changed
+                                  1 base class deletion:
+                                    class std::allocator<std::_Rb_tree_node<PtrData> >
+                                  2 data member deletions:
+                                    'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
+                                    'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                                  1 data member change:
+                                    type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                                      type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
+                                      type size changed from 8 to 384 (in bits)
+                                      1 base class deletion:
+                                        struct std::binary_function<PtrData, PtrData, bool>
+                                      1 base class insertion:
+                                        class std::allocator<std::_Rb_tree_node<PtrData> >
+                                      3 data member insertions:
+                                        'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits)
+                                        'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
+                                        'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                                    and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl'
+                              and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t'
+                        and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list'
 
-                'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-                'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-                type of 'coifunction* Engine::m_funcs[6]' changed:
-                  type name changed from 'coifunction*[6]' to 'coifunction*[7]'
-                  array type size changed from 384 to 448
-                  array type subrange 1 changed length from 6 to 7
-                and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
+                  'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+                  'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+                  type of 'coifunction* Engine::m_funcs[6]' changed:
+                    type name changed from 'coifunction*[6]' to 'coifunction*[7]'
+                    array type size changed from 384 to 448
+                    array type subrange 1 changed length from 6 to 7
+                  and offset changed from 2368 to 5056 (in bits) (by +2688 bits)
 
-           'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-           'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-           type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
-             in pointed to type 'struct OffloadDescriptor::VarExtra':
-               type size changed from 576 to 640 (in bits)
-               2 data member insertions:
-                 'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits)
-                 'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits)
-               4 data member changes (3 filtered):
-                'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
-                  in pointed to type 'struct CeanReadRanges':
-                    type size changed from 512 to 576 (in bits)
-                    1 data member insertion:
-                      'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits)
-                    7 data member changes:
-                     'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                     'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                     'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                     'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
-                and offset changed from 384 to 448 (in bits) (by +64 bits)
-                'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+              in pointed to type 'struct OffloadDescriptor::VarExtra':
+                type size changed from 576 to 640 (in bits)
+                2 data member insertions:
+                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits)
+                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits)
+                4 data member changes (3 filtered):
+                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                    in pointed to type 'struct CeanReadRanges':
+                      type size changed from 512 to 576 (in bits)
+                      1 data member insertion:
+                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits)
+                      7 data member changes:
+                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                  and offset changed from 384 to 448 (in bits) (by +64 bits)
+                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
 
-           'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-           'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-           'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
-           'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
+            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
     return type changed:
@@ -415,9 +415,9 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
-     type name changed from 'const char*[6]' to 'const char*[7]'
-     array type size changed from 384 to 448
-     array type subrange 1 changed length from 6 to 7
+      type name changed from 'const char*[6]' to 'const char*[7]'
+      array type size changed from 384 to 448
+      array type subrange 1 changed length from 6 to 7
 
 
 7 Removed function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
index 2f07f1a6..6ae2e3b0 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
@@ -93,9 +93,9 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
-     type name changed from 'const char*[6]' to 'const char*[7]'
-     array type size changed from 384 to 448
-     array type subrange 1 changed length from 6 to 7
+      type name changed from 'const char*[6]' to 'const char*[7]'
+      array type size changed from 384 to 448
+      array type subrange 1 changed length from 6 to 7
 
 
 7 Removed function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-filter/test36-report-0.txt b/tests/data/test-diff-filter/test36-report-0.txt
index 22e614d8..4b6b634d 100644
--- a/tests/data/test-diff-filter/test36-report-0.txt
+++ b/tests/data/test-diff-filter/test36-report-0.txt
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at test36-1-v1.c:6:1:
         type size hasn't changed
         1 data member change:
-         type of 'int S::m0' changed:
-           type name changed from 'int' to 'unsigned int'
-           type size hasn't changed
+          type of 'int S::m0' changed:
+            type name changed from 'int' to 'unsigned int'
+            type size hasn't changed
 
 
   [C] 'function int foo_2(S*)' at test36-2-v1.c:13:1 has some indirect sub-type changes:
@@ -18,13 +18,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at test36-2-v1.c:6:1:
         type size hasn't changed
         2 data member changes:
-         type of 'int S::m0' changed:
-           type name changed from 'int' to 'unsigned int'
-           type size hasn't changed
+          type of 'int S::m0' changed:
+            type name changed from 'int' to 'unsigned int'
+            type size hasn't changed
 
-         type of 'int S::m1' changed:
-           type name changed from 'int' to 'unsigned int'
-           type size hasn't changed
+          type of 'int S::m1' changed:
+            type name changed from 'int' to 'unsigned int'
+            type size hasn't changed
 
 
 
diff --git a/tests/data/test-diff-filter/test37-report-0.txt b/tests/data/test-diff-filter/test37-report-0.txt
index 4617a505..9680f32c 100644
--- a/tests/data/test-diff-filter/test37-report-0.txt
+++ b/tests/data/test-diff-filter/test37-report-0.txt
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct A' at test37-v1.cc:3:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-         type of 'int A::m0' changed:
-           type name changed from 'int' to 'char'
-           type size changed from 32 to 8 (in bits)
+          type of 'int A::m0' changed:
+            type name changed from 'int' to 'char'
+            type size changed from 32 to 8 (in bits)
 
 
   [C] 'function void f2(B&)' at test37-v1.cc:23:1 has some indirect sub-type changes:
@@ -18,9 +18,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct B' at test37-v1.cc:8:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-         type of 'int B::m0' changed:
-           type name changed from 'int' to 'char'
-           type size changed from 32 to 8 (in bits)
+          type of 'int B::m0' changed:
+            type name changed from 'int' to 'char'
+            type size changed from 32 to 8 (in bits)
 
 
   [C] 'function void f3(C&)' at test37-v1.cc:27:1 has some indirect sub-type changes:
@@ -28,9 +28,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct C' at test37-v1.cc:13:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-         type of 'int C::m0' changed:
-           type name changed from 'int' to 'char'
-           type size changed from 32 to 8 (in bits)
+          type of 'int C::m0' changed:
+            type name changed from 'int' to 'char'
+            type size changed from 32 to 8 (in bits)
 
 
 
diff --git a/tests/data/test-diff-filter/test39/test39-report-0.txt b/tests/data/test-diff-filter/test39/test39-report-0.txt
index c6bfa2b1..43de553f 100644
--- a/tests/data/test-diff-filter/test39/test39-report-0.txt
+++ b/tests/data/test-diff-filter/test39/test39-report-0.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct container_type' at test39.h:3:1:
         type size hasn't changed
         1 data member change:
-         type of 'opaque_type* container_type::s' changed:
-           in pointed to type 'struct opaque_type' at test39-b-v1.c:3:1:
-             type size changed from 32 to 64 (in bits)
-             1 data member insertion:
-               'char opaque_type::m1', at offset 32 (in bits) at test39-b-v1.c:6:1
+          type of 'opaque_type* container_type::s' changed:
+            in pointed to type 'struct opaque_type' at test39-b-v1.c:3:1:
+              type size changed from 32 to 64 (in bits)
+              1 data member insertion:
+                'char opaque_type::m1', at offset 32 (in bits) at test39-b-v1.c:6:1
 
 
   [C] 'function long long int foo2(container_type*)' at test39-c-v1.c:10:1 has some indirect sub-type changes:
@@ -20,11 +20,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct container_type' at test39.h:3:1:
         type size hasn't changed
         1 data member change:
-         type of 'opaque_type* container_type::s' changed:
-           in pointed to type 'struct opaque_type' at test39-c-v1.c:3:1:
-             type size changed from 32 to 64 (in bits)
-             1 data member insertion:
-               'unsigned char opaque_type::m1', at offset 32 (in bits) at test39-c-v1.c:6:1
+          type of 'opaque_type* container_type::s' changed:
+            in pointed to type 'struct opaque_type' at test39-c-v1.c:3:1:
+              type size changed from 32 to 64 (in bits)
+              1 data member insertion:
+                'unsigned char opaque_type::m1', at offset 32 (in bits) at test39-c-v1.c:6:1
 
 
 
diff --git a/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt b/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
index a660fd3e..ed10b78a 100644
--- a/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
+++ b/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S2' at test44-anonymous-data-member-v1.c:11:1:
         type size changed from 128 to 160 (in bits)
         2 data member changes:
-         anonymous data member at offset 32 (in bits) changed from:
-           struct {int b; float c;}
-         to:
-           struct {int b; float c; char e;}
+          anonymous data member at offset 32 (in bits) changed from:
+            struct {int b; float c;}
+          to:
+            struct {int b; float c; char e;}
 
-         'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt b/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
index c866a9d4..4ac353fb 100644
--- a/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
+++ b/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
@@ -6,10 +6,10 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct S2 at test-44-anonymous-data-member-v0.c:10:1' changed:
   type size changed from 128 to 160 (in bits)
   there are data member changes:
-   anonymous data member at offset 32 (in bits) changed from:
-     struct {int b; float c;}
-   to:
-     struct {int b; float c; char e;}
-   size changed from 64 to 96 (in bits) (by +32 bits)
-   'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits)
+    anonymous data member at offset 32 (in bits) changed from:
+      struct {int b; float c;}
+    to:
+      struct {int b; float c; char e;}
+    size changed from 64 to 96 (in bits) (by +32 bits)
+    'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
index fb67e43a..f65e09e0 100644
--- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
@@ -11,17 +11,17 @@
         in unqualified underlying type 'struct gl_h__gluint_vec___XUP' at gl_h.ads:57:1:
           type size hasn't changed
           1 data member change:
-           type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* gl_h__gluint_vec___XUP::P_BOUNDS' changed:
-             in pointed to type 'struct gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB' at gl_h.ads:57:1:
-               type size hasn't changed
-               2 data member changes:
-                type of 'integer gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB::LB0' changed:
-                  entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
-                  type size changed from 32 to 2147483647 (in bits)
+            type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* gl_h__gluint_vec___XUP::P_BOUNDS' changed:
+              in pointed to type 'struct gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB' at gl_h.ads:57:1:
+                type size hasn't changed
+                2 data member changes:
+                  type of 'integer gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB::LB0' changed:
+                    entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
+                    type size changed from 32 to 2147483647 (in bits)
 
-                type of 'integer gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB::UB0' changed:
-                  entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
-                  type size changed from 32 to 2147483647 (in bits)
+                  type of 'integer gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB::UB0' changed:
+                    entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
+                    type size changed from 32 to 2147483647 (in bits)
 
 
 
@@ -30,17 +30,17 @@
         in unqualified underlying type 'struct gtk__glarea__attributes_array___XUP' at gtk-glarea.ads:48:1:
           type size hasn't changed
           1 data member change:
-           type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB* gtk__glarea__attributes_array___XUP::P_BOUNDS' changed:
-             in pointed to type 'struct gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB':
-               type size hasn't changed
-               2 data member changes:
-                type of 'integer gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB::LB0' changed:
-                  entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
-                  type size changed from 32 to 2147483647 (in bits)
-
-                type of 'integer gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB::UB0' changed:
-                  entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
-                  type size changed from 32 to 2147483647 (in bits)
+            type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB* gtk__glarea__attributes_array___XUP::P_BOUNDS' changed:
+              in pointed to type 'struct gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB':
+                type size hasn't changed
+                2 data member changes:
+                  type of 'integer gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB::LB0' changed:
+                    entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
+                    type size changed from 32 to 2147483647 (in bits)
+
+                  type of 'integer gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB::UB0' changed:
+                    entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
+                    type size changed from 32 to 2147483647 (in bits)
 
 
 
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index d106bf9b..2dad2619 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -35,10 +35,10 @@
       1 data member insertion:
         'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* _FlatpakTransactionClass::end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
       4 data member changes (3 filtered):
-       'typedef gboolean (FlatpakTransaction*)* _FlatpakTransactionClass::ready' offset changed from 1408 to 1472 (in bits) (by +64 bits)
-       'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransactionRemoteReason, const char*, const char*, const char*)* _FlatpakTransactionClass::add_new_remote' offset changed from 1472 to 1536 (in bits) (by +64 bits)
-       'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* _FlatpakTransactionClass::run' offset changed from 1536 to 1600 (in bits) (by +64 bits)
-       'gpointer _FlatpakTransactionClass::padding[9]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*)* _FlatpakTransactionClass::ready' offset changed from 1408 to 1472 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransactionRemoteReason, const char*, const char*, const char*)* _FlatpakTransactionClass::add_new_remote' offset changed from 1472 to 1536 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* _FlatpakTransactionClass::run' offset changed from 1536 to 1600 (in bits) (by +64 bits)
+        'gpointer _FlatpakTransactionClass::padding[9]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
 
 
   3 added types unreachable from any public interface:
diff --git a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
index 0c097b6b..f6f4cd98 100644
--- a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
@@ -16,73 +16,73 @@
           in pointed to type 'struct _IceConn' at ICEconn.h:131:1:
             type size hasn't changed
             2 data member changes (3 filtered):
-             type of 'IceListenObj _IceConn::listen_obj' changed:
-               underlying type '_IceListenObj*' changed:
-                 in pointed to type 'struct _IceListenObj' at ICElibint.h:120:1:
-                   type size hasn't changed
-                   1 data member change:
-                    type of '_XtransConnInfo* _IceListenObj::trans_conn' changed:
-                      in pointed to type 'struct _XtransConnInfo' at Xtransint.h:136:1:
-                        type size changed from 640 to 768 (in bits)
-                        2 data member insertions:
-                          '_XtransConnFd* _XtransConnInfo::recv_fds', at offset 640 (in bits) at Xtransint.h:148:1
-                          '_XtransConnFd* _XtransConnInfo::send_fds', at offset 704 (in bits) at Xtransint.h:149:1
-                        1 data member change:
-                         type of '_Xtransport* _XtransConnInfo::transptr' changed:
-                           in pointed to type 'struct _Xtransport' at Xtransint.h:158:1:
-                             type size hasn't changed
-                             3 data member changes (16 filtered):
-                              type of 'typedef XtransConnInfo (_Xtransport*, char*, char*, char*)* _Xtransport::OpenCOTSClient' changed:
-                                in pointed to type 'function type typedef XtransConnInfo (_Xtransport*, char*, char*, char*)':
-                                  parameter 2 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-                                  parameter 3 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-                                  parameter 4 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-
-                              type of 'typedef XtransConnInfo (_Xtransport*, char*, char*, char*)* _Xtransport::OpenCOTSServer' changed:
-                                in pointed to type 'function type typedef XtransConnInfo (_Xtransport*, char*, char*, char*)':
-                                  parameter 2 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-                                  parameter 3 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-                                  parameter 4 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-
-                              type of 'typedef XtransConnInfo (_Xtransport*, char*, char*, char*)* _Xtransport::OpenCLTSServer' changed:
-                                in pointed to type 'function type typedef XtransConnInfo (_Xtransport*, char*, char*, char*)':
-                                  parameter 2 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-                                  parameter 3 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-                                  parameter 4 of type 'char*' changed:
-                                    in pointed to type 'char':
-                                      entity changed from 'char' to 'const char'
-                                      type size hasn't changed
-
-
-
-
-             type of '_IcePingWait* _IceConn::ping_waits' changed:
-               in pointed to type 'struct _IcePingWait' at ICEconn.h:48:1:
-                 entity changed from 'struct _IcePingWait' to compatible type 'typedef _IcePingWait' at ICEconn.h:48:1
+              type of 'IceListenObj _IceConn::listen_obj' changed:
+                underlying type '_IceListenObj*' changed:
+                  in pointed to type 'struct _IceListenObj' at ICElibint.h:120:1:
+                    type size hasn't changed
+                    1 data member change:
+                      type of '_XtransConnInfo* _IceListenObj::trans_conn' changed:
+                        in pointed to type 'struct _XtransConnInfo' at Xtransint.h:136:1:
+                          type size changed from 640 to 768 (in bits)
+                          2 data member insertions:
+                            '_XtransConnFd* _XtransConnInfo::recv_fds', at offset 640 (in bits) at Xtransint.h:148:1
+                            '_XtransConnFd* _XtransConnInfo::send_fds', at offset 704 (in bits) at Xtransint.h:149:1
+                          1 data member change:
+                            type of '_Xtransport* _XtransConnInfo::transptr' changed:
+                              in pointed to type 'struct _Xtransport' at Xtransint.h:158:1:
+                                type size hasn't changed
+                                3 data member changes (16 filtered):
+                                  type of 'typedef XtransConnInfo (_Xtransport*, char*, char*, char*)* _Xtransport::OpenCOTSClient' changed:
+                                    in pointed to type 'function type typedef XtransConnInfo (_Xtransport*, char*, char*, char*)':
+                                      parameter 2 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+                                      parameter 3 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+                                      parameter 4 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+
+                                  type of 'typedef XtransConnInfo (_Xtransport*, char*, char*, char*)* _Xtransport::OpenCOTSServer' changed:
+                                    in pointed to type 'function type typedef XtransConnInfo (_Xtransport*, char*, char*, char*)':
+                                      parameter 2 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+                                      parameter 3 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+                                      parameter 4 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+
+                                  type of 'typedef XtransConnInfo (_Xtransport*, char*, char*, char*)* _Xtransport::OpenCLTSServer' changed:
+                                    in pointed to type 'function type typedef XtransConnInfo (_Xtransport*, char*, char*, char*)':
+                                      parameter 2 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+                                      parameter 3 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+                                      parameter 4 of type 'char*' changed:
+                                        in pointed to type 'char':
+                                          entity changed from 'char' to 'const char'
+                                          type size hasn't changed
+
+
+
+
+              type of '_IcePingWait* _IceConn::ping_waits' changed:
+                in pointed to type 'struct _IcePingWait' at ICEconn.h:48:1:
+                  entity changed from 'struct _IcePingWait' to compatible type 'typedef _IcePingWait' at ICEconn.h:48:1
 
 
 
@@ -94,22 +94,22 @@
 
     [C] 'char* _IceAuthNames[1]' was changed to 'const char* _IceAuthNames[1]' at globals.h:37:1:
       type of variable changed:
-       array element type 'char*' changed: 
-         in pointed to type 'char':
-           entity changed from 'char' to 'const char'
-           type size hasn't changed
-       type name changed from 'char*[1]' to 'const char*[1]'
-       type size hasn't changed
+        array element type 'char*' changed: 
+          in pointed to type 'char':
+            entity changed from 'char' to 'const char'
+            type size hasn't changed
+        type name changed from 'char*[1]' to 'const char*[1]'
+        type size hasn't changed
 
     [C] '_IceWatchProc* _IceWatchProcs' was changed at globals.h:39:1:
       type of variable changed:
-       in pointed to type 'struct _IceWatchProc' at ICElibint.h:322:1:
-         entity changed from 'struct _IceWatchProc' to compatible type 'typedef _IceWatchProc' at ICElibint.h:322:1
-           type size hasn't changed
-           1 data member changes (2 filtered):
-            type of '_IceWatchedConnection* _IceWatchProc::watched_connections' changed:
-              in pointed to type 'struct _IceWatchedConnection' at ICElibint.h:315:1:
-                entity changed from 'struct _IceWatchedConnection' to compatible type 'typedef _IceWatchedConnection' at ICElibint.h:315:1
+        in pointed to type 'struct _IceWatchProc' at ICElibint.h:322:1:
+          entity changed from 'struct _IceWatchProc' to compatible type 'typedef _IceWatchProc' at ICElibint.h:322:1
+            type size hasn't changed
+            1 data member changes (2 filtered):
+              type of '_IceWatchedConnection* _IceWatchProc::watched_connections' changed:
+                in pointed to type 'struct _IceWatchedConnection' at ICElibint.h:315:1:
+                  entity changed from 'struct _IceWatchedConnection' to compatible type 'typedef _IceWatchedConnection' at ICElibint.h:315:1
 
 
 
diff --git a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
index 23b12adf..c4f420fa 100644
--- a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
+++ b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
@@ -10,30 +10,30 @@
           underlying type 'union {uint8_t type; cdio_dvd_physical_t physical; cdio_dvd_copyright_t copyright; cdio_dvd_disckey_t disckey; cdio_dvd_bca_t bca; cdio_dvd_manufact_t manufact;}' at dvd.h:122:1 changed:
             type size hasn't changed
             2 data member changes:
-             type of 'cdio_dvd_disckey_t disckey' changed:
-               underlying type 'struct cdio_dvd_disckey' at dvd.h:100:1 changed:
-                 type size hasn't changed
-                 1 data member change:
-                  'unsigned int cdio_dvd_disckey::agid' offset changed from 30 to 22 (in bits) (by -8 bits)
-
-             type of 'cdio_dvd_physical_t physical' changed:
-               underlying type 'struct cdio_dvd_physical' at dvd.h:86:1 changed:
-                 type size hasn't changed
-                 1 data member change:
-                  type of 'cdio_dvd_layer_t cdio_dvd_physical::layer[4]' changed:
-                    array element type 'typedef cdio_dvd_layer_t' changed: 
-                      underlying type 'struct cdio_dvd_layer' at dvd.h:65:1 changed:
-                        type size hasn't changed
-                        8 data member changes:
-                         'unsigned int cdio_dvd_layer::track_density' offset changed from 21 to 5 (in bits) (by -16 bits)
-                         'unsigned int cdio_dvd_layer::bca' offset changed from 24 to 0 (in bits) (by -24 bits)
-                         'unsigned int cdio_dvd_layer::disc_size' offset changed from 24 to 16 (in bits) (by -8 bits)
-                         'unsigned int cdio_dvd_layer::linear_density' offset changed from 25 to 1 (in bits) (by -24 bits)
-                         'unsigned int cdio_dvd_layer::nlayers' offset changed from 25 to 9 (in bits) (by -16 bits)
-                         'unsigned int cdio_dvd_layer::track_path' offset changed from 27 to 11 (in bits) (by -16 bits)
-                         'unsigned int cdio_dvd_layer::layer_type' offset changed from 28 to 12 (in bits) (by -16 bits)
-                         'unsigned int cdio_dvd_layer::min_rate' offset changed from 28 to 20 (in bits) (by -8 bits)
-                    type size hasn't changed
+              type of 'cdio_dvd_disckey_t disckey' changed:
+                underlying type 'struct cdio_dvd_disckey' at dvd.h:100:1 changed:
+                  type size hasn't changed
+                  1 data member change:
+                    'unsigned int cdio_dvd_disckey::agid' offset changed from 30 to 22 (in bits) (by -8 bits)
+
+              type of 'cdio_dvd_physical_t physical' changed:
+                underlying type 'struct cdio_dvd_physical' at dvd.h:86:1 changed:
+                  type size hasn't changed
+                  1 data member change:
+                    type of 'cdio_dvd_layer_t cdio_dvd_physical::layer[4]' changed:
+                      array element type 'typedef cdio_dvd_layer_t' changed: 
+                        underlying type 'struct cdio_dvd_layer' at dvd.h:65:1 changed:
+                          type size hasn't changed
+                          8 data member changes:
+                            'unsigned int cdio_dvd_layer::track_density' offset changed from 21 to 5 (in bits) (by -16 bits)
+                            'unsigned int cdio_dvd_layer::bca' offset changed from 24 to 0 (in bits) (by -24 bits)
+                            'unsigned int cdio_dvd_layer::disc_size' offset changed from 24 to 16 (in bits) (by -8 bits)
+                            'unsigned int cdio_dvd_layer::linear_density' offset changed from 25 to 1 (in bits) (by -24 bits)
+                            'unsigned int cdio_dvd_layer::nlayers' offset changed from 25 to 9 (in bits) (by -16 bits)
+                            'unsigned int cdio_dvd_layer::track_path' offset changed from 27 to 11 (in bits) (by -16 bits)
+                            'unsigned int cdio_dvd_layer::layer_type' offset changed from 28 to 12 (in bits) (by -16 bits)
+                            'unsigned int cdio_dvd_layer::min_rate' offset changed from 28 to 20 (in bits) (by -8 bits)
+                      type size hasn't changed
 
 
 
diff --git a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
index 873a84cd..1cd20374 100644
--- a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
+++ b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
@@ -18,50 +18,50 @@
           in unqualified underlying type 'struct sigc::connection':
             type size hasn't changed
             1 data member change:
-             type of 'sigc::slot_base* sigc::connection::slot_' changed:
-               in pointed to type 'class sigc::slot_base':
-                 type size hasn't changed
-                 1 data member change:
-                  type of 'sigc::slot_base::rep_type* sigc::slot_base::rep_' changed:
-                    in pointed to type 'typedef sigc::slot_base::rep_type':
-                      underlying type 'struct sigc::internal::slot_rep' changed:
-                        type size hasn't changed
-                        1 base class change:
-                          'struct sigc::trackable' changed:
-                            type size hasn't changed
-                            1 data member change:
-                             type of 'sigc::internal::trackable_callback_list* sigc::trackable::callback_list_' changed:
-                               in pointed to type 'struct sigc::internal::trackable_callback_list':
-                                 type size changed from 192 to 256 (in bits)
-                                 2 data member changes:
-                                  type of 'sigc::internal::trackable_callback_list::callback_list sigc::internal::trackable_callback_list::callbacks_' changed:
-                                    underlying type 'class std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
-                                      type name changed from 'std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
-                                      type size changed from 128 to 192 (in bits)
-                                      1 base class change:
-                                        'class std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
-                                          type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
+              type of 'sigc::slot_base* sigc::connection::slot_' changed:
+                in pointed to type 'class sigc::slot_base':
+                  type size hasn't changed
+                  1 data member change:
+                    type of 'sigc::slot_base::rep_type* sigc::slot_base::rep_' changed:
+                      in pointed to type 'typedef sigc::slot_base::rep_type':
+                        underlying type 'struct sigc::internal::slot_rep' changed:
+                          type size hasn't changed
+                          1 base class change:
+                            'struct sigc::trackable' changed:
+                              type size hasn't changed
+                              1 data member change:
+                                type of 'sigc::internal::trackable_callback_list* sigc::trackable::callback_list_' changed:
+                                  in pointed to type 'struct sigc::internal::trackable_callback_list':
+                                    type size changed from 192 to 256 (in bits)
+                                    2 data member changes:
+                                      type of 'sigc::internal::trackable_callback_list::callback_list sigc::internal::trackable_callback_list::callbacks_' changed:
+                                        underlying type 'class std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
+                                          type name changed from 'std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                           type size changed from 128 to 192 (in bits)
-                                          1 data member change:
-                                           type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed:
-                                             type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl'
-                                             type size changed from 128 to 192 (in bits)
-                                             1 data member change:
-                                              type of 'std::__detail::_List_node_base std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed:
-                                                type name changed from 'std::__detail::_List_node_base' to 'std::_List_node<long unsigned int>'
-                                                type size changed from 128 to 192 (in bits)
-                                                1 base class insertion:
-                                                  struct std::__detail::_List_node_base
-                                                2 data member deletions:
-                                                  'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits)
-                                                  'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits)
-                                                1 data member insertion:
-                                                  'unsigned long int std::_List_node<long unsigned int>::_M_data', at offset 128 (in bits)
-                                              and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node'
-                                           and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl'
+                                          1 base class change:
+                                            'class std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
+                                              type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
+                                              type size changed from 128 to 192 (in bits)
+                                              1 data member change:
+                                                type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed:
+                                                  type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl'
+                                                  type size changed from 128 to 192 (in bits)
+                                                  1 data member change:
+                                                    type of 'std::__detail::_List_node_base std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed:
+                                                      type name changed from 'std::__detail::_List_node_base' to 'std::_List_node<long unsigned int>'
+                                                      type size changed from 128 to 192 (in bits)
+                                                      1 base class insertion:
+                                                        struct std::__detail::_List_node_base
+                                                      2 data member deletions:
+                                                        'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits)
+                                                        'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits)
+                                                      1 data member insertion:
+                                                        'unsigned long int std::_List_node<long unsigned int>::_M_data', at offset 128 (in bits)
+                                                    and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node'
+                                                and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl'
 
 
-                                  'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
+                                      'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
 
 
 
@@ -72,20 +72,20 @@
         in pointed to type 'struct sigc::internal::signal_impl':
           type size changed from 192 to 256 (in bits)
           1 data member change:
-           type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > sigc::internal::signal_impl::slots_' changed:
-             type name changed from 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >'
-             type size changed from 128 to 192 (in bits)
-             1 base class change:
-               'class std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' changed:
-                 type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >'
-                 type size changed from 128 to 192 (in bits)
-                 1 data member change:
-                  type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed:
-                    type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl'
-                    type size changed from 128 to 192 (in bits)
-                    1 data member change:
-                     name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node'
-                  and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl'
+            type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > sigc::internal::signal_impl::slots_' changed:
+              type name changed from 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >'
+              type size changed from 128 to 192 (in bits)
+              1 base class change:
+                'class std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' changed:
+                  type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >'
+                  type size changed from 128 to 192 (in bits)
+                  1 data member change:
+                    type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed:
+                      type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl'
+                      type size changed from 128 to 192 (in bits)
+                      1 data member change:
+                        name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node'
+                    and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl'
 
 
 
diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index a0cc67c2..b23de5ae 100644
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -45,19 +45,19 @@
             1 data member insertion:
               'SSLAuthType SSLCipherSuiteInfoStr::authType', at offset 736 (in bits) at sslt.h:250:1
             1 data member changes (3 filtered):
-             type of 'SSLAuthType SSLCipherSuiteInfoStr::authAlgorithm' changed:
-               underlying type 'enum __anonymous_enum__' at sslt.h:87:1 changed:
-                 type size hasn't changed
-                 1 enumerator deletion:
-                   '__anonymous_enum__::ssl_auth_rsa' value '1'
-                 7 enumerator insertions:
-                   '__anonymous_enum__::ssl_auth_rsa_decrypt' value '1'
-                   '__anonymous_enum__::ssl_auth_ecdh_rsa' value '5'
-                   '__anonymous_enum__::ssl_auth_ecdh_ecdsa' value '6'
-                   '__anonymous_enum__::ssl_auth_rsa_sign' value '7'
-                   '__anonymous_enum__::ssl_auth_rsa_pss' value '8'
-                   '__anonymous_enum__::ssl_auth_psk' value '9'
-                   '__anonymous_enum__::ssl_auth_size' value '10'
+              type of 'SSLAuthType SSLCipherSuiteInfoStr::authAlgorithm' changed:
+                underlying type 'enum __anonymous_enum__' at sslt.h:87:1 changed:
+                  type size hasn't changed
+                  1 enumerator deletion:
+                    '__anonymous_enum__::ssl_auth_rsa' value '1'
+                  7 enumerator insertions:
+                    '__anonymous_enum__::ssl_auth_rsa_decrypt' value '1'
+                    '__anonymous_enum__::ssl_auth_ecdh_rsa' value '5'
+                    '__anonymous_enum__::ssl_auth_ecdh_ecdsa' value '6'
+                    '__anonymous_enum__::ssl_auth_rsa_sign' value '7'
+                    '__anonymous_enum__::ssl_auth_rsa_pss' value '8'
+                    '__anonymous_enum__::ssl_auth_psk' value '9'
+                    '__anonymous_enum__::ssl_auth_size' value '10'
 
 
 
@@ -67,9 +67,9 @@
     [C] 'const PRUint16 SSL_ImplementedCiphers[74]' was changed to 'const PRUint16 SSL_ImplementedCiphers[69]' at sslenum.c:51:1:
       size of symbol changed from 148 to 138
       type of variable changed:
-       type name changed from 'PRUint16[74]' to 'const PRUint16[69]'
-       array type size changed from 1184 to 1104
-       array type subrange 1 changed length from 74 to 69
+        type name changed from 'PRUint16[74]' to 'const PRUint16[69]'
+        array type size changed from 1184 to 1104
+        array type subrange 1 changed length from 74 to 69
 
 
 ================ end of changes of 'libssl3.so'===============
@@ -86,33 +86,33 @@
           underlying type 'struct NSSCMSContentInfoStr' at cmst.h:131:1 changed:
             type size hasn't changed
             1 data member changes (2 filtered):
-             type of 'NSSCMSContent NSSCMSContentInfoStr::content' changed:
-               underlying type 'union NSSCMSContentUnion' at cmst.h:118:1 changed:
-                 type size hasn't changed
-                 1 data member changes (3 filtered):
-                  type of 'NSSCMSEncryptedData* NSSCMSContentUnion::encryptedData' changed:
-                    in pointed to type 'typedef NSSCMSEncryptedData' at cmst.h:65:1:
-                      underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:468:1 changed:
-                        type size hasn't changed
-                        1 data member changes (1 filtered):
-                         type of 'NSSCMSAttribute** NSSCMSEncryptedDataStr::unprotectedAttr' changed:
-                           in pointed to type 'NSSCMSAttribute*':
-                             in pointed to type 'typedef NSSCMSAttribute' at cmst.h:69:1:
-                               underlying type 'struct NSSCMSAttributeStr' at cmst.h:487:1 changed:
-                                 type size hasn't changed
-                                 1 data member change:
-                                  type of 'SECOidData* NSSCMSAttributeStr::typeTag' changed:
-                                    in pointed to type 'typedef SECOidData' at secoidt.h:16:1:
-                                      underlying type 'struct SECOidDataStr' at secoidt.h:500:1 changed:
-                                        type size hasn't changed
-                                        1 data member change:
-                                         type of 'SECOidTag SECOidDataStr::offset' changed:
-                                           underlying type 'enum __anonymous_enum__1' at secoidt.h:34:1 changed:
-                                             type size hasn't changed
-                                             1 enumerator insertion:
-                                               '__anonymous_enum__1::SEC_OID_TLS_ECDHE_PSK' value '347'
-                                             1 enumerator change:
-                                               '__anonymous_enum__1::SEC_OID_TOTAL' from value '347' to '348' at secoidt.h:34:1
+              type of 'NSSCMSContent NSSCMSContentInfoStr::content' changed:
+                underlying type 'union NSSCMSContentUnion' at cmst.h:118:1 changed:
+                  type size hasn't changed
+                  1 data member changes (3 filtered):
+                    type of 'NSSCMSEncryptedData* NSSCMSContentUnion::encryptedData' changed:
+                      in pointed to type 'typedef NSSCMSEncryptedData' at cmst.h:65:1:
+                        underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:468:1 changed:
+                          type size hasn't changed
+                          1 data member changes (1 filtered):
+                            type of 'NSSCMSAttribute** NSSCMSEncryptedDataStr::unprotectedAttr' changed:
+                              in pointed to type 'NSSCMSAttribute*':
+                                in pointed to type 'typedef NSSCMSAttribute' at cmst.h:69:1:
+                                  underlying type 'struct NSSCMSAttributeStr' at cmst.h:487:1 changed:
+                                    type size hasn't changed
+                                    1 data member change:
+                                      type of 'SECOidData* NSSCMSAttributeStr::typeTag' changed:
+                                        in pointed to type 'typedef SECOidData' at secoidt.h:16:1:
+                                          underlying type 'struct SECOidDataStr' at secoidt.h:500:1 changed:
+                                            type size hasn't changed
+                                            1 data member change:
+                                              type of 'SECOidTag SECOidDataStr::offset' changed:
+                                                underlying type 'enum __anonymous_enum__1' at secoidt.h:34:1 changed:
+                                                  type size hasn't changed
+                                                  1 enumerator insertion:
+                                                    '__anonymous_enum__1::SEC_OID_TLS_ECDHE_PSK' value '347'
+                                                  1 enumerator change:
+                                                    '__anonymous_enum__1::SEC_OID_TOTAL' from value '347' to '348' at secoidt.h:34:1
 
 
 
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index c247ef95..163c176c 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -25,40 +25,40 @@
           underlying type 'struct QXLInstance' at spice.h:259:1 changed:
             type size hasn't changed
             1 data member change:
-             type of 'QXLState* QXLInstance::st' changed:
-               in pointed to type 'typedef QXLState' at spice-qxl.h:35:1:
-                 underlying type 'struct QXLState' at reds.h:93:1 changed:
-                   type size hasn't changed
-                   1 data member change:
-                    type of 'RedDispatcher* QXLState::dispatcher' changed:
-                      in pointed to type 'typedef RedDispatcher' at red_worker.h:87:1:
-                        underlying type 'struct RedDispatcher' at red_dispatcher.c:53:1 changed:
-                          type size changed from 3264 to 3328 (in bits)
-                          13 data member changes:
-                           type of 'QXLInstance* RedDispatcher::qxl' changed:
-                             in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
-                               underlying type 'struct QXLInstance' changed; details are being reported
-
-                           type of 'Dispatcher RedDispatcher::dispatcher' changed:
-                             underlying type 'struct Dispatcher' at dispatcher.h:22:1 changed:
-                               type size changed from 960 to 1024 (in bits)
-                               1 data member insertion:
-                                 'dispatcher_handle_any_message Dispatcher::any_handler', at offset 960 (in bits) at dispatcher.h:56:1
-
-                           'pthread_t RedDispatcher::worker_thread' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-                           'uint32_t RedDispatcher::pending' offset changed from 2112 to 2176 (in bits) (by +64 bits)
-                           'int RedDispatcher::primary_active' offset changed from 2144 to 2208 (in bits) (by +64 bits)
-                           'int RedDispatcher::x_res' offset changed from 2176 to 2240 (in bits) (by +64 bits)
-                           'int RedDispatcher::y_res' offset changed from 2208 to 2272 (in bits) (by +64 bits)
-                           'int RedDispatcher::use_hardware_cursor' offset changed from 2240 to 2304 (in bits) (by +64 bits)
-                           type of 'RedDispatcher* RedDispatcher::next' changed:
-                             in pointed to type 'typedef RedDispatcher' at red_worker.h:87:1:
-                               underlying type 'struct RedDispatcher' changed; details are being reported
-                           and offset changed from 2304 to 2368 (in bits) (by +64 bits)
-                           'Ring RedDispatcher::async_commands' offset changed from 2368 to 2432 (in bits) (by +64 bits)
-                           'pthread_mutex_t RedDispatcher::async_lock' offset changed from 2496 to 2560 (in bits) (by +64 bits)
-                           'QXLDevSurfaceCreate RedDispatcher::surface_create' offset changed from 2816 to 2880 (in bits) (by +64 bits)
-                           'unsigned int RedDispatcher::max_monitors' offset changed from 3200 to 3264 (in bits) (by +64 bits)
+              type of 'QXLState* QXLInstance::st' changed:
+                in pointed to type 'typedef QXLState' at spice-qxl.h:35:1:
+                  underlying type 'struct QXLState' at reds.h:93:1 changed:
+                    type size hasn't changed
+                    1 data member change:
+                      type of 'RedDispatcher* QXLState::dispatcher' changed:
+                        in pointed to type 'typedef RedDispatcher' at red_worker.h:87:1:
+                          underlying type 'struct RedDispatcher' at red_dispatcher.c:53:1 changed:
+                            type size changed from 3264 to 3328 (in bits)
+                            13 data member changes:
+                              type of 'QXLInstance* RedDispatcher::qxl' changed:
+                                in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
+                                  underlying type 'struct QXLInstance' changed; details are being reported
+
+                              type of 'Dispatcher RedDispatcher::dispatcher' changed:
+                                underlying type 'struct Dispatcher' at dispatcher.h:22:1 changed:
+                                  type size changed from 960 to 1024 (in bits)
+                                  1 data member insertion:
+                                    'dispatcher_handle_any_message Dispatcher::any_handler', at offset 960 (in bits) at dispatcher.h:56:1
+
+                              'pthread_t RedDispatcher::worker_thread' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+                              'uint32_t RedDispatcher::pending' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+                              'int RedDispatcher::primary_active' offset changed from 2144 to 2208 (in bits) (by +64 bits)
+                              'int RedDispatcher::x_res' offset changed from 2176 to 2240 (in bits) (by +64 bits)
+                              'int RedDispatcher::y_res' offset changed from 2208 to 2272 (in bits) (by +64 bits)
+                              'int RedDispatcher::use_hardware_cursor' offset changed from 2240 to 2304 (in bits) (by +64 bits)
+                              type of 'RedDispatcher* RedDispatcher::next' changed:
+                                in pointed to type 'typedef RedDispatcher' at red_worker.h:87:1:
+                                  underlying type 'struct RedDispatcher' changed; details are being reported
+                              and offset changed from 2304 to 2368 (in bits) (by +64 bits)
+                              'Ring RedDispatcher::async_commands' offset changed from 2368 to 2432 (in bits) (by +64 bits)
+                              'pthread_mutex_t RedDispatcher::async_lock' offset changed from 2496 to 2560 (in bits) (by +64 bits)
+                              'QXLDevSurfaceCreate RedDispatcher::surface_create' offset changed from 2816 to 2880 (in bits) (by +64 bits)
+                              'unsigned int RedDispatcher::max_monitors' offset changed from 3200 to 3264 (in bits) (by +64 bits)
 
 
 
@@ -164,269 +164,269 @@
           underlying type 'struct RedsState' at reds-private.h:127:1 changed:
             type size hasn't changed
             2 data member changes (1 filtered):
-             type of 'VDIPortState RedsState::agent_state' changed:
-               underlying type 'struct VDIPortState' at reds-private.h:46:1 changed:
-                 type size hasn't changed
-                 1 data member change:
-                  type of 'SpiceCharDeviceState* VDIPortState::base' changed:
-                    in pointed to type 'typedef SpiceCharDeviceState' at spice-char.h:34:1:
-                      underlying type 'struct SpiceCharDeviceState' at char_device.c:47:1 changed:
-                        type size changed from 1536 to 1600 (in bits)
-                        1 data member insertion:
-                          'uint64_t SpiceCharDeviceState::cur_pool_size', at offset 384 (in bits) at char_device.c:57:1
-                        12 data member changes:
-                         'SpiceCharDeviceWriteBuffer* SpiceCharDeviceState::cur_write_buf' offset changed from 384 to 448 (in bits) (by +64 bits)
-                         'uint8_t* SpiceCharDeviceState::cur_write_buf_pos' offset changed from 448 to 512 (in bits) (by +64 bits)
-                         'SpiceTimer* SpiceCharDeviceState::write_to_dev_timer' offset changed from 512 to 576 (in bits) (by +64 bits)
-                         'uint64_t SpiceCharDeviceState::num_self_tokens' offset changed from 576 to 640 (in bits) (by +64 bits)
-                         'Ring SpiceCharDeviceState::clients' offset changed from 640 to 704 (in bits) (by +64 bits)
-                         'uint32_t SpiceCharDeviceState::num_clients' offset changed from 768 to 832 (in bits) (by +64 bits)
-                         'uint64_t SpiceCharDeviceState::client_tokens_interval' offset changed from 832 to 896 (in bits) (by +64 bits)
-                         type of 'SpiceCharDeviceInstance* SpiceCharDeviceState::sin' changed:
-                           in pointed to type 'typedef SpiceCharDeviceInstance' at spice-char.h:33:1:
-                             underlying type 'struct SpiceCharDeviceInstance' at spice.h:416:1 changed:
-                               type size hasn't changed
-                               1 data member change:
-                                type of 'SpiceCharDeviceState* SpiceCharDeviceInstance::st' changed:
-                                  in pointed to type 'typedef SpiceCharDeviceState' at spice-char.h:34:1:
-                                    underlying type 'struct SpiceCharDeviceState' changed; details are being reported
-
-                         and offset changed from 896 to 960 (in bits) (by +64 bits)
-                         'int SpiceCharDeviceState::during_read_from_device' offset changed from 960 to 1024 (in bits) (by +64 bits)
-                         'int SpiceCharDeviceState::during_write_to_device' offset changed from 992 to 1056 (in bits) (by +64 bits)
-                         type of 'SpiceCharDeviceCallbacks SpiceCharDeviceState::cbs' changed:
-                           underlying type 'struct SpiceCharDeviceCallbacks' at char_device.h:81:1 changed:
-                             type size hasn't changed
-                             1 data member change:
-                              type of 'SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)* SpiceCharDeviceCallbacks::read_one_msg_from_device' changed:
-                                in pointed to type 'function type SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)':
-                                  parameter 1 of type 'SpiceCharDeviceInstance*' has sub-type changes:
-                                    pointed to type 'typedef SpiceCharDeviceInstance' changed at spice.h:399:1, as reported earlier
-
-                         and offset changed from 1024 to 1088 (in bits) (by +64 bits)
-                         'void* SpiceCharDeviceState::opaque' offset changed from 1472 to 1536 (in bits) (by +64 bits)
-
-                 no data member changes (3 filtered);
-
-             type of 'MainChannel* RedsState::main_channel' changed:
-               in pointed to type 'typedef MainChannel' at main_channel.h:48:1:
-                 underlying type 'struct MainChannel' at main_channel.h:36:1 changed:
-                   type size hasn't changed
-                   1 data member change:
-                    type of 'RedChannel MainChannel::base' changed:
-                      underlying type 'struct RedChannel' at red_channel.h:303:1 changed:
-                        type size hasn't changed
-                        2 data member changes (1 filtered):
-                         type of 'ChannelCbs RedChannel::channel_cbs' changed:
-                           underlying type 'struct {channel_configure_socket_proc config_socket; channel_disconnect_proc on_disconnect; channel_send_pipe_item_proc send_item; channel_hold_pipe_item_proc hold_item; channel_release_pipe_item_proc release_item; channel_alloc_msg_recv_buf_proc alloc_recv_buf; channel_release_msg_recv_buf_proc release_recv_buf; channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark; channel_handle_migrate_data_proc handle_migrate_data; channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial;}' at red_channel.h:195:1 changed:
-                             type size hasn't changed
-                             10 data member changes:
-                              type of 'channel_configure_socket_proc config_socket' changed:
-                                underlying type 'int (RedChannelClient*)*' changed:
-                                  in pointed to type 'function type int (RedChannelClient*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      in pointed to type 'typedef RedChannelClient' at red_channel.h:131:1:
-                                        underlying type 'struct RedChannelClient' at red_channel.h:247:1 changed:
-                                          type size hasn't changed
-                                          2 data member changes (2 filtered):
-                                           type of 'RedChannel* RedChannelClient::channel' changed:
-                                             in pointed to type 'typedef RedChannel' at red_channel.h:130:1:
-                                               underlying type 'struct RedChannel' changed; details are being reported
-
-                                           type of 'RedsStream* RedChannelClient::stream' changed:
-                                             in pointed to type 'typedef RedsStream' at reds_stream.h:31:1:
-                                               underlying type 'struct RedsStream' at reds.h:68:1 changed:
-                                                 type size changed from 1280 to 256 (in bits)
-                                                 5 data member deletions:
-                                                   'RedsSASL RedsStream::sasl', at offset 256 (in bits) at reds.h:78:1
-                                                   'SpiceChannelEventInfo* RedsStream::info', at offset 1024 (in bits) at reds.h:85:1
-                                                   'typedef ssize_t (RedsStream*, void*, typedef size_t)* RedsStream::read', at offset 1088 (in bits) at reds.h:88:1
-                                                   'typedef ssize_t (RedsStream*, void*, typedef size_t)* RedsStream::write', at offset 1152 (in bits) at reds.h:89:1
-                                                   'typedef ssize_t (RedsStream*, const iovec*, int)* RedsStream::writev', at offset 1216 (in bits) at reds.h:90:1
-                                                 1 data member change:
-                                                  type of 'SSL* RedsStream::ssl' changed:
-                                                    in pointed to type 'typedef SSL' at reds_stream.h:32:1:
-                                                      typedef name changed from SSL to RedsStreamPrivate at reds_stream.h:32:1
-                                                      underlying type 'struct ssl_st' at ssl.h:1065:1 changed:
-                                                        type name changed from 'ssl_st' to 'RedsStreamPrivate'
-                                                        type size changed from 5504 to 0 (in bits)
-                                                        94 data member deletions:
-                                                          'int ssl_st::version', at offset 0 (in bits) at ssl.h:1070:1
-                                                          'int ssl_st::type', at offset 32 (in bits) at ssl.h:1071:1
-                                                          'const SSL_METHOD* ssl_st::method', at offset 64 (in bits) at ssl.h:1073:1
-                                                          'BIO* ssl_st::rbio', at offset 128 (in bits) at ssl.h:1080:1
-                                                          'BIO* ssl_st::wbio', at offset 192 (in bits) at ssl.h:1081:1
-                                                          'BIO* ssl_st::bbio', at offset 256 (in bits) at ssl.h:1082:1
-                                                          'int ssl_st::rwstate', at offset 320 (in bits) at ssl.h:1093:1
-                                                          'int ssl_st::in_handshake', at offset 352 (in bits) at ssl.h:1096:1
-                                                          'int (SSL*)* ssl_st::handshake_func', at offset 384 (in bits) at ssl.h:1097:1
-                                                          'int ssl_st::server', at offset 448 (in bits) at ssl.h:1107:1
-                                                          'int ssl_st::new_session', at offset 480 (in bits) at ssl.h:1109:1
-                                                          'int ssl_st::quiet_shutdown', at offset 512 (in bits) at ssl.h:1113:1
-                                                          'int ssl_st::shutdown', at offset 544 (in bits) at ssl.h:1114:1
-                                                          'int ssl_st::state', at offset 576 (in bits) at ssl.h:1116:1
-                                                          'int ssl_st::rstate', at offset 608 (in bits) at ssl.h:1117:1
-                                                          'BUF_MEM* ssl_st::init_buf', at offset 640 (in bits) at ssl.h:1119:1
-                                                          'void* ssl_st::init_msg', at offset 704 (in bits) at ssl.h:1120:1
-                                                          'int ssl_st::init_num', at offset 768 (in bits) at ssl.h:1121:1
-                                                          'int ssl_st::init_off', at offset 800 (in bits) at ssl.h:1122:1
-                                                          'unsigned char* ssl_st::packet', at offset 832 (in bits) at ssl.h:1125:1
-                                                          'unsigned int ssl_st::packet_length', at offset 896 (in bits) at ssl.h:1126:1
-                                                          'ssl2_state_st* ssl_st::s2', at offset 960 (in bits) at ssl.h:1128:1
-                                                          'ssl3_state_st* ssl_st::s3', at offset 1024 (in bits) at ssl.h:1129:1
-                                                          'dtls1_state_st* ssl_st::d1', at offset 1088 (in bits) at ssl.h:1130:1
-                                                          'int ssl_st::read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
-                                                          'void (int, int, int, void*, typedef size_t, SSL*, void*)* ssl_st::msg_callback', at offset 1216 (in bits) at ssl.h:1136:1
-                                                          'void* ssl_st::msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
-                                                          'int ssl_st::hit', at offset 1344 (in bits) at ssl.h:1139:1
-                                                          'X509_VERIFY_PARAM* ssl_st::param', at offset 1408 (in bits) at ssl.h:1141:1
-                                                          'stack_st_SSL_CIPHER* ssl_st::cipher_list', at offset 1472 (in bits) at ssl.h:1149:1
-                                                          'stack_st_SSL_CIPHER* ssl_st::cipher_list_by_id', at offset 1536 (in bits) at ssl.h:1150:1
-                                                          'int ssl_st::mac_flags', at offset 1600 (in bits) at ssl.h:1154:1
-                                                          'EVP_CIPHER_CTX* ssl_st::enc_read_ctx', at offset 1664 (in bits) at ssl.h:1155:1
-                                                          'EVP_MD_CTX* ssl_st::read_hash', at offset 1728 (in bits) at ssl.h:1156:1
-                                                          'COMP_CTX* ssl_st::expand', at offset 1792 (in bits) at ssl.h:1158:1
-                                                          'EVP_CIPHER_CTX* ssl_st::enc_write_ctx', at offset 1856 (in bits) at ssl.h:1163:1
-                                                          'EVP_MD_CTX* ssl_st::write_hash', at offset 1920 (in bits) at ssl.h:1164:1
-                                                          'COMP_CTX* ssl_st::compress', at offset 1984 (in bits) at ssl.h:1166:1
-                                                          'cert_st* ssl_st::cert', at offset 2048 (in bits) at ssl.h:1175:1
-                                                          'unsigned int ssl_st::sid_ctx_length', at offset 2112 (in bits) at ssl.h:1179:1
-                                                          'unsigned char ssl_st::sid_ctx[32]', at offset 2144 (in bits) at ssl.h:1180:1
-                                                          'SSL_SESSION* ssl_st::session', at offset 2432 (in bits) at ssl.h:1183:1
-                                                          'GEN_SESSION_CB ssl_st::generate_session_id', at offset 2496 (in bits) at ssl.h:1186:1
-                                                          'int ssl_st::verify_mode', at offset 2560 (in bits) at ssl.h:1189:1
-                                                          'int (int, X509_STORE_CTX*)* ssl_st::verify_callback', at offset 2624 (in bits) at ssl.h:1191:1
-                                                          'void (const SSL*, int, int)* ssl_st::info_callback', at offset 2688 (in bits) at ssl.h:1193:1
-                                                          'int ssl_st::error', at offset 2752 (in bits) at ssl.h:1195:1
-                                                          'int ssl_st::error_code', at offset 2784 (in bits) at ssl.h:1196:1
-                                                          'KSSL_CTX* ssl_st::kssl_ctx', at offset 2816 (in bits) at ssl.h:1199:1
-                                                          'unsigned int (SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)* ssl_st::psk_client_callback', at offset 2880 (in bits) at ssl.h:1203:1
-                                                          'unsigned int (SSL*, const char*, unsigned char*, unsigned int)* ssl_st::psk_server_callback', at offset 2944 (in bits) at ssl.h:1206:1
-                                                          'SSL_CTX* ssl_st::ctx', at offset 3008 (in bits) at ssl.h:1210:1
-                                                          'int ssl_st::debug', at offset 3072 (in bits) at ssl.h:1213:1
-                                                          'long int ssl_st::verify_result', at offset 3136 (in bits) at ssl.h:1216:1
-                                                          'CRYPTO_EX_DATA ssl_st::ex_data', at offset 3200 (in bits) at ssl.h:1217:1
-                                                          'stack_st_X509_NAME* ssl_st::client_CA', at offset 3328 (in bits) at ssl.h:1220:1
-                                                          'int ssl_st::references', at offset 3392 (in bits) at ssl.h:1222:1
-                                                          'unsigned long int ssl_st::options', at offset 3456 (in bits) at ssl.h:1223:1
-                                                          'unsigned long int ssl_st::mode', at offset 3520 (in bits) at ssl.h:1224:1
-                                                          'long int ssl_st::max_cert_list', at offset 3584 (in bits) at ssl.h:1225:1
-                                                          'int ssl_st::first_packet', at offset 3648 (in bits) at ssl.h:1226:1
-                                                          'int ssl_st::client_version', at offset 3680 (in bits) at ssl.h:1227:1
-                                                          'unsigned int ssl_st::max_send_fragment', at offset 3712 (in bits) at ssl.h:1229:1
-                                                          'void (SSL*, int, int, unsigned char*, int, void*)* ssl_st::tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232:1
-                                                          'void* ssl_st::tlsext_debug_arg', at offset 3840 (in bits) at ssl.h:1235:1
-                                                          'char* ssl_st::tlsext_hostname', at offset 3904 (in bits) at ssl.h:1236:1
-                                                          'int ssl_st::servername_done', at offset 3968 (in bits) at ssl.h:1237:1
-                                                          'int ssl_st::tlsext_status_type', at offset 4000 (in bits) at ssl.h:1244:1
-                                                          'int ssl_st::tlsext_status_expected', at offset 4032 (in bits) at ssl.h:1246:1
-                                                          'stack_st_OCSP_RESPID* ssl_st::tlsext_ocsp_ids', at offset 4096 (in bits) at ssl.h:1248:1
-                                                          'X509_EXTENSIONS* ssl_st::tlsext_ocsp_exts', at offset 4160 (in bits) at ssl.h:1249:1
-                                                          'unsigned char* ssl_st::tlsext_ocsp_resp', at offset 4224 (in bits) at ssl.h:1251:1
-                                                          'int ssl_st::tlsext_ocsp_resplen', at offset 4288 (in bits) at ssl.h:1252:1
-                                                          'int ssl_st::tlsext_ticket_expected', at offset 4320 (in bits) at ssl.h:1255:1
-                                                          'size_t ssl_st::tlsext_ecpointformatlist_length', at offset 4352 (in bits) at ssl.h:1257:1
-                                                          'unsigned char* ssl_st::tlsext_ecpointformatlist', at offset 4416 (in bits) at ssl.h:1258:1
-                                                          'size_t ssl_st::tlsext_ellipticcurvelist_length', at offset 4480 (in bits) at ssl.h:1259:1
-                                                          'unsigned char* ssl_st::tlsext_ellipticcurvelist', at offset 4544 (in bits) at ssl.h:1260:1
-                                                          'void* ssl_st::tlsext_opaque_prf_input', at offset 4608 (in bits) at ssl.h:1264:1
-                                                          'size_t ssl_st::tlsext_opaque_prf_input_len', at offset 4672 (in bits) at ssl.h:1265:1
-                                                          'TLS_SESSION_TICKET_EXT* ssl_st::tlsext_session_ticket', at offset 4736 (in bits) at ssl.h:1268:1
-                                                          'tls_session_ticket_ext_cb_fn ssl_st::tls_session_ticket_ext_cb', at offset 4800 (in bits) at ssl.h:1271:1
-                                                          'void* ssl_st::tls_session_ticket_ext_cb_arg', at offset 4864 (in bits) at ssl.h:1272:1
-                                                          'tls_session_secret_cb_fn ssl_st::tls_session_secret_cb', at offset 4928 (in bits) at ssl.h:1275:1
-                                                          'void* ssl_st::tls_session_secret_cb_arg', at offset 4992 (in bits) at ssl.h:1276:1
-                                                          'SSL_CTX* ssl_st::initial_ctx', at offset 5056 (in bits) at ssl.h:1278:1
-                                                          'unsigned char* ssl_st::next_proto_negotiated', at offset 5120 (in bits) at ssl.h:1288:1
-                                                          'unsigned char ssl_st::next_proto_negotiated_len', at offset 5184 (in bits) at ssl.h:1289:1
-                                                          'stack_st_SRTP_PROTECTION_PROFILE* ssl_st::srtp_profiles', at offset 5248 (in bits) at ssl.h:1294:1
-                                                          'SRTP_PROTECTION_PROFILE* ssl_st::srtp_profile', at offset 5312 (in bits) at ssl.h:1295:1
-                                                          'unsigned int ssl_st::tlsext_heartbeat', at offset 5376 (in bits) at ssl.h:1297:1
-                                                          'unsigned int ssl_st::tlsext_hb_pending', at offset 5408 (in bits) at ssl.h:1302:1
-                                                          'unsigned int ssl_st::tlsext_hb_seq', at offset 5440 (in bits) at ssl.h:1303:1
-                                                          'int ssl_st::renegotiate', at offset 5472 (in bits) at ssl.h:1308:1
-                                                  and name of 'RedsStream::ssl' changed to 'RedsStream::priv' at reds_stream.h:42:1
-
-
-                              type of 'channel_disconnect_proc on_disconnect' changed:
-                                underlying type 'void (RedChannelClient*)*' changed:
-                                  in pointed to type 'function type void (RedChannelClient*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_send_pipe_item_proc send_item' changed:
-                                underlying type 'void (RedChannelClient*, PipeItem*)*' changed:
-                                  in pointed to type 'function type void (RedChannelClient*, PipeItem*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_hold_pipe_item_proc hold_item' changed:
-                                underlying type 'void (RedChannelClient*, PipeItem*)*' changed:
-                                  in pointed to type 'function type void (RedChannelClient*, PipeItem*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_release_pipe_item_proc release_item' changed:
-                                underlying type 'void (RedChannelClient*, PipeItem*, int)*' changed:
-                                  in pointed to type 'function type void (RedChannelClient*, PipeItem*, int)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_alloc_msg_recv_buf_proc alloc_recv_buf' changed:
-                                underlying type 'uint8_t* (RedChannelClient*, typedef uint16_t, typedef uint32_t)*' changed:
-                                  in pointed to type 'function type uint8_t* (RedChannelClient*, typedef uint16_t, typedef uint32_t)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_release_msg_recv_buf_proc release_recv_buf' changed:
-                                underlying type 'void (RedChannelClient*, typedef uint16_t, typedef uint32_t, uint8_t*)*' changed:
-                                  in pointed to type 'function type void (RedChannelClient*, typedef uint16_t, typedef uint32_t, uint8_t*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark' changed:
-                                underlying type 'int (RedChannelClient*)*' changed:
-                                  in pointed to type 'function type int (RedChannelClient*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_handle_migrate_data_proc handle_migrate_data' changed:
-                                underlying type 'int (RedChannelClient*, typedef uint32_t, void*)*' changed:
-                                  in pointed to type 'function type int (RedChannelClient*, typedef uint32_t, void*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial' changed:
-                                underlying type 'typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)*' changed:
-                                  in pointed to type 'function type typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-
-                         type of 'ClientCbs RedChannel::client_cbs' changed:
-                           underlying type 'struct {channel_client_connect_proc connect; channel_client_disconnect_proc disconnect; channel_client_migrate_proc migrate;}' at red_channel.h:213:1 changed:
-                             type size hasn't changed
-                             3 data member changes:
-                              type of 'channel_client_connect_proc connect' changed:
-                                underlying type 'void (RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)*' changed:
-                                  in pointed to type 'function type void (RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)':
-                                    parameter 1 of type 'RedChannel*' has sub-type changes:
-                                      in pointed to type 'typedef RedChannel' at red_channel.h:130:1:
-                                        underlying type 'struct RedChannel' changed; details are being reported
-                                    parameter 3 of type 'RedsStream*' has sub-type changes:
-                                      pointed to type 'typedef RedsStream' changed at red_channel.h:134:1, as reported earlier
-
-                              type of 'channel_client_disconnect_proc disconnect' changed:
-                                underlying type 'void (RedChannelClient*)*' changed:
-                                  in pointed to type 'function type void (RedChannelClient*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'channel_client_migrate_proc migrate' changed:
-                                underlying type 'void (RedChannelClient*)*' changed:
-                                  in pointed to type 'function type void (RedChannelClient*)':
-                                    parameter 1 of type 'RedChannelClient*' has sub-type changes:
-                                      pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+              type of 'VDIPortState RedsState::agent_state' changed:
+                underlying type 'struct VDIPortState' at reds-private.h:46:1 changed:
+                  type size hasn't changed
+                  1 data member change:
+                    type of 'SpiceCharDeviceState* VDIPortState::base' changed:
+                      in pointed to type 'typedef SpiceCharDeviceState' at spice-char.h:34:1:
+                        underlying type 'struct SpiceCharDeviceState' at char_device.c:47:1 changed:
+                          type size changed from 1536 to 1600 (in bits)
+                          1 data member insertion:
+                            'uint64_t SpiceCharDeviceState::cur_pool_size', at offset 384 (in bits) at char_device.c:57:1
+                          12 data member changes:
+                            'SpiceCharDeviceWriteBuffer* SpiceCharDeviceState::cur_write_buf' offset changed from 384 to 448 (in bits) (by +64 bits)
+                            'uint8_t* SpiceCharDeviceState::cur_write_buf_pos' offset changed from 448 to 512 (in bits) (by +64 bits)
+                            'SpiceTimer* SpiceCharDeviceState::write_to_dev_timer' offset changed from 512 to 576 (in bits) (by +64 bits)
+                            'uint64_t SpiceCharDeviceState::num_self_tokens' offset changed from 576 to 640 (in bits) (by +64 bits)
+                            'Ring SpiceCharDeviceState::clients' offset changed from 640 to 704 (in bits) (by +64 bits)
+                            'uint32_t SpiceCharDeviceState::num_clients' offset changed from 768 to 832 (in bits) (by +64 bits)
+                            'uint64_t SpiceCharDeviceState::client_tokens_interval' offset changed from 832 to 896 (in bits) (by +64 bits)
+                            type of 'SpiceCharDeviceInstance* SpiceCharDeviceState::sin' changed:
+                              in pointed to type 'typedef SpiceCharDeviceInstance' at spice-char.h:33:1:
+                                underlying type 'struct SpiceCharDeviceInstance' at spice.h:416:1 changed:
+                                  type size hasn't changed
+                                  1 data member change:
+                                    type of 'SpiceCharDeviceState* SpiceCharDeviceInstance::st' changed:
+                                      in pointed to type 'typedef SpiceCharDeviceState' at spice-char.h:34:1:
+                                        underlying type 'struct SpiceCharDeviceState' changed; details are being reported
+
+                            and offset changed from 896 to 960 (in bits) (by +64 bits)
+                            'int SpiceCharDeviceState::during_read_from_device' offset changed from 960 to 1024 (in bits) (by +64 bits)
+                            'int SpiceCharDeviceState::during_write_to_device' offset changed from 992 to 1056 (in bits) (by +64 bits)
+                            type of 'SpiceCharDeviceCallbacks SpiceCharDeviceState::cbs' changed:
+                              underlying type 'struct SpiceCharDeviceCallbacks' at char_device.h:81:1 changed:
+                                type size hasn't changed
+                                1 data member change:
+                                  type of 'SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)* SpiceCharDeviceCallbacks::read_one_msg_from_device' changed:
+                                    in pointed to type 'function type SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)':
+                                      parameter 1 of type 'SpiceCharDeviceInstance*' has sub-type changes:
+                                        pointed to type 'typedef SpiceCharDeviceInstance' changed at spice.h:399:1, as reported earlier
+
+                            and offset changed from 1024 to 1088 (in bits) (by +64 bits)
+                            'void* SpiceCharDeviceState::opaque' offset changed from 1472 to 1536 (in bits) (by +64 bits)
+
+                  no data member changes (3 filtered);
+
+              type of 'MainChannel* RedsState::main_channel' changed:
+                in pointed to type 'typedef MainChannel' at main_channel.h:48:1:
+                  underlying type 'struct MainChannel' at main_channel.h:36:1 changed:
+                    type size hasn't changed
+                    1 data member change:
+                      type of 'RedChannel MainChannel::base' changed:
+                        underlying type 'struct RedChannel' at red_channel.h:303:1 changed:
+                          type size hasn't changed
+                          2 data member changes (1 filtered):
+                            type of 'ChannelCbs RedChannel::channel_cbs' changed:
+                              underlying type 'struct {channel_configure_socket_proc config_socket; channel_disconnect_proc on_disconnect; channel_send_pipe_item_proc send_item; channel_hold_pipe_item_proc hold_item; channel_release_pipe_item_proc release_item; channel_alloc_msg_recv_buf_proc alloc_recv_buf; channel_release_msg_recv_buf_proc release_recv_buf; channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark; channel_handle_migrate_data_proc handle_migrate_data; channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial;}' at red_channel.h:195:1 changed:
+                                type size hasn't changed
+                                10 data member changes:
+                                  type of 'channel_configure_socket_proc config_socket' changed:
+                                    underlying type 'int (RedChannelClient*)*' changed:
+                                      in pointed to type 'function type int (RedChannelClient*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          in pointed to type 'typedef RedChannelClient' at red_channel.h:131:1:
+                                            underlying type 'struct RedChannelClient' at red_channel.h:247:1 changed:
+                                              type size hasn't changed
+                                              2 data member changes (2 filtered):
+                                                type of 'RedChannel* RedChannelClient::channel' changed:
+                                                  in pointed to type 'typedef RedChannel' at red_channel.h:130:1:
+                                                    underlying type 'struct RedChannel' changed; details are being reported
+
+                                                type of 'RedsStream* RedChannelClient::stream' changed:
+                                                  in pointed to type 'typedef RedsStream' at reds_stream.h:31:1:
+                                                    underlying type 'struct RedsStream' at reds.h:68:1 changed:
+                                                      type size changed from 1280 to 256 (in bits)
+                                                      5 data member deletions:
+                                                        'RedsSASL RedsStream::sasl', at offset 256 (in bits) at reds.h:78:1
+                                                        'SpiceChannelEventInfo* RedsStream::info', at offset 1024 (in bits) at reds.h:85:1
+                                                        'typedef ssize_t (RedsStream*, void*, typedef size_t)* RedsStream::read', at offset 1088 (in bits) at reds.h:88:1
+                                                        'typedef ssize_t (RedsStream*, void*, typedef size_t)* RedsStream::write', at offset 1152 (in bits) at reds.h:89:1
+                                                        'typedef ssize_t (RedsStream*, const iovec*, int)* RedsStream::writev', at offset 1216 (in bits) at reds.h:90:1
+                                                      1 data member change:
+                                                        type of 'SSL* RedsStream::ssl' changed:
+                                                          in pointed to type 'typedef SSL' at reds_stream.h:32:1:
+                                                            typedef name changed from SSL to RedsStreamPrivate at reds_stream.h:32:1
+                                                            underlying type 'struct ssl_st' at ssl.h:1065:1 changed:
+                                                              type name changed from 'ssl_st' to 'RedsStreamPrivate'
+                                                              type size changed from 5504 to 0 (in bits)
+                                                              94 data member deletions:
+                                                                'int ssl_st::version', at offset 0 (in bits) at ssl.h:1070:1
+                                                                'int ssl_st::type', at offset 32 (in bits) at ssl.h:1071:1
+                                                                'const SSL_METHOD* ssl_st::method', at offset 64 (in bits) at ssl.h:1073:1
+                                                                'BIO* ssl_st::rbio', at offset 128 (in bits) at ssl.h:1080:1
+                                                                'BIO* ssl_st::wbio', at offset 192 (in bits) at ssl.h:1081:1
+                                                                'BIO* ssl_st::bbio', at offset 256 (in bits) at ssl.h:1082:1
+                                                                'int ssl_st::rwstate', at offset 320 (in bits) at ssl.h:1093:1
+                                                                'int ssl_st::in_handshake', at offset 352 (in bits) at ssl.h:1096:1
+                                                                'int (SSL*)* ssl_st::handshake_func', at offset 384 (in bits) at ssl.h:1097:1
+                                                                'int ssl_st::server', at offset 448 (in bits) at ssl.h:1107:1
+                                                                'int ssl_st::new_session', at offset 480 (in bits) at ssl.h:1109:1
+                                                                'int ssl_st::quiet_shutdown', at offset 512 (in bits) at ssl.h:1113:1
+                                                                'int ssl_st::shutdown', at offset 544 (in bits) at ssl.h:1114:1
+                                                                'int ssl_st::state', at offset 576 (in bits) at ssl.h:1116:1
+                                                                'int ssl_st::rstate', at offset 608 (in bits) at ssl.h:1117:1
+                                                                'BUF_MEM* ssl_st::init_buf', at offset 640 (in bits) at ssl.h:1119:1
+                                                                'void* ssl_st::init_msg', at offset 704 (in bits) at ssl.h:1120:1
+                                                                'int ssl_st::init_num', at offset 768 (in bits) at ssl.h:1121:1
+                                                                'int ssl_st::init_off', at offset 800 (in bits) at ssl.h:1122:1
+                                                                'unsigned char* ssl_st::packet', at offset 832 (in bits) at ssl.h:1125:1
+                                                                'unsigned int ssl_st::packet_length', at offset 896 (in bits) at ssl.h:1126:1
+                                                                'ssl2_state_st* ssl_st::s2', at offset 960 (in bits) at ssl.h:1128:1
+                                                                'ssl3_state_st* ssl_st::s3', at offset 1024 (in bits) at ssl.h:1129:1
+                                                                'dtls1_state_st* ssl_st::d1', at offset 1088 (in bits) at ssl.h:1130:1
+                                                                'int ssl_st::read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
+                                                                'void (int, int, int, void*, typedef size_t, SSL*, void*)* ssl_st::msg_callback', at offset 1216 (in bits) at ssl.h:1136:1
+                                                                'void* ssl_st::msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
+                                                                'int ssl_st::hit', at offset 1344 (in bits) at ssl.h:1139:1
+                                                                'X509_VERIFY_PARAM* ssl_st::param', at offset 1408 (in bits) at ssl.h:1141:1
+                                                                'stack_st_SSL_CIPHER* ssl_st::cipher_list', at offset 1472 (in bits) at ssl.h:1149:1
+                                                                'stack_st_SSL_CIPHER* ssl_st::cipher_list_by_id', at offset 1536 (in bits) at ssl.h:1150:1
+                                                                'int ssl_st::mac_flags', at offset 1600 (in bits) at ssl.h:1154:1
+                                                                'EVP_CIPHER_CTX* ssl_st::enc_read_ctx', at offset 1664 (in bits) at ssl.h:1155:1
+                                                                'EVP_MD_CTX* ssl_st::read_hash', at offset 1728 (in bits) at ssl.h:1156:1
+                                                                'COMP_CTX* ssl_st::expand', at offset 1792 (in bits) at ssl.h:1158:1
+                                                                'EVP_CIPHER_CTX* ssl_st::enc_write_ctx', at offset 1856 (in bits) at ssl.h:1163:1
+                                                                'EVP_MD_CTX* ssl_st::write_hash', at offset 1920 (in bits) at ssl.h:1164:1
+                                                                'COMP_CTX* ssl_st::compress', at offset 1984 (in bits) at ssl.h:1166:1
+                                                                'cert_st* ssl_st::cert', at offset 2048 (in bits) at ssl.h:1175:1
+                                                                'unsigned int ssl_st::sid_ctx_length', at offset 2112 (in bits) at ssl.h:1179:1
+                                                                'unsigned char ssl_st::sid_ctx[32]', at offset 2144 (in bits) at ssl.h:1180:1
+                                                                'SSL_SESSION* ssl_st::session', at offset 2432 (in bits) at ssl.h:1183:1
+                                                                'GEN_SESSION_CB ssl_st::generate_session_id', at offset 2496 (in bits) at ssl.h:1186:1
+                                                                'int ssl_st::verify_mode', at offset 2560 (in bits) at ssl.h:1189:1
+                                                                'int (int, X509_STORE_CTX*)* ssl_st::verify_callback', at offset 2624 (in bits) at ssl.h:1191:1
+                                                                'void (const SSL*, int, int)* ssl_st::info_callback', at offset 2688 (in bits) at ssl.h:1193:1
+                                                                'int ssl_st::error', at offset 2752 (in bits) at ssl.h:1195:1
+                                                                'int ssl_st::error_code', at offset 2784 (in bits) at ssl.h:1196:1
+                                                                'KSSL_CTX* ssl_st::kssl_ctx', at offset 2816 (in bits) at ssl.h:1199:1
+                                                                'unsigned int (SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)* ssl_st::psk_client_callback', at offset 2880 (in bits) at ssl.h:1203:1
+                                                                'unsigned int (SSL*, const char*, unsigned char*, unsigned int)* ssl_st::psk_server_callback', at offset 2944 (in bits) at ssl.h:1206:1
+                                                                'SSL_CTX* ssl_st::ctx', at offset 3008 (in bits) at ssl.h:1210:1
+                                                                'int ssl_st::debug', at offset 3072 (in bits) at ssl.h:1213:1
+                                                                'long int ssl_st::verify_result', at offset 3136 (in bits) at ssl.h:1216:1
+                                                                'CRYPTO_EX_DATA ssl_st::ex_data', at offset 3200 (in bits) at ssl.h:1217:1
+                                                                'stack_st_X509_NAME* ssl_st::client_CA', at offset 3328 (in bits) at ssl.h:1220:1
+                                                                'int ssl_st::references', at offset 3392 (in bits) at ssl.h:1222:1
+                                                                'unsigned long int ssl_st::options', at offset 3456 (in bits) at ssl.h:1223:1
+                                                                'unsigned long int ssl_st::mode', at offset 3520 (in bits) at ssl.h:1224:1
+                                                                'long int ssl_st::max_cert_list', at offset 3584 (in bits) at ssl.h:1225:1
+                                                                'int ssl_st::first_packet', at offset 3648 (in bits) at ssl.h:1226:1
+                                                                'int ssl_st::client_version', at offset 3680 (in bits) at ssl.h:1227:1
+                                                                'unsigned int ssl_st::max_send_fragment', at offset 3712 (in bits) at ssl.h:1229:1
+                                                                'void (SSL*, int, int, unsigned char*, int, void*)* ssl_st::tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232:1
+                                                                'void* ssl_st::tlsext_debug_arg', at offset 3840 (in bits) at ssl.h:1235:1
+                                                                'char* ssl_st::tlsext_hostname', at offset 3904 (in bits) at ssl.h:1236:1
+                                                                'int ssl_st::servername_done', at offset 3968 (in bits) at ssl.h:1237:1
+                                                                'int ssl_st::tlsext_status_type', at offset 4000 (in bits) at ssl.h:1244:1
+                                                                'int ssl_st::tlsext_status_expected', at offset 4032 (in bits) at ssl.h:1246:1
+                                                                'stack_st_OCSP_RESPID* ssl_st::tlsext_ocsp_ids', at offset 4096 (in bits) at ssl.h:1248:1
+                                                                'X509_EXTENSIONS* ssl_st::tlsext_ocsp_exts', at offset 4160 (in bits) at ssl.h:1249:1
+                                                                'unsigned char* ssl_st::tlsext_ocsp_resp', at offset 4224 (in bits) at ssl.h:1251:1
+                                                                'int ssl_st::tlsext_ocsp_resplen', at offset 4288 (in bits) at ssl.h:1252:1
+                                                                'int ssl_st::tlsext_ticket_expected', at offset 4320 (in bits) at ssl.h:1255:1
+                                                                'size_t ssl_st::tlsext_ecpointformatlist_length', at offset 4352 (in bits) at ssl.h:1257:1
+                                                                'unsigned char* ssl_st::tlsext_ecpointformatlist', at offset 4416 (in bits) at ssl.h:1258:1
+                                                                'size_t ssl_st::tlsext_ellipticcurvelist_length', at offset 4480 (in bits) at ssl.h:1259:1
+                                                                'unsigned char* ssl_st::tlsext_ellipticcurvelist', at offset 4544 (in bits) at ssl.h:1260:1
+                                                                'void* ssl_st::tlsext_opaque_prf_input', at offset 4608 (in bits) at ssl.h:1264:1
+                                                                'size_t ssl_st::tlsext_opaque_prf_input_len', at offset 4672 (in bits) at ssl.h:1265:1
+                                                                'TLS_SESSION_TICKET_EXT* ssl_st::tlsext_session_ticket', at offset 4736 (in bits) at ssl.h:1268:1
+                                                                'tls_session_ticket_ext_cb_fn ssl_st::tls_session_ticket_ext_cb', at offset 4800 (in bits) at ssl.h:1271:1
+                                                                'void* ssl_st::tls_session_ticket_ext_cb_arg', at offset 4864 (in bits) at ssl.h:1272:1
+                                                                'tls_session_secret_cb_fn ssl_st::tls_session_secret_cb', at offset 4928 (in bits) at ssl.h:1275:1
+                                                                'void* ssl_st::tls_session_secret_cb_arg', at offset 4992 (in bits) at ssl.h:1276:1
+                                                                'SSL_CTX* ssl_st::initial_ctx', at offset 5056 (in bits) at ssl.h:1278:1
+                                                                'unsigned char* ssl_st::next_proto_negotiated', at offset 5120 (in bits) at ssl.h:1288:1
+                                                                'unsigned char ssl_st::next_proto_negotiated_len', at offset 5184 (in bits) at ssl.h:1289:1
+                                                                'stack_st_SRTP_PROTECTION_PROFILE* ssl_st::srtp_profiles', at offset 5248 (in bits) at ssl.h:1294:1
+                                                                'SRTP_PROTECTION_PROFILE* ssl_st::srtp_profile', at offset 5312 (in bits) at ssl.h:1295:1
+                                                                'unsigned int ssl_st::tlsext_heartbeat', at offset 5376 (in bits) at ssl.h:1297:1
+                                                                'unsigned int ssl_st::tlsext_hb_pending', at offset 5408 (in bits) at ssl.h:1302:1
+                                                                'unsigned int ssl_st::tlsext_hb_seq', at offset 5440 (in bits) at ssl.h:1303:1
+                                                                'int ssl_st::renegotiate', at offset 5472 (in bits) at ssl.h:1308:1
+                                                        and name of 'RedsStream::ssl' changed to 'RedsStream::priv' at reds_stream.h:42:1
+
+
+                                  type of 'channel_disconnect_proc on_disconnect' changed:
+                                    underlying type 'void (RedChannelClient*)*' changed:
+                                      in pointed to type 'function type void (RedChannelClient*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_send_pipe_item_proc send_item' changed:
+                                    underlying type 'void (RedChannelClient*, PipeItem*)*' changed:
+                                      in pointed to type 'function type void (RedChannelClient*, PipeItem*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_hold_pipe_item_proc hold_item' changed:
+                                    underlying type 'void (RedChannelClient*, PipeItem*)*' changed:
+                                      in pointed to type 'function type void (RedChannelClient*, PipeItem*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_release_pipe_item_proc release_item' changed:
+                                    underlying type 'void (RedChannelClient*, PipeItem*, int)*' changed:
+                                      in pointed to type 'function type void (RedChannelClient*, PipeItem*, int)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_alloc_msg_recv_buf_proc alloc_recv_buf' changed:
+                                    underlying type 'uint8_t* (RedChannelClient*, typedef uint16_t, typedef uint32_t)*' changed:
+                                      in pointed to type 'function type uint8_t* (RedChannelClient*, typedef uint16_t, typedef uint32_t)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_release_msg_recv_buf_proc release_recv_buf' changed:
+                                    underlying type 'void (RedChannelClient*, typedef uint16_t, typedef uint32_t, uint8_t*)*' changed:
+                                      in pointed to type 'function type void (RedChannelClient*, typedef uint16_t, typedef uint32_t, uint8_t*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark' changed:
+                                    underlying type 'int (RedChannelClient*)*' changed:
+                                      in pointed to type 'function type int (RedChannelClient*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_handle_migrate_data_proc handle_migrate_data' changed:
+                                    underlying type 'int (RedChannelClient*, typedef uint32_t, void*)*' changed:
+                                      in pointed to type 'function type int (RedChannelClient*, typedef uint32_t, void*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial' changed:
+                                    underlying type 'typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)*' changed:
+                                      in pointed to type 'function type typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+
+                            type of 'ClientCbs RedChannel::client_cbs' changed:
+                              underlying type 'struct {channel_client_connect_proc connect; channel_client_disconnect_proc disconnect; channel_client_migrate_proc migrate;}' at red_channel.h:213:1 changed:
+                                type size hasn't changed
+                                3 data member changes:
+                                  type of 'channel_client_connect_proc connect' changed:
+                                    underlying type 'void (RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)*' changed:
+                                      in pointed to type 'function type void (RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)':
+                                        parameter 1 of type 'RedChannel*' has sub-type changes:
+                                          in pointed to type 'typedef RedChannel' at red_channel.h:130:1:
+                                            underlying type 'struct RedChannel' changed; details are being reported
+                                        parameter 3 of type 'RedsStream*' has sub-type changes:
+                                          pointed to type 'typedef RedsStream' changed at red_channel.h:134:1, as reported earlier
+
+                                  type of 'channel_client_disconnect_proc disconnect' changed:
+                                    underlying type 'void (RedChannelClient*)*' changed:
+                                      in pointed to type 'function type void (RedChannelClient*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'channel_client_migrate_proc migrate' changed:
+                                    underlying type 'void (RedChannelClient*)*' changed:
+                                      in pointed to type 'function type void (RedChannelClient*)':
+                                        parameter 1 of type 'RedChannelClient*' has sub-type changes:
+                                          pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
 
 
 
@@ -531,65 +531,65 @@
           underlying type 'struct SpicePlaybackInstance' at spice.h:350:1 changed:
             type size hasn't changed
             1 data member change:
-             type of 'SpicePlaybackState* SpicePlaybackInstance::st' changed:
-               in pointed to type 'typedef SpicePlaybackState' at spice-audio.h:34:1:
-                 underlying type 'struct SpicePlaybackState' at snd_worker.c:165:1 changed:
-                   type size changed from 512 to 576 (in bits)
-                   1 data member insertion:
-                     'uint32_t SpicePlaybackState::frequency', at offset 512 (in bits) at snd_worker.c:159:1
-                   2 data member changes:
-                    type of 'SndWorker SpicePlaybackState::worker' changed:
-                      type size hasn't changed
-                      3 data member changes:
-                       type of 'RedChannel* SndWorker::base_channel' changed:
-                         pointed to type 'typedef RedChannel' changed at red_channel.h:135:1, as reported earlier
-
-                       type of 'SndChannel* SndWorker::connection' changed:
-                         in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
-                           underlying type 'struct SndChannel' at snd_worker.c:89:1 changed:
-                             type size hasn't changed
-                             6 data member changes:
-                              type of 'RedsStream* SndChannel::stream' changed:
-                                pointed to type 'typedef RedsStream' changed at red_channel.h:134:1, as reported earlier
-
-                              type of 'SndWorker* SndChannel::worker' changed:
-                                in pointed to type 'typedef SndWorker' at snd_worker.c:80:1:
-                                  underlying type 'struct SndWorker' changed; details are being reported
-
-                              type of 'RedChannelClient* SndChannel::channel_client' changed:
-                                pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-
-                              type of 'snd_channel_handle_message_proc SndChannel::handle_message' changed:
-                                underlying type 'int (SndChannel*, typedef size_t, typedef uint32_t, void*)*' changed:
-                                  in pointed to type 'function type int (SndChannel*, typedef size_t, typedef uint32_t, void*)':
-                                    parameter 1 of type 'SndChannel*' has sub-type changes:
-                                      in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
-                                        underlying type 'struct SndChannel' changed; details are being reported
-
-                              type of 'snd_channel_on_message_done_proc SndChannel::on_message_done' changed:
-                                underlying type 'void (SndChannel*)*' changed:
-                                  in pointed to type 'function type void (SndChannel*)':
-                                    parameter 1 of type 'SndChannel*' has sub-type changes:
-                                      in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
-                                        underlying type 'struct SndChannel' changed; details are being reported
-
-                              type of 'snd_channel_cleanup_channel_proc SndChannel::cleanup' changed:
-                                underlying type 'void (SndChannel*)*' changed:
-                                  in pointed to type 'function type void (SndChannel*)':
-                                    parameter 1 of type 'SndChannel*' has sub-type changes:
-                                      in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
-                                        underlying type 'struct SndChannel' changed; details are being reported
-
-                             no data member change (1 filtered);
-
-                       type of 'SndWorker* SndWorker::next' changed:
-                         in pointed to type 'typedef SndWorker' at snd_worker.c:80:1:
-                           underlying type 'struct SndWorker' changed; details are being reported
-
-
-                    type of 'SpicePlaybackInstance* SpicePlaybackState::sin' changed:
-                      in pointed to type 'typedef SpicePlaybackInstance' at spice-audio.h:33:1:
-                        underlying type 'struct SpicePlaybackInstance' changed; details are being reported
+              type of 'SpicePlaybackState* SpicePlaybackInstance::st' changed:
+                in pointed to type 'typedef SpicePlaybackState' at spice-audio.h:34:1:
+                  underlying type 'struct SpicePlaybackState' at snd_worker.c:165:1 changed:
+                    type size changed from 512 to 576 (in bits)
+                    1 data member insertion:
+                      'uint32_t SpicePlaybackState::frequency', at offset 512 (in bits) at snd_worker.c:159:1
+                    2 data member changes:
+                      type of 'SndWorker SpicePlaybackState::worker' changed:
+                        type size hasn't changed
+                        3 data member changes:
+                          type of 'RedChannel* SndWorker::base_channel' changed:
+                            pointed to type 'typedef RedChannel' changed at red_channel.h:135:1, as reported earlier
+
+                          type of 'SndChannel* SndWorker::connection' changed:
+                            in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
+                              underlying type 'struct SndChannel' at snd_worker.c:89:1 changed:
+                                type size hasn't changed
+                                6 data member changes:
+                                  type of 'RedsStream* SndChannel::stream' changed:
+                                    pointed to type 'typedef RedsStream' changed at red_channel.h:134:1, as reported earlier
+
+                                  type of 'SndWorker* SndChannel::worker' changed:
+                                    in pointed to type 'typedef SndWorker' at snd_worker.c:80:1:
+                                      underlying type 'struct SndWorker' changed; details are being reported
+
+                                  type of 'RedChannelClient* SndChannel::channel_client' changed:
+                                    pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
+
+                                  type of 'snd_channel_handle_message_proc SndChannel::handle_message' changed:
+                                    underlying type 'int (SndChannel*, typedef size_t, typedef uint32_t, void*)*' changed:
+                                      in pointed to type 'function type int (SndChannel*, typedef size_t, typedef uint32_t, void*)':
+                                        parameter 1 of type 'SndChannel*' has sub-type changes:
+                                          in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
+                                            underlying type 'struct SndChannel' changed; details are being reported
+
+                                  type of 'snd_channel_on_message_done_proc SndChannel::on_message_done' changed:
+                                    underlying type 'void (SndChannel*)*' changed:
+                                      in pointed to type 'function type void (SndChannel*)':
+                                        parameter 1 of type 'SndChannel*' has sub-type changes:
+                                          in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
+                                            underlying type 'struct SndChannel' changed; details are being reported
+
+                                  type of 'snd_channel_cleanup_channel_proc SndChannel::cleanup' changed:
+                                    underlying type 'void (SndChannel*)*' changed:
+                                      in pointed to type 'function type void (SndChannel*)':
+                                        parameter 1 of type 'SndChannel*' has sub-type changes:
+                                          in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
+                                            underlying type 'struct SndChannel' changed; details are being reported
+
+                                no data member change (1 filtered);
+
+                          type of 'SndWorker* SndWorker::next' changed:
+                            in pointed to type 'typedef SndWorker' at snd_worker.c:80:1:
+                              underlying type 'struct SndWorker' changed; details are being reported
+
+
+                      type of 'SpicePlaybackInstance* SpicePlaybackState::sin' changed:
+                        in pointed to type 'typedef SpicePlaybackInstance' at spice-audio.h:33:1:
+                          underlying type 'struct SpicePlaybackInstance' changed; details are being reported
 
 
 
@@ -623,19 +623,19 @@
           underlying type 'struct SpiceRecordInstance' at spice.h:380:1 changed:
             type size hasn't changed
             1 data member change:
-             type of 'SpiceRecordState* SpiceRecordInstance::st' changed:
-               in pointed to type 'typedef SpiceRecordState' at spice-audio.h:68:1:
-                 underlying type 'struct SpiceRecordState' at snd_worker.c:171:1 changed:
-                   type size changed from 512 to 576 (in bits)
-                   1 data member insertion:
-                     'uint32_t SpiceRecordState::frequency', at offset 512 (in bits) at snd_worker.c:166:1
-                   2 data member changes:
-                    type of 'SndWorker SpiceRecordState::worker' changed:
-                      details were reported earlier
-
-                    type of 'SpiceRecordInstance* SpiceRecordState::sin' changed:
-                      in pointed to type 'typedef SpiceRecordInstance' at spice-audio.h:67:1:
-                        underlying type 'struct SpiceRecordInstance' changed; details are being reported
+              type of 'SpiceRecordState* SpiceRecordInstance::st' changed:
+                in pointed to type 'typedef SpiceRecordState' at spice-audio.h:68:1:
+                  underlying type 'struct SpiceRecordState' at snd_worker.c:171:1 changed:
+                    type size changed from 512 to 576 (in bits)
+                    1 data member insertion:
+                      'uint32_t SpiceRecordState::frequency', at offset 512 (in bits) at snd_worker.c:166:1
+                    2 data member changes:
+                      type of 'SndWorker SpiceRecordState::worker' changed:
+                        details were reported earlier
+
+                      type of 'SpiceRecordInstance* SpiceRecordState::sin' changed:
+                        in pointed to type 'typedef SpiceRecordInstance' at spice-audio.h:67:1:
+                          underlying type 'struct SpiceRecordInstance' changed; details are being reported
 
 
 
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index d0381ce5..e192f2b2 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -33,25 +33,25 @@
             underlying type 'class tbb::internal::concurrent_queue_base_v3' at _concurrent_queue_impl.h:816:1 changed:
               type size hasn't changed
               1 data member change:
-               type of 'tbb::internal::concurrent_queue_rep* tbb::internal::concurrent_queue_base_v3::my_rep' changed:
-                 in pointed to type 'class tbb::internal::concurrent_queue_rep' at concurrent_queue_v2.cpp:102:1:
-                   type size hasn't changed
-                   2 data member changes (1 filtered):
-                    type of 'tbb::internal::concurrent_monitor tbb::internal::concurrent_queue_rep::items_avail' changed:
-                      type size hasn't changed
-                      1 data member change:
-                       'tbb::spin_mutex tbb::internal::concurrent_monitor::mutex_ec' offset changed from 0 to 8 (in bits) (by +8 bits)
-
-                    type of 'tbb::internal::micro_queue tbb::internal::concurrent_queue_rep::array[8]' changed:
-                      array element type 'struct tbb::internal::micro_queue' changed: 
+                type of 'tbb::internal::concurrent_queue_rep* tbb::internal::concurrent_queue_base_v3::my_rep' changed:
+                  in pointed to type 'class tbb::internal::concurrent_queue_rep' at concurrent_queue_v2.cpp:102:1:
+                    type size hasn't changed
+                    2 data member changes (1 filtered):
+                      type of 'tbb::internal::concurrent_monitor tbb::internal::concurrent_queue_rep::items_avail' changed:
                         type size hasn't changed
                         1 data member change:
-                         type of 'tbb::spin_mutex tbb::internal::micro_queue::page_mutex' changed:
-                           type size hasn't changed
-                           1 base class insertion:
-                             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
+                          'tbb::spin_mutex tbb::internal::concurrent_monitor::mutex_ec' offset changed from 0 to 8 (in bits) (by +8 bits)
 
-                      type size hasn't changed
+                      type of 'tbb::internal::micro_queue tbb::internal::concurrent_queue_rep::array[8]' changed:
+                        array element type 'struct tbb::internal::micro_queue' changed: 
+                          type size hasn't changed
+                          1 data member change:
+                            type of 'tbb::spin_mutex tbb::internal::micro_queue::page_mutex' changed:
+                              type size hasn't changed
+                              1 base class insertion:
+                                class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
+
+                        type size hasn't changed
 
 
 
@@ -78,124 +78,124 @@
           1 data member insertion:
             'tbb::internal::cpu_ctl_env_space tbb::task_group_context::my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
           2 data member changes (1 filtered):
-           type of 'char tbb::task_group_context::_leading_padding[80]' changed:
-             type name changed from 'char[80]' to 'char[72]'
-             array type size changed from 640 to 576
-             array type subrange 1 changed length from 80 to 72
-
-           type of 'tbb::internal::generic_scheduler* tbb::task_group_context::my_owner' changed:
-             in pointed to type 'class tbb::internal::generic_scheduler' at scheduler.h:110:1:
-               type size changed from 3136 to 3072 (in bits)
-               1 base class change:
-                 'struct tbb::internal::scheduler_state' at scheduler.h:73:1 changed:
-                   type size changed from 576 to 704 (in bits)
-                   2 data member insertions:
-                     'volatile intptr_t* tbb::internal::scheduler_state::my_ref_top_priority', at offset 576 (in bits) at scheduler.h:96:1
-                     'volatile uintptr_t* tbb::internal::scheduler_state::my_ref_reload_epoch', at offset 640 (in bits) at scheduler.h:99:1
-                   2 data member changes (1 filtered):
-                    type of 'tbb::internal::arena* tbb::internal::scheduler_state::my_arena' changed:
-                      in pointed to type 'class tbb::internal::arena' at arena.h:160:1:
+            type of 'char tbb::task_group_context::_leading_padding[80]' changed:
+              type name changed from 'char[80]' to 'char[72]'
+              array type size changed from 640 to 576
+              array type subrange 1 changed length from 80 to 72
+
+            type of 'tbb::internal::generic_scheduler* tbb::task_group_context::my_owner' changed:
+              in pointed to type 'class tbb::internal::generic_scheduler' at scheduler.h:110:1:
+                type size changed from 3136 to 3072 (in bits)
+                1 base class change:
+                  'struct tbb::internal::scheduler_state' at scheduler.h:73:1 changed:
+                    type size changed from 576 to 704 (in bits)
+                    2 data member insertions:
+                      'volatile intptr_t* tbb::internal::scheduler_state::my_ref_top_priority', at offset 576 (in bits) at scheduler.h:96:1
+                      'volatile uintptr_t* tbb::internal::scheduler_state::my_ref_reload_epoch', at offset 640 (in bits) at scheduler.h:99:1
+                    2 data member changes (1 filtered):
+                      type of 'tbb::internal::arena* tbb::internal::scheduler_state::my_arena' changed:
+                        in pointed to type 'class tbb::internal::arena' at arena.h:160:1:
+                          type size hasn't changed
+                          1 base class deletion:
+                            struct tbb::internal::padded<tbb::internal::arena_base> at tbb_stddef.h:261:1
+                          1 base class insertion:
+                            struct tbb::internal::padded<tbb::internal::arena_base, 128ul> at tbb_stddef.h:251:1
+                          1 data member change:
+                            type of 'tbb::internal::arena_slot tbb::internal::arena::my_slots[1]' changed:
+                              array element type 'struct tbb::internal::arena_slot' changed: 
+                                type size hasn't changed
+                                2 base class deletions:
+                                  struct tbb::internal::padded<tbb::internal::arena_slot_line1> at tbb_stddef.h:261:1
+                                  struct tbb::internal::padded<tbb::internal::arena_slot_line2> at tbb_stddef.h:261:1
+                                2 base class insertions:
+                                  struct tbb::internal::padded<tbb::internal::arena_slot_line1, 128ul> at tbb_stddef.h:251:1
+                                  struct tbb::internal::padded<tbb::internal::arena_slot_line2, 128ul> at tbb_stddef.h:251:1
+                              type size hasn't changed
+
+
+                      type of 'tbb::internal::mail_inbox tbb::internal::scheduler_state::my_inbox' changed:
                         type size hasn't changed
-                        1 base class deletion:
-                          struct tbb::internal::padded<tbb::internal::arena_base> at tbb_stddef.h:261:1
-                        1 base class insertion:
-                          struct tbb::internal::padded<tbb::internal::arena_base, 128ul> at tbb_stddef.h:251:1
                         1 data member change:
-                         type of 'tbb::internal::arena_slot tbb::internal::arena::my_slots[1]' changed:
-                           array element type 'struct tbb::internal::arena_slot' changed: 
-                             type size hasn't changed
-                             2 base class deletions:
-                               struct tbb::internal::padded<tbb::internal::arena_slot_line1> at tbb_stddef.h:261:1
-                               struct tbb::internal::padded<tbb::internal::arena_slot_line2> at tbb_stddef.h:261:1
-                             2 base class insertions:
-                               struct tbb::internal::padded<tbb::internal::arena_slot_line1, 128ul> at tbb_stddef.h:251:1
-                               struct tbb::internal::padded<tbb::internal::arena_slot_line2, 128ul> at tbb_stddef.h:251:1
-                           type size hasn't changed
-
-
-                    type of 'tbb::internal::mail_inbox tbb::internal::scheduler_state::my_inbox' changed:
-                      type size hasn't changed
-                      1 data member change:
-                       type of 'tbb::internal::mail_outbox* tbb::internal::mail_inbox::my_putter' changed:
-                         in pointed to type 'class tbb::internal::mail_outbox' at mailbox.h:103:1:
-                           type size hasn't changed
-                           1 base class deletion:
-                             class tbb::internal::unpadded_mail_outbox at mailbox.h:97:1
-                           1 base class insertion:
-                             struct tbb::internal::padded<tbb::internal::unpadded_mail_outbox, 128ul> at tbb_stddef.h:251:1
-                           1 data member deletion:
-                             'char tbb::internal::mail_outbox::pad[104]', at offset 136 (in bits) at mailbox.h:114:1
-
-
-
-               1 member function deletion:
-                 'method virtual tbb::task* tbb::internal::generic_scheduler::receive_or_steal_task(tbb::internal::reference_count&, bool)' at scheduler.h:391:1, virtual at voffset 7/7
-
-               1 member function insertion:
-                 'method virtual tbb::task* tbb::internal::generic_scheduler::receive_or_steal_task(tbb::internal::reference_count&)' at scheduler.h:362:1, virtual at voffset 7/7
-
-               3 data member deletions:
-                 'unsigned int tbb::internal::generic_scheduler::hint_for_push', at offset 896 (in bits) at scheduler.h:171:1
-                 'volatile intptr_t* tbb::internal::generic_scheduler::my_ref_top_priority', at offset 2560 (in bits) at scheduler.h:433:1
-                 'volatile uintptr_t* tbb::internal::generic_scheduler::my_ref_reload_epoch', at offset 2752 (in bits) at scheduler.h:443:1
-               18 data member changes:
-                'uintptr_t tbb::internal::generic_scheduler::my_stealing_threshold' offset changed from 704 to 832 (in bits) (by +128 bits)
-                type of 'tbb::internal::market* tbb::internal::generic_scheduler::my_market' changed:
-                  in pointed to type 'class tbb::internal::market' at market.h:49:1:
-                    type size changed from 1664 to 1728 (in bits)
-                    1 data member insertion:
-                      'bool tbb::internal::market::join_workers', at offset 384 (in bits) at market.h:88:1
-                    7 data member changes:
-                     type of 'tbb::internal::market::arenas_list_mutex_type tbb::internal::market::my_arenas_list_mutex' changed:
-                       underlying type 'typedef tbb::internal::scheduler_mutex_type' at scheduler_common.h:123:1 changed:
-                         typedef name changed from tbb::internal::scheduler_mutex_type to tbb::spin_rw_mutex at spin_rw_mutex.h:38:1
-                         underlying type 'class tbb::spin_mutex' at spin_mutex.h:47:1 changed:
-                           type name changed from 'tbb::spin_mutex' to 'tbb::spin_rw_mutex_v3'
-                           type size changed from 8 to 64 (in bits)
-                           1 base class insertion:
-                             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
-                           1 data member change:
-                            type of '__TBB_atomic_flag tbb::spin_mutex::flag' changed:
-                              typedef name changed from __TBB_atomic_flag to tbb::spin_rw_mutex_v3::state_t at spin_rw_mutex.h:214:1
-                              underlying type 'typedef __TBB_Flag' at tbb_machine.h:875:1 changed:
-                                typedef name changed from __TBB_Flag to intptr_t at stdint.h:119:1
-                                underlying type 'unsigned char' changed:
-                                  type name changed from 'unsigned char' to 'long int'
-                                  type size changed from 8 to 64 (in bits)
-                            and name of 'tbb::spin_mutex::flag' changed to 'tbb::spin_rw_mutex_v3::state' at spin_rw_mutex.h:224:1
-
-                     'intptr_t tbb::internal::market::my_global_top_priority' offset changed from 384 to 448 (in bits) (by +64 bits)
-                     'intptr_t tbb::internal::market::my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits)
-                     'uintptr_t tbb::internal::market::my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits)
-                     type of 'tbb::internal::market::priority_level_info tbb::internal::market::my_priority_levels[3]' changed:
-                       array element type 'struct tbb::internal::market::priority_level_info' changed: 
-                         type size hasn't changed
-                         1 data member change:
-                          type of 'tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator tbb::internal::market::priority_level_info::next_arena' changed:
-                            entity changed from 'class tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator' to 'tbb::internal::arena*'
+                          type of 'tbb::internal::mail_outbox* tbb::internal::mail_inbox::my_putter' changed:
+                            in pointed to type 'class tbb::internal::mail_outbox' at mailbox.h:103:1:
+                              type size hasn't changed
+                              1 base class deletion:
+                                class tbb::internal::unpadded_mail_outbox at mailbox.h:97:1
+                              1 base class insertion:
+                                struct tbb::internal::padded<tbb::internal::unpadded_mail_outbox, 128ul> at tbb_stddef.h:251:1
+                              1 data member deletion:
+                                'char tbb::internal::mail_outbox::pad[104]', at offset 136 (in bits) at mailbox.h:114:1
+
+
+
+                1 member function deletion:
+                  'method virtual tbb::task* tbb::internal::generic_scheduler::receive_or_steal_task(tbb::internal::reference_count&, bool)' at scheduler.h:391:1, virtual at voffset 7/7
+
+                1 member function insertion:
+                  'method virtual tbb::task* tbb::internal::generic_scheduler::receive_or_steal_task(tbb::internal::reference_count&)' at scheduler.h:362:1, virtual at voffset 7/7
+
+                3 data member deletions:
+                  'unsigned int tbb::internal::generic_scheduler::hint_for_push', at offset 896 (in bits) at scheduler.h:171:1
+                  'volatile intptr_t* tbb::internal::generic_scheduler::my_ref_top_priority', at offset 2560 (in bits) at scheduler.h:433:1
+                  'volatile uintptr_t* tbb::internal::generic_scheduler::my_ref_reload_epoch', at offset 2752 (in bits) at scheduler.h:443:1
+                18 data member changes:
+                  'uintptr_t tbb::internal::generic_scheduler::my_stealing_threshold' offset changed from 704 to 832 (in bits) (by +128 bits)
+                  type of 'tbb::internal::market* tbb::internal::generic_scheduler::my_market' changed:
+                    in pointed to type 'class tbb::internal::market' at market.h:49:1:
+                      type size changed from 1664 to 1728 (in bits)
+                      1 data member insertion:
+                        'bool tbb::internal::market::join_workers', at offset 384 (in bits) at market.h:88:1
+                      7 data member changes:
+                        type of 'tbb::internal::market::arenas_list_mutex_type tbb::internal::market::my_arenas_list_mutex' changed:
+                          underlying type 'typedef tbb::internal::scheduler_mutex_type' at scheduler_common.h:123:1 changed:
+                            typedef name changed from tbb::internal::scheduler_mutex_type to tbb::spin_rw_mutex at spin_rw_mutex.h:38:1
+                            underlying type 'class tbb::spin_mutex' at spin_mutex.h:47:1 changed:
+                              type name changed from 'tbb::spin_mutex' to 'tbb::spin_rw_mutex_v3'
+                              type size changed from 8 to 64 (in bits)
+                              1 base class insertion:
+                                class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
+                              1 data member change:
+                                type of '__TBB_atomic_flag tbb::spin_mutex::flag' changed:
+                                  typedef name changed from __TBB_atomic_flag to tbb::spin_rw_mutex_v3::state_t at spin_rw_mutex.h:214:1
+                                  underlying type 'typedef __TBB_Flag' at tbb_machine.h:875:1 changed:
+                                    typedef name changed from __TBB_Flag to intptr_t at stdint.h:119:1
+                                    underlying type 'unsigned char' changed:
+                                      type name changed from 'unsigned char' to 'long int'
+                                      type size changed from 8 to 64 (in bits)
+                                and name of 'tbb::spin_mutex::flag' changed to 'tbb::spin_rw_mutex_v3::state' at spin_rw_mutex.h:224:1
+
+                        'intptr_t tbb::internal::market::my_global_top_priority' offset changed from 384 to 448 (in bits) (by +64 bits)
+                        'intptr_t tbb::internal::market::my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits)
+                        'uintptr_t tbb::internal::market::my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits)
+                        type of 'tbb::internal::market::priority_level_info tbb::internal::market::my_priority_levels[3]' changed:
+                          array element type 'struct tbb::internal::market::priority_level_info' changed: 
                             type size hasn't changed
-
-                       type size hasn't changed
-                     and offset changed from 576 to 640 (in bits) (by +64 bits)
-                     'uintptr_t tbb::internal::market::my_arenas_aba_epoch' offset changed from 1536 to 1600 (in bits) (by +64 bits)
-                     'tbb::internal::generic_scheduler* tbb::internal::market::my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
-                and offset changed from 768 to 896 (in bits) (by +128 bits)
-                'tbb::internal::FastRandom tbb::internal::generic_scheduler::my_random' offset changed from 832 to 960 (in bits) (by +128 bits)
-                'tbb::task* tbb::internal::generic_scheduler::my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
-                'tbb::task* tbb::internal::generic_scheduler::my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
-                'long int tbb::internal::generic_scheduler::my_ref_count' offset changed from 1088 to 1152 (in bits) (by +64 bits)
-                'bool tbb::internal::generic_scheduler::my_auto_initialized' offset changed from 1152 to 1216 (in bits) (by +64 bits)
-                'intptr_t tbb::internal::generic_scheduler::my_small_task_count' offset changed from 1216 to 1280 (in bits) (by +64 bits)
-                'tbb::task* tbb::internal::generic_scheduler::my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
-                'char tbb::internal::generic_scheduler::_padding1[112]' offset changed from 1344 to 1408 (in bits) (by +64 bits)
-                'tbb::internal::context_list_node_t tbb::internal::generic_scheduler::my_context_list_head' offset changed from 2240 to 2304 (in bits) (by +64 bits)
-                'tbb::spin_mutex tbb::internal::generic_scheduler::my_context_list_mutex' offset changed from 2368 to 2432 (in bits) (by +64 bits)
-                'uintptr_t tbb::internal::generic_scheduler::my_context_state_propagation_epoch' offset changed from 2432 to 2496 (in bits) (by +64 bits)
-                'tbb::atomic<long unsigned int> tbb::internal::generic_scheduler::my_local_ctx_list_update' offset changed from 2496 to 2560 (in bits) (by +64 bits)
-                'uintptr_t tbb::internal::generic_scheduler::my_local_reload_epoch' offset changed from 2816 to 2752 (in bits) (by -64 bits)
-                'volatile bool tbb::internal::generic_scheduler::my_pool_reshuffling_pending' offset changed from 2880 to 2816 (in bits) (by -64 bits)
-                'tbb::atomic<long unsigned int> tbb::internal::generic_scheduler::my_nonlocal_ctx_list_update' offset changed from 2944 to 2880 (in bits) (by -64 bits)
-                '__cilk_tbb_unwatch_thunk tbb::internal::generic_scheduler::my_cilk_unwatch_thunk' offset changed from 3008 to 2944 (in bits) (by -64 bits)
+                            1 data member change:
+                              type of 'tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator tbb::internal::market::priority_level_info::next_arena' changed:
+                                entity changed from 'class tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator' to 'tbb::internal::arena*'
+                                type size hasn't changed
+
+                          type size hasn't changed
+                        and offset changed from 576 to 640 (in bits) (by +64 bits)
+                        'uintptr_t tbb::internal::market::my_arenas_aba_epoch' offset changed from 1536 to 1600 (in bits) (by +64 bits)
+                        'tbb::internal::generic_scheduler* tbb::internal::market::my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
+                  and offset changed from 768 to 896 (in bits) (by +128 bits)
+                  'tbb::internal::FastRandom tbb::internal::generic_scheduler::my_random' offset changed from 832 to 960 (in bits) (by +128 bits)
+                  'tbb::task* tbb::internal::generic_scheduler::my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
+                  'tbb::task* tbb::internal::generic_scheduler::my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
+                  'long int tbb::internal::generic_scheduler::my_ref_count' offset changed from 1088 to 1152 (in bits) (by +64 bits)
+                  'bool tbb::internal::generic_scheduler::my_auto_initialized' offset changed from 1152 to 1216 (in bits) (by +64 bits)
+                  'intptr_t tbb::internal::generic_scheduler::my_small_task_count' offset changed from 1216 to 1280 (in bits) (by +64 bits)
+                  'tbb::task* tbb::internal::generic_scheduler::my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
+                  'char tbb::internal::generic_scheduler::_padding1[112]' offset changed from 1344 to 1408 (in bits) (by +64 bits)
+                  'tbb::internal::context_list_node_t tbb::internal::generic_scheduler::my_context_list_head' offset changed from 2240 to 2304 (in bits) (by +64 bits)
+                  'tbb::spin_mutex tbb::internal::generic_scheduler::my_context_list_mutex' offset changed from 2368 to 2432 (in bits) (by +64 bits)
+                  'uintptr_t tbb::internal::generic_scheduler::my_context_state_propagation_epoch' offset changed from 2432 to 2496 (in bits) (by +64 bits)
+                  'tbb::atomic<long unsigned int> tbb::internal::generic_scheduler::my_local_ctx_list_update' offset changed from 2496 to 2560 (in bits) (by +64 bits)
+                  'uintptr_t tbb::internal::generic_scheduler::my_local_reload_epoch' offset changed from 2816 to 2752 (in bits) (by -64 bits)
+                  'volatile bool tbb::internal::generic_scheduler::my_pool_reshuffling_pending' offset changed from 2880 to 2816 (in bits) (by -64 bits)
+                  'tbb::atomic<long unsigned int> tbb::internal::generic_scheduler::my_nonlocal_ctx_list_update' offset changed from 2944 to 2880 (in bits) (by -64 bits)
+                  '__cilk_tbb_unwatch_thunk tbb::internal::generic_scheduler::my_cilk_unwatch_thunk' offset changed from 3008 to 2944 (in bits) (by -64 bits)
 
 
     [C] 'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index 89c8efa3..203b8473 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -49,10 +49,10 @@
           1 data member insertion:
             'tbb::internal::cpu_ctl_env_space tbb::task_group_context::my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
           1 data member changes (2 filtered):
-           type of 'char tbb::task_group_context::_leading_padding[80]' changed:
-             type name changed from 'char[80]' to 'char[72]'
-             array type size changed from 640 to 576
-             array type subrange 1 changed length from 80 to 72
+            type of 'char tbb::task_group_context::_leading_padding[80]' changed:
+              type name changed from 'char[80]' to 'char[72]'
+              array type size changed from 640 to 576
+              array type subrange 1 changed length from 80 to 72
 
 
     [C] 'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
index 11a383c7..3af4788a 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-         type of 'MyType::Private* MyType::priv' changed:
-           in pointed to type 'struct MyType::Private':
-             type size changed from 32 to 64 (in bits)
-             1 data member insertion:
-               'char MyType::Private::m1', at offset 32 (in bits)
+          type of 'MyType::Private* MyType::priv' changed:
+            in pointed to type 'struct MyType::Private':
+              type size changed from 32 to 64 (in bits)
+              1 data member insertion:
+                'char MyType::Private::m1', at offset 32 (in bits)
 
 
 
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
index 11a383c7..3af4788a 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-         type of 'MyType::Private* MyType::priv' changed:
-           in pointed to type 'struct MyType::Private':
-             type size changed from 32 to 64 (in bits)
-             1 data member insertion:
-               'char MyType::Private::m1', at offset 32 (in bits)
+          type of 'MyType::Private* MyType::priv' changed:
+            in pointed to type 'struct MyType::Private':
+              type size changed from 32 to 64 (in bits)
+              1 data member insertion:
+                'char MyType::Private::m1', at offset 32 (in bits)
 
 
 
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
index 11a383c7..3af4788a 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-         type of 'MyType::Private* MyType::priv' changed:
-           in pointed to type 'struct MyType::Private':
-             type size changed from 32 to 64 (in bits)
-             1 data member insertion:
-               'char MyType::Private::m1', at offset 32 (in bits)
+          type of 'MyType::Private* MyType::priv' changed:
+            in pointed to type 'struct MyType::Private':
+              type size changed from 32 to 64 (in bits)
+              1 data member insertion:
+                'char MyType::Private::m1', at offset 32 (in bits)
 
 
 
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
index 11a383c7..3af4788a 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-         type of 'MyType::Private* MyType::priv' changed:
-           in pointed to type 'struct MyType::Private':
-             type size changed from 32 to 64 (in bits)
-             1 data member insertion:
-               'char MyType::Private::m1', at offset 32 (in bits)
+          type of 'MyType::Private* MyType::priv' changed:
+            in pointed to type 'struct MyType::Private':
+              type size changed from 32 to 64 (in bits)
+              1 data member insertion:
+                'char MyType::Private::m1', at offset 32 (in bits)
 
 
 
diff --git a/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt b/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
index d3ac0320..8b33db84 100644
--- a/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char b_type::m_char', at offset 0 (in bits)
         1 data member change:
-         'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function void foo(a_type*)' has some indirect sub-type changes:
     parameter 1 of type 'a_type*' has sub-type changes:
@@ -20,6 +20,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 data member insertion:
             'char a_type::m_char', at offset 0 (in bits)
           1 data member change:
-           'int a_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int a_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt b/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
index e9a14b00..251f4356 100644
--- a/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char b_type::m_char', at offset 0 (in bits)
         1 data member change:
-         'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
index fa1d882f..71f601f9 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
@@ -9,9 +9,9 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
   [C] 'S* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
index 2cb7afd9..ab0c65c0 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
@@ -5,9 +5,9 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added (1 filtered out) variab
 
   [C] 'S* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
index fa1d882f..71f601f9 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
@@ -9,9 +9,9 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
   [C] 'S* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
index 47fe3d83..a8dc9848 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
@@ -9,9 +9,9 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
   [C] 'S* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
index f235ac30..6f9467c7 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
@@ -5,9 +5,9 @@ Variables changes summary: 0 Removed (1 filtered out), 1 Changed, 0 Added variab
 
   [C] 'S* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
index 47fe3d83..a8dc9848 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
@@ -9,9 +9,9 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
   [C] 'S* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt b/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
index 0de2e7cf..b380313d 100644
--- a/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char C::inserted_char_member', at offset 0 (in bits)
         1 data member change:
-         'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt b/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
index 75274e00..125cd90c 100644
--- a/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
+++ b/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
@@ -13,6 +13,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 data member insertion:
             'char S::inserted_member', at offset 0 (in bits)
           1 data member change:
-           'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt b/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
index 75274e00..125cd90c 100644
--- a/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
+++ b/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
@@ -13,6 +13,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 data member insertion:
             'char S::inserted_member', at offset 0 (in bits)
           1 data member change:
-           'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test29-soname-report-3.txt b/tests/data/test-diff-suppr/test29-soname-report-3.txt
index 609643aa..c17c6a39 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-3.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-3.txt
@@ -5,9 +5,9 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
   [C] 'static S* S::sm0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test29-soname-report-6.txt b/tests/data/test-diff-suppr/test29-soname-report-6.txt
index 609643aa..c17c6a39 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-6.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-6.txt
@@ -5,9 +5,9 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
   [C] 'static S* S::sm0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test29-soname-report-8.txt b/tests/data/test-diff-suppr/test29-soname-report-8.txt
index 609643aa..c17c6a39 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-8.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-8.txt
@@ -5,9 +5,9 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
   [C] 'static S* S::sm0' was changed:
     type of variable changed:
-     in pointed to type 'struct S':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S::m1', at offset 32 (in bits)
+      in pointed to type 'struct S':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S::m1', at offset 32 (in bits)
 
 
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
index ebd3b6ea..b36cce6e 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
@@ -10,13 +10,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char S::inserted_char_member', at offset 0 (in bits)
         1 data member change:
-         'int S::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
     parameter 2 of type 'C&' has sub-type changes:
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char C::inserted_char_member', at offset 0 (in bits)
         1 data member change:
-         'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
index 93fa56e1..a2fe75aa 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char C::inserted_char_member', at offset 0 (in bits)
         1 data member change:
-         'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
index 3cf04629..0e09e1ec 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char S::inserted_char_member', at offset 0 (in bits)
         1 data member change:
-         'int S::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index 9ac85d53..15790f64 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -22,11 +22,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class S' at test30-pub-lib-v1.h:1:1:
         type size hasn't changed
         1 data member change:
-         type of 'S::priv_type* S::priv' changed:
-           in pointed to type 'class S::priv_type' at test30-pub-lib-v1.cc:14:1:
-             type size changed from 64 to 128 (in bits)
-             1 data member insertion:
-               'int S::priv_type::member1', at offset 64 (in bits) at test30-pub-lib-v1.cc:18:1
+          type of 'S::priv_type* S::priv' changed:
+            in pointed to type 'class S::priv_type' at test30-pub-lib-v1.cc:14:1:
+              type size changed from 64 to 128 (in bits)
+              1 data member insertion:
+                'int S::priv_type::member1', at offset 64 (in bits) at test30-pub-lib-v1.cc:18:1
 
 
 
diff --git a/tests/data/test-diff-suppr/test36-leaf-report-0.txt b/tests/data/test-diff-suppr/test36-leaf-report-0.txt
index f286cc7b..92de4df4 100644
--- a/tests/data/test-diff-suppr/test36-leaf-report-0.txt
+++ b/tests/data/test-diff-suppr/test36-leaf-report-0.txt
@@ -16,9 +16,9 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct leaf2 at test36-leaf-v0.cc:9:1' changed:
   type size changed from 64 to 96 (in bits)
   there are data member changes:
-   type 'struct leaf1' of 'leaf2::member0' changed as reported earlier
-   and size changed from 32 to 64 (in bits) (by +32 bits)
-   'char leaf2::member1' offset changed from 32 to 64 (in bits) (by +32 bits)
+    type 'struct leaf1' of 'leaf2::member0' changed as reported earlier
+    and size changed from 32 to 64 (in bits) (by +32 bits)
+    'char leaf2::member1' offset changed from 32 to 64 (in bits) (by +32 bits)
   3 impacted interfaces:
     function void interface1(struct_type*)
     function void interface2(struct_type&)
diff --git a/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt b/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
index 3484c052..4129ccae 100644
--- a/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
@@ -10,12 +10,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'unsigned int public_type::oops', at offset 0 (in bits)
         1 data member change:
-         type of 'private_data* public_type::priv_' changed:
-           in pointed to type 'struct private_data':
-             type size changed from 32 to 64 (in bits)
-             1 data member insertion:
-               'char private_data::private_data1', at offset 32 (in bits)
-         and offset changed from 0 to 64 (in bits) (by +64 bits)
+          type of 'private_data* public_type::priv_' changed:
+            in pointed to type 'struct private_data':
+              type size changed from 32 to 64 (in bits)
+              1 data member insertion:
+                'char private_data::private_data1', at offset 32 (in bits)
+          and offset changed from 0 to 64 (in bits) (by +64 bits)
     parameter 2 of type 'a_not_private_type*' has sub-type changes:
       in pointed to type 'struct a_not_private_type':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt b/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
index e051f750..b76e25b0 100644
--- a/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'unsigned int public_type::oops', at offset 0 (in bits)
         1 data member change:
-         'private_data* public_type::priv_' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'private_data* public_type::priv_' offset changed from 0 to 64 (in bits) (by +64 bits)
     parameter 2 of type 'a_not_private_type*' has sub-type changes:
       in pointed to type 'struct a_not_private_type':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test46-PR25128-report-1.txt b/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
index 9a974032..f16989e4 100644
--- a/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
+++ b/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
@@ -10,9 +10,9 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct root_domain at sched.h:732:1' changed:
   type size changed from 14592 to 14720 (in bits)
   there are data member changes:
-   type 'unsigned long int' of 'root_domain::max_cpu_capacity' changed:
-     entity changed from 'unsigned long int' to 'struct max_cpu_capacity' at sched.h:722:1
-     type size changed from 64 to 192 (in bits)
-   and size changed from 64 to 192 (in bits) (by +128 bits)
-   'perf_domain* root_domain::pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
+    type 'unsigned long int' of 'root_domain::max_cpu_capacity' changed:
+      entity changed from 'unsigned long int' to 'struct max_cpu_capacity' at sched.h:722:1
+      type size changed from 64 to 192 (in bits)
+    and size changed from 64 to 192 (in bits) (by +128 bits)
+    'perf_domain* root_domain::pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
 
diff --git a/tests/data/test-diff-suppr/test46-PR25128-report-2.txt b/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
index d6873cb0..f8654213 100644
--- a/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
+++ b/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
@@ -6,9 +6,9 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct root_domain at sched.h:732:1' changed:
   type size changed from 14592 to 14720 (in bits)
   there are data member changes:
-   type 'unsigned long int' of 'root_domain::max_cpu_capacity' changed:
-     entity changed from 'unsigned long int' to 'struct max_cpu_capacity' at sched.h:722:1
-     type size changed from 64 to 192 (in bits)
-   and size changed from 64 to 192 (in bits) (by +128 bits)
-   'perf_domain* root_domain::pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
+    type 'unsigned long int' of 'root_domain::max_cpu_capacity' changed:
+      entity changed from 'unsigned long int' to 'struct max_cpu_capacity' at sched.h:722:1
+      type size changed from 64 to 192 (in bits)
+    and size changed from 64 to 192 (in bits) (by +128 bits)
+    'perf_domain* root_domain::pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
 
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
index 30b79879..505ba42c 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char S::m0', at offset 0 (in bits)
         1 data member change:
-         'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
index 072702c9..45ead077 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
@@ -9,6 +9,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       1 data member insertion:
         'char S::m0', at offset 0 (in bits)
       1 data member change:
-       'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
index 072702c9..45ead077 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
@@ -9,6 +9,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       1 data member insertion:
         'char S::m0', at offset 0 (in bits)
       1 data member change:
-       'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
index 072702c9..45ead077 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
@@ -9,6 +9,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       1 data member insertion:
         'char S::m0', at offset 0 (in bits)
       1 data member change:
-       'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
index ca57bbbb..1d631754 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
@@ -10,6 +10,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member insertion:
           'char S::m0', at offset 0 (in bits)
         1 data member change:
-         'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
index 072702c9..45ead077 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
@@ -9,6 +9,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       1 data member insertion:
         'char S::m0', at offset 0 (in bits)
       1 data member change:
-       'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
index 2c08c142..559182db 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base at test6-fn-suppr-v1.cc:4:1
         1 data member change:
-         'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function int bar(S&)' at test6-fn-suppr-v1.cc:42:1 has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
@@ -19,7 +19,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base at test6-fn-suppr-v1.cc:4:1
         1 data member change:
-         'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' at test6-fn-suppr-v1.cc:52:1 has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -29,6 +29,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base at test6-fn-suppr-v1.cc:4:1
           1 data member change:
-           'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
index 32e1d239..a679f47a 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-         'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
@@ -19,7 +19,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-         'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -29,6 +29,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-           'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
index 0a3c7b4d..20fcb19b 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-         'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,6 +20,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-           'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
index 0a3c7b4d..20fcb19b 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-         'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,6 +20,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-           'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
index 0a3c7b4d..20fcb19b 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-         'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,6 +20,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-           'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
index 7fd8502c..10153c12 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
@@ -5,20 +5,20 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
   [C] 'S0* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S0':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S0::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S0':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S0::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'S1* var1' was changed:
     type of variable changed:
-     in pointed to type 'struct S1':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S1::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S1':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S1::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
index d4d86310..6a924a85 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
@@ -5,11 +5,11 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
   [C] 'S1* var1' was changed:
     type of variable changed:
-     in pointed to type 'struct S1':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S1::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S1':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S1::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
index af81d0a8..15e0668f 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
@@ -5,11 +5,11 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
   [C] 'S0* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S0':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S0::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S0':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S0::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
index d4d86310..6a924a85 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
@@ -5,11 +5,11 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
   [C] 'S1* var1' was changed:
     type of variable changed:
-     in pointed to type 'struct S1':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S1::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S1':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S1::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
index af81d0a8..15e0668f 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
@@ -5,11 +5,11 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
   [C] 'S0* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S0':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S0::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S0':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S0::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
index af81d0a8..15e0668f 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
@@ -5,11 +5,11 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
   [C] 'S0* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S0':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S0::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S0':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S0::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
index 7fd8502c..10153c12 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
@@ -5,20 +5,20 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
   [C] 'S0* var0' was changed:
     type of variable changed:
-     in pointed to type 'struct S0':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S0::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S0':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S0::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'S1* var1' was changed:
     type of variable changed:
-     in pointed to type 'struct S1':
-       type size changed from 32 to 64 (in bits)
-       1 data member insertion:
-         'char S1::inserted_member', at offset 0 (in bits)
-       1 data member change:
-        'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+      in pointed to type 'struct S1':
+        type size changed from 32 to 64 (in bits)
+        1 data member insertion:
+          'char S1::inserted_member', at offset 0 (in bits)
+        1 data member change:
+          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
 
