diff mbox series

abg-writer.cc: Clean up new line emission.

Message ID 20200629105033.1195405-1-gprocida@google.com
State New
Headers show
Series abg-writer.cc: Clean up new line emission. | expand

Commit Message

Giuliano Procida June 29, 2020, 10:50 a.m. UTC
The XML writer has a few different styles of new line handling in
different places. Some functions are responsible for line termination,
others are not and there is bespoke logic and state variables in a few
places.

Extra or missing newlines should have no impact on the semantics of
any given ABI file but they do affect textual diffs and diff
statistics.

By insisting the XML emitted should have exactly one XML tag (or
comment) per line, we can simplify the code and make it more
composable.

This commit does this, yielding a modest reduction in code size and
eliminating all blank lines in XML output (7127 blank lines in current
tests). The commit also fixes some code whitespace.

	* src/abg-writer.cc (annotate): In the
	function_decl::parameter_sptr overload, fix code whitespace.
	(write_decl_in_scope): Remove wrote_context state variable and
	associated logic; emit new line unconditionally after end of
	XML tags and nowhere else.
	(write_canonical_types_of_scope): Emit new line after end of
	XML comment and nowhere else.
	(write_translation_unit): Emit new line after end of XML tags
	and nowhere else.
	(write_type_decl): Likewise.
	(write_namespace_decl): Likewise.
	(write_qualified_type_def): Emit new line after end of XML tag.
	(write_pointer_type_def): Likewise.
	(write_reference_type_def): Likewise.
	(write_array_type_def): Emit new line after end of XML tags
	and nowhere else.
	(write_enum_type_decl): Emit new line after end of XML tag.
	(write_elf_symbol): Likewise.
	(write_elf_symbols_table): Emit no new lines.
	(write_elf_needed): Emit new line unconditionally after end of
	XML tags.
	(write_typedef_decl): Emit new line after end of XML tag.
	(write_var_decl): Emit new line after end of XML tag.
	(write_function_decl): Likewise.
	(write_function_type): Fold two output statements into
	one; emit new line after end of XML tag.
	(write_class_decl_opening_tag): Emit new line unconditionally
	after end of XML tags and simplify empty element tag logic.
	(write_union_decl_opening_tag): Likewise.
	(write_class_decl): Emit new line after end of XML tag and
	nowhere else.
	(write_union_decl): Likewise.
	(write_member_type_opening_tag): Emit new line after end of
	XML tag.
	(write_member_type): Emit new lines only after XML tags.
	(write_type_tparameter): Emit new line after XML tag.
	(write_non_type_tparameter): Likewise.
	(write_template_tparameter): Emit new line after XML tag and
	nowhere else.
	(write_type_composition): Likewise.
	(write_template_parameters): Emit no new lines.
	(write_function_tdecl): Emit new line after XML tag and
	nowhere else.
	(write_class_tdecl): Likewise.
	(write_corpus): Emit new lines only after XML tags.
	(dump): In the decl_base_sptr overload, don't emit final new
	line as this is now done by write_decl. In the var_decl_sptr
	overload, don't emit final new line (mistakenly done to cerr
	instead of o) as this is now done by write_var_decl. In the
	translation_unit overload, don't emit final new line as this
	doubles that emitted by write_translation_unit.
	* tests/data/test-annotate/libtest23.so.abi: Delete all blank
	lines.
	* tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Ditto.
	* tests/data/test-annotate/libtest24-drop-fns.so.abi: Ditto.
	* tests/data/test-annotate/test-anonymous-members-0.o.abi:
	Ditto.
	* tests/data/test-annotate/test1.abi: Ditto.
	* tests/data/test-annotate/test13-pr18894.so.abi: Ditto.
	* tests/data/test-annotate/test14-pr18893.so.abi: Ditto.
	* tests/data/test-annotate/test15-pr18892.so.abi: Ditto.
	* tests/data/test-annotate/test17-pr19027.so.abi: Ditto.
	* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
	Ditto.
	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Ditto.
	* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi:
	Ditto.
	* tests/data/test-annotate/test21-pr19092.so.abi: Ditto.
	* tests/data/test-annotate/test7.so.abi: Ditto.
	* tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Ditto.
	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Ditto.
	* tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi:
	Ditto.
	* tests/data/test-read-dwarf/libtest23.so.abi: Ditto.
	* tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/libtest24-drop-fns.so.abi: Ditto.
	* tests/data/test-read-dwarf/test1.abi: Ditto.
	* tests/data/test-read-dwarf/test1.hash.abi: Ditto.
	* tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Ditto.
	* tests/data/test-read-dwarf/test11-pr18828.so.abi: Ditto.
	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Ditto.
	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Ditto.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Ditto.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Ditto.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Ditto.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Ditto.
	* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Ditto.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
	Ditto.
	* tests/data/test-read-dwarf/test7.so.abi: Ditto.
	* tests/data/test-read-dwarf/test7.so.hash.abi: Ditto.
	* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi:
	Ditto.
	* tests/data/test-read-write/test10.xml: Ditto.
	* tests/data/test-read-write/test15.xml: Ditto.
	* tests/data/test-read-write/test21.xml: Ditto.
	* tests/data/test-read-write/test25.xml: Ditto.
	* tests/data/test-read-write/test28-without-std-fns-ref.xml:
	Ditto.
	* tests/data/test-read-write/test28-without-std-vars-ref.xml:
	Ditto.

Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 src/abg-writer.cc                             |  146 +-
 tests/data/test-annotate/libtest23.so.abi     |   49 -
 .../test-annotate/libtest24-drop-fns-2.so.abi |   29 -
 .../test-annotate/libtest24-drop-fns.so.abi   |   29 -
 .../test-anonymous-members-0.o.abi            |    8 -
 tests/data/test-annotate/test1.abi            |    2 -
 .../data/test-annotate/test13-pr18894.so.abi  |    6 -
 .../data/test-annotate/test14-pr18893.so.abi  |   62 -
 .../data/test-annotate/test15-pr18892.so.abi  |  140 --
 .../data/test-annotate/test17-pr19027.so.abi  |  165 ---
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |   92 --
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |  325 -----
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |  114 --
 .../data/test-annotate/test21-pr19092.so.abi  |   50 -
 tests/data/test-annotate/test7.so.abi         |   15 -
 .../PR22015-libboost_iostreams.so.abi         |   52 -
 .../test-read-dwarf/PR22122-libftdc.so.abi    |  300 -----
 .../data/test-read-dwarf/PR25007-sdhci.ko.abi |   76 --
 .../PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi |   12 -
 tests/data/test-read-dwarf/libtest23.so.abi   |   49 -
 .../libtest24-drop-fns-2.so.abi               |   29 -
 .../test-read-dwarf/libtest24-drop-fns.so.abi |   29 -
 tests/data/test-read-dwarf/test1.abi          |    2 -
 tests/data/test-read-dwarf/test1.hash.abi     |    2 -
 .../test-read-dwarf/test10-pr18818-gcc.so.abi |  234 ----
 .../test-read-dwarf/test11-pr18828.so.abi     |  944 -------------
 .../test-read-dwarf/test12-pr18844.so.abi     |  921 -------------
 .../test-read-dwarf/test13-pr18894.so.abi     |    6 -
 .../test-read-dwarf/test14-pr18893.so.abi     |   62 -
 .../test-read-dwarf/test15-pr18892.so.abi     |  140 --
 .../test-read-dwarf/test16-pr18904.so.abi     | 1169 -----------------
 .../test-read-dwarf/test17-pr19027.so.abi     |  165 ---
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |   92 --
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |  325 -----
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |  114 --
 .../test-read-dwarf/test21-pr19092.so.abi     |   50 -
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi | 1040 ---------------
 tests/data/test-read-dwarf/test7.so.abi       |   15 -
 tests/data/test-read-dwarf/test7.so.hash.abi  |   15 -
 .../test9-pr18818-clang.so.abi                |  140 --
 tests/data/test-read-write/test10.xml         |    1 -
 tests/data/test-read-write/test15.xml         |    1 -
 tests/data/test-read-write/test21.xml         |    1 -
 tests/data/test-read-write/test25.xml         |    7 -
 .../test28-without-std-fns-ref.xml            |   24 -
 .../test28-without-std-vars-ref.xml           |   24 -
 46 files changed, 40 insertions(+), 7233 deletions(-)
diff mbox series

Patch

diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index ce0bae2d..8e2c4df1 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -1229,7 +1229,7 @@  annotate(const function_decl::parameter_sptr&	parm,
 	<< xml::escape_xml_comment(get_pretty_representation(parm->get_type()));
     }
 
-  o << "' -->\n" ;
+  o << "' -->\n";
 
   return true;
 }
@@ -1959,23 +1959,19 @@  write_decl_in_scope(const decl_base_sptr&	decl,
   stack<string> closing_tags;
   stack<unsigned> closing_indents;
   unsigned indent = initial_indent;
-  bool wrote_context = false;
   for (list<scope_decl*>::const_iterator i = scopes.begin();
        i != scopes.end();
        ++i)
     {
       ABG_ASSERT(!is_global_scope(*i));
 
-      if (i != scopes.begin())
-	o << "\n";
-
       // A type scope is either a namespace ...
       if (namespace_decl* n = is_namespace(*i))
 	{
 	  do_indent(o, indent);
 	  o << "<namespace-decl name='"
 	    << xml::escape_xml_string(n->get_name())
-	    << "'>";
+	    << "'>\n";
 	  closing_tags.push("</namespace-decl>");
 	  closing_indents.push(indent);
 	}
@@ -2012,19 +2008,14 @@  write_decl_in_scope(const decl_base_sptr&	decl,
 	// We should never reach this point.
 	abort();
       indent += c.get_xml_element_indent();
-      wrote_context = true;
     }
 
-  if (wrote_context)
-    o << "\n";
-
   write_decl(decl, ctxt, indent);
 
   while (!closing_tags.empty())
     {
-      o << "\n";
       do_indent(o, closing_indents.top());
-      o << closing_tags.top();
+      o << closing_tags.top() << "\n";
       closing_tags.pop();
       closing_indents.pop();
     }
@@ -2201,14 +2192,12 @@  write_canonical_types_of_scope(const scope_decl	&scope,
   const type_base_sptrs_type &canonical_types =
     scope.get_sorted_canonical_types();
 
-  ostream& o = ctxt.get_ostream();
   const config& c = ctxt.get_config();
 
   for (type_base_sptrs_type::const_iterator i = canonical_types.begin();
        i != canonical_types.end();
        ++i)
     {
-      o << "\n";
       if (is_member_type)
 	write_member_type(*i, ctxt, indent + c.get_xml_element_indent());
       else
@@ -2264,11 +2253,11 @@  write_translation_unit(write_context&	       ctxt,
 
   if (tu.is_empty())
     {
-      o << "/>";
+      o << "/>\n";
       return true;
     }
 
-  o << ">";
+  o << ">\n";
 
   write_canonical_types_of_scope(*tu.get_global_scope(),
 				 ctxt, indent);
@@ -2287,18 +2276,14 @@  write_translation_unit(write_context&	       ctxt,
 	    if (class_type->get_is_declaration_only()
 		&& !class_type->is_empty()
 		&& !ctxt.type_is_emitted(class_type))
-	    {
-	      o << "\n";
 	      write_type(class_type, ctxt,
 			 indent + c.get_xml_element_indent());
-	    }
 	  continue;
 	}
 
       if (decl_base_sptr d = is_decl(*i))
 	if (ctxt.decl_is_emitted(d))
 	  continue;
-      o << "\n";
       write_decl(*i, ctxt, indent + c.get_xml_element_indent());
     }
 
@@ -2361,13 +2346,11 @@  write_translation_unit(write_context&	       ctxt,
 	      if (decl_base* d = get_type_declaration(*i))
 		{
 		  decl_base_sptr decl(d, noop_deleter());
-		  o << "\n";
 		  write_decl_in_scope(decl, ctxt,
 				      indent + c.get_xml_element_indent());
 		}
 	      else if (function_type_sptr fn_type = is_function_type(t))
 		{
-		  o << "\n";
 		  write_function_type(fn_type, ctxt,
 				      indent + c.get_xml_element_indent());
 		}
@@ -2418,11 +2401,9 @@  write_translation_unit(write_context&	       ctxt,
 	continue;
 
       ABG_ASSERT(fn_type);
-      o << "\n";
       write_function_type(fn_type, ctxt, indent + c.get_xml_element_indent());
     }
 
-  o << "\n";
   do_indent(o, indent);
   o << "</abi-instr>\n";
 
@@ -2461,7 +2442,7 @@  write_type_decl(const type_decl_sptr& d, write_context& ctxt, unsigned indent)
 
   write_location(d, ctxt);
 
-  o << " id='" << ctxt.get_id_for_type(d) << "'" <<  "/>";
+  o << " id='" << ctxt.get_id_for_type(d) << "'" <<  "/>\n";
 
   ctxt.record_type_as_emitted(d);
 
@@ -2495,7 +2476,7 @@  write_namespace_decl(const namespace_decl_sptr& decl,
 
   o << "<namespace-decl name='"
     << xml::escape_xml_string(decl->get_name())
-    << "'>";
+    << "'>\n";
 
   typedef scope_decl::declarations		declarations;
   typedef declarations::const_iterator const_iterator;
@@ -2508,13 +2489,11 @@  write_namespace_decl(const namespace_decl_sptr& decl,
 	  // This type has already been emitted to the current
 	  // translation unit so do not emit it again.
 	  continue;
-      o << "\n";
       write_decl(*i, ctxt, indent + c.get_xml_element_indent());
     }
 
-  o << "\n";
   do_indent(o, indent);
-  o << "</namespace-decl>";
+  o << "</namespace-decl>\n";
 
   return true;
 }
@@ -2573,7 +2552,7 @@  write_qualified_type_def(const qualified_type_def_sptr&	decl,
   if (i.empty())
     i = ctxt.get_id_for_type(decl);
 
-  o<< " id='" << i << "'/>";
+  o<< " id='" << i << "'/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -2649,7 +2628,7 @@  write_pointer_type_def(const pointer_type_def_sptr&	decl,
   o << " id='" << i << "'";
 
   write_location(static_pointer_cast<decl_base>(decl), ctxt);
-  o << "/>";
+  o << "/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -2731,7 +2710,7 @@  write_reference_type_def(const reference_type_def_sptr&	decl,
 
   write_location(static_pointer_cast<decl_base>(decl), ctxt);
 
-  o << "/>";
+  o << "/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -2857,7 +2836,7 @@  write_array_type_def(const array_type_def_sptr&	decl,
   write_location(static_pointer_cast<decl_base>(decl), ctxt);
 
   if (!decl->get_dimension_count())
-    o << "/>";
+    o << "/>\n";
   else
     {
       o << ">\n";
@@ -2870,11 +2849,10 @@  write_array_type_def(const array_type_def_sptr&	decl,
 	  unsigned local_indent =
 	    indent + ctxt.get_config().get_xml_element_indent();
 	  write_array_subrange_type(*si, ctxt, local_indent);
-	  o << "\n";
 	}
 
       do_indent(o, indent);
-      o << "</array-type-def>";
+      o << "</array-type-def>\n";
     }
 
   ctxt.record_type_as_emitted(decl);
@@ -2963,7 +2941,7 @@  write_enum_type_decl(const enum_type_decl_sptr& decl,
     }
 
   do_indent(o, indent);
-  o << "</enum-decl>";
+  o << "</enum-decl>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -3040,7 +3018,7 @@  write_elf_symbol(const elf_symbol_sptr&	sym,
   if (sym->is_common_symbol())
     o << " is-common='yes'";
 
-  o << "/>";
+  o << "/>\n";
 
   return true;
 }
@@ -3063,14 +3041,9 @@  write_elf_symbols_table(const elf_symbols&	syms,
   if (syms.empty())
     return false;
 
-  ostream& o = ctxt.get_ostream();
-
   unordered_map<string, bool> emitted_syms;
   for (elf_symbols::const_iterator it = syms.begin(); it != syms.end(); ++it)
-    {
-      write_elf_symbol(*it, ctxt, indent);
-      o << "\n";
-    }
+    write_elf_symbol(*it, ctxt, indent);
 
   return true;
 }
@@ -3099,10 +3072,8 @@  write_elf_needed(const vector<string>&	needed,
        i != needed.end();
        ++i)
     {
-      if (i != needed.begin())
-	o << "\n";
       do_indent(o, indent);
-      o << "<dependency name='" << *i << "'/>";
+      o << "<dependency name='" << *i << "'/>\n";
     }
   return true;
 }
@@ -3154,7 +3125,7 @@  write_typedef_decl(const typedef_decl_sptr&	decl,
   if (i.empty())
     i = ctxt.get_id_for_type(decl);
 
-  o << " id='" << i << "'/>";
+  o << " id='" << i << "'/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -3221,7 +3192,7 @@  write_var_decl(const var_decl_sptr& decl, write_context& ctxt,
 
   write_elf_symbol_reference(decl->get_symbol(), o);
 
-  o << "/>";
+  o << "/>\n";
 
   ctxt.record_decl_as_emitted(decl);
 
@@ -3323,7 +3294,7 @@  write_function_decl(const function_decl_sptr& decl, write_context& ctxt,
     }
 
   do_indent(o, indent);
-  o << "</function-decl>";
+  o << "</function-decl>\n";
 
   ctxt.record_decl_as_emitted(decl);
 
@@ -3374,8 +3345,8 @@  write_function_type(const function_type_sptr& fn_type,
   interned_string id = ctxt.get_id_for_type(fn_type);
 
   o << " id='"
-    <<  id << "'";
-  o << ">\n";
+    <<  id << "'"
+    << ">\n";
 
   type_base_sptr parm_type;
   for (vector<function_decl::parameter_sptr>::const_iterator pi =
@@ -3420,7 +3391,7 @@  write_function_type(const function_type_sptr& fn_type,
     }
 
   do_indent(o, indent);
-  o << "</function-type>";
+  o << "</function-type>\n";
 
   ctxt.record_type_as_emitted(fn_type);
   return true;
@@ -3490,15 +3461,10 @@  write_class_decl_opening_tag(const class_decl_sptr&	decl,
     i = ctxt.get_id_for_type(decl);
   o << " id='" << i << "'";
 
-  if (!prepare_to_handle_members)
-    o << ">\n";
+  if (prepare_to_handle_members && decl->has_no_base_nor_member())
+    o << "/>\n";
   else
-    {
-      if (decl->has_no_base_nor_member())
-	o << "/>";
-      else
-	o << ">\n";
-    }
+    o << ">\n";
 
   return true;
 }
@@ -3556,15 +3522,10 @@  write_union_decl_opening_tag(const union_decl_sptr&	decl,
     i = ctxt.get_id_for_type(decl);
   o << " id='" << i << "'";
 
-  if (!prepare_to_handle_members)
-    o << ">\n";
+  if (prepare_to_handle_members && decl->has_no_member())
+    o << "/>\n";
   else
-    {
-      if (decl->has_no_member())
-	o << "/>";
-      else
-	o << ">\n";
-    }
+    o << ">\n";
 
   return true;
 }
@@ -3658,7 +3619,6 @@  write_class_decl(const class_decl_sptr& decl,
 
 	  write_var_decl(*data, ctxt, is_static,
 			 get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</data-member>\n";
@@ -3690,7 +3650,6 @@  write_class_decl(const class_decl_sptr& decl,
 	  write_function_decl(fn, ctxt,
 			      /*skip_first_parameter=*/false,
 			      get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</member-function>\n";
@@ -3719,7 +3678,6 @@  write_class_decl(const class_decl_sptr& decl,
 	  write_function_decl(fn, ctxt,
 			      /*skip_first_parameter=*/false,
 			      get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</member-function>\n";
@@ -3740,7 +3698,6 @@  write_class_decl(const class_decl_sptr& decl,
 	  o << ">\n";
 	  write_function_tdecl((*fn)->as_function_tdecl(), ctxt,
 			       get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 	  do_indent(o, nb_ws);
 	  o << "</member-template>\n";
 	}
@@ -3758,14 +3715,13 @@  write_class_decl(const class_decl_sptr& decl,
 	  o << ">\n";
 	  write_class_tdecl((*cl)->as_class_tdecl(), ctxt,
 			    get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 	  do_indent(o, nb_ws);
 	  o << "</member-template>\n";
 	}
 
       do_indent_to_level(ctxt, indent, 0);
 
-      o << "</class-decl>";
+      o << "</class-decl>\n";
     }
 
   // We allow several *declarations* of the same class in the corpus,
@@ -3845,7 +3801,6 @@  write_union_decl(const union_decl_sptr& decl,
 
 	  write_var_decl(*data, ctxt, is_static,
 			 get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</data-member>\n";
@@ -3877,7 +3832,6 @@  write_union_decl(const union_decl_sptr& decl,
 	  write_function_decl(fn, ctxt,
 			      /*skip_first_parameter=*/false,
 			      get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 
 	  do_indent_to_level(ctxt, indent, 1);
 	  o << "</member-function>\n";
@@ -3898,7 +3852,6 @@  write_union_decl(const union_decl_sptr& decl,
 	  o << ">\n";
 	  write_function_tdecl((*fn)->as_function_tdecl(), ctxt,
 			       get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 	  do_indent(o, nb_ws);
 	  o << "</member-template>\n";
 	}
@@ -3916,14 +3869,13 @@  write_union_decl(const union_decl_sptr& decl,
 	  o << ">\n";
 	  write_class_tdecl((*cl)->as_class_tdecl(), ctxt,
 			    get_indent_to_level(ctxt, indent, 2));
-	  o << "\n";
 	  do_indent(o, nb_ws);
 	  o << "</member-template>\n";
 	}
 
       do_indent_to_level(ctxt, indent, 0);
 
-      o << "</union-decl>";
+      o << "</union-decl>\n";
     }
 
   // We allow several *declarations* of the same union in the corpus,
@@ -3965,7 +3917,7 @@  write_member_type_opening_tag(const type_base_sptr& t,
 
   o << "<member-type";
   write_access(decl, o);
-  o << ">";
+  o << ">\n";
 
   return true;
 }
@@ -3991,7 +3943,6 @@  write_member_type(const type_base_sptr& t, write_context& ctxt, unsigned indent)
   ostream& o = ctxt.get_ostream();
 
   write_member_type_opening_tag(t, ctxt, indent);
-  o << "\n";
 
   string id = ctxt.get_id_for_type(t);
 
@@ -4012,7 +3963,6 @@  write_member_type(const type_base_sptr& t, write_context& ctxt, unsigned indent)
 			     id, ctxt, nb_ws)
 	 || write_class_decl(dynamic_pointer_cast<class_decl>(t),
 			     id, ctxt, nb_ws));
-  o << "\n";
 
   do_indent_to_level(ctxt, indent, 0);
   o << "</member-type>\n";
@@ -4055,7 +4005,7 @@  write_type_tparameter(const type_tparameter_sptr	decl,
 
   write_location(decl, ctxt);
 
-  o << "/>";
+  o << "/>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -4092,7 +4042,7 @@  write_non_type_tparameter(
 
   write_location(decl, ctxt);
 
-  o << "/>";
+  o << "/>\n";
 
   return true;
 }
@@ -4136,13 +4086,10 @@  write_template_tparameter (const template_tparameter_sptr	decl,
 	 decl->get_template_parameters().begin();
        p != decl->get_template_parameters().end();
        ++p)
-    {
-      write_template_parameter(decl, ctxt, nb_spaces);
-      o <<"\n";
-    }
+    write_template_parameter(decl, ctxt, nb_spaces);
 
   do_indent_to_level(ctxt, indent, 0);
-  o << "</template-template-parameter>";
+  o << "</template-template-parameter>\n";
 
   ctxt.record_type_as_emitted(decl);
 
@@ -4186,10 +4133,8 @@  write_type_composition
    (dynamic_pointer_cast<qualified_type_def>(decl->get_composed_type()),
     ctxt, nb_spaces));
 
-  o << "\n";
-
   do_indent_to_level(ctxt, indent, 0);
-  o << "</template-parameter-type-composition>";
+  o << "</template-parameter-type-composition>\n";
 
   return true;
 }
@@ -4233,17 +4178,12 @@  write_template_parameters(const shared_ptr<template_decl> tmpl,
   if (!tmpl)
     return;
 
-  ostream &o = ctxt.get_ostream();
-
   unsigned nb_spaces = get_indent_to_level(ctxt, indent, 1);
   for (list<shared_ptr<template_parameter> >::const_iterator p =
 	 tmpl->get_template_parameters().begin();
        p != tmpl->get_template_parameters().end();
        ++p)
-    {
-      write_template_parameter(*p, ctxt, nb_spaces);
-      o << "\n";
-    }
+    write_template_parameter(*p, ctxt, nb_spaces);
 }
 
 /// Serialize an instance of function_tdecl.
@@ -4279,11 +4219,10 @@  write_function_tdecl(const shared_ptr<function_tdecl> decl,
   write_function_decl(decl->get_pattern(), ctxt,
 		      /*skip_first_parameter=*/false,
 		      get_indent_to_level(ctxt, indent, 1));
-  o << "\n";
 
   do_indent_to_level(ctxt, indent, 0);
 
-  o << "</function-template-decl>";
+  o << "</function-template-decl>\n";
 
   return true;
 }
@@ -4322,11 +4261,10 @@  write_class_tdecl(const shared_ptr<class_tdecl> decl,
 
   write_class_decl(decl->get_pattern(), ctxt,
 		   get_indent_to_level(ctxt, indent, 1));
-  o << "\n";
 
   do_indent_to_level(ctxt, indent, 0);
 
-  o << "</class-template-decl>";
+  o << "</class-template-decl>\n";
 
   return true;
 }
@@ -4591,7 +4529,6 @@  write_corpus(write_context&	ctxt,
       out << "<elf-needed>\n";
       write_elf_needed(corpus->get_needed(), ctxt,
 		       get_indent_to_level(ctxt, indent, 2));
-      out << "\n";
       do_indent_to_level(ctxt, indent, 1);
       out << "</elf-needed>\n";
     }
@@ -4712,7 +4649,6 @@  dump(const decl_base_sptr d, std::ostream& o, const bool annotate)
   xml_writer::write_context ctxt(d->get_environment(), o);
   xml_writer::set_annotate(ctxt, annotate);
   write_decl(d, ctxt, /*indent=*/0);
-  o << "\n";
 }
 
 /// Serialize a pointer to decl_base to stderr.
@@ -4757,7 +4693,6 @@  dump(const var_decl_sptr v, std::ostream& o, const bool annotate)
   xml_writer::write_context ctxt(v->get_environment(), o);
   xml_writer::set_annotate(ctxt, annotate);
   write_var_decl(v, ctxt, /*linkage_name*/true, /*indent=*/0);
-  cerr << "\n";
 }
 
 /// Serialize a pointer to var_decl to stderr.
@@ -4782,7 +4717,6 @@  dump(const translation_unit& t, std::ostream& o, const bool annotate)
   xml_writer::write_context ctxt(t.get_environment(), o);
   xml_writer::set_annotate(ctxt, annotate);
   write_translation_unit(ctxt, t, /*indent=*/0);
-  o << "\n";
 }
 
 /// Serialize an instance of @ref translation_unit to stderr.
diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi
index 627f72af..f5f868dc 100644
--- a/tests/data/test-annotate/libtest23.so.abi
+++ b/tests/data/test-annotate/libtest23.so.abi
@@ -16,7 +16,6 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -66,7 +65,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='infinite' id='type-id-16'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-17'/>
-
     </array-type-def>
     <!-- void -->
     <type-decl name='void' id='type-id-18'/>
@@ -232,7 +230,6 @@ 
     <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-75'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> > std::string -->
       <typedef-decl name='string' type-id='type-id-51' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-72'/>
     </namespace-decl>
@@ -334,7 +331,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
     <!-- wint_t btowc(int) -->
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -962,72 +958,58 @@ 
     <namespace-decl name='std'>
       <!-- class std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='112' column='1' id='type-id-51'>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::size_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type -->
             <typedef-decl name='size_type' type-id='type-id-81' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='121' column='1' id='type-id-57'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef rebind<char>::other std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_CharT_alloc_type -->
             <typedef-decl name='_CharT_alloc_type' type-id='type-id-83' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='114' column='1' id='type-id-82'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char_traits<char> std::basic_string<char, std::char_traits<char>, std::allocator<char> >::traits_type -->
             <typedef-decl name='traits_type' type-id='type-id-85' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='118' column='1' id='type-id-84'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char_traits<char>::char_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::value_type -->
             <typedef-decl name='value_type' type-id='type-id-87' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='119' column='1' id='type-id-86'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char> std::basic_string<char, std::char_traits<char>, std::allocator<char> >::allocator_type -->
             <typedef-decl name='allocator_type' type-id='type-id-39' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='120' column='1' id='type-id-88'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::difference_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::difference_type -->
             <typedef-decl name='difference_type' type-id='type-id-90' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='122' column='1' id='type-id-89'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reference -->
             <typedef-decl name='reference' type-id='type-id-92' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='123' column='1' id='type-id-91'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::const_reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-94' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='124' column='1' id='type-id-93'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::pointer std::basic_string<char, std::char_traits<char>, std::allocator<char> >::pointer -->
             <typedef-decl name='pointer' type-id='type-id-96' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='125' column='1' id='type-id-95'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef allocator<char>::const_pointer std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_pointer -->
             <typedef-decl name='const_pointer' type-id='type-id-98' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='126' column='1' id='type-id-97'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::iterator -->
             <typedef-decl name='iterator' type-id='type-id-100' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='127' column='1' id='type-id-99'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_iterator -->
             <typedef-decl name='const_iterator' type-id='type-id-102' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='129' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reverse_iterator -->
             <typedef-decl name='const_reverse_iterator' type-id='type-id-104' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='130' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reverse_iterator -->
             <typedef-decl name='reverse_iterator' type-id='type-id-106' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='131' column='1' id='type-id-105'/>
@@ -2825,32 +2807,26 @@ 
     </namespace-decl>
     <!-- class allocator<char> -->
     <class-decl name='allocator&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-39'>
-
         <member-type access='public'>
           <!-- typedef std::size_t allocator<char>::size_type -->
           <typedef-decl name='size_type' type-id='type-id-109' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='95' column='1' id='type-id-81'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef std::ptrdiff_t allocator<char>::difference_type -->
           <typedef-decl name='difference_type' type-id='type-id-110' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='96' column='1' id='type-id-90'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef char& allocator<char>::reference -->
           <typedef-decl name='reference' type-id='type-id-36' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='99' column='1' id='type-id-92'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef const char& allocator<char>::const_reference -->
           <typedef-decl name='const_reference' type-id='type-id-44' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='100' column='1' id='type-id-94'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef char* allocator<char>::pointer -->
           <typedef-decl name='pointer' type-id='type-id-37' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='97' column='1' id='type-id-96'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef const char* allocator<char>::const_pointer -->
           <typedef-decl name='const_pointer' type-id='type-id-29' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='98' column='1' id='type-id-98'/>
@@ -2869,7 +2845,6 @@ 
     </namespace-decl>
     <!-- struct rebind<char> -->
     <class-decl name='rebind&lt;char&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-111'>
-
         <member-type access='public'>
           <!-- typedef allocator<char> rebind<char>::other -->
           <typedef-decl name='other' type-id='type-id-39' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='105' column='1' id='type-id-83'/>
@@ -2877,7 +2852,6 @@ 
     </class-decl>
     <!-- struct char_traits<char> -->
     <class-decl name='char_traits&lt;char&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-85'>
-
         <member-type access='public'>
           <!-- typedef char char_traits<char>::char_type -->
           <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/4.8.2/bits/char_traits.h' line='235' column='1' id='type-id-87'/>
@@ -2897,23 +2871,10 @@ 
       <!-- void -->
       <return type-id='type-id-18'/>
     </function-decl>
-
-
-
-
-
-
-
-
-
-
     <!-- struct _IO_FILE -->
     <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-21'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
-
     <!-- void emit(std::string&, std::string&) -->
     <function-decl name='emit' mangled-name='_Z4emitRSsS_' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSsS_'>
       <!-- parameter of type 'std::string&' -->
@@ -2923,15 +2884,5 @@ 
       <!-- void -->
       <return type-id='type-id-18'/>
     </function-decl>
-
-
-
-
-
-
-
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
index 5b8cb006..0c6078af 100644
--- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
@@ -18,8 +18,6 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -28,7 +26,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
@@ -75,7 +72,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='infinite' id='type-id-18'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-19'/>
-
     </array-type-def>
     <!-- void -->
     <type-decl name='void' id='type-id-20'/>
@@ -95,7 +91,6 @@ 
     <typedef-decl name='__mbstate_t' type-id='type-id-29' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-27'/>
     <!-- struct {int __count; union {unsigned int __wch; char __wchb[4];} __value;} -->
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-27' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-29'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-30'>
@@ -384,10 +379,8 @@ 
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-59'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-90'>
@@ -412,47 +405,38 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::size_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type -->
             <typedef-decl name='size_type' type-id='type-id-101' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-66'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char> std::basic_string<char, std::char_traits<char>, std::allocator<char> >::allocator_type -->
             <typedef-decl name='allocator_type' type-id='type-id-56' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reference -->
             <typedef-decl name='reference' type-id='type-id-104' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::const_reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-106' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-105'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::iterator -->
             <typedef-decl name='iterator' type-id='type-id-108' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-107'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_iterator -->
             <typedef-decl name='const_iterator' type-id='type-id-110' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-109'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reverse_iterator -->
             <typedef-decl name='const_reverse_iterator' type-id='type-id-112' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-111'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reverse_iterator -->
             <typedef-decl name='reverse_iterator' type-id='type-id-114' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-113'/>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-115'>
@@ -470,7 +454,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-63'>
@@ -2293,17 +2276,14 @@ 
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-56'>
       <!-- class __gnu_cxx::new_allocator<char> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-40'/>
-
           <member-type access='public'>
             <!-- typedef std::size_t std::allocator<char>::size_type -->
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char& std::allocator<char>::reference -->
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char& std::allocator<char>::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-106'/>
@@ -2357,12 +2337,10 @@ 
       </function-decl>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-117'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-68'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-72'/>
@@ -2529,30 +2507,24 @@ 
     </namespace-decl>
     <!-- namespace __gnu_cxx -->
     <namespace-decl name='__gnu_cxx'>
-
       <!-- class __gnu_cxx::new_allocator<char> -->
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-40'>
-
           <member-type access='public'>
             <!-- typedef std::size_t __gnu_cxx::new_allocator<char>::size_type -->
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-119'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char* __gnu_cxx::new_allocator<char>::pointer -->
             <typedef-decl name='pointer' type-id='type-id-34' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-120'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char* __gnu_cxx::new_allocator<char>::const_pointer -->
             <typedef-decl name='const_pointer' type-id='type-id-32' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-121'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char& __gnu_cxx::new_allocator<char>::reference -->
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-122'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char& __gnu_cxx::new_allocator<char>::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-123'/>
@@ -3347,7 +3319,6 @@ 
       <!-- long long unsigned int -->
       <return type-id='type-id-15'/>
     </function-decl>
-
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi
index 5b8cb006..0c6078af 100644
--- a/tests/data/test-annotate/libtest24-drop-fns.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi
@@ -18,8 +18,6 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -28,7 +26,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
@@ -75,7 +72,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='infinite' id='type-id-18'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-19'/>
-
     </array-type-def>
     <!-- void -->
     <type-decl name='void' id='type-id-20'/>
@@ -95,7 +91,6 @@ 
     <typedef-decl name='__mbstate_t' type-id='type-id-29' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-27'/>
     <!-- struct {int __count; union {unsigned int __wch; char __wchb[4];} __value;} -->
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-27' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-29'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-30'>
@@ -384,10 +379,8 @@ 
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-59'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-90'>
@@ -412,47 +405,38 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::size_type std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type -->
             <typedef-decl name='size_type' type-id='type-id-101' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-66'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char> std::basic_string<char, std::char_traits<char>, std::allocator<char> >::allocator_type -->
             <typedef-decl name='allocator_type' type-id='type-id-56' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reference -->
             <typedef-decl name='reference' type-id='type-id-104' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::allocator<char>::const_reference std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-106' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-105'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::iterator -->
             <typedef-decl name='iterator' type-id='type-id-108' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-107'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_iterator -->
             <typedef-decl name='const_iterator' type-id='type-id-110' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-109'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::const_reverse_iterator -->
             <typedef-decl name='const_reverse_iterator' type-id='type-id-112' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-111'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::reverse_iterator<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::basic_string<char, std::char_traits<char>, std::allocator<char> >::reverse_iterator -->
             <typedef-decl name='reverse_iterator' type-id='type-id-114' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-113'/>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-115'>
@@ -470,7 +454,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-63'>
@@ -2293,17 +2276,14 @@ 
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-56'>
       <!-- class __gnu_cxx::new_allocator<char> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-40'/>
-
           <member-type access='public'>
             <!-- typedef std::size_t std::allocator<char>::size_type -->
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char& std::allocator<char>::reference -->
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char& std::allocator<char>::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-106'/>
@@ -2357,12 +2337,10 @@ 
       </function-decl>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-117'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-68'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-72'/>
@@ -2529,30 +2507,24 @@ 
     </namespace-decl>
     <!-- namespace __gnu_cxx -->
     <namespace-decl name='__gnu_cxx'>
-
       <!-- class __gnu_cxx::new_allocator<char> -->
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-40'>
-
           <member-type access='public'>
             <!-- typedef std::size_t __gnu_cxx::new_allocator<char>::size_type -->
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-119'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char* __gnu_cxx::new_allocator<char>::pointer -->
             <typedef-decl name='pointer' type-id='type-id-34' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-120'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char* __gnu_cxx::new_allocator<char>::const_pointer -->
             <typedef-decl name='const_pointer' type-id='type-id-32' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-121'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef char& __gnu_cxx::new_allocator<char>::reference -->
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-122'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const char& __gnu_cxx::new_allocator<char>::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-123'/>
@@ -3347,7 +3319,6 @@ 
       <!-- long long unsigned int -->
       <return type-id='type-id-15'/>
     </function-decl>
-
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
diff --git a/tests/data/test-annotate/test-anonymous-members-0.o.abi b/tests/data/test-annotate/test-anonymous-members-0.o.abi
index 83496d0f..08ad50fa 100644
--- a/tests/data/test-annotate/test-anonymous-members-0.o.abi
+++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi
@@ -18,7 +18,6 @@ 
     <type-decl name='void' id='type-id-6'/>
     <!-- struct S -->
     <class-decl name='S' size-in-bits='256' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='1' column='1' id='type-id-7'>
-
         <member-type access='public'>
           <!-- struct {int m;} -->
           <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='4' column='1' id='type-id-8'>
@@ -28,7 +27,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {char bar;} -->
           <class-decl name='__anonymous_struct__1' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='9' column='1' id='type-id-9'>
@@ -38,7 +36,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {char baz;} -->
           <class-decl name='__anonymous_struct__2' size-in-bits='8' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='14' column='1' id='type-id-10'>
@@ -48,7 +45,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum S::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='18' column='1' id='type-id-11'>
@@ -57,7 +53,6 @@ 
             <enumerator name='two' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum S::__anonymous_enum__1 -->
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='20' column='1' id='type-id-12'>
@@ -66,7 +61,6 @@ 
             <enumerator name='four' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum S::__anonymous_enum__2 -->
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='22' column='1' id='type-id-13'>
@@ -75,7 +69,6 @@ 
             <enumerator name='six' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- union {int a; char b;} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='24' column='1' id='type-id-14'>
@@ -89,7 +82,6 @@ 
             </data-member>
           </union-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- union {unsigned int c; double d;} -->
           <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/home/dodji/git/libabigail/fixes/tests/data/test-annotate/test-anonymous-members-0.cc' line='26' column='1' id='type-id-15'>
diff --git a/tests/data/test-annotate/test1.abi b/tests/data/test-annotate/test1.abi
index cab842e3..1cdd44b1 100644
--- a/tests/data/test-annotate/test1.abi
+++ b/tests/data/test-annotate/test1.abi
@@ -100,12 +100,10 @@ 
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-7'/>
     <!-- struct b1 -->
       <base-class access='public' layout-offset-in-bits='256' is-virtual='yes' type-id='type-id-8'/>
-
         <member-type access='public'>
           <!-- typedef int s0::integer -->
           <typedef-decl name='integer' type-id='type-id-3' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='15' column='1' id='type-id-10'/>
         </member-type>
-
         <member-type access='public'>
           <!-- typedef unsigned char s0::byte -->
           <typedef-decl name='byte' type-id='type-id-5' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='16' column='1' id='type-id-11'/>
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index 208d7d59..efb83bcc 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -823,12 +823,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-connection.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
-
     <!-- DBusHeaderField[10] -->
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='320' id='type-id-34'>
       <!-- <anonymous range>[10] -->
       <subrange length='10' type-id='type-id-27' id='type-id-35'/>
-
     </array-type-def>
     <!-- struct DBusCMutex -->
     <class-decl name='DBusCMutex' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
@@ -2859,19 +2857,15 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='dbus-server.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
-
-
     <!-- char[16] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-152'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-27' id='type-id-153'/>
-
     </array-type-def>
     <!-- dbus_uint32_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='128' id='type-id-154'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-27' id='type-id-155'/>
-
     </array-type-def>
     <!-- struct DBusServer -->
     <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='57' column='1' id='type-id-156'>
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 6dfa87e4..9e57a6d5 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -127,19 +127,15 @@ 
     <elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <!-- REAL[160] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='5120' id='type-id-2'>
       <!-- <anonymous range>[160] -->
       <subrange length='160' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <!-- REAL[40] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='1280' id='type-id-5'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
-
     </array-type-def>
     <!-- struct BasicCurveEvaluator -->
     <class-decl name='BasicCurveEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basiccrveval.h' line='43' column='1' id='type-id-7'>
@@ -857,7 +853,6 @@ 
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-21'/>
     <!-- class CachingEvaluator -->
     <class-decl name='CachingEvaluator' size-in-bits='64' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' is-declaration-only='yes' id='type-id-8'>
-
         <member-type access='private'>
           <!-- enum CachingEvaluator::ServiceMode -->
           <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-37'>
@@ -2898,12 +2893,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <!-- GLfloat[4] -->
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='128' id='type-id-61'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- typedef void (typedef GLenum)* errorCallbackType -->
     <typedef-decl name='errorCallbackType' type-id='type-id-16' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-41'/>
@@ -3672,52 +3665,42 @@ 
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-46'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <!-- GLint[2] -->
     <array-type-def dimensions='1' type-id='type-id-60' size-in-bits='64' id='type-id-50'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- REAL[2] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-89'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- REAL[3] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='96' id='type-id-90'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <!-- REAL[40][4] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='5120' id='type-id-52'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-3' id='type-id-6'/>
-
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- REAL[6400] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='204800' id='type-id-53'>
       <!-- <anonymous range>[6400] -->
       <subrange length='6400' type-id='type-id-3' id='type-id-92'/>
-
     </array-type-def>
     <!-- StoredVertex*[3] -->
     <array-type-def dimensions='1' type-id='type-id-93' size-in-bits='192' id='type-id-49'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <!-- long int[2] -->
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='128' id='type-id-94'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- class StoredVertex -->
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-95'>
@@ -4414,14 +4397,12 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/interface/insurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-106'/>
     <!-- char*[32] -->
     <array-type-def dimensions='1' type-id='type-id-107' size-in-bits='2048' id='type-id-108'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-3' id='type-id-109'/>
-
     </array-type-def>
     <!-- struct Arc -->
     <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-110'>
@@ -4758,7 +4739,6 @@ 
     </class-decl>
     <!-- class Pool -->
     <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-68'>
-
         <member-type access='protected'>
           <!-- enum Pool::Magic -->
           <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-120'>
@@ -5052,25 +5032,19 @@ 
     <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-129'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <!-- REAL[4] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-131'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- REAL[][24][24] -->
     <array-type-def dimensions='3' type-id='type-id-1' size-in-bits='infinite' id='type-id-132'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-133'/>
-
       <!-- <anonymous range>[24] -->
       <subrange length='24' type-id='type-id-3' id='type-id-134'/>
-
       <!-- <anonymous range>[24] -->
       <subrange length='24' type-id='type-id-3' id='type-id-134'/>
-
     </array-type-def>
     <!-- struct Curvelist -->
     <class-decl name='Curvelist' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/curvelist.h' line='47' column='1' id='type-id-135'>
@@ -6202,7 +6176,6 @@ 
     </class-decl>
     <!-- class Subdivider -->
     <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-66'>
-
         <member-type access='private'>
           <!-- enum Subdivider::dir -->
           <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-169'>
@@ -8270,10 +8243,8 @@ 
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-191'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- struct GridVertex -->
     <class-decl name='GridVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='39' column='1' id='type-id-202'>
@@ -9197,46 +9168,37 @@ 
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-209'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
-
     <!-- Quiltspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-216' size-in-bits='640' id='type-id-164'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- REAL[120] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-217'>
       <!-- <anonymous range>[120] -->
       <subrange length='120' type-id='type-id-3' id='type-id-218'/>
-
     </array-type-def>
     <!-- REAL[5] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-219'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <!-- REAL[5][5] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='800' id='type-id-221'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <!-- float[4] -->
     <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='128' id='type-id-222'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-62'/>
-
     </array-type-def>
     <!-- int[2] -->
     <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-223'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- class Curve -->
     <class-decl name='Curve' size-in-bits='8128' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-224'>
@@ -10464,7 +10426,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-30' size-in-bits='96' id='type-id-137'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <!-- Curvelist* -->
     <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-138'/>
@@ -10622,7 +10583,6 @@ 
     <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-243'>
     <!-- class TrimRegion -->
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-210'/>
-
         <member-type access='private'>
           <!-- struct Hull::Side -->
           <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-244'>
@@ -10875,7 +10835,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-193' size-in-bits='128' id='type-id-249'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- class Mesher -->
     <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-183'>
@@ -11155,7 +11114,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-253' size-in-bits='64' id='type-id-254'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- typedef float Real -->
     <typedef-decl name='Real' type-id='type-id-30' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-253'/>
@@ -11891,7 +11849,6 @@ 
     <class-decl name='O_curve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='55' column='1' id='type-id-272'>
     <!-- class PooledObj -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-111'/>
-
         <member-type access='public'>
           <!-- union {O_nurbscurve* o_nurbscurve; O_pwlcurve* o_pwlcurve;} -->
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-273'>
@@ -12026,27 +11983,22 @@ 
     <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-141'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <!-- Patchspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-276' size-in-bits='640' id='type-id-277'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- REAL[2880] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='92160' id='type-id-278'>
       <!-- <anonymous range>[2880] -->
       <subrange length='2880' type-id='type-id-3' id='type-id-279'/>
-
     </array-type-def>
     <!-- REAL[2][5] -->
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='320' id='type-id-280'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-220'/>
-
     </array-type-def>
     <!-- struct Pspec -->
     <class-decl name='Pspec' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/patch.h' line='46' column='1' id='type-id-281'>
@@ -12296,7 +12248,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-281' size-in-bits='512' id='type-id-180'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-88'/>
-
     </array-type-def>
     <!-- Patchlist* -->
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-181'/>
@@ -13356,18 +13307,15 @@ 
     <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-
     <!-- REAL[1000] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-300'>
       <!-- <anonymous range>[1000] -->
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
-
     </array-type-def>
     <!-- long int[1000] -->
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64000' id='type-id-302'>
       <!-- <anonymous range>[1000] -->
       <subrange length='1000' type-id='type-id-3' id='type-id-301'/>
-
     </array-type-def>
     <!-- class Varray -->
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-303'>
@@ -14518,28 +14466,20 @@ 
   <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/sampledLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
-
-
-
-
-
     <!-- CachedVertex[100] -->
     <array-type-def dimensions='1' type-id='type-id-318' size-in-bits='25600' id='type-id-319'>
       <!-- <anonymous range>[100] -->
       <subrange length='100' type-id='type-id-3' id='type-id-320'/>
-
     </array-type-def>
     <!-- GLdouble[3] -->
     <array-type-def dimensions='1' type-id='type-id-321' size-in-bits='192' id='type-id-322'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-91'/>
-
     </array-type-def>
     <!-- __jmp_buf_tag[1] -->
     <array-type-def dimensions='1' type-id='type-id-323' size-in-bits='1600' id='type-id-324'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-3' id='type-id-325'/>
-
     </array-type-def>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-30'/>
@@ -14549,7 +14489,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='512' id='type-id-326'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-3' id='type-id-327'/>
-
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-38'/>
@@ -14559,7 +14498,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-328'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-3' id='type-id-329'/>
-
     </array-type-def>
     <!-- typedef GLUtesselator GLUtesselator -->
     <typedef-decl name='GLUtesselator' type-id='type-id-330' filepath='../../../include/GL/glu.h' line='276' column='1' id='type-id-331'/>
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 4e93c02d..2fb415c2 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -3036,8 +3036,6 @@ 
     <elf-symbol name='__asan_cplus_demangle_operators' size='1488' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
-
-
     <!-- void* dlvsym(void*, const char*, const char*) -->
     <function-decl name='dlvsym' filepath='/usr/include/dlfcn.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -3051,7 +3049,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_type_test.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <!-- struct backtrace_freelist_struct -->
@@ -3562,19 +3559,15 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
-
-
     <!-- const demangle_builtin_type_info[33] -->
     <array-type-def dimensions='1' type-id='type-id-36' size-in-bits='8448' id='type-id-37'>
       <!-- <anonymous range>[33] -->
       <subrange length='33' type-id='type-id-38' id='type-id-39'/>
-
     </array-type-def>
     <!-- const demangle_operator_info[62] -->
     <array-type-def dimensions='1' type-id='type-id-40' size-in-bits='11904' id='type-id-41'>
       <!-- <anonymous range>[62] -->
       <subrange length='62' type-id='type-id-38' id='type-id-42'/>
-
     </array-type-def>
     <!-- struct demangle_component -->
     <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='453' column='1' id='type-id-43'>
@@ -4218,7 +4211,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- __sanitizer::LowLevelAllocator* -->
@@ -4325,18 +4317,15 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <!-- AddressRange[6] -->
     <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='768' id='type-id-85'>
       <!-- <anonymous range>[6] -->
       <subrange length='6' type-id='type-id-38' id='type-id-86'/>
-
     </array-type-def>
     <!-- char[4096] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='32768' id='type-id-88'>
       <!-- <anonymous range>[4096] -->
       <subrange length='4096' type-id='type-id-38' id='type-id-89'/>
-
     </array-type-def>
     <!-- __sanitizer::InternalScopedString* -->
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-91'/>
@@ -4488,7 +4477,6 @@ 
       </function-decl>
       <!-- struct __sanitizer::StackTrace -->
       <class-decl name='StackTrace' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='31' column='1' id='type-id-94'>
-
           <member-type access='public'>
             <!-- typedef bool (void*, char*, int)* __sanitizer::StackTrace::SymbolizeCallback -->
             <typedef-decl name='SymbolizeCallback' type-id='type-id-99' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.h' line='33' column='1' id='type-id-113'/>
@@ -4673,7 +4661,6 @@ 
       </function-decl>
       <!-- class __sanitizer::LoadedModule -->
       <class-decl name='LoadedModule' size-in-bits='960' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='442' column='1' id='type-id-92'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LoadedModule::AddressRange -->
             <class-decl name='AddressRange' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='452' column='1' id='type-id-84'>
@@ -5373,14 +5360,12 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- char[256] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='2048' id='type-id-138'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <!-- struct sigaltstack -->
     <class-decl name='sigaltstack' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/bits/sigstack.h' line='50' column='1' id='type-id-140'>
@@ -5424,7 +5409,6 @@ 
     <typedef-decl name='Elf64_Dyn' type-id='type-id-145' filepath='/usr/include/elf.h' line='650' column='1' id='type-id-146'/>
     <!-- struct {Elf64_Sxword d_tag; union {Elf64_Xword d_val; Elf64_Addr d_ptr;} d_un;} -->
     <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-146' visibility='default' filepath='/usr/include/elf.h' line='643' column='1' id='type-id-145'>
-
         <member-type access='public'>
           <!-- union {Elf64_Xword d_val; Elf64_Addr d_ptr;} -->
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/elf.h' line='646' column='1' id='type-id-147'>
@@ -5711,7 +5695,6 @@ 
       </function-decl>
       <!-- struct __sanitizer::__sanitizer_kernel_sigaction_t -->
       <class-decl name='__sanitizer_kernel_sigaction_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='423' column='1' id='type-id-155'>
-
           <member-type access='public'>
             <!-- union {void (int, void*, void*)* sigaction; void (int)* handler;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='424' column='1' id='type-id-177'>
@@ -6203,12 +6186,10 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <!-- char[56] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='448' id='type-id-184'>
       <!-- <anonymous range>[56] -->
       <subrange length='56' type-id='type-id-38' id='type-id-185'/>
-
     </array-type-def>
     <!-- typedef __anonymous_enum__ _Unwind_Reason_Code -->
     <typedef-decl name='_Unwind_Reason_Code' type-id='type-id-186' filepath='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/host-x86_64-unknown-linux-gnu/gcc/include/unwind.h' line='76' column='1' id='type-id-187'/>
@@ -7728,12 +7709,10 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
     <!-- unsigned long int[1] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='64' id='type-id-211'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-38' id='type-id-212'/>
-
     </array-type-def>
     <!-- __sanitizer::InternalMmapVector<__sanitizer::StackDepotReverseMap::IdDescPair>* -->
     <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
@@ -7780,7 +7759,6 @@ 
       </function-decl>
       <!-- class __sanitizer::StackDepotReverseMap -->
       <class-decl name='StackDepotReverseMap' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.h' line='39' column='1' id='type-id-215'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::StackDepotReverseMap::IdDescPair -->
             <class-decl name='IdDescPair' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.h' line='45' column='1' id='type-id-217'>
@@ -8111,10 +8089,8 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- typedef __pid_t pid_t -->
@@ -8358,7 +8334,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
@@ -8381,7 +8356,6 @@ 
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-253'/>
     <!-- void (void*, typedef uintptr_t, const char*, typedef uintptr_t, typedef uintptr_t)* -->
     <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-255'/>
-
     <!-- int (void*, uintptr_t, const char*, int, const char*) -->
     <function-type size-in-bits='64' id='type-id-258'>
       <!-- parameter of type 'void*' -->
@@ -8438,14 +8412,12 @@ 
     <class-decl name='backtrace_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-256'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- char[16384] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='131072' id='type-id-262'>
       <!-- <anonymous range>[16384] -->
       <subrange length='16384' type-id='type-id-38' id='type-id-263'/>
-
     </array-type-def>
     <!-- __sanitizer::ExternalSymbolizer* -->
     <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-265'/>
@@ -8784,7 +8756,6 @@ 
       </class-decl>
       <!-- class __sanitizer::InternalSymbolizer -->
       <class-decl name='InternalSymbolizer' size-in-bits='131072' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='321' column='1' id='type-id-266'>
-
           <member-type access='public'>
             <!-- typedef bool (const char*, typedef __sanitizer::u64, char*, int)* __sanitizer::InternalSymbolizer::SanitizerSymbolizeFn -->
             <typedef-decl name='SanitizerSymbolizeFn' type-id='type-id-276' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='323' column='1' id='type-id-282'/>
@@ -8966,10 +8937,8 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_clock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-5'/>
     <!-- long long unsigned int -->
@@ -8978,7 +8947,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1048576' id='type-id-283'>
       <!-- <anonymous range>[16384] -->
       <subrange length='16384' type-id='type-id-38' id='type-id-263'/>
-
     </array-type-def>
     <!-- sizetype -->
     <type-decl name='sizetype' size-in-bits='64' id='type-id-38'/>
@@ -9465,7 +9433,6 @@ 
         <return type-id='type-id-304'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- __sanitizer::CommonFlags* -->
@@ -9557,44 +9524,32 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
-
-
-
     <!-- LibCodeRange[128] -->
     <array-type-def dimensions='1' type-id='type-id-310' size-in-bits='16384' id='type-id-311'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- Lib[128] -->
     <array-type-def dimensions='1' type-id='type-id-313' size-in-bits='32768' id='type-id-314'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- SignalDesc[64] -->
     <array-type-def dimensions='1' type-id='type-id-315' size-in-bits='552960' id='type-id-316'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- bool[128] -->
     <array-type-def dimensions='1' type-id='type-id-116' size-in-bits='1024' id='type-id-318'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- char[14] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='112' id='type-id-319'>
       <!-- <anonymous range>[14] -->
       <subrange length='14' type-id='type-id-38' id='type-id-320'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-321'>
@@ -9623,7 +9578,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-324' size-in-bits='64000' id='type-id-325'>
       <!-- <anonymous range>[500] -->
       <subrange length='500' type-id='type-id-38' id='type-id-326'/>
-
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-327'/>
@@ -9633,49 +9587,41 @@ 
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='7552' id='type-id-329'>
       <!-- <anonymous range>[118] -->
       <subrange length='118' type-id='type-id-38' id='type-id-330'/>
-
     </array-type-def>
     <!-- long long unsigned int[16] -->
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1024' id='type-id-331'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <!-- unsigned char[6] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='48' id='type-id-333'>
       <!-- <anonymous range>[6] -->
       <subrange length='6' type-id='type-id-38' id='type-id-86'/>
-
     </array-type-def>
     <!-- unsigned char[8] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='64' id='type-id-334'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-38' id='type-id-335'/>
-
     </array-type-def>
     <!-- unsigned long int[16] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='1024' id='type-id-336'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <!-- unsigned long int[4] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='256' id='type-id-337'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-38' id='type-id-338'/>
-
     </array-type-def>
     <!-- void*[128] -->
     <array-type-def dimensions='1' type-id='type-id-108' size-in-bits='8192' id='type-id-339'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- wchar_t -->
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-340'/>
     <!-- struct ioctl_desc -->
     <class-decl name='ioctl_desc' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='13' column='1' id='type-id-324'>
-
         <member-type access='public'>
           <!-- enum ioctl_desc::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc' line='16' column='1' id='type-id-341'>
@@ -9793,7 +9739,6 @@ 
     </class-decl>
     <!-- class AtExitContext -->
     <class-decl name='AtExitContext' size-in-bits='17536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='281' column='1' id='type-id-353'>
-
         <member-type access='public'>
           <!-- typedef void ()* AtExitContext::atexit_t -->
           <typedef-decl name='atexit_t' type-id='type-id-108' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='288' column='1' id='type-id-354'/>
@@ -10021,7 +9966,6 @@ 
     <typedef-decl name='OFF_T' type-id='type-id-171' filepath='../../.././libsanitizer/interception/interception.h' line='28' column='1' id='type-id-381'/>
     <!-- struct sigaction_t -->
     <class-decl name='sigaction_t' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='91' column='1' id='type-id-382'>
-
         <member-type access='public'>
           <!-- union {sighandler_t sa_handler; void (int, my_siginfo_t*, void*)* sa_sigaction;} -->
           <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='92' column='1' id='type-id-383'>
@@ -11279,7 +11223,6 @@ 
       </function-decl>
       <!-- struct __sanitizer::atomic_uint32_t -->
       <class-decl name='atomic_uint32_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='38' column='1' id='type-id-958'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::u32 __sanitizer::atomic_uint32_t::Type -->
             <typedef-decl name='Type' type-id='type-id-170' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='39' column='1' id='type-id-175'/>
@@ -11854,7 +11797,6 @@ 
       </class-decl>
       <!-- class __sanitizer::LibIgnore -->
       <class-decl name='LibIgnore' size-in-bits='49984' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='26' column='1' id='type-id-891'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LibIgnore::Lib -->
             <class-decl name='Lib' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='43' column='1' id='type-id-313'>
@@ -11876,7 +11818,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LibIgnore::LibCodeRange -->
             <class-decl name='LibCodeRange' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='50' column='1' id='type-id-310'>
@@ -26317,7 +26258,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='1024' id='type-id-1223'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- __tsan::DynamicAnnContext* -->
     <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1225'/>
@@ -27059,69 +26999,47 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <!-- __int128 -->
     <type-decl name='__int128' size-in-bits='128' id='type-id-1238'/>
     <!-- SizeClassInfo[53] -->
     <array-type-def dimensions='1' type-id='type-id-1239' size-in-bits='27136' id='type-id-1240'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <!-- PerClass[53] -->
     <array-type-def dimensions='1' type-id='type-id-1242' size-in-bits='440960' id='type-id-1243'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <!-- PerClass[53] -->
     <array-type-def dimensions='1' type-id='type-id-1244' size-in-bits='875136' id='type-id-1245'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-38' id='type-id-1241'/>
-
     </array-type-def>
     <!-- atomic_uint64_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-1246' size-in-bits='256' id='type-id-1247'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-38' id='type-id-338'/>
-
     </array-type-def>
     <!-- atomic_uintptr_t[2048] -->
     <array-type-def dimensions='1' type-id='type-id-1200' size-in-bits='131072' id='type-id-1248'>
       <!-- <anonymous range>[2048] -->
       <subrange length='2048' type-id='type-id-38' id='type-id-1249'/>
-
     </array-type-def>
     <!-- MD5Hash[2] -->
     <array-type-def dimensions='1' type-id='type-id-1250' size-in-bits='256' id='type-id-1251'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-38' id='type-id-1252'/>
-
     </array-type-def>
     <!-- Desc[16] -->
     <array-type-def dimensions='1' type-id='type-id-1253' size-in-bits='3072' id='type-id-1254'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <!-- Part[1009] -->
     <array-type-def dimensions='1' type-id='type-id-1255' size-in-bits='516608' id='type-id-1256'>
       <!-- <anonymous range>[1009] -->
       <subrange length='1009' type-id='type-id-38' id='type-id-1257'/>
-
     </array-type-def>
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-116'/>
@@ -27131,13 +27049,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='256' id='type-id-1258'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-38' id='type-id-1259'/>
-
     </array-type-def>
     <!-- char[48] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='384' id='type-id-1260'>
       <!-- <anonymous range>[48] -->
       <subrange length='48' type-id='type-id-38' id='type-id-1261'/>
-
     </array-type-def>
     <!-- long int -->
     <type-decl name='long int' size-in-bits='64' id='type-id-33'/>
@@ -27145,25 +27061,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='704' id='type-id-1262'>
       <!-- <anonymous range>[11] -->
       <subrange length='11' type-id='type-id-38' id='type-id-1263'/>
-
     </array-type-def>
     <!-- long long unsigned int[23] -->
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='1472' id='type-id-1264'>
       <!-- <anonymous range>[23] -->
       <subrange length='23' type-id='type-id-38' id='type-id-1265'/>
-
     </array-type-def>
     <!-- long long unsigned int[2] -->
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='128' id='type-id-1266'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-38' id='type-id-1252'/>
-
     </array-type-def>
     <!-- long long unsigned int[438] -->
     <array-type-def dimensions='1' type-id='type-id-136' size-in-bits='28032' id='type-id-1267'>
       <!-- <anonymous range>[438] -->
       <subrange length='438' type-id='type-id-38' id='type-id-1268'/>
-
     </array-type-def>
     <!-- short int -->
     <type-decl name='short int' size-in-bits='16' id='type-id-62'/>
@@ -27173,25 +27085,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-129' size-in-bits='512' id='type-id-1269'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-38' id='type-id-332'/>
-
     </array-type-def>
     <!-- unsigned long int[10] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='640' id='type-id-1270'>
       <!-- <anonymous range>[10] -->
       <subrange length='10' type-id='type-id-38' id='type-id-1271'/>
-
     </array-type-def>
     <!-- void*[128] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-356'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-38' id='type-id-312'/>
-
     </array-type-def>
     <!-- void*[256] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-1272'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <!-- enum LinkerInitialized -->
     <enum-decl name='LinkerInitialized' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='283' column='1' id='type-id-1201'>
@@ -27586,7 +27494,6 @@ 
       <typedef-decl name='u32' type-id='type-id-129' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='68' column='1' id='type-id-170'/>
       <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > -->
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-1319'>
-
           <member-type access='public'>
             <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass -->
             <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-1244'>
@@ -27604,7 +27511,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::Batch -->
             <typedef-decl name='Batch' type-id='type-id-1321' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-1472'/>
@@ -27783,7 +27689,6 @@ 
       </class-decl>
       <!-- struct __sanitizer::atomic_uint64_t -->
       <class-decl name='atomic_uint64_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='43' column='1' id='type-id-1246'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::u64 __sanitizer::atomic_uint64_t::Type -->
             <typedef-decl name='Type' type-id='type-id-173' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='44' column='1' id='type-id-304'/>
@@ -27952,7 +27857,6 @@ 
       </class-decl>
       <!-- struct __sanitizer::atomic_uint8_t -->
       <class-decl name='atomic_uint8_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='28' column='1' id='type-id-1474'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::u8 __sanitizer::atomic_uint8_t::Type -->
             <typedef-decl name='Type' type-id='type-id-1338' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='29' column='1' id='type-id-1463'/>
@@ -27966,7 +27870,6 @@ 
       <typedef-decl name='u8' type-id='type-id-17' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='66' column='1' id='type-id-1338'/>
       <!-- class __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> -->
       <class-decl name='SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='305' column='1' id='type-id-1309'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback>::RegionInfo -->
             <class-decl name='RegionInfo' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='474' column='1' id='type-id-1315'>
@@ -28004,12 +27907,10 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback>::Batch -->
             <typedef-decl name='Batch' type-id='type-id-1321' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='307' column='1' id='type-id-1313'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback>::AllocatorCache -->
             <typedef-decl name='AllocatorCache' type-id='type-id-1319' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='310' column='1' id='type-id-1311'/>
@@ -28424,7 +28325,6 @@ 
       </class-decl>
       <!-- class __sanitizer::SizeClassMap<17ul, 128ul, 16ul> -->
       <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-1476'>
-
           <member-type access='public'>
             <!-- struct __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch -->
             <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-1321'>
@@ -28541,12 +28441,10 @@ 
       <typedef-decl name='ForEachChunkCallback' type-id='type-id-1461' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='284' column='1' id='type-id-1475'/>
       <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> > -->
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt; &gt;' size-in-bits='441344' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-1317'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::Batch -->
             <typedef-decl name='Batch' type-id='type-id-1323' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-1477'/>
           </member-type>
-
           <member-type access='public'>
             <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass -->
             <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-1242'>
@@ -28677,7 +28575,6 @@ 
       </class-decl>
       <!-- class __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> -->
       <class-decl name='SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='158272' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='677' column='1' id='type-id-1302'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>::SizeClassInfo -->
             <class-decl name='SizeClassInfo' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='820' column='1' id='type-id-1239'>
@@ -28695,12 +28592,10 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>::Batch -->
             <typedef-decl name='Batch' type-id='type-id-1323' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='679' column='1' id='type-id-1306'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> > __sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>::AllocatorCache -->
             <typedef-decl name='AllocatorCache' type-id='type-id-1317' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='682' column='1' id='type-id-1304'/>
@@ -29111,7 +29006,6 @@ 
       </class-decl>
       <!-- class __sanitizer::SizeClassMap<17ul, 64ul, 14ul> -->
       <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-1478'>
-
           <member-type access='public'>
             <!-- struct __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch -->
             <class-decl name='TransferBatch' size-in-bits='4224' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-1323'>
@@ -29328,7 +29222,6 @@ 
       </class-decl>
       <!-- struct __sanitizer::atomic_uintptr_t -->
       <class-decl name='atomic_uintptr_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='48' column='1' id='type-id-1200'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::uptr __sanitizer::atomic_uintptr_t::Type -->
             <typedef-decl name='Type' type-id='type-id-83' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='49' column='1' id='type-id-1465'/>
@@ -29342,12 +29235,10 @@ 
       <typedef-decl name='InternalAllocatorCache' type-id='type-id-1317' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator_internal.h' line='43' column='1' id='type-id-1480'/>
       <!-- class __sanitizer::ThreadRegistry -->
       <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-1333'>
-
           <member-type access='public'>
             <!-- typedef void (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::ThreadCallback -->
             <typedef-decl name='ThreadCallback' type-id='type-id-1459' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-1481'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef bool (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::FindThreadCallback -->
             <typedef-decl name='FindThreadCallback' type-id='type-id-1384' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='99' column='1' id='type-id-1482'/>
@@ -30687,7 +30578,6 @@ 
       </class-decl>
       <!-- class __tsan::MutexSet -->
       <class-decl name='MutexSet' size-in-bits='3136' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='19' column='1' id='type-id-1355'>
-
           <member-type access='public'>
             <!-- struct __tsan::MutexSet::Desc -->
             <class-decl name='Desc' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutexset.h' line='24' column='1' id='type-id-1253'>
@@ -31266,7 +31156,6 @@ 
       </class-decl>
       <!-- class __tsan::SyncTab -->
       <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-1364'>
-
           <member-type access='private'>
             <!-- struct __tsan::SyncTab::Part -->
             <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-1255'>
@@ -33621,7 +33510,6 @@ 
     <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
     <!-- __tsan::ScopedJavaFunc* -->
     <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1496'/>
-
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
       <!-- class __tsan::ScopedJavaFunc -->
@@ -33812,13 +33700,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='512' id='type-id-1497'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- __tsan::__anonymous_struct__* -->
     <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-1500'/>
-
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
       <!-- struct {__tsan::MD5_u32plus lo; __tsan::MD5_u32plus hi; __tsan::MD5_u32plus a; __tsan::MD5_u32plus b; __tsan::MD5_u32plus c; __tsan::MD5_u32plus d; unsigned char buffer[64]; unsigned int block[16];} -->
@@ -33906,30 +33792,25 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <!-- Header*[262144] -->
     <array-type-def dimensions='1' type-id='type-id-1503' size-in-bits='16777216' id='type-id-1504'>
       <!-- <anonymous range>[262144] -->
       <subrange length='262144' type-id='type-id-38' id='type-id-1505'/>
-
     </array-type-def>
     <!-- Header*[262144] -->
     <array-type-def dimensions='1' type-id='type-id-1506' size-in-bits='16777216' id='type-id-1507'>
       <!-- <anonymous range>[262144] -->
       <subrange length='262144' type-id='type-id-38' id='type-id-1505'/>
-
     </array-type-def>
     <!-- unsigned long int[64] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='4096' id='type-id-1508'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- void*[64] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-1479'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- __sanitizer::CombinedAllocator<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >, __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap> >* -->
     <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
@@ -34281,7 +34162,6 @@ 
       </class-decl>
       <!-- class __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap> -->
       <class-decl name='LargeMmapAllocator&lt;__sanitizer::CrashOnMapUnmap&gt;' size-in-bits='16781952' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='995' column='1' id='type-id-1517'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap>::Stats -->
             <class-decl name='Stats' size-in-bits='4352' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1215' column='1' id='type-id-1538'>
@@ -34307,7 +34187,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LargeMmapAllocator<__sanitizer::CrashOnMapUnmap>::Header -->
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1186' column='1' id='type-id-1519'>
@@ -34819,7 +34698,6 @@ 
       </class-decl>
       <!-- class __sanitizer::LargeMmapAllocator<__tsan::MapUnmapCallback> -->
       <class-decl name='LargeMmapAllocator&lt;__tsan::MapUnmapCallback&gt;' size-in-bits='16781952' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='995' column='1' id='type-id-1520'>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LargeMmapAllocator<__tsan::MapUnmapCallback>::Stats -->
             <class-decl name='Stats' size-in-bits='4352' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1215' column='1' id='type-id-1540'>
@@ -34845,7 +34723,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct __sanitizer::LargeMmapAllocator<__tsan::MapUnmapCallback>::Header -->
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='1186' column='1' id='type-id-1522'>
@@ -35412,8 +35289,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- struct rlimit -->
@@ -37733,12 +37608,10 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <!-- char[431104] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='3448832' id='type-id-1655'>
       <!-- <anonymous range>[431104] -->
       <subrange length='431104' type-id='type-id-38' id='type-id-1656'/>
-
     </array-type-def>
     <!-- __sanitizer::GenericScopedLock<__sanitizer::StaticSpinMutex>* -->
     <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
@@ -38545,7 +38418,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
       <!-- void __tsan::ReleaseStoreImpl(__tsan::ThreadState*, __sanitizer::uptr, __tsan::SyncClock*) -->
@@ -38930,31 +38802,25 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
     <!-- TraceHeader[256] -->
     <array-type-def dimensions='1' type-id='type-id-1693' size-in-bits='5062656' id='type-id-1694'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <!-- char[64] -->
     <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='512' id='type-id-1483'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-38' id='type-id-317'/>
-
     </array-type-def>
     <!-- unsigned long int[256] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='16384' id='type-id-114'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-38' id='type-id-139'/>
-
     </array-type-def>
     <!-- unsigned long int[65536] -->
     <array-type-def dimensions='1' type-id='type-id-102' size-in-bits='4194304' id='type-id-1695'>
       <!-- <anonymous range>[65536] -->
       <subrange length='65536' type-id='type-id-38' id='type-id-1696'/>
-
     </array-type-def>
     <!-- __sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>* -->
     <pointer-type-def type-id='type-id-1697' size-in-bits='64' id='type-id-1698'/>
@@ -40175,8 +40041,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- __sanitizer::Suppression* const -->
@@ -40503,7 +40367,6 @@ 
       </class-decl>
       <!-- class __sanitizer::Symbolizer -->
       <class-decl name='Symbolizer' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='64' column='1' id='type-id-277'>
-
           <member-type access='protected'>
             <!-- class __sanitizer::Symbolizer::SymbolizerScope -->
             <class-decl name='SymbolizerScope' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='133' column='1' id='type-id-273'>
@@ -40557,12 +40420,10 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef void ()* __sanitizer::Symbolizer::StartSymbolizationHook -->
             <typedef-decl name='StartSymbolizationHook' type-id='type-id-108' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='110' column='1' id='type-id-1739'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef void ()* __sanitizer::Symbolizer::EndSymbolizationHook -->
             <typedef-decl name='EndSymbolizationHook' type-id='type-id-108' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='111' column='1' id='type-id-1740'/>
@@ -41240,7 +41101,6 @@ 
       </function-decl>
       <!-- struct __tsan::MBlock -->
       <class-decl name='MBlock' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='52' column='1' id='type-id-1758'>
-
           <member-type access='public'>
             <!-- typedef __sanitizer::GenericScopedLock<__tsan::MBlock> __tsan::MBlock::ScopedLock -->
             <typedef-decl name='ScopedLock' type-id='type-id-1754' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='119' column='1' id='type-id-1767'/>
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index 42d5f812..4814b0f2 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -519,8 +519,6 @@ 
     <elf-symbol name='hb_version_string' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -529,13 +527,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-3'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- hb_user_data_item_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='384' id='type-id-7'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-9'/>
@@ -1002,7 +998,6 @@ 
     </class-decl>
     <!-- struct hb_user_data_array_t -->
     <class-decl name='hb_user_data_array_t' size-in-bits='832' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='70' column='1' id='type-id-17'>
-
         <member-type access='public'>
           <!-- struct hb_user_data_array_t::hb_user_data_item_t -->
           <class-decl name='hb_user_data_item_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='71' column='1' id='type-id-6'>
@@ -1286,35 +1281,27 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
-
-
     <!-- const char*[8] -->
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='512' id='type-id-62'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- hb_codepoint_t[2][5] -->
     <array-type-def dimensions='2' type-id='type-id-64' size-in-bits='320' id='type-id-65'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-4' id='type-id-66'/>
-
     </array-type-def>
     <!-- int16_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-67' size-in-bits='32' id='type-id-68'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- int8_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='32' id='type-id-70'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <!-- short int -->
     <type-decl name='short int' size-in-bits='16' id='type-id-72'/>
@@ -1324,19 +1311,16 @@ 
     <array-type-def dimensions='1' type-id='type-id-74' size-in-bits='32' id='type-id-75'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- uint8_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='32' id='type-id-77'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <!-- uint8_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='64' id='type-id-78'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- unsigned char -->
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-79'/>
@@ -1344,7 +1328,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='64' id='type-id-80'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- unsigned short int -->
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-81'/>
@@ -1359,7 +1342,6 @@ 
     <typedef-decl name='hb_buffer_t' type-id='type-id-83' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='93' column='1' id='type-id-84'/>
     <!-- struct hb_buffer_t -->
     <class-decl name='hb_buffer_t' size-in-bits='2752' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='46' column='1' id='type-id-83'>
-
         <member-type access='public'>
           <!-- typedef long int hb_buffer_t::scratch_buffer_t -->
           <typedef-decl name='scratch_buffer_t' type-id='type-id-10' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='190' column='1' id='type-id-85'/>
@@ -2031,7 +2013,6 @@ 
     <typedef-decl name='hb_codepoint_t' type-id='type-id-108' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='75' column='1' id='type-id-64'/>
     <!-- struct hb_unicode_funcs_t -->
     <class-decl name='hb_unicode_funcs_t' size-in-bits='2560' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='64' column='1' id='type-id-106'>
-
         <member-type access='public'>
           <!-- struct {hb_unicode_combining_class_func_t combining_class; hb_unicode_eastasian_width_func_t eastasian_width; hb_unicode_general_category_func_t general_category; hb_unicode_mirroring_func_t mirroring; hb_unicode_script_func_t script; hb_unicode_compose_func_t compose; hb_unicode_decompose_func_t decompose; hb_unicode_decompose_compatibility_func_t decompose_compatibility;} -->
           <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='203' column='1' id='type-id-109'>
@@ -2069,7 +2050,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {void* combining_class; void* eastasian_width; void* general_category; void* mirroring; void* script; void* compose; void* decompose; void* decompose_compatibility;} -->
           <class-decl name='__anonymous_struct__1' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='209' column='1' id='type-id-117'>
@@ -2107,7 +2087,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {hb_destroy_func_t combining_class; hb_destroy_func_t eastasian_width; hb_destroy_func_t general_category; hb_destroy_func_t mirroring; hb_destroy_func_t script; hb_destroy_func_t compose; hb_destroy_func_t decompose; hb_destroy_func_t decompose_compatibility;} -->
           <class-decl name='__anonymous_struct__2' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='215' column='1' id='type-id-118'>
@@ -3867,12 +3846,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <!-- const char[1] -->
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='8' id='type-id-131'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- struct hb_language_item_t -->
     <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-179'>
@@ -4044,23 +4021,19 @@ 
     <array-type-def dimensions='1' type-id='type-id-185' size-in-bits='32' id='type-id-186'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- TableRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-187' size-in-bits='128' id='type-id-188'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- uint8_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='16' id='type-id-189'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- struct hb_font_funcs_t -->
     <class-decl name='hb_font_funcs_t' size-in-bits='3072' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='58' column='1' id='type-id-190'>
-
         <member-type access='public'>
           <!-- struct {hb_font_get_glyph_func_t glyph; hb_font_get_glyph_h_advance_func_t glyph_h_advance; hb_font_get_glyph_v_advance_func_t glyph_v_advance; hb_font_get_glyph_h_origin_func_t glyph_h_origin; hb_font_get_glyph_v_origin_func_t glyph_v_origin; hb_font_get_glyph_h_kerning_func_t glyph_h_kerning; hb_font_get_glyph_v_kerning_func_t glyph_v_kerning; hb_font_get_glyph_extents_func_t glyph_extents; hb_font_get_glyph_contour_point_func_t glyph_contour_point; hb_font_get_glyph_name_func_t glyph_name; hb_font_get_glyph_from_name_func_t glyph_from_name;} -->
           <class-decl name='__anonymous_struct__' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='66' column='1' id='type-id-191'>
@@ -4110,7 +4083,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {void* glyph; void* glyph_h_advance; void* glyph_v_advance; void* glyph_h_origin; void* glyph_v_origin; void* glyph_h_kerning; void* glyph_v_kerning; void* glyph_extents; void* glyph_contour_point; void* glyph_name; void* glyph_from_name;} -->
           <class-decl name='__anonymous_struct__1' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='72' column='1' id='type-id-203'>
@@ -4160,7 +4132,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct {hb_destroy_func_t glyph; hb_destroy_func_t glyph_h_advance; hb_destroy_func_t glyph_v_advance; hb_destroy_func_t glyph_h_origin; hb_destroy_func_t glyph_v_origin; hb_destroy_func_t glyph_h_kerning; hb_destroy_func_t glyph_v_kerning; hb_destroy_func_t glyph_extents; hb_destroy_func_t glyph_contour_point; hb_destroy_func_t glyph_name; hb_destroy_func_t glyph_from_name;} -->
           <class-decl name='__anonymous_struct__2' size-in-bits='704' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='78' column='1' id='type-id-204'>
@@ -4290,7 +4261,6 @@ 
     </class-decl>
     <!-- struct hb_face_t -->
     <class-decl name='hb_face_t' size-in-bits='1472' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='43' column='1' id='type-id-210'>
-
         <member-type access='public'>
           <!-- struct hb_face_t::plan_node_t -->
           <class-decl name='plan_node_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='59' column='1' id='type-id-211'>
@@ -4976,7 +4946,6 @@ 
       </class-decl>
       <!-- struct OT::hb_sanitize_context_t -->
       <class-decl name='hb_sanitize_context_t' size-in-bits='320' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='178' column='1' id='type-id-279'>
-
           <member-type access='public'>
             <!-- typedef bool OT::hb_sanitize_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='181' column='1' id='type-id-369'/>
@@ -8815,7 +8784,6 @@ 
       <typedef-decl name='OpenTypeFontFace' type-id='type-id-263' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='119' column='1' id='type-id-328'/>
       <!-- struct OT::TTCHeader -->
       <class-decl name='TTCHeader' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='150' column='1' id='type-id-272'>
-
           <member-type access='protected'>
             <!-- union {struct {OT::Tag ttcTag; OT::FixedVersion version;} header; OT::TTCHeaderVersion1 version1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='183' column='1' id='type-id-566'>
@@ -8943,7 +8911,6 @@ 
       </class-decl>
       <!-- struct OT::OpenTypeFontFile -->
       <class-decl name='OpenTypeFontFile' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='199' column='1' id='type-id-268'>
-
           <member-type access='protected'>
             <!-- union {OT::Tag tag; OT::OpenTypeFontFace fontFace; OT::TTCHeader ttcHeader;} -->
             <union-decl name='__anonymous_union__' size-in-bits='224' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='250' column='1' id='type-id-571'>
@@ -9345,7 +9312,6 @@ 
   <abi-instr version='1.0' address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- int* -->
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-572'/>
-
     <!-- hb_font_funcs_t* hb_font_funcs_get_empty() -->
     <function-decl name='hb_font_funcs_get_empty' mangled-name='hb_font_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_empty'>
       <!-- hb_font_funcs_t* -->
@@ -10935,73 +10901,60 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
-
     <!-- BYTE[256] -->
     <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='2048' id='type-id-668'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-4' id='type-id-669'/>
-
     </array-type-def>
     <!-- CmapSubtableLongGroup[1] -->
     <array-type-def dimensions='1' type-id='type-id-670' size-in-bits='96' id='type-id-671'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- EncodingRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-672' size-in-bits='64' id='type-id-673'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- IntType<short unsigned int, 2u>[1] -->
     <array-type-def dimensions='1' type-id='type-id-257' size-in-bits='16' id='type-id-674'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- LongMetric[1] -->
     <array-type-def dimensions='1' type-id='type-id-675' size-in-bits='32' id='type-id-676'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- SHORT[1] -->
     <array-type-def dimensions='1' type-id='type-id-564' size-in-bits='16' id='type-id-677'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- USHORT[1] -->
     <array-type-def dimensions='1' type-id='type-id-528' size-in-bits='16' id='type-id-678'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- UVSMapping[1] -->
     <array-type-def dimensions='1' type-id='type-id-679' size-in-bits='40' id='type-id-680'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- UnicodeValueRange[1] -->
     <array-type-def dimensions='1' type-id='type-id-681' size-in-bits='32' id='type-id-682'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- VariationSelectorRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-683' size-in-bits='88' id='type-id-684'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- uint8_t[3] -->
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='24' id='type-id-685'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-686'/>
-
     </array-type-def>
     <!-- struct hb_ot_face_cmap_accelerator_t -->
     <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-687'>
@@ -11615,7 +11568,6 @@ 
       </class-decl>
       <!-- struct OT::CmapSubtable -->
       <class-decl name='CmapSubtable' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='393' column='1' id='type-id-710'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::CmapSubtableFormat0 format0; OT::CmapSubtableFormat4 format4; OT::CmapSubtableFormat6 format6; OT::CmapSubtableFormat10 format10; OT::CmapSubtableFormat12 format12; OT::CmapSubtableFormat13 format13; OT::CmapSubtableFormat14 format14;} -->
             <union-decl name='__anonymous_union__' size-in-bits='2096' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='437' column='1' id='type-id-823'>
@@ -14124,254 +14076,211 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <!-- EntryExitRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-840' size-in-bits='32' id='type-id-841'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Index[1] -->
     <array-type-def dimensions='1' type-id='type-id-842' size-in-bits='16' id='type-id-843'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- IntType<unsigned int, 3u>[1] -->
     <array-type-def dimensions='1' type-id='type-id-732' size-in-bits='24' id='type-id-844'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- LookupRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-845' size-in-bits='32' id='type-id-846'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- MarkRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-847' size-in-bits='32' id='type-id-848'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Offset<OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-849' size-in-bits='16' id='type-id-850'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-851' size-in-bits='16' id='type-id-852'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-853' size-in-bits='16' id='type-id-854'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-855' size-in-bits='16' id='type-id-856'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-857' size-in-bits='16' id='type-id-858'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-859' size-in-bits='16' id='type-id-860'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-861' size-in-bits='16' id='type-id-862'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-863' size-in-bits='16' id='type-id-864'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-865' size-in-bits='32' id='type-id-866'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-867' size-in-bits='16' id='type-id-868'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-869' size-in-bits='16' id='type-id-870'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-871' size-in-bits='16' id='type-id-872'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-873' size-in-bits='16' id='type-id-874'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-875' size-in-bits='16' id='type-id-876'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-877' size-in-bits='16' id='type-id-878'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-879' size-in-bits='16' id='type-id-880'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-881' size-in-bits='16' id='type-id-882'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-883' size-in-bits='16' id='type-id-884'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-885' size-in-bits='16' id='type-id-886'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-887' size-in-bits='16' id='type-id-888'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-889' size-in-bits='16' id='type-id-890'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-891' size-in-bits='16' id='type-id-892'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- RangeRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-893' size-in-bits='48' id='type-id-894'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Record<OT::Feature>[1] -->
     <array-type-def dimensions='1' type-id='type-id-895' size-in-bits='48' id='type-id-896'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Record<OT::LangSys>[1] -->
     <array-type-def dimensions='1' type-id='type-id-897' size-in-bits='48' id='type-id-898'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Record<OT::Script>[1] -->
     <array-type-def dimensions='1' type-id='type-id-899' size-in-bits='48' id='type-id-900'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- Value[1] -->
     <array-type-def dimensions='1' type-id='type-id-901' size-in-bits='16' id='type-id-902'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-178'/>
-
     </array-type-def>
     <!-- bool[2] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16' id='type-id-903'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- feature_map_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-904' size-in-bits='2304' id='type-id-905'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- lookup_map_t[32] -->
     <array-type-def dimensions='1' type-id='type-id-906' size-in-bits='2048' id='type-id-907'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-4' id='type-id-908'/>
-
     </array-type-def>
     <!-- stage_map_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-909' size-in-bits='512' id='type-id-910'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-71'/>
-
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-911' size-in-bits='4352' id='type-id-912'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-913' size-in-bits='1280' id='type-id-914'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- hb_tag_t[2] -->
     <array-type-def dimensions='1' type-id='type-id-183' size-in-bits='64' id='type-id-915'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- void*[3] -->
     <array-type-def dimensions='1' type-id='type-id-43' size-in-bits='192' id='type-id-916'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-686'/>
-
     </array-type-def>
     <!-- struct hb_ot_map_t -->
     <class-decl name='hb_ot_map_t' size-in-bits='8192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='40' column='1' id='type-id-917'>
-
         <member-type access='public'>
           <!-- struct hb_ot_map_t::stage_map_t -->
           <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-909'>
-
               <member-type access='public'>
                 <!-- typedef void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* hb_ot_map_t::stage_map_t::pause_func_t -->
                 <typedef-decl name='pause_func_t' type-id='type-id-919' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-918'/>
@@ -14386,7 +14295,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct hb_ot_map_t::lookup_map_t -->
           <class-decl name='lookup_map_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='59' column='1' id='type-id-906'>
@@ -14415,7 +14323,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- struct hb_ot_map_t::feature_map_t -->
           <class-decl name='feature_map_t' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='45' column='1' id='type-id-904'>
@@ -15676,7 +15583,6 @@ 
     </class-decl>
     <!-- struct GSUBProxy -->
     <class-decl name='GSUBProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='804' column='1' id='type-id-978'>
-
         <member-type access='public'>
           <!-- typedef OT::SubstLookup GSUBProxy::Lookup -->
           <typedef-decl name='Lookup' type-id='type-id-980' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='807' column='1' id='type-id-979'/>
@@ -15711,7 +15617,6 @@ 
     </class-decl>
     <!-- struct GPOSProxy -->
     <class-decl name='GPOSProxy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='818' column='1' id='type-id-985'>
-
         <member-type access='public'>
           <!-- typedef OT::PosLookup GPOSProxy::Lookup -->
           <typedef-decl name='Lookup' type-id='type-id-987' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='821' column='1' id='type-id-986'/>
@@ -17393,7 +17298,6 @@ 
     <namespace-decl name='OT'>
       <!-- struct OT::CoverageFormat1 -->
       <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-1118'>
-
           <member-type access='public'>
             <!-- struct OT::CoverageFormat1::Iter -->
             <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1119'>
@@ -17559,7 +17463,6 @@ 
       </class-decl>
       <!-- struct OT::CoverageFormat2 -->
       <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-1121'>
-
           <member-type access='public'>
             <!-- struct OT::CoverageFormat2::Iter -->
             <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1122'>
@@ -17733,11 +17636,9 @@ 
       </class-decl>
       <!-- struct OT::hb_apply_context_t -->
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-1375'>
-
           <member-type access='public'>
             <!-- struct OT::hb_apply_context_t::matcher_t -->
             <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1377'>
-
                 <member-type access='public'>
                   <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
                   <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1810'>
@@ -17747,7 +17648,6 @@ 
                     <enumerator name='MATCH_MAYBE' value='2'/>
                   </enum-decl>
                 </member-type>
-
                 <member-type access='public'>
                   <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
                   <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1811'>
@@ -17757,7 +17657,6 @@ 
                     <enumerator name='SKIP_MAYBE' value='2'/>
                   </enum-decl>
                 </member-type>
-
                 <member-type access='public'>
                   <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::hb_apply_context_t::matcher_t::match_func_t -->
                   <typedef-decl name='match_func_t' type-id='type-id-1394' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1812'/>
@@ -17895,7 +17794,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- struct OT::hb_apply_context_t::skipping_backward_iterator_t -->
             <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1379'>
@@ -18002,7 +17900,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- struct OT::hb_apply_context_t::skipping_forward_iterator_t -->
             <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1381'>
@@ -18113,12 +18010,10 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* OT::hb_apply_context_t::recurse_func_t -->
             <typedef-decl name='recurse_func_t' type-id='type-id-1801' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1813'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef bool OT::hb_apply_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-1814'/>
@@ -19323,7 +19218,6 @@ 
       </class-decl>
       <!-- struct OT::FeatureParams -->
       <class-decl name='FeatureParams' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='446' column='1' id='type-id-1142'>
-
           <member-type access='private'>
             <!-- union {OT::FeatureParamsSize size; OT::FeatureParamsStylisticSet stylisticSet; OT::FeatureParamsCharacterVariants characterVariants;} -->
             <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-1815'>
@@ -19755,11 +19649,9 @@ 
       </class-decl>
       <!-- struct OT::Coverage -->
       <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-1115'>
-
           <member-type access='public'>
             <!-- struct OT::Coverage::Iter -->
             <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-1116'>
-
                 <member-type access='private'>
                   <!-- union {OT::CoverageFormat1::Iter format1; OT::CoverageFormat2::Iter format2;} -->
                   <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-1816'>
@@ -19839,7 +19731,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::CoverageFormat1 format1; OT::CoverageFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-1817'>
@@ -20468,7 +20359,6 @@ 
       </class-decl>
       <!-- struct OT::ClassDef -->
       <class-decl name='ClassDef' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1049' column='1' id='type-id-1094'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ClassDefFormat1 format1; OT::ClassDefFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1086' column='1' id='type-id-1818'>
@@ -21694,7 +21584,6 @@ 
       </class-decl>
       <!-- struct OT::CaretValue -->
       <class-decl name='CaretValue' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='170' column='1' id='type-id-1065'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::CaretValueFormat1 format1; OT::CaretValueFormat2 format2; OT::CaretValueFormat3 format3;} -->
             <union-decl name='__anonymous_union__' size-in-bits='48' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='193' column='1' id='type-id-1822'>
@@ -22002,7 +21891,6 @@ 
       </class-decl>
       <!-- struct OT::MarkGlyphSets -->
       <class-decl name='MarkGlyphSets' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='293' column='1' id='type-id-1186'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MarkGlyphSetsFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='312' column='1' id='type-id-1823'>
@@ -22690,7 +22578,6 @@ 
       </class-decl>
       <!-- struct OT::Anchor -->
       <class-decl name='Anchor' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='307' column='1' id='type-id-995'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::AnchorFormat1 format1; OT::AnchorFormat2 format2; OT::AnchorFormat3 format3;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='332' column='1' id='type-id-1826'>
@@ -23825,12 +23712,10 @@ 
       </class-decl>
       <!-- struct OT::hb_closure_context_t -->
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1383'>
-
           <member-type access='public'>
             <!-- typedef typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* OT::hb_closure_context_t::recurse_func_t -->
             <typedef-decl name='recurse_func_t' type-id='type-id-1803' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1829'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef hb_void_t OT::hb_closure_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-974' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-1830'/>
@@ -24171,12 +24056,10 @@ 
       </class-decl>
       <!-- struct OT::hb_collect_glyphs_context_t -->
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1385'>
-
           <member-type access='public'>
             <!-- typedef typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* OT::hb_collect_glyphs_context_t::recurse_func_t -->
             <typedef-decl name='recurse_func_t' type-id='type-id-1805' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1831'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef hb_void_t OT::hb_collect_glyphs_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-974' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-1832'/>
@@ -24643,7 +24526,6 @@ 
       </class-decl>
       <!-- struct OT::hb_would_apply_context_t -->
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1389'>
-
           <member-type access='public'>
             <!-- typedef bool OT::hb_would_apply_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-1834'/>
@@ -28593,7 +28475,6 @@ 
       <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-1373'>
       <!-- struct OT::IntType<short unsigned int, 2u> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
-
           <member-type access='public'>
             <!-- enum OT::ValueFormat::Flags -->
             <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1854'>
@@ -29696,7 +29577,6 @@ 
       </class-decl>
       <!-- struct OT::PairSet -->
       <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-1259'>
-
           <member-type access='public'>
             <!-- struct OT::PairSet::sanitize_closure_t -->
             <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-1262'>
@@ -29982,7 +29862,6 @@ 
       </class-decl>
       <!-- struct OT::SubstLookupSubTable -->
       <class-decl name='SubstLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-1310'>
-
           <member-type access='public'>
             <!-- enum OT::SubstLookupSubTable::Type -->
             <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-1856'>
@@ -29997,7 +29876,6 @@ 
               <enumerator name='ReverseChainSingle' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- union {struct {OT::USHORT sub_format;} header; OT::SingleSubst single; OT::MultipleSubst multiple; OT::AlternateSubst alternate; OT::LigatureSubst ligature; OT::ContextSubst context; OT::ChainContextSubst chainContext; OT::ExtensionSubst extension; OT::ReverseChainSingleSubst reverseChainContextSingle;} -->
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-1857'>
@@ -30146,7 +30024,6 @@ 
       </class-decl>
       <!-- struct OT::SingleSubst -->
       <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-1305'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::SingleSubstFormat1 format1; OT::SingleSubstFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-1862'>
@@ -30254,7 +30131,6 @@ 
       </class-decl>
       <!-- struct OT::hb_get_coverage_context_t -->
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1387'>
-
           <member-type access='public'>
             <!-- typedef const OT::Coverage& OT::hb_get_coverage_context_t::return_t -->
             <typedef-decl name='return_t' type-id='type-id-966' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-1861'/>
@@ -30515,7 +30391,6 @@ 
       </class-decl>
       <!-- struct OT::GDEF -->
       <class-decl name='GDEF' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='326' column='1' id='type-id-1151'>
-
           <member-type access='public'>
             <!-- enum OT::GDEF::GlyphClasses -->
             <enum-decl name='GlyphClasses' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='329' column='1' id='type-id-1863'>
@@ -30971,7 +30846,6 @@ 
       <class-decl name='Supplier&lt;OT::Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1322'/>
       <!-- struct OT::MultipleSubst -->
       <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-1201'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MultipleSubstFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-1864'>
@@ -31077,7 +30951,6 @@ 
       </class-decl>
       <!-- struct OT::AlternateSubst -->
       <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-991'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::AlternateSubstFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-1865'>
@@ -31183,7 +31056,6 @@ 
       </class-decl>
       <!-- struct OT::LigatureSubst -->
       <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-1173'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::LigatureSubstFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-1866'>
@@ -31298,7 +31170,6 @@ 
       </class-decl>
       <!-- struct OT::Context -->
       <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-1101'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ContextFormat1 format1; OT::ContextFormat2 format2; OT::ContextFormat3 format3;} -->
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1867'>
@@ -31398,7 +31269,6 @@ 
       </class-decl>
       <!-- struct OT::ChainContext -->
       <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-1074'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ChainContextFormat1 format1; OT::ChainContextFormat2 format2; OT::ChainContextFormat3 format3;} -->
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1868'>
@@ -31692,7 +31562,6 @@ 
       </class-decl>
       <!-- struct OT::ReverseChainSingleSubst -->
       <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-1283'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ReverseChainSingleSubstFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-1870'>
@@ -31864,7 +31733,6 @@ 
       </class-decl>
       <!-- struct OT::PosLookupSubTable -->
       <class-decl name='PosLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1372' column='1' id='type-id-1266'>
-
           <member-type access='public'>
             <!-- enum OT::PosLookupSubTable::Type -->
             <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1375' column='1' id='type-id-1871'>
@@ -31880,7 +31748,6 @@ 
               <enumerator name='Extension' value='9'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- union {struct {OT::USHORT sub_format;} header; OT::SinglePos single; OT::PairPos pair; OT::CursivePos cursive; OT::MarkBasePos markBase; OT::MarkLigPos markLig; OT::MarkMarkPos markMark; OT::ContextPos context; OT::ChainContextPos chainContext; OT::ExtensionPos extension;} -->
             <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1424' column='1' id='type-id-1872'>
@@ -32007,7 +31874,6 @@ 
       </class-decl>
       <!-- struct OT::SinglePos -->
       <class-decl name='SinglePos' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='529' column='1' id='type-id-1299'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::SinglePosFormat1 format1; OT::SinglePosFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='552' column='1' id='type-id-1877'>
@@ -32076,7 +31942,6 @@ 
       </class-decl>
       <!-- struct OT::PairPos -->
       <class-decl name='PairPos' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='821' column='1' id='type-id-1253'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::PairPosFormat1 format1; OT::PairPosFormat2 format2;} -->
             <union-decl name='__anonymous_union__' size-in-bits='144' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='844' column='1' id='type-id-1878'>
@@ -32145,7 +32010,6 @@ 
       </class-decl>
       <!-- struct OT::CursivePos -->
       <class-decl name='CursivePos' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='988' column='1' id='type-id-1124'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::CursivePosFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1009' column='1' id='type-id-1879'>
@@ -32210,7 +32074,6 @@ 
       </class-decl>
       <!-- struct OT::MarkBasePos -->
       <class-decl name='MarkBasePos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1087' column='1' id='type-id-1182'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MarkBasePosFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1108' column='1' id='type-id-1880'>
@@ -32275,7 +32138,6 @@ 
       </class-decl>
       <!-- struct OT::MarkLigPos -->
       <class-decl name='MarkLigPos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1208' column='1' id='type-id-1191'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MarkLigPosFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1229' column='1' id='type-id-1881'>
@@ -32340,7 +32202,6 @@ 
       </class-decl>
       <!-- struct OT::MarkMarkPos -->
       <class-decl name='MarkMarkPos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1327' column='1' id='type-id-1195'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::MarkMarkPosFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1348' column='1' id='type-id-1882'>
@@ -32420,7 +32281,6 @@ 
       </class-decl>
       <!-- struct OT::Extension<OT::ExtensionPos> -->
       <class-decl name='Extension&lt;OT::ExtensionPos&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-1133'>
-
           <member-type access='protected'>
             <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1883'>
@@ -35855,23 +35715,19 @@ 
     <array-type-def dimensions='1' type-id='type-id-1888' size-in-bits='7168' id='type-id-1889'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-4' id='type-id-908'/>
-
     </array-type-def>
     <!-- stage_info_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-1890' size-in-bits='1024' id='type-id-1891'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>[2] -->
     <array-type-def dimensions='1' type-id='type-id-1892' size-in-bits='2304' id='type-id-1893'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-8'/>
-
     </array-type-def>
     <!-- struct hb_ot_map_builder_t -->
     <class-decl name='hb_ot_map_builder_t' size-in-bits='10240' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='181' column='1' id='type-id-1894'>
-
         <member-type access='private'>
           <!-- struct hb_ot_map_builder_t::feature_info_t -->
           <class-decl name='feature_info_t' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='210' column='1' id='type-id-1888'>
@@ -35912,7 +35768,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct hb_ot_map_builder_t::stage_info_t -->
           <class-decl name='stage_info_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='222' column='1' id='type-id-1890'>
@@ -36341,7 +36196,6 @@ 
     <pointer-type-def type-id='type-id-1897' size-in-bits='64' id='type-id-1901'/>
     <!-- hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u>* -->
     <pointer-type-def type-id='type-id-1892' size-in-bits='64' id='type-id-1906'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
@@ -36394,27 +36248,20 @@ 
     <pointer-type-def type-id='type-id-1916' size-in-bits='64' id='type-id-1838'/>
     <!-- const unsigned int* -->
     <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-1836'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <!-- hb_mask_t[21] -->
     <array-type-def dimensions='1' type-id='type-id-101' size-in-bits='672' id='type-id-1917'>
       <!-- <anonymous range>[21] -->
       <subrange length='21' type-id='type-id-4' id='type-id-1918'/>
-
     </array-type-def>
     <!-- struct indic_shape_plan_t -->
     <class-decl name='indic_shape_plan_t' size-in-bits='1344' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='507' column='1' id='type-id-1919'>
@@ -36605,32 +36452,24 @@ 
     <pointer-type-def type-id='type-id-1933' size-in-bits='64' id='type-id-1930'/>
     <!-- would_substitute_feature_t* -->
     <pointer-type-def type-id='type-id-1921' size-in-bits='64' id='type-id-1929'/>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- char[8] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-1934'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-63'/>
-
     </array-type-def>
     <!-- struct hb_ot_complex_shaper_t -->
     <class-decl name='hb_ot_complex_shaper_t' size-in-bits='704' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='69' column='1' id='type-id-1935'>
@@ -36832,7 +36671,6 @@ 
     <pointer-type-def type-id='type-id-1956' size-in-bits='64' id='type-id-1936'/>
     <!-- void* (const hb_ot_shape_plan_t*)* -->
     <pointer-type-def type-id='type-id-1957' size-in-bits='64' id='type-id-1937'/>
-
     <!-- void hb_ot_shape_plan_collect_lookups(hb_shape_plan_t*, hb_tag_t, hb_set_t*) -->
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
       <!-- parameter of type 'hb_shape_plan_t*' -->
@@ -36948,16 +36786,13 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-
     <!-- elt_t[2048] -->
     <array-type-def dimensions='1' type-id='type-id-1958' size-in-bits='65536' id='type-id-1959'>
       <!-- <anonymous range>[2048] -->
       <subrange length='2048' type-id='type-id-4' id='type-id-1960'/>
-
     </array-type-def>
     <!-- struct hb_set_t -->
     <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-1961'>
-
         <member-type access='public'>
           <!-- typedef uint32_t hb_set_t::elt_t -->
           <typedef-decl name='elt_t' type-id='type-id-108' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1958'/>
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index d5ab3e3d..0af4ac26 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -867,10 +867,6 @@ 
     <elf-symbol name='vtkSurfaceLICPainter_SC' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
-
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -879,25 +875,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <!-- char[40] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-8'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-10'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-12'>
@@ -928,7 +920,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='128' id='type-id-18'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-19'/>
@@ -2359,7 +2350,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-86' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-87'/>
     <!-- struct __mbstate_t -->
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-86'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='87' column='1' id='type-id-88'>
@@ -2530,7 +2520,6 @@ 
     </class-decl>
     <!-- class vtkWeakPointerBase -->
     <class-decl name='vtkWeakPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='31' column='1' id='type-id-75'>
-
         <member-type access='protected'>
           <!-- class vtkWeakPointerBase::NoReference -->
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='70' column='1' id='type-id-91'/>
@@ -2660,7 +2649,6 @@ 
     </class-decl>
     <!-- class vtkPixelTransfer -->
     <class-decl name='vtkPixelTransfer' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.h' line='35' column='1' id='type-id-104'>
-
         <member-type access='private'>
           <!-- typedef double vtkPixelTransfer::VTK_TT -->
           <typedef-decl name='VTK_TT' type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' line='19' column='1' id='type-id-105'/>
@@ -3448,10 +3436,8 @@ 
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::ios_base -->
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-219'>
-
           <member-type access='private'>
             <!-- class std::ios_base::Init -->
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='538' column='1' id='type-id-221'>
@@ -3608,7 +3594,6 @@ 
       </class-decl>
       <!-- struct std::_Resetiosflags -->
       <class-decl name='_Resetiosflags' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iomanip' line='49' column='1' id='type-id-262'>
-
           <member-type access='public'>
             <!-- typedef std::_Ios_Fmtflags std::_Resetiosflags::fmtflags -->
             <typedef-decl name='fmtflags' type-id='type-id-263' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='263' column='1' id='type-id-149'/>
@@ -3643,7 +3628,6 @@ 
       </enum-decl>
       <!-- struct std::basic_ios<char, std::char_traits<char> > -->
       <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-164'>
-
           <member-type access='public'>
             <!-- typedef std::_Ios_Iostate std::basic_ios<char, std::char_traits<char> >::iostate -->
             <typedef-decl name='iostate' type-id='type-id-264' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='338' column='1' id='type-id-167'/>
@@ -3711,12 +3695,10 @@ 
       </enum-decl>
       <!-- class std::__basic_file<char> -->
       <class-decl name='__basic_file&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/basic_file.h' line='53' column='1' id='type-id-151'>
-
           <member-type access='private'>
             <!-- typedef std::_Ios_Openmode std::__basic_file<char>::openmode -->
             <typedef-decl name='openmode' type-id='type-id-265' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='369' column='1' id='type-id-154'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef std::_Ios_Seekdir std::__basic_file<char>::seekdir -->
             <typedef-decl name='seekdir' type-id='type-id-266' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='401' column='1' id='type-id-156'/>
@@ -5214,12 +5196,10 @@ 
       </class-decl>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-280'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-169'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-17' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-173'/>
@@ -5379,7 +5359,6 @@ 
       </class-decl>
       <!-- class std::_Deque_base<vtkPixelExtent, std::allocator<vtkPixelExtent> > -->
       <class-decl name='_Deque_base&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-142'>
-
           <member-type access='protected'>
             <!-- enum std::_Deque_base<vtkPixelExtent, std::allocator<vtkPixelExtent> >::__anonymous_enum__ -->
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-281'>
@@ -5387,7 +5366,6 @@ 
               <enumerator name='_S_initial_map_size' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- struct std::_Deque_base<vtkPixelExtent, std::allocator<vtkPixelExtent> >::_Deque_impl -->
             <class-decl name='_Deque_impl' size-in-bits='640' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='412' column='1' id='type-id-200'>
@@ -6674,7 +6652,6 @@ 
       <!-- long long unsigned int -->
       <return type-id='type-id-22'/>
     </function-decl>
-
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -6935,7 +6912,6 @@ 
       <!-- int -->
       <return type-id='type-id-17'/>
     </function-decl>
-
     <!-- int atexit(void ()*) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void ()*' -->
@@ -7487,7 +7463,6 @@ 
     </class-decl>
     <!-- class vtkDataObject -->
     <class-decl name='vtkDataObject' visibility='default' is-declaration-only='yes' id='type-id-235'>
-
         <member-type access='private'>
           <!-- enum vtkDataObject::FieldAssociations -->
           <enum-decl name='FieldAssociations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/DataModel/vtkDataObject.h' line='212' column='1' id='type-id-287'>
@@ -7616,7 +7591,6 @@ 
     </class-decl>
     <!-- class vtkOStreamWrapper -->
     <class-decl name='vtkOStreamWrapper' visibility='default' is-declaration-only='yes' id='type-id-289'>
-
         <member-type access='private'>
           <!-- struct vtkOStreamWrapper::EndlType -->
           <class-decl name='EndlType' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkOStreamWrapper.h' line='58' column='1' id='type-id-184'/>
@@ -7881,7 +7855,6 @@ 
     </class-decl>
     <!-- class vtkTextureObject -->
     <class-decl name='vtkTextureObject' visibility='default' is-declaration-only='yes' id='type-id-290'>
-
         <member-type access='private'>
           <!-- enum vtkTextureObject::__anonymous_enum__2 -->
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='88' column='1' id='type-id-291'>
@@ -7894,7 +7867,6 @@ 
             <enumerator name='NumberOfDepthFormats' value='5'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum vtkTextureObject::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='65' column='1' id='type-id-292'>
@@ -7907,7 +7879,6 @@ 
             <enumerator name='NumberOfWrapModes' value='5'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum vtkTextureObject::__anonymous_enum__1 -->
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkTextureObject.h' line='76' column='1' id='type-id-293'>
@@ -7984,7 +7955,6 @@ 
     </class-decl>
     <!-- class vtkPixelBufferObject -->
     <class-decl name='vtkPixelBufferObject' visibility='default' is-declaration-only='yes' id='type-id-247'>
-
         <member-type access='private'>
           <!-- enum vtkPixelBufferObject::BufferType -->
           <enum-decl name='BufferType' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkPixelBufferObject.h' line='265' column='1' id='type-id-295'>
@@ -8057,7 +8027,6 @@ 
     </class-decl>
     <!-- class vtkDataArrayTemplate<float> -->
     <class-decl name='vtkDataArrayTemplate&lt;float&gt;' visibility='default' is-declaration-only='yes' id='type-id-233'>
-
         <member-type access='private'>
           <!-- enum vtkDataArrayTemplate<float>::DeleteMethod -->
           <enum-decl name='DeleteMethod' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkDataArrayTemplate.h' line='254' column='1' id='type-id-296'>
@@ -8105,8 +8074,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
     <!-- class vtkImageNoiseSource -->
     <class-decl name='vtkImageNoiseSource' visibility='default' is-declaration-only='yes' id='type-id-241'/>
     <!-- class vtkInformationVector -->
@@ -8139,12 +8106,10 @@ 
     <class-decl name='vtkRenderWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-258'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
     <!-- int[6] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-63'>
       <!-- <anonymous range>[6] -->
       <subrange length='6' type-id='type-id-4' id='type-id-297'/>
-
     </array-type-def>
     <!-- class vtkWeakPointer<vtkImageDataLIC2D> -->
     <class-decl name='vtkWeakPointer&lt;vtkImageDataLIC2D&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='47' column='1' id='type-id-65'>
@@ -8308,10 +8273,8 @@ 
     <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-298'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::ctype<char> -->
       <class-decl name='ctype&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-302'>
-
           <member-type access='private'>
             <!-- typedef char std::ctype<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/locale_facets.h' line='679' column='1' id='type-id-309'/>
@@ -8350,9 +8313,6 @@ 
         <return type-id='type-id-214'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <!-- std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&) -->
     <function-type size-in-bits='64' id='type-id-308'>
       <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >&' -->
@@ -8362,30 +8322,25 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
     <!-- int[2] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='64' id='type-id-310'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <!-- size_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='256' id='type-id-312'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- unsigned int*[2] -->
     <array-type-def dimensions='1' type-id='type-id-56' size-in-bits='128' id='type-id-313'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <!-- unsigned int[2] -->
     <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='64' id='type-id-314'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-4' id='type-id-311'/>
-
     </array-type-def>
     <!-- class vtkPainterCommunicator -->
     <class-decl name='vtkPainterCommunicator' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPainterCommunicator.h' line='30' column='1' id='type-id-315'>
@@ -8523,7 +8478,6 @@ 
     <class-decl name='vtkLineIntegralConvolution2D' size-in-bits='1792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.h' line='105' column='1' id='type-id-320'>
     <!-- class vtkObject -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-286'/>
-
         <member-type access='private'>
           <!-- enum vtkLineIntegralConvolution2D::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.h' line='149' column='1' id='type-id-321'>
@@ -10132,7 +10086,6 @@ 
     <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-325'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- ptrdiff_t std::operator&#45;<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>(const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&, const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&) -->
       <function-decl name='operator-&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&' -->
@@ -10512,7 +10465,6 @@ 
       </function-decl>
       <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-373'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-423'>
@@ -10530,7 +10482,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-377'>
@@ -10683,7 +10634,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-405'>
@@ -12414,7 +12364,6 @@ 
       <typedef-decl name='string' type-id='type-id-373' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='56' column='1' id='type-id-428'/>
       <!-- struct std::_Vector_base<vtkPixelBufferObject*, std::allocator<vtkPixelBufferObject*> > -->
       <class-decl name='_Vector_base&lt;vtkPixelBufferObject*, std::allocator&lt;vtkPixelBufferObject*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-355'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtkPixelBufferObject*, std::allocator<vtkPixelBufferObject*> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-394'>
@@ -13110,7 +13059,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<float, std::allocator<float> > -->
       <class-decl name='_Vector_base&lt;float, std::allocator&lt;float&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-352'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<float, std::allocator<float> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-391'>
@@ -14452,8 +14400,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<const float*, std::vector<float, std::allocator<float> > > -->
       <class-decl name='__normal_iterator&lt;const float*, std::vector&lt;float, std::allocator&lt;float&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-437'/>
     </namespace-decl>
-
-
     <!-- namespace vtkLineIntegralConvolution2DUtil -->
     <namespace-decl name='vtkLineIntegralConvolution2DUtil'>
       <!-- const char* vtkLineIntegralConvolution2DUtil::GetVectorLookupProgram(int) -->
@@ -14526,15 +14472,10 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- vtkPixelTransfer::VTK_TT* -->
     <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- class vtkStructuredGridLIC2D -->
@@ -15042,9 +14983,6 @@ 
     <pointer-type-def type-id='type-id-469' size-in-bits='64' id='type-id-453'/>
     <!-- vtkStructuredGridLIC2D* -->
     <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-451'/>
-
-
-
     <!-- namespace detail -->
     <namespace-decl name='detail'>
       <!-- class detail::vtkAtomicIntImpl<int> -->
@@ -15168,8 +15106,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- class vtkSurfaceLICComposite -->
@@ -15716,7 +15652,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-325' size-in-bits='64' id='type-id-475'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- bool std::operator==<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>(const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&, const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&) -->
       <function-decl name='operator==&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>&' -->
@@ -16588,8 +16523,6 @@ 
         <return type-id='type-id-46'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- class vtkSurfaceLICDefaultPainter -->
@@ -16855,7 +16788,6 @@ 
     <class-decl name='vtkSurfaceLICPainter' size-in-bits='2880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='67' column='1' id='type-id-504'>
     <!-- class vtkPainter -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-505'/>
-
         <member-type access='private'>
           <!-- enum vtkSurfaceLICPainter::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='210' column='1' id='type-id-506'>
@@ -16866,7 +16798,6 @@ 
             <enumerator name='ENHANCE_CONTRAST_BOTH' value='4'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum vtkSurfaceLICPainter::__anonymous_enum__1 -->
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.h' line='374' column='1' id='type-id-507'>
@@ -16877,7 +16808,6 @@ 
             <enumerator name='COMPOSITE_AUTO' value='3'/>
           </enum-decl>
         </member-type>
-
         <member-type access='protected'>
           <!-- class vtkSurfaceLICPainter::vtkInternals -->
           <class-decl name='vtkInternals' size-in-bits='3392' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='824' column='1' id='type-id-508'>
@@ -18710,13 +18640,8 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-500' size-in-bits='64' id='type-id-503'/>
     <!-- vtkTimeStamp* -->
     <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-501'/>
-
-
-
-
     <!-- class vtkPainter -->
     <class-decl name='vtkPainter' visibility='default' is-declaration-only='yes' id='type-id-505'>
-
         <member-type access='private'>
           <!-- enum vtkPainter::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/Core/vtkPainter.h' line='100' column='1' id='type-id-551'>
@@ -18951,13 +18876,10 @@ 
     <class-decl name='vtkScalarsToColorsPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-549'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
-
-
     <!-- double[3] -->
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-524'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-552'/>
-
     </array-type-def>
     <!-- unsigned char -->
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-553'/>
@@ -18965,13 +18887,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-554' size-in-bits='512' id='type-id-509'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-4' id='type-id-555'/>
-
     </array-type-def>
     <!-- typedef float GLfloat -->
     <typedef-decl name='GLfloat' type-id='type-id-16' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/mesa@8.0.5-22dd4c4b/include/GL/gl.h' line='160' column='1' id='type-id-556'/>
     <!-- class vtkSmartPointerBase -->
     <class-decl name='vtkSmartPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='30' column='1' id='type-id-557'>
-
         <member-type access='protected'>
           <!-- class vtkSmartPointerBase::NoReference -->
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='73' column='1' id='type-id-558'/>
@@ -21882,7 +21802,6 @@ 
     <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-528'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- vtkPixelExtent* std::uninitialized_copy<std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>, vtkPixelExtent*>(std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>, std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>, vtkPixelExtent*) -->
       <function-decl name='uninitialized_copy&lt;std::_Deque_iterator&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'struct std::_Deque_iterator<vtkPixelExtent, vtkPixelExtent&, vtkPixelExtent*>' -->
@@ -21938,7 +21857,6 @@ 
       </function-decl>
       <!-- struct std::_Vector_base<vtkPixelExtent, std::allocator<vtkPixelExtent> > -->
       <class-decl name='_Vector_base&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-630'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtkPixelExtent, std::allocator<vtkPixelExtent> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-659'>
@@ -22632,8 +22550,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<const vtkPixelExtent*, std::vector<vtkPixelExtent, std::allocator<vtkPixelExtent> > > -->
       <class-decl name='__normal_iterator&lt;const vtkPixelExtent*, std::vector&lt;vtkPixelExtent, std::allocator&lt;vtkPixelExtent&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-686'/>
     </namespace-decl>
-
-
     <!-- namespace vtkSurfaceLICPainterUtil -->
     <namespace-decl name='vtkSurfaceLICPainterUtil'>
       <!-- int vtkSurfaceLICPainterUtil::ilog2(unsigned int) -->
@@ -22756,7 +22672,6 @@ 
       </class-decl>
       <!-- class vtkSurfaceLICPainterUtil::RandomNoise2D -->
       <class-decl name='RandomNoise2D' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='299' column='1' id='type-id-678'>
-
           <member-type access='private'>
             <!-- enum vtkSurfaceLICPainterUtil::RandomNoise2D::__anonymous_enum__ -->
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' line='319' column='1' id='type-id-689'>
@@ -22926,7 +22841,6 @@ 
     </namespace-decl>
     <!-- class vtkLightingHelper -->
     <class-decl name='vtkLightingHelper' visibility='default' is-declaration-only='yes' id='type-id-671'>
-
         <member-type access='private'>
           <!-- enum vtkLightingHelper::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/OpenGL/vtkLightingHelper.h' line='42' column='1' id='type-id-690'>
@@ -23114,8 +23028,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
     <!-- class vtkBackgroundColorMonitor -->
     <class-decl name='vtkBackgroundColorMonitor' visibility='default' is-declaration-only='yes' id='type-id-664'/>
     <!-- class vtkCellData -->
@@ -23165,10 +23077,6 @@ 
         </function-decl>
       </member-function>
     </class-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC/vtkLineIntegralConvolution2D_AAH.cxx' language='LANG_C_plus_plus'>
     <!-- const char* vtkLineIntegralConvolution2D_AAH -->
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 5b1f7134..0b2acfcc 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1577,12 +1577,6 @@ 
     <elf-symbol name='sys_alloc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
     <!-- int RunningOnValgrind() -->
@@ -1597,12 +1591,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- unsigned char[16] -->
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128' id='type-id-4'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-5' id='type-id-6'/>
-
     </array-type-def>
     <!-- struct Elf64_Sym -->
     <class-decl name='Elf64_Sym' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/elf.h' line='389' column='1' id='type-id-7'>
@@ -1837,10 +1829,8 @@ 
     <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-51'/>
     <!-- namespace base -->
     <namespace-decl name='base'>
-
       <!-- class base::ElfMemImage -->
       <class-decl name='ElfMemImage' size-in-bits='576' visibility='default' filepath='./src/base/elf_mem_image.h' line='56' column='1' id='type-id-23'>
-
           <member-type access='private'>
             <!-- struct base::ElfMemImage::SymbolInfo -->
             <class-decl name='SymbolInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/base/elf_mem_image.h' line='64' column='1' id='type-id-25'>
@@ -1862,7 +1852,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- class base::ElfMemImage::SymbolIterator -->
             <class-decl name='SymbolIterator' size-in-bits='384' visibility='default' filepath='./src/base/elf_mem_image.h' line='73' column='1' id='type-id-27'>
@@ -2171,10 +2160,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- typedef int (void*, int, pid_t*, typedef __va_list_tag __va_list_tag*)* ListAllProcessThreadsCallBack -->
@@ -2187,7 +2172,6 @@ 
     <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-58'/>
     <!-- pid_t* -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-63'/>
-
     <!-- int TCMalloc_ListAllProcessThreads(void*, ListAllProcessThreadsCallBack, ...) -->
     <function-decl name='TCMalloc_ListAllProcessThreads' mangled-name='TCMalloc_ListAllProcessThreads' filepath='src/base/linuxthreads.cc' line='551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='TCMalloc_ListAllProcessThreads'>
       <!-- parameter of type 'void*' -->
@@ -2222,10 +2206,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <!-- int32 FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_verbose -->
@@ -2233,7 +2213,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_noverbose -->
       <var-decl name='FLAGS_noverbose' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead15FLAGS_noverboseE' visibility='default' filepath='src/base/logging.cc' line='40' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead15FLAGS_noverboseE'/>
     </namespace-decl>
-
     <!-- void RawClose(RawFD) -->
     <function-decl name='RawClose' mangled-name='_Z8RawClosei' filepath='src/base/logging.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8RawClosei'>
       <!-- parameter of type 'typedef RawFD' -->
@@ -2261,25 +2240,17 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- AllocList*[30] -->
     <array-type-def dimensions='1' type-id='type-id-68' size-in-bits='1920' id='type-id-69'>
       <!-- <anonymous range>[30] -->
       <subrange length='30' type-id='type-id-5' id='type-id-70'/>
-
     </array-type-def>
     <!-- low_level_alloc_internal::AllocList* -->
     <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-68'/>
-
-
-
-
-
     <!-- namespace low_level_alloc_internal -->
     <namespace-decl name='low_level_alloc_internal'>
       <!-- struct low_level_alloc_internal::AllocList -->
       <class-decl name='AllocList' size-in-bits='2240' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='67' column='1' id='type-id-71'>
-
           <member-type access='public'>
             <!-- struct low_level_alloc_internal::AllocList::Header -->
             <class-decl name='Header' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='68' column='1' id='type-id-72'>
@@ -2315,7 +2286,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- struct CycleClock -->
@@ -2330,8 +2300,6 @@ 
     </class-decl>
     <!-- namespace base -->
     <namespace-decl name='base'>
-
-
       <!-- void base::SubmitSpinLockProfileData(void*, int64) -->
       <function-decl name='SubmitSpinLockProfileData' mangled-name='_ZN4base25SubmitSpinLockProfileDataEPKvl' filepath='./src/base/synchronization_profiling.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base25SubmitSpinLockProfileDataEPKvl'>
         <!-- parameter of type 'void*' -->
@@ -2342,11 +2310,6 @@ 
         <return type-id='type-id-56'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- const base::internal::SpinLockWaitTransition -->
@@ -2415,26 +2378,20 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <!-- char[10] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='80' id='type-id-83'>
       <!-- <anonymous range>[10] -->
       <subrange length='10' type-id='type-id-5' id='type-id-84'/>
-
     </array-type-def>
     <!-- char[5120] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='40960' id='type-id-85'>
       <!-- <anonymous range>[5120] -->
       <subrange length='5120' type-id='type-id-5' id='type-id-86'/>
-
     </array-type-def>
     <!-- class ProcMapsIterator -->
     <class-decl name='ProcMapsIterator' size-in-bits='640' visibility='default' filepath='./src/base/sysinfo.h' line='102' column='1' id='type-id-87'>
-
         <member-type access='private'>
           <!-- struct ProcMapsIterator::Buffer -->
           <class-decl name='Buffer' size-in-bits='40960' is-struct='yes' visibility='default' filepath='./src/base/sysinfo.h' line='104' column='1' id='type-id-88'>
@@ -2667,11 +2624,6 @@ 
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-98'/>
     <!-- uint64* -->
     <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-96'/>
-
-
-
-
-
     <!-- bool HasPosixThreads() -->
     <function-decl name='HasPosixThreads' mangled-name='_Z15HasPosixThreadsv' filepath='src/base/sysinfo.cc' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15HasPosixThreadsv'>
       <!-- bool -->
@@ -2717,7 +2669,6 @@ 
       <!-- const char* -->
       <return type-id='type-id-52'/>
     </function-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- base::VDSOInitHelper* -->
@@ -2756,12 +2707,10 @@ 
       </class-decl>
       <!-- class base::VDSOSupport -->
       <class-decl name='VDSOSupport' size-in-bits='576' visibility='default' filepath='./src/base/vdso_support.h' line='72' column='1' id='type-id-104'>
-
           <member-type access='private'>
             <!-- typedef base::ElfMemImage::SymbolInfo base::VDSOSupport::SymbolInfo -->
             <typedef-decl name='SymbolInfo' type-id='type-id-25' filepath='./src/base/vdso_support.h' line='76' column='1' id='type-id-106'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef base::ElfMemImage::SymbolIterator base::VDSOSupport::SymbolIterator -->
             <typedef-decl name='SymbolIterator' type-id='type-id-27' filepath='./src/base/vdso_support.h' line='77' column='1' id='type-id-111'/>
@@ -2882,10 +2831,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- const int& -->
@@ -2900,7 +2845,6 @@ 
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- const int& std::max<int>(const int&, const int&) -->
       <function-decl name='max&lt;int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const int&' -->
@@ -2920,12 +2864,8 @@ 
         <return type-id='type-id-116'/>
       </function-decl>
     </namespace-decl>
-
-
-
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
-
       <!-- bool tcmalloc::DLL_IsEmpty(const tcmalloc::Span*) -->
       <function-decl name='DLL_IsEmpty' filepath='src/span.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const tcmalloc::Span*' -->
@@ -2962,7 +2902,6 @@ 
         <return type-id='type-id-53'/>
       </function-decl>
     </namespace-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- class HeapLeakCheckerGlobalPrePost -->
@@ -2994,33 +2933,24 @@ 
     </class-decl>
     <!-- HeapLeakCheckerGlobalPrePost* -->
     <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
-
-
-
-
     <!-- bool heap_leak_checker_bcad_variable -->
     <var-decl name='heap_leak_checker_bcad_variable' type-id='type-id-55' mangled-name='heap_leak_checker_bcad_variable' visibility='default' filepath='src/heap-checker-bcad.cc' line='53' column='1' elf-symbol-id='heap_leak_checker_bcad_variable'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <!-- char[] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='infinite' id='type-id-123'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' id='type-id-124'/>
-
     </array-type-def>
     <!-- size_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='256' id='type-id-125'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <!-- void*[32] -->
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='2048' id='type-id-127'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-5' id='type-id-128'/>
-
     </array-type-def>
     <!-- struct AllocObject -->
     <class-decl name='AllocObject' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='356' column='1' id='type-id-129'>
@@ -3368,7 +3298,6 @@ 
     </class-decl>
     <!-- class GoogleInitializer -->
     <class-decl name='GoogleInitializer' size-in-bits='128' visibility='default' filepath='src/base/googleinit.h' line='39' column='1' id='type-id-151'>
-
         <member-type access='private'>
           <!-- typedef void ()* GoogleInitializer::VoidFunction -->
           <typedef-decl name='VoidFunction' type-id='type-id-153' filepath='src/base/googleinit.h' line='41' column='1' id='type-id-152'/>
@@ -3410,7 +3339,6 @@ 
     </class-decl>
     <!-- class MemoryRegionMap -->
     <class-decl name='MemoryRegionMap' size-in-bits='8' visibility='default' filepath='src/memory_region_map.h' line='69' column='1' id='type-id-157'>
-
         <member-type access='private'>
           <!-- struct MemoryRegionMap::RegionCmp -->
           <class-decl name='RegionCmp' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='245' column='1' id='type-id-158'>
@@ -3429,7 +3357,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct MemoryRegionMap::Region -->
           <class-decl name='Region' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='137' column='1' id='type-id-161'>
@@ -3550,7 +3477,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct MemoryRegionMap::MyAllocator -->
           <class-decl name='MyAllocator' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/memory_region_map.h' line='252' column='1' id='type-id-164'>
@@ -3576,12 +3502,10 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > MemoryRegionMap::RegionSet -->
           <typedef-decl name='RegionSet' type-id='type-id-166' filepath='src/memory_region_map.h' line='263' column='1' id='type-id-165'/>
         </member-type>
-
         <member-type access='private'>
           <!-- union MemoryRegionMap::RegionSetRep -->
           <union-decl name='RegionSetRep' size-in-bits='384' visibility='default' filepath='src/memory_region_map.cc' line='177' column='1' id='type-id-167'>
@@ -3604,7 +3528,6 @@ 
             </member-function>
           </union-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- class MemoryRegionMap::LockHolder -->
           <class-decl name='LockHolder' size-in-bits='8' visibility='default' filepath='src/memory_region_map.h' line='126' column='1' id='type-id-171'>
@@ -3652,7 +3575,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::_Rb_tree_const_iterator<MemoryRegionMap::Region> MemoryRegionMap::RegionIterator -->
           <typedef-decl name='RegionIterator' type-id='type-id-175' filepath='src/memory_region_map.h' line='268' column='1' id='type-id-174'/>
@@ -3971,11 +3893,9 @@ 
     </class-decl>
     <!-- class HeapProfileTable -->
     <class-decl name='HeapProfileTable' size-in-bits='832' visibility='default' filepath='src/heap-profile-table.h' line='51' column='1' id='type-id-187'>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::AllocValue -->
           <class-decl name='AllocValue' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='190' column='1' id='type-id-188'>
-
               <member-type access='private'>
                 <!-- typedef HeapProfileBucket HeapProfileTable::AllocValue::Bucket -->
                 <typedef-decl name='Bucket' type-id='type-id-190' filepath='src/heap-profile-table.h' line='187' column='1' id='type-id-189'/>
@@ -4062,11 +3982,9 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::DumpArgs -->
           <class-decl name='DumpArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='242' column='1' id='type-id-194'>
-
               <member-type access='public'>
                 <!-- typedef HeapProfileStats HeapProfileTable::DumpArgs::Stats -->
                 <typedef-decl name='Stats' type-id='type-id-141' filepath='src/heap-profile-table.h' line='63' column='1' id='type-id-195'/>
@@ -4094,11 +4012,9 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::Snapshot -->
           <class-decl name='Snapshot' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='347' column='1' id='type-id-198'>
-
               <member-type access='private'>
                 <!-- struct HeapProfileTable::Snapshot::Entry -->
                 <class-decl name='Entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.cc' line='514' column='1' id='type-id-199'>
@@ -4136,7 +4052,6 @@ 
                   </member-function>
                 </class-decl>
               </member-type>
-
               <member-type access='private'>
                 <!-- struct HeapProfileTable::Snapshot::ReportState -->
                 <class-decl name='ReportState' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/heap-profile-table.cc' line='528' column='1' id='type-id-203'>
@@ -4272,7 +4187,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::AddNonLiveArgs -->
           <class-decl name='AddNonLiveArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='305' column='1' id='type-id-214'>
@@ -4286,7 +4200,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::AllocInfo -->
           <class-decl name='AllocInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='66' column='1' id='type-id-215'>
@@ -4312,7 +4225,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::AllocContextInfo -->
           <class-decl name='AllocContextInfo' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='77' column='1' id='type-id-216'>
@@ -4328,32 +4240,26 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void* (typedef size_t)* HeapProfileTable::Allocator -->
           <typedef-decl name='Allocator' type-id='type-id-217' filepath='src/heap-profile-table.h' line='83' column='1' id='type-id-209'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (void*)* HeapProfileTable::DeAllocator -->
           <typedef-decl name='DeAllocator' type-id='type-id-218' filepath='src/heap-profile-table.h' line='84' column='1' id='type-id-210'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef AddressMap<HeapProfileTable::AllocValue> HeapProfileTable::AllocationMap -->
           <typedef-decl name='AllocationMap' type-id='type-id-219' filepath='src/heap-profile-table.h' line='224' column='1' id='type-id-205'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (void*, const HeapProfileTable::AllocInfo&)* HeapProfileTable::AllocIterator -->
           <typedef-decl name='AllocIterator' type-id='type-id-221' filepath='src/heap-profile-table.h' line='138' column='1' id='type-id-220'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (const HeapProfileTable::AllocContextInfo&)* HeapProfileTable::AllocContextIterator -->
           <typedef-decl name='AllocContextIterator' type-id='type-id-223' filepath='src/heap-profile-table.h' line='147' column='1' id='type-id-222'/>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapProfileTable::BufferArgs -->
           <class-decl name='BufferArgs' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-profile-table.h' line='227' column='1' id='type-id-224'>
@@ -4809,7 +4715,6 @@ 
     </class-decl>
     <!-- class LowLevelAlloc -->
     <class-decl name='LowLevelAlloc' size-in-bits='8' visibility='default' filepath='src/base/low_level_alloc.h' line='44' column='1' id='type-id-237'>
-
         <member-type access='private'>
           <!-- struct LowLevelAlloc::Arena -->
           <class-decl name='Arena' size-in-bits='2560' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='184' column='1' id='type-id-238'>
@@ -4922,7 +4827,6 @@ 
     </class-decl>
     <!-- class HeapLeakChecker -->
     <class-decl name='HeapLeakChecker' size-in-bits='448' visibility='default' filepath='src/gperftools/heap-checker.h' line='78' column='1' id='type-id-239'>
-
         <member-type access='private'>
           <!-- class HeapLeakChecker::Disabler -->
           <class-decl name='Disabler' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='175' column='1' id='type-id-240'>
@@ -4970,7 +4874,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum HeapLeakChecker::ShouldSymbolize -->
           <enum-decl name='ShouldSymbolize' filepath='./src/gperftools/heap-checker.h' line='225' column='1' id='type-id-243'>
@@ -4979,7 +4882,6 @@ 
             <enumerator name='DO_NOT_SYMBOLIZE' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum HeapLeakChecker::ProcMapsTask -->
           <enum-decl name='ProcMapsTask' filepath='./src/gperftools/heap-checker.h' line='295' column='1' id='type-id-244'>
@@ -4988,7 +4890,6 @@ 
             <enumerator name='DISABLE_LIBRARY_ALLOCS' value='1'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum HeapLeakChecker::ProcMapsResult -->
           <enum-decl name='ProcMapsResult' filepath='./src/gperftools/heap-checker.h' line='301' column='1' id='type-id-245'>
@@ -4998,7 +4899,6 @@ 
             <enumerator name='NO_SHARED_LIBS_IN_PROC_MAPS' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct HeapLeakChecker::RangeValue -->
           <class-decl name='RangeValue' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/heap-checker.cc' line='404' column='1' id='type-id-246'>
@@ -7182,7 +7082,6 @@ 
     <typedef-decl name='MallocHook_SbrkHook' type-id='type-id-368' filepath='./src/gperftools/malloc_hook_c.h' line='144' column='1' id='type-id-369'/>
     <!-- class HeapCleaner -->
     <class-decl name='HeapCleaner' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='403' column='1' id='type-id-370'>
-
         <member-type access='private'>
           <!-- typedef void ()* HeapCleaner::void_function -->
           <typedef-decl name='void_function' type-id='type-id-153' filepath='./src/gperftools/heap-checker.h' line='405' column='1' id='type-id-371'/>
@@ -8020,7 +7919,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-712' size-in-bits='64' id='type-id-713'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void std::swap<AllocObject*>(AllocObject*&, AllocObject*&) -->
       <function-decl name='swap&lt;AllocObject*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'AllocObject*&' -->
@@ -8519,7 +8417,6 @@ 
       </function-decl>
       <!-- class std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='105' column='1' id='type-id-555'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-665'>
@@ -8544,7 +8441,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-559'>
@@ -8697,7 +8593,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-719'>
@@ -10453,7 +10348,6 @@ 
       </function-decl>
       <!-- struct std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Vector_base&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-543'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-653'>
@@ -11223,12 +11117,10 @@ 
       </class-decl>
       <!-- struct std::_Rb_tree_node_base -->
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-531'>
-
           <member-type access='public'>
             <!-- typedef std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Base_ptr -->
             <typedef-decl name='_Base_ptr' type-id='type-id-650' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-730'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Const_Base_ptr -->
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-533' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='90' column='1' id='type-id-731'/>
@@ -11438,7 +11330,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, STL_Allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-478'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-630'>
@@ -12642,7 +12533,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-470'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-622'>
@@ -13811,7 +13701,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Rb_tree&lt;long unsigned int, long unsigned int, std::_Identity&lt;long unsigned int&gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;long unsigned int, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-466'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-618'>
@@ -14877,7 +14766,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, long unsigned int&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-474'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-626'>
@@ -15966,7 +15854,6 @@ 
       <class-decl name='unary_function&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, const long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' is-declaration-only='yes' id='type-id-752'/>
       <!-- struct std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > -->
       <class-decl name='_Vector_base&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-549'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-659'>
@@ -16166,7 +16053,6 @@ 
       <class-decl name='unary_function&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' is-declaration-only='yes' id='type-id-754'/>
       <!-- struct std::_Vector_base<void (*)(), std::allocator<void (*)()> > -->
       <class-decl name='_Vector_base&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-546'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-656'>
@@ -16308,12 +16194,10 @@ 
       </class-decl>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-755'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-66' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-565'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-569'/>
@@ -20173,7 +20057,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<void* const*, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > -->
       <class-decl name='__normal_iterator&lt;void* const*, std::vector&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-766'/>
     </namespace-decl>
-
     <!-- namespace base -->
     <namespace-decl name='base'>
       <!-- namespace base::internal -->
@@ -20347,7 +20230,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
     </namespace-decl>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
@@ -20421,7 +20303,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_noheap_check_max_pointer_offset -->
       <var-decl name='FLAGS_noheap_check_max_pointer_offset' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead37FLAGS_noheap_check_max_pointer_offsetE' visibility='default' filepath='src/heap-checker.cc' line='209' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead37FLAGS_noheap_check_max_pointer_offsetE'/>
     </namespace-decl>
-
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- namespace tcmalloc::commandlineflags -->
@@ -20717,7 +20598,6 @@ 
     <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-277'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- bool std::__equal_aux<const void* const*, const void**>(void* const*, void* const*, void**) -->
       <function-decl name='__equal_aux&lt;const void* const*, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'void* const*' -->
@@ -21224,7 +21104,6 @@ 
       </function-decl>
       <!-- class std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
       <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-805'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;HeapProfileTable::Bucket*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-843'>
@@ -23291,8 +23170,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <!-- int32 FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_heap_check_max_leaks -->
@@ -23313,7 +23190,6 @@ 
         <!-- int -->
         <return type-id='type-id-1'/>
       </function-decl>
-
     </namespace-decl>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead'>
@@ -23413,11 +23289,6 @@ 
     </class-decl>
     <!-- HeapProfileEndWriter* -->
     <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-883'/>
-
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
       <!-- int64 FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_heap_profile_allocation_interval -->
@@ -23452,8 +23323,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_noonly_mmap_profile -->
       <var-decl name='FLAGS_noonly_mmap_profile' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead25FLAGS_noonly_mmap_profileE' visibility='default' filepath='src/heap-profiler.cc' line='125' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead25FLAGS_noonly_mmap_profileE'/>
     </namespace-decl>
-
-
     <!-- void HeapProfilerDump(const char*) -->
     <function-decl name='HeapProfilerDump' mangled-name='HeapProfilerDump' filepath='src/heap-profiler.cc' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='HeapProfilerDump'>
       <!-- parameter of type 'const char*' -->
@@ -23485,12 +23354,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- char[200] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='1600' id='type-id-884'>
       <!-- <anonymous range>[200] -->
       <subrange length='200' type-id='type-id-5' id='type-id-885'/>
-
     </array-type-def>
     <!-- const tcmalloc::LogItem -->
     <qualified-type-def type-id='type-id-886' const='yes' id='type-id-887'/>
@@ -23561,11 +23428,6 @@ 
       <!-- void (const char*, int)* tcmalloc::log_message_writer -->
       <var-decl name='log_message_writer' type-id='type-id-892' mangled-name='_ZN8tcmalloc18log_message_writerE' visibility='default' filepath='src/internal_logging.cc' line='63' column='1' elf-symbol-id='_ZN8tcmalloc18log_message_writerE'/>
     </namespace-decl>
-
-
-
-
-
     <!-- void (const char*, int) -->
     <function-type size-in-bits='64' id='type-id-891'>
       <!-- parameter of type 'const char*' -->
@@ -23588,12 +23450,6 @@ 
     <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-259'/>
     <!-- MallocExtension::RangeFunction* -->
     <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-896'/>
-
-
-
-
-
-
     <!-- MallocExtension_Ownership MallocExtension_GetOwnership(void*) -->
     <function-decl name='MallocExtension_GetOwnership' mangled-name='MallocExtension_GetOwnership' filepath='src/malloc_extension.cc' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='MallocExtension_GetOwnership'>
       <!-- parameter of type 'void*' -->
@@ -23703,7 +23559,6 @@ 
     </function-decl>
     <!-- class MallocExtension -->
     <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-
         <member-type access='private'>
           <!-- enum MallocExtension::Ownership -->
           <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
@@ -23713,7 +23568,6 @@ 
             <enumerator name='kNotOwned' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct MallocExtension::FreeListInfo -->
           <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
@@ -23735,7 +23589,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (void*, const base::MallocRange*) MallocExtension::RangeFunction -->
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
@@ -24116,7 +23969,6 @@ 
     <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-946'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void** std::__copy_move_a<false, void**, void**>(void**, void**, void**) -->
       <function-decl name='__copy_move_a&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'void**' -->
@@ -24151,8 +24003,6 @@ 
         <return type-id='type-id-120'/>
       </function-decl>
     </namespace-decl>
-
-
     <!-- namespace base -->
     <namespace-decl name='base'>
       <!-- namespace base::internal -->
@@ -24618,8 +24468,6 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
-
     <!-- void* mmap(void*, size_t, int, int, int, off_t) -->
     <function-decl name='mmap' mangled-name='mmap' filepath='src/malloc_hook_mmap_linux.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmap'>
       <!-- parameter of type 'void*' -->
@@ -24977,10 +24825,6 @@ 
     <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
     <!-- pthread_once_t* -->
     <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
-
-
-
-
     <!-- int perftools_pthread_once(pthread_once_t*, void ()*) -->
     <function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
       <!-- parameter of type 'pthread_once_t*' -->
@@ -25101,12 +24945,6 @@ 
     </class-decl>
     <!-- HugetlbSysAllocator* -->
     <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-959'/>
-
-
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead'>
       <!-- std::string FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead::FLAGS_memfs_malloc_path -->
@@ -25136,7 +24974,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_nomemfs_malloc_map_private -->
       <var-decl name='FLAGS_nomemfs_malloc_map_private' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE' visibility='default' filepath='src/memfs_malloc.cc' line='87' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead32FLAGS_nomemfs_malloc_map_privateE'/>
     </namespace-decl>
-
     <!-- class SysAllocator -->
     <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
       <member-function access='private' constructor='yes'>
@@ -25181,16 +25018,13 @@ 
     <array-type-def dimensions='1' type-id='type-id-190' size-in-bits='8960' id='type-id-179'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
     </array-type-def>
     <!-- void*[20][32] -->
     <array-type-def dimensions='2' type-id='type-id-53' size-in-bits='40960' id='type-id-180'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-5' id='type-id-128'/>
-
     </array-type-def>
     <!-- class STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator> -->
     <class-decl name='STL_Allocator&lt;std::_Rb_tree_node&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-961'>
@@ -25559,7 +25393,6 @@ 
     <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-184'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- bool std::__equal_aux<const void**, const void**>(void**, void**, void**) -->
       <function-decl name='__equal_aux&lt;const void**, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'void**' -->
@@ -25936,7 +25769,6 @@ 
       </class-decl>
       <!-- class std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
       <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-979'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true> -->
             <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-990'>
@@ -26922,11 +26754,8 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <!-- namespace base -->
     <namespace-decl name='base'>
-
       <!-- namespace base::subtle -->
       <namespace-decl name='subtle'>
         <!-- Atomic32 base::subtle::NoBarrier_Load(const volatile Atomic32*) -->
@@ -26938,7 +26767,6 @@ 
         </function-decl>
       </namespace-decl>
     </namespace-decl>
-
     <!-- void (const MemoryRegionMap::Region&) -->
     <function-type size-in-bits='64' id='type-id-998'>
       <!-- parameter of type 'const MemoryRegionMap::Region&' -->
@@ -26948,10 +26776,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- namespace tcmalloc::commandlineflags -->
@@ -27009,7 +26833,6 @@ 
     <typedef-decl name='__timer_t' type-id='type-id-53' filepath='/usr/include/bits/types.h' line='161' column='1' id='type-id-1010'/>
     <!-- class ProfileHandler -->
     <class-decl name='ProfileHandler' size-in-bits='448' visibility='default' filepath='src/profile-handler.cc' line='84' column='1' id='type-id-1011'>
-
         <member-type access='private'>
           <!-- enum ProfileHandler::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/profile-handler.cc' line='166' column='1' id='type-id-1012'>
@@ -27020,12 +26843,10 @@ 
             <enumerator name='TIMERS_SEPARATE' value='3'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::list<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > ProfileHandler::CallbackList -->
           <typedef-decl name='CallbackList' type-id='type-id-1014' filepath='src/profile-handler.cc' line='199' column='1' id='type-id-1013'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::_List_iterator<ProfileHandlerToken*> ProfileHandler::CallbackIterator -->
           <typedef-decl name='CallbackIterator' type-id='type-id-1016' filepath='src/profile-handler.cc' line='200' column='1' id='type-id-1015'/>
@@ -27384,10 +27205,8 @@ 
     <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1009'/>
     <!-- void (int, siginfo_t*, void*, void*)* -->
     <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-1005'/>
-
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- struct std::_List_iterator<ProfileHandlerToken*> -->
       <class-decl name='_List_iterator&lt;ProfileHandlerToken*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-1016'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -28086,7 +27905,6 @@ 
       </class-decl>
       <!-- class std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> > -->
       <class-decl name='_List_base&lt;ProfileHandlerToken*, std::allocator&lt;ProfileHandlerToken*&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1040'>
-
           <member-type access='protected'>
             <!-- struct std::_List_base<ProfileHandlerToken*, std::allocator<ProfileHandlerToken*> >::_List_impl -->
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1060'>
@@ -28553,9 +28371,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <!-- void ProfileHandlerGetState(ProfileHandlerState*) -->
     <function-decl name='ProfileHandlerGetState' mangled-name='ProfileHandlerGetState' filepath='src/profile-handler.cc' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfileHandlerGetState'>
       <!-- parameter of type 'ProfileHandlerState*' -->
@@ -28604,41 +28419,30 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- Slot[64] -->
     <array-type-def dimensions='1' type-id='type-id-1078' size-in-bits='4096' id='type-id-1079'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
-
     </array-type-def>
     <!-- Entry[4] -->
     <array-type-def dimensions='1' type-id='type-id-1081' size-in-bits='16896' id='type-id-1082'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <!-- char[1024] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8192' id='type-id-1083'>
       <!-- <anonymous range>[1024] -->
       <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
-
     </array-type-def>
     <!-- int[28] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='896' id='type-id-1085'>
       <!-- <anonymous range>[28] -->
       <subrange length='28' type-id='type-id-5' id='type-id-1086'/>
-
     </array-type-def>
     <!-- class ProfileData -->
     <class-decl name='ProfileData' size-in-bits='448' visibility='default' filepath='src/profiledata.h' line='79' column='1' id='type-id-1087'>
-
         <member-type access='private'>
           <!-- class ProfileData::Options -->
           <class-decl name='Options' size-in-bits='32' visibility='default' filepath='src/profiledata.h' line='88' column='1' id='type-id-1088'>
@@ -28677,7 +28481,6 @@ 
             </member-function>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct ProfileData::State -->
           <class-decl name='State' size-in-bits='8384' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='81' column='1' id='type-id-1091'>
@@ -28699,11 +28502,9 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct ProfileData::Entry -->
           <class-decl name='Entry' size-in-bits='4224' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='154' column='1' id='type-id-1081'>
-
               <member-type access='private'>
                 <!-- typedef uintptr_t ProfileData::Entry::Slot -->
                 <typedef-decl name='Slot' type-id='type-id-130' filepath='src/profiledata.h' line='151' column='1' id='type-id-1078'/>
@@ -28722,7 +28523,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct ProfileData::Bucket -->
           <class-decl name='Bucket' size-in-bits='16896' is-struct='yes' visibility='default' filepath='src/profiledata.h' line='161' column='1' id='type-id-1093'>
@@ -28948,7 +28748,6 @@ 
     <typedef-decl name='time_t' type-id='type-id-1103' filepath='/usr/include/time.h' line='76' column='1' id='type-id-1092'/>
     <!-- struct siginfo -->
     <class-decl name='siginfo' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='52' column='1' id='type-id-1104'>
-
         <member-type access='public'>
           <!-- union {int _pad[28]; struct {__pid_t si_pid; __uid_t si_uid;} _kill; struct {int si_tid; int si_overrun; sigval_t si_sigval;} _timer; struct {__pid_t si_pid; __uid_t si_uid; sigval_t si_sigval;} _rt; struct {__pid_t si_pid; __uid_t si_uid; int si_status; __clock_t si_utime; __clock_t si_stime;} _sigchld; struct {void* si_addr;} _sigfault; struct {long int si_band; int si_fd;} _sigpoll;} -->
           <union-decl name='__anonymous_union__' size-in-bits='896' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/siginfo.h' line='59' column='1' id='type-id-1105'>
@@ -29315,11 +29114,6 @@ 
     <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1116'/>
     <!-- siginfo_t* -->
     <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-1021'/>
-
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead'>
       <!-- bool FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_cpu_profiler_unittest -->
@@ -29327,7 +29121,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead::FLAGS_nocpu_profiler_unittest -->
       <var-decl name='FLAGS_nocpu_profiler_unittest' type-id='type-id-66' mangled-name='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead29FLAGS_nocpu_profiler_unittestE' visibility='default' filepath='src/profiler.cc' line='78' column='1' elf-symbol-id='_ZN60FLAG__namespace_do_not_use_directly_use_DECLARE_bool_instead29FLAGS_nocpu_profiler_unittestE'/>
     </namespace-decl>
-
     <!-- void ProfilerEnable() -->
     <function-decl name='ProfilerEnable' mangled-name='ProfilerEnable' filepath='src/profiler.cc' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ProfilerEnable'>
       <!-- void -->
@@ -29481,17 +29274,10 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- const double& std::min<double>(const double&, const double&) -->
       <function-decl name='min&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const double&' -->
@@ -29502,8 +29288,6 @@ 
         <return type-id='type-id-1135'/>
       </function-decl>
     </namespace-decl>
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
       <!-- int64 FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_tcmalloc_sample_parameter -->
@@ -29562,10 +29346,6 @@ 
         <return type-id='type-id-1136'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- const tcmalloc::PageHeapAllocator<tcmalloc::StackTraceTable::Bucket> -->
@@ -29594,7 +29374,6 @@ 
     <namespace-decl name='tcmalloc'>
       <!-- class tcmalloc::StackTraceTable -->
       <class-decl name='StackTraceTable' size-in-bits='192' visibility='default' filepath='src/stack_trace_table.h' line='47' column='1' id='type-id-1145'>
-
           <member-type access='private'>
             <!-- struct tcmalloc::StackTraceTable::Bucket -->
             <class-decl name='Bucket' size-in-bits='2304' is-struct='yes' visibility='default' filepath='src/stack_trace_table.h' line='65' column='1' id='type-id-1148'>
@@ -29709,19 +29488,8 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <!-- int GetStackFrames(void**, int*, int, int) -->
     <function-decl name='GetStackFrames' mangled-name='_Z14GetStackFramesPPvPiii' filepath='src/stacktrace.cc' line='220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14GetStackFramesPPvPiii'>
       <!-- parameter of type 'void**' -->
@@ -29776,17 +29544,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- class SymbolTable -->
     <class-decl name='SymbolTable' size-in-bits='448' visibility='default' filepath='src/symbolize.h' line='50' column='1' id='type-id-1154'>
-
         <member-type access='private'>
           <!-- typedef std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > SymbolTable::SymbolMap -->
           <typedef-decl name='SymbolMap' type-id='type-id-1156' filepath='src/symbolize.h' line='72' column='1' id='type-id-1155'/>
@@ -29965,10 +29726,8 @@ 
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1223'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > -->
       <class-decl name='_Rb_tree&lt;const void*, std::pair&lt;const void* const, const char*&gt;, std::_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1169'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_Rb_tree_impl<std::less<const void*>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;const void*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1207'>
@@ -31897,9 +31656,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- void tcmalloc::DumpProcSelfMaps(RawFD) -->
@@ -31919,24 +31675,20 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
     <!-- SysAllocator*[2] -->
     <array-type-def dimensions='1' type-id='type-id-902' size-in-bits='128' id='type-id-1231'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <!-- bool[2] -->
     <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='16' id='type-id-1233'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <!-- const char*[2] -->
     <array-type-def dimensions='1' type-id='type-id-52' size-in-bits='128' id='type-id-1234'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-5' id='type-id-1232'/>
-
     </array-type-def>
     <!-- class MmapSysAllocator -->
     <class-decl name='MmapSysAllocator' size-in-bits='64' visibility='default' filepath='src/system-alloc.cc' line='158' column='1' id='type-id-1235'>
@@ -32093,12 +31845,6 @@ 
     <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
     <!-- SbrkSysAllocator* -->
     <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1238'/>
-
-
-
-
-
-
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead'>
       <!-- int32 FLAG__namespace_do_not_use_directly_use_DECLARE_int32_instead::FLAGS_malloc_devmem_start -->
@@ -32172,23 +31918,10 @@ 
     <var-decl name='TCMalloc_SystemTaken' type-id='type-id-57' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
     <!-- AtomicWord[8] -->
     <array-type-def dimensions='1' type-id='type-id-781' size-in-bits='512' id='type-id-782'>
       <!-- <anonymous range>[8] -->
       <subrange length='8' type-id='type-id-5' id='type-id-1243'/>
-
     </array-type-def>
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-55'/>
@@ -32198,25 +31931,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='8' id='type-id-1244'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-5' id='type-id-1245'/>
-
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='160' id='type-id-1246'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-5' id='type-id-960'/>
-
     </array-type-def>
     <!-- char[48] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='384' id='type-id-168'>
       <!-- <anonymous range>[48] -->
       <subrange length='48' type-id='type-id-5' id='type-id-1247'/>
-
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-66' size-in-bits='32' id='type-id-1248'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-5' id='type-id-126'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-1249'>
@@ -32243,7 +31972,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='65536' id='type-id-1250'>
       <!-- <anonymous range>[1024] -->
       <subrange length='1024' type-id='type-id-5' id='type-id-1084'/>
-
     </array-type-def>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-1251'/>
@@ -32253,13 +31981,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-76' size-in-bits='8192' id='type-id-1252'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
-
     </array-type-def>
     <!-- int[88] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='2816' id='type-id-1254'>
       <!-- <anonymous range>[88] -->
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <!-- long double -->
     <type-decl name='long double' size-in-bits='128' id='type-id-1256'/>
@@ -32275,31 +32001,26 @@ 
     <array-type-def dimensions='1' type-id='type-id-57' size-in-bits='5632' id='type-id-1260'>
       <!-- <anonymous range>[88] -->
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <!-- TCEntry[64] -->
     <array-type-def dimensions='1' type-id='type-id-1261' size-in-bits='8192' id='type-id-1262'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-5' id='type-id-1080'/>
-
     </array-type-def>
     <!-- CentralFreeListPadded[88] -->
     <array-type-def dimensions='1' type-id='type-id-1263' size-in-bits='856064' id='type-id-1264'>
       <!-- <anonymous range>[88] -->
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <!-- SpanList[128] -->
     <array-type-def dimensions='1' type-id='type-id-1265' size-in-bits='98304' id='type-id-1266'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-5' id='type-id-1253'/>
-
     </array-type-def>
     <!-- FreeList[88] -->
     <array-type-def dimensions='1' type-id='type-id-1267' size-in-bits='16896' id='type-id-1268'>
       <!-- <anonymous range>[88] -->
       <subrange length='88' type-id='type-id-5' id='type-id-1255'/>
-
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-133'/>
@@ -32309,7 +32030,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='17352' id='type-id-1269'>
       <!-- <anonymous range>[2169] -->
       <subrange length='2169' type-id='type-id-5' id='type-id-1270'/>
-
     </array-type-def>
     <!-- unsigned int -->
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-1123'/>
@@ -32323,13 +32043,11 @@ 
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1984' id='type-id-1271'>
       <!-- <anonymous range>[31] -->
       <subrange length='31' type-id='type-id-5' id='type-id-1272'/>
-
     </array-type-def>
     <!-- volatile unsigned long int[65536] -->
     <array-type-def dimensions='1' type-id='type-id-1273' size-in-bits='4194304' id='type-id-1274'>
       <!-- <anonymous range>[65536] -->
       <subrange length='65536' type-id='type-id-5' id='type-id-1275'/>
-
     </array-type-def>
     <!-- wchar_t -->
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-1276'/>
@@ -32475,7 +32193,6 @@ 
     </class-decl>
     <!-- class SpinLock -->
     <class-decl name='SpinLock' size-in-bits='32' visibility='default' filepath='./src/base/spinlock.h' line='48' column='1' id='type-id-176'>
-
         <member-type access='private'>
           <!-- enum SpinLock::__anonymous_enum__2 -->
           <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-1287'>
@@ -32483,7 +32200,6 @@ 
             <enumerator name='kSpinLockSleeper' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum SpinLock::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/base/spinlock.h' line='114' column='1' id='type-id-1288'>
@@ -32491,7 +32207,6 @@ 
             <enumerator name='kSpinLockFree' value='0'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum SpinLock::__anonymous_enum__1 -->
           <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='src/base/spinlock.h' line='115' column='1' id='type-id-1289'>
@@ -32961,7 +32676,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-1309' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-1310'/>
     <!-- struct __mbstate_t -->
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-1309'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='87' column='1' id='type-id-1311'>
@@ -33181,52 +32895,42 @@ 
     </class-decl>
     <!-- class MallocHook -->
     <class-decl name='MallocHook' size-in-bits='8' visibility='default' filepath='./src/gperftools/malloc_hook.h' line='98' column='1' id='type-id-1317'>
-
         <member-type access='private'>
           <!-- typedef MallocHook_PreMmapHook MallocHook::PreMmapHook -->
           <typedef-decl name='PreMmapHook' type-id='type-id-905' filepath='./src/gperftools/malloc_hook.h' line='126' column='1' id='type-id-1318'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MmapReplacement MallocHook::MmapReplacement -->
           <typedef-decl name='MmapReplacement' type-id='type-id-907' filepath='./src/gperftools/malloc_hook.h' line='150' column='1' id='type-id-1319'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MunmapReplacement MallocHook::MunmapReplacement -->
           <typedef-decl name='MunmapReplacement' type-id='type-id-909' filepath='./src/gperftools/malloc_hook.h' line='192' column='1' id='type-id-1320'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MunmapHook MallocHook::MunmapHook -->
           <typedef-decl name='MunmapHook' type-id='type-id-910' filepath='./src/gperftools/malloc_hook.h' line='204' column='1' id='type-id-1321'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MremapHook MallocHook::MremapHook -->
           <typedef-decl name='MremapHook' type-id='type-id-912' filepath='./src/gperftools/malloc_hook.h' line='214' column='1' id='type-id-1322'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_PreSbrkHook MallocHook::PreSbrkHook -->
           <typedef-decl name='PreSbrkHook' type-id='type-id-914' filepath='./src/gperftools/malloc_hook.h' line='234' column='1' id='type-id-1323'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_NewHook MallocHook::NewHook -->
           <typedef-decl name='NewHook' type-id='type-id-364' filepath='./src/gperftools/malloc_hook.h' line='102' column='1' id='type-id-1324'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_DeleteHook MallocHook::DeleteHook -->
           <typedef-decl name='DeleteHook' type-id='type-id-365' filepath='./src/gperftools/malloc_hook.h' line='113' column='1' id='type-id-1325'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_MmapHook MallocHook::MmapHook -->
           <typedef-decl name='MmapHook' type-id='type-id-367' filepath='./src/gperftools/malloc_hook.h' line='168' column='1' id='type-id-1326'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef MallocHook_SbrkHook MallocHook::SbrkHook -->
           <typedef-decl name='SbrkHook' type-id='type-id-369' filepath='./src/gperftools/malloc_hook.h' line='247' column='1' id='type-id-1327'/>
@@ -33776,7 +33480,6 @@ 
     <class-decl name='TCMallocImplementation' size-in-bits='128' visibility='default' filepath='src/tcmalloc.cc' line='562' column='1' id='type-id-1331'>
     <!-- class MallocExtension -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
-
         <member-type access='private'>
           <!-- typedef void (void*, const base::MallocRange*) TCMallocImplementation::RangeFunction -->
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='./src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-1332'/>
@@ -34393,7 +34096,6 @@ 
     <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1485'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void std::_Destroy<MallocExtension::FreeListInfo*>(MallocExtension::FreeListInfo*, MallocExtension::FreeListInfo*) -->
       <function-decl name='_Destroy&lt;MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'MallocExtension::FreeListInfo*' -->
@@ -34589,7 +34291,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
       <class-decl name='_Vector_base&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1380'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1430'>
@@ -35582,7 +35283,6 @@ 
       </class-decl>
       <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-726'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-562'>
@@ -35735,7 +35435,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-1439'>
@@ -35760,7 +35459,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-1496'>
@@ -37478,7 +37176,6 @@ 
     </namespace-decl>
     <!-- class MallocExtension -->
     <class-decl name='MallocExtension' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='90' column='1' is-declaration-only='yes' id='type-id-894'>
-
         <member-type access='private'>
           <!-- enum MallocExtension::Ownership -->
           <enum-decl name='Ownership' filepath='./src/gperftools/malloc_extension.h' line='315' column='1' id='type-id-898'>
@@ -37488,7 +37185,6 @@ 
             <enumerator name='kNotOwned' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- struct MallocExtension::FreeListInfo -->
           <class-decl name='FreeListInfo' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='333' column='1' id='type-id-899'>
@@ -37510,7 +37206,6 @@ 
             </data-member>
           </class-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef void (void*, const base::MallocRange*) MallocExtension::RangeFunction -->
           <typedef-decl name='RangeFunction' type-id='type-id-900' filepath='src/gperftools/malloc_extension.h' line='143' column='1' id='type-id-895'/>
@@ -38236,7 +37931,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<const char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > -->
       <class-decl name='__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1498'/>
     </namespace-decl>
-
     <!-- int atexit(void ()*) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void ()*' -->
@@ -39330,7 +39024,6 @@ 
       </enum-decl>
       <!-- struct base::MallocRange -->
       <class-decl name='MallocRange' size-in-bits='256' is-struct='yes' visibility='default' filepath='./src/gperftools/malloc_extension.h' line='399' column='1' id='type-id-1351'>
-
           <member-type access='public'>
             <!-- enum base::MallocRange::Type -->
             <enum-decl name='Type' filepath='./src/gperftools/malloc_extension.h' line='400' column='1' id='type-id-1501'>
@@ -39377,7 +39070,6 @@ 
       </enum-decl>
       <!-- class tcmalloc::LogItem -->
       <class-decl name='LogItem' size-in-bits='128' visibility='default' filepath='src/internal_logging.h' line='70' column='1' id='type-id-886'>
-
           <member-type access='private'>
             <!-- enum tcmalloc::LogItem::Tag -->
             <enum-decl name='Tag' filepath='src/internal_logging.h' line='83' column='1' id='type-id-1503'>
@@ -39389,7 +39081,6 @@ 
               <enumerator name='kEnd' value='4'/>
             </enum-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- union {const char* str; void* ptr; int64_t snum; uint64_t unum;} -->
             <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='src/internal_logging.h' line='91' column='1' id='type-id-1504'>
@@ -39848,7 +39539,6 @@ 
       </class-decl>
       <!-- class tcmalloc::CentralFreeList -->
       <class-decl name='CentralFreeList' size-in-bits='9344' visibility='default' filepath='src/central_freelist.h' line='50' column='1' id='type-id-1446'>
-
           <member-type access='private'>
             <!-- struct tcmalloc::CentralFreeList::TCEntry -->
             <class-decl name='TCEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/central_freelist.h' line='97' column='1' id='type-id-1261'>
@@ -40335,7 +40025,6 @@ 
       </class-decl>
       <!-- class tcmalloc::PageHeap -->
       <class-decl name='PageHeap' size-in-bits='4293888' visibility='default' filepath='src/page_heap.h' line='104' column='1' id='type-id-1403'>
-
           <member-type access='private'>
             <!-- struct tcmalloc::PageHeap::Stats -->
             <class-decl name='Stats' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='145' column='1' id='type-id-1330'>
@@ -40366,7 +40055,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct tcmalloc::PageHeap::SmallSpanStats -->
             <class-decl name='SmallSpanStats' size-in-bits='16384' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='155' column='1' id='type-id-1453'>
@@ -40380,7 +40068,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct tcmalloc::PageHeap::LargeSpanStats -->
             <class-decl name='LargeSpanStats' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='164' column='1' id='type-id-1451'>
@@ -40398,7 +40085,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct tcmalloc::PageHeap::SpanList -->
             <class-decl name='SpanList' size-in-bits='768' is-struct='yes' visibility='default' filepath='src/page_heap.h' line='232' column='1' id='type-id-1265'>
@@ -40412,12 +40098,10 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef TCMalloc_PageMap3<35> tcmalloc::PageHeap::PageMap -->
             <typedef-decl name='PageMap' type-id='type-id-1278' filepath='src/page_heap.h' line='224' column='1' id='type-id-1507'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef PackedCache<35, long unsigned int> tcmalloc::PageHeap::PageMapCache -->
             <typedef-decl name='PageMapCache' type-id='type-id-1299' filepath='src/page_heap.h' line='225' column='1' id='type-id-1508'/>
@@ -40835,7 +40519,6 @@ 
       </class-decl>
       <!-- class tcmalloc::ThreadCache -->
       <class-decl name='ThreadCache' size-in-bits='17408' visibility='default' filepath='src/thread_cache.h' line='66' column='1' id='type-id-1415'>
-
           <member-type access='private'>
             <!-- class tcmalloc::ThreadCache::FreeList -->
             <class-decl name='FreeList' size-in-bits='192' visibility='default' filepath='src/thread_cache.h' line='132' column='1' id='type-id-1267'>
@@ -41005,7 +40688,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct tcmalloc::ThreadCache::ThreadLocalData -->
             <class-decl name='ThreadLocalData' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/thread_cache.h' line='262' column='1' id='type-id-1509'>
@@ -41019,7 +40701,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- enum tcmalloc::ThreadCache::__anonymous_enum__ -->
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/thread_cache.h' line='69' column='1' id='type-id-1510'>
@@ -41570,8 +41251,6 @@ 
       <!-- char FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead::FLAGS_notcmalloc_large_alloc_report_threshold -->
       <var-decl name='FLAGS_notcmalloc_large_alloc_report_threshold' type-id='type-id-66' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE' visibility='default' filepath='src/tcmalloc.cc' line='195' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead45FLAGS_notcmalloc_large_alloc_report_thresholdE'/>
     </namespace-decl>
-
-
     <!-- class SysAllocator -->
     <class-decl name='SysAllocator' size-in-bits='64' visibility='default' filepath='src/gperftools/malloc_extension.h' line='75' column='1' is-declaration-only='yes' id='type-id-958'>
       <member-function access='private' constructor='yes'>
@@ -41903,10 +41582,8 @@ 
       <!-- tcmalloc::PageHeapAllocator<tcmalloc::ThreadCache> tcmalloc::threadcache_allocator -->
       <var-decl name='threadcache_allocator' type-id='type-id-1412' mangled-name='_ZN8tcmalloc21threadcache_allocatorE' visibility='default' filepath='src/thread_cache.cc' line='67' column='1' elf-symbol-id='_ZN8tcmalloc21threadcache_allocatorE'/>
     </namespace-decl>
-
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- const double& std::max<double>(const double&, const double&) -->
       <function-decl name='max&lt;double&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const double&' -->
@@ -41926,7 +41603,5 @@ 
         <return type-id='type-id-113'/>
       </function-decl>
     </namespace-decl>
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index dc009c8a..3dbf8cd2 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -753,11 +753,6 @@ 
     <elf-symbol name='_ZTVN15vtkCommunicator9OperationE' size='48' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
-
-
-
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <!-- char -->
@@ -766,25 +761,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <!-- char[40] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='320' id='type-id-8'>
       <!-- <anonymous range>[40] -->
       <subrange length='40' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-10'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-12'>
@@ -811,7 +802,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-16'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-17'/>
-
     </array-type-def>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-18'/>
@@ -1097,11 +1087,9 @@ 
     </class-decl>
     <!-- class vtkMultiProcessStream -->
     <class-decl name='vtkMultiProcessStream' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.h' line='35' column='1' id='type-id-51'>
-
         <member-type access='private'>
           <!-- struct vtkMultiProcessStream::vtkInternals -->
           <class-decl name='vtkInternals' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='23' column='1' id='type-id-52'>
-
               <member-type access='public'>
                 <!-- enum vtkMultiProcessStream::vtkInternals::Types -->
                 <enum-decl name='Types' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='28' column='1' id='type-id-53'>
@@ -1118,7 +1106,6 @@ 
                   <enumerator name='stream_value' value='9'/>
                 </enum-decl>
               </member-type>
-
               <member-type access='public'>
                 <!-- typedef std::deque<unsigned char, std::allocator<unsigned char> > vtkMultiProcessStream::vtkInternals::DataType -->
                 <typedef-decl name='DataType' type-id='type-id-55' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' line='25' column='1' id='type-id-54'/>
@@ -1746,7 +1733,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-94' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-95'/>
     <!-- struct __mbstate_t -->
     <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-94'>
-
         <member-type access='public'>
           <!-- union {unsigned int __wch; char __wchb[4];} -->
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='87' column='1' id='type-id-96'>
@@ -2468,7 +2454,6 @@ 
     <class-decl name='vtkCommunicator' size-in-bits='576' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='45' column='1' id='type-id-116'>
     <!-- class vtkObject -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-117'/>
-
         <member-type access='private'>
           <!-- enum vtkCommunicator::Tags -->
           <enum-decl name='Tags' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='65' column='1' id='type-id-118'>
@@ -2482,7 +2467,6 @@ 
             <enumerator name='BARRIER_TAG' value='16'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- enum vtkCommunicator::StandardOperations -->
           <enum-decl name='StandardOperations' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.h' line='76' column='1' id='type-id-119'>
@@ -6104,7 +6088,6 @@ 
     </class-decl>
     <!-- class vtkSmartPointerBase -->
     <class-decl name='vtkSmartPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='30' column='1' id='type-id-161'>
-
         <member-type access='protected'>
           <!-- class vtkSmartPointerBase::NoReference -->
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointerBase.h' line='73' column='1' id='type-id-185'/>
@@ -6727,10 +6710,8 @@ 
     <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-389'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- class std::ios_base -->
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-354'>
-
           <member-type access='private'>
             <!-- class std::ios_base::Init -->
             <class-decl name='Init' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='538' column='1' id='type-id-356'>
@@ -6883,7 +6864,6 @@ 
       </class-decl>
       <!-- struct std::_Resetiosflags -->
       <class-decl name='_Resetiosflags' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iomanip' line='49' column='1' id='type-id-390'>
-
           <member-type access='public'>
             <!-- typedef std::_Ios_Fmtflags std::_Resetiosflags::fmtflags -->
             <typedef-decl name='fmtflags' type-id='type-id-391' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='263' column='1' id='type-id-232'/>
@@ -6918,7 +6898,6 @@ 
       </enum-decl>
       <!-- struct std::basic_ios<char, std::char_traits<char> > -->
       <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-260'>
-
           <member-type access='public'>
             <!-- typedef std::_Ios_Iostate std::basic_ios<char, std::char_traits<char> >::iostate -->
             <typedef-decl name='iostate' type-id='type-id-392' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='338' column='1' id='type-id-263'/>
@@ -6993,12 +6972,10 @@ 
       </enum-decl>
       <!-- class std::__basic_file<char> -->
       <class-decl name='__basic_file&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/x86_64-redhat-linux/bits/basic_file.h' line='53' column='1' id='type-id-240'>
-
           <member-type access='private'>
             <!-- typedef std::_Ios_Openmode std::__basic_file<char>::openmode -->
             <typedef-decl name='openmode' type-id='type-id-393' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='369' column='1' id='type-id-243'/>
           </member-type>
-
           <member-type access='private'>
             <!-- typedef std::_Ios_Seekdir std::__basic_file<char>::seekdir -->
             <typedef-decl name='seekdir' type-id='type-id-394' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='401' column='1' id='type-id-245'/>
@@ -7321,7 +7298,6 @@ 
       </function-decl>
       <!-- struct std::__miter_base<const vtkCommunicator::ReduceVoidArray::VTK_TT*, false> -->
       <class-decl name='__miter_base&lt;const vtkCommunicator::ReduceVoidArray::VTK_TT*, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' is-declaration-only='yes' id='type-id-399'>
-
           <member-type access='public'>
             <!-- typedef long long int std::__miter_base<const vtkCommunicator::ReduceVoidArray::VTK_TT*, false>::VTK_TT -->
             <typedef-decl name='VTK_TT' type-id='type-id-22' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' line='1342' column='1' id='type-id-247'/>
@@ -7666,7 +7642,6 @@ 
       </function-decl>
       <!-- class std::ctype<char> -->
       <class-decl name='ctype&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-276'>
-
           <member-type access='private'>
             <!-- typedef char std::ctype<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/locale_facets.h' line='679' column='1' id='type-id-400'/>
@@ -7834,7 +7809,6 @@ 
       <typedef-decl name='ostream' type-id='type-id-340' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iosfwd' line='130' column='1' id='type-id-358'/>
       <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-265'>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-349'>
@@ -7987,7 +7961,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-347'>
@@ -8012,7 +7985,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-402'>
@@ -10326,7 +10298,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<unsigned char, std::allocator<unsigned char> > -->
       <class-decl name='_Vector_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-237'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<unsigned char, std::allocator<unsigned char> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-326'>
@@ -10561,7 +10532,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<long long int, std::allocator<long long int> > -->
       <class-decl name='_Vector_base&lt;long long int, std::allocator&lt;long long int&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-234'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<long long int, std::allocator<long long int> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-323'>
@@ -11643,12 +11613,10 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const long long int*, std::vector&lt;long long int, std::allocator&lt;long long int&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-443'/>
       <!-- struct std::char_traits<char> -->
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='238' column='1' is-declaration-only='yes' id='type-id-444'>
-
           <member-type access='public'>
             <!-- typedef char std::char_traits<char>::char_type -->
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='239' column='1' id='type-id-269'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef int std::char_traits<char>::int_type -->
             <typedef-decl name='int_type' type-id='type-id-19' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='240' column='1' id='type-id-273'/>
@@ -13063,7 +13031,6 @@ 
       <!-- long long unsigned int -->
       <return type-id='type-id-23'/>
     </function-decl>
-
     <!-- char* setlocale(int, const char*) -->
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -13324,7 +13291,6 @@ 
       <!-- int -->
       <return type-id='type-id-19'/>
     </function-decl>
-
     <!-- int atexit(void ()*) -->
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void ()*' -->
@@ -13644,7 +13610,6 @@ 
     </class-decl>
     <!-- class vtkOStreamWrapper -->
     <class-decl name='vtkOStreamWrapper' visibility='default' is-declaration-only='yes' id='type-id-450'>
-
         <member-type access='private'>
           <!-- struct vtkOStreamWrapper::EndlType -->
           <class-decl name='EndlType' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkOStreamWrapper.h' line='58' column='1' id='type-id-302'/>
@@ -13661,7 +13626,6 @@ 
     </class-decl>
     <!-- class vtkDataArrayTemplate<char> -->
     <class-decl name='vtkDataArrayTemplate&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-371'>
-
         <member-type access='private'>
           <!-- enum vtkDataArrayTemplate<char>::DeleteMethod -->
           <enum-decl name='DeleteMethod' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkDataArrayTemplate.h' line='254' column='1' id='type-id-451'>
@@ -13970,17 +13934,12 @@ 
     <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-454'/>
     <!-- vtkDummyCommunicator* -->
     <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-453'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- struct vtkMultiProcessController -->
     <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-457'>
     <!-- class vtkObject -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-117'/>
-
         <member-type access='public'>
           <!-- enum vtkMultiProcessController::Errors -->
           <enum-decl name='Errors' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='296' column='1' id='type-id-458'>
@@ -13990,7 +13949,6 @@ 
             <enumerator name='RMI_ARG_ERROR' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum vtkMultiProcessController::Consts -->
           <enum-decl name='Consts' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='303' column='1' id='type-id-459'>
@@ -13999,7 +13957,6 @@ 
             <enumerator name='INVALID_SOURCE' value='-2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- enum vtkMultiProcessController::Tags -->
           <enum-decl name='Tags' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='309' column='1' id='type-id-460'>
@@ -14010,11 +13967,9 @@ 
             <enumerator name='XML_WRITER_DATA_INFO' value='4'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- class vtkMultiProcessController::vtkInternal -->
           <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-461'>
-
               <member-type access='private'>
                 <!-- class vtkMultiProcessController::vtkInternal::vtkRMICallback -->
                 <class-decl name='vtkRMICallback' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='51' column='1' id='type-id-462'>
@@ -14032,7 +13987,6 @@ 
                   </data-member>
                 </class-decl>
               </member-type>
-
               <member-type access='private'>
                 <!-- typedef vtksys::hash_map<int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >, vtksys::hash<int>, std::equal_to<int>, std::allocator<char> > vtkMultiProcessController::vtkInternal::RMICallbackMap -->
                 <typedef-decl name='RMICallbackMap' type-id='type-id-465' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='61' column='1' id='type-id-464'/>
@@ -16975,10 +16929,6 @@ 
     <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-481'/>
     <!-- vtkMultiProcessController* -->
     <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-471'/>
-
-
-
-
     <!-- void (void*, void*, int, int) -->
     <function-type size-in-bits='64' id='type-id-485'>
       <!-- parameter of type 'void*' -->
@@ -17257,10 +17207,6 @@ 
     <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-491'/>
     <!-- vtkStringArray* -->
     <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-490'/>
-
-
-
-
     <!-- void* memchr(void*, int, size_t) -->
     <function-decl name='memchr' mangled-name='*memchr' filepath='/usr/include/string.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -17799,7 +17745,6 @@ 
     <typedef-decl name='vtkProcessFunctionType' type-id='type-id-506' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='53' column='1' id='type-id-468'/>
     <!-- class vtkWeakPointerBase -->
     <class-decl name='vtkWeakPointerBase' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='31' column='1' id='type-id-507'>
-
         <member-type access='protected'>
           <!-- class vtkWeakPointerBase::NoReference -->
           <class-decl name='NoReference' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointerBase.h' line='70' column='1' id='type-id-508'/>
@@ -18994,7 +18939,6 @@ 
     <pointer-type-def type-id='type-id-841' size-in-bits='64' id='type-id-974'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void std::__fill_a<std::_Bit_type*, int>(std::_Bit_type*, std::_Bit_type*, const int&) -->
       <function-decl name='__fill_a&lt;std::_Bit_type*, int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'std::_Bit_type*' -->
@@ -19021,17 +18965,14 @@ 
       <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='186' column='1' id='type-id-630'>
       <!-- struct std::_Bit_iterator_base -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-634'/>
-
           <member-type access='public'>
             <!-- typedef std::_Bit_reference std::_Bit_iterator::reference -->
             <typedef-decl name='reference' type-id='type-id-638' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='187' column='1' id='type-id-975'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::_Bit_reference* std::_Bit_iterator::pointer -->
             <typedef-decl name='pointer' type-id='type-id-853' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='188' column='1' id='type-id-976'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::_Bit_iterator std::_Bit_iterator::iterator -->
             <typedef-decl name='iterator' type-id='type-id-630' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='189' column='1' id='type-id-849'/>
@@ -20137,7 +20078,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-666'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-877'>
@@ -20966,7 +20906,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-669'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-880'>
@@ -21795,7 +21734,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
       <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-663'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-874'>
@@ -22764,22 +22702,18 @@ 
       <class-decl name='_Bit_const_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='268' column='1' id='type-id-627'>
       <!-- struct std::_Bit_iterator_base -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-634'/>
-
           <member-type access='public'>
             <!-- typedef bool std::_Bit_const_iterator::reference -->
             <typedef-decl name='reference' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='269' column='1' id='type-id-1006'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef bool std::_Bit_const_iterator::const_reference -->
             <typedef-decl name='const_reference' type-id='type-id-1' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='270' column='1' id='type-id-1007'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const bool* std::_Bit_const_iterator::pointer -->
             <typedef-decl name='pointer' type-id='type-id-626' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='271' column='1' id='type-id-1008'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef std::_Bit_const_iterator std::_Bit_const_iterator::const_iterator -->
             <typedef-decl name='const_iterator' type-id='type-id-627' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='272' column='1' id='type-id-846'/>
@@ -24477,7 +24411,6 @@ 
       </class-decl>
       <!-- struct std::_Bvector_base<std::allocator<bool> > -->
       <class-decl name='_Bvector_base&lt;std::allocator&lt;bool&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='375' column='1' id='type-id-643'>
-
           <member-type access='public'>
             <!-- struct std::_Bvector_base<std::allocator<bool> >::_Bvector_impl -->
             <class-decl name='_Bvector_impl' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='381' column='1' id='type-id-855'>
@@ -25044,7 +24977,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > -->
       <class-decl name='_Vector_base&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-660'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-871'>
@@ -25234,7 +25166,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<int, std::allocator<int> > -->
       <class-decl name='_Vector_base&lt;int, std::allocator&lt;int&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-657'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<int, std::allocator<int> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-868'>
@@ -25534,7 +25465,6 @@ 
       </class-decl>
       <!-- class std::_List_base<int, std::allocator<int> > -->
       <class-decl name='_List_base&lt;int, std::allocator&lt;int&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-646'>
-
           <member-type access='protected'>
             <!-- struct std::_List_base<int, std::allocator<int> >::_List_impl -->
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-858'>
@@ -32430,8 +32360,6 @@ 
       <!-- class __gnu_cxx::__normal_iterator<const int*, std::vector<int, std::allocator<int> > > -->
       <class-decl name='__normal_iterator&lt;const int*, std::vector&lt;int, std::allocator&lt;int&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1035'/>
     </namespace-decl>
-
-
     <!-- class vtkOutputWindow -->
     <class-decl name='vtkOutputWindow' visibility='default' is-declaration-only='yes' id='type-id-937'/>
     <!-- void (vtkMultiProcessController*, void*) -->
@@ -32449,7 +32377,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-39' size-in-bits='256' id='type-id-403'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-11'/>
-
     </array-type-def>
     <!-- __gnu_cxx::__normal_iterator<const unsigned char*, std::vector<unsigned char, std::allocator<unsigned char> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-448'/>
@@ -32527,7 +32454,6 @@ 
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-430'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
       <class-decl name='_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-417'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -34267,7 +34193,6 @@ 
       </class-decl>
       <!-- class std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
       <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-1052'>
-
           <member-type access='protected'>
             <!-- enum std::_Deque_base<unsigned char, std::allocator<unsigned char> >::__anonymous_enum__ -->
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-1082'>
@@ -34275,7 +34200,6 @@ 
               <enumerator name='_S_initial_map_size' value='8'/>
             </enum-decl>
           </member-type>
-
           <member-type access='protected'>
             <!-- struct std::_Deque_base<unsigned char, std::allocator<unsigned char> >::_Deque_impl -->
             <class-decl name='_Deque_impl' size-in-bits='640' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='412' column='1' id='type-id-1070'>
@@ -34766,8 +34690,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- const vtkProcess -->
@@ -34776,10 +34698,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-502'/>
     <!-- const vtkProcess* -->
     <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-501'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- const vtkProcessGroup -->
@@ -34790,7 +34708,6 @@ 
     <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-504'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- int* std::__copy_move_a<false, int*, int*>(int*, int*, int*) -->
       <function-decl name='__copy_move_a&lt;false, int*, int*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'int*' -->
@@ -34837,16 +34754,12 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- class vtkSocketCommunicator -->
     <class-decl name='vtkSocketCommunicator' size-in-bits='1088' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.h' line='55' column='1' id='type-id-1094'>
     <!-- class vtkCommunicator -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-116'/>
-
         <member-type access='private'>
           <!-- enum vtkSocketCommunicator::ErrorIds -->
           <enum-decl name='ErrorIds' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.h' line='259' column='1' id='type-id-1095'>
@@ -34856,16 +34769,13 @@ 
             <enumerator name='SwapNotSet' value='2'/>
           </enum-decl>
         </member-type>
-
         <member-type access='private'>
           <!-- class vtkSocketCommunicator::vtkMessageBuffer -->
           <class-decl name='vtkMessageBuffer' size-in-bits='384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='37' column='1' id='type-id-1096'>
-
               <member-type access='private'>
                 <!-- typedef std::map<int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > >, std::less<int>, std::allocator<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > > > vtkSocketCommunicator::vtkMessageBuffer::BufferType -->
                 <typedef-decl name='BufferType' type-id='type-id-1098' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='41' column='1' id='type-id-1097'/>
               </member-type>
-
               <member-type access='private'>
                 <!-- typedef std::vector<char, std::allocator<char> > vtkSocketCommunicator::vtkMessageBuffer::MessageType -->
                 <typedef-decl name='MessageType' type-id='type-id-1100' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' line='39' column='1' id='type-id-1099'/>
@@ -35778,17 +35688,14 @@ 
     <class-decl name='vtkStdString' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='40' column='1' id='type-id-1110'>
     <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-265'/>
-
         <member-type access='private'>
           <!-- typedef std::string vtkStdString::StdString -->
           <typedef-decl name='StdString' type-id='type-id-280' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='42' column='1' id='type-id-1111'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef std::char_traits<char>::char_type vtkStdString::value_type -->
           <typedef-decl name='value_type' type-id='type-id-269' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='43' column='1' id='type-id-1112'/>
         </member-type>
-
         <member-type access='private'>
           <!-- typedef size_t vtkStdString::size_type -->
           <typedef-decl name='size_type' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkStdString.h' line='47' column='1' id='type-id-1113'/>
@@ -36265,7 +36172,6 @@ 
     <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1114'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- std::_Ios_Iostate std::operator&(std::_Ios_Iostate, std::_Ios_Iostate) -->
       <function-decl name='operator&amp;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'enum std::_Ios_Iostate' -->
@@ -37491,7 +37397,6 @@ 
       </function-decl>
       <!-- class std::_Rb_tree<int, std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > >, std::_Select1st<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > >, std::less<int>, std::allocator<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > > > -->
       <class-decl name='_Rb_tree&lt;int, std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt;, std::less&lt;int&gt;, std::allocator&lt;std::pair&lt;const int, std::list&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1182'>
-
           <member-type access='protected'>
             <!-- struct std::_Rb_tree<int, std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > >, std::_Select1st<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > >, std::less<int>, std::allocator<std::pair<const int, std::list<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > > > >::_Rb_tree_impl<std::less<int>, false> -->
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-1252'>
@@ -38419,12 +38324,10 @@ 
       </class-decl>
       <!-- struct std::_Rb_tree_node_base -->
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-1198'>
-
           <member-type access='public'>
             <!-- typedef std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Base_ptr -->
             <typedef-decl name='_Base_ptr' type-id='type-id-1260' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-1296'/>
           </member-type>
-
           <member-type access='public'>
             <!-- typedef const std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Const_Base_ptr -->
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-1200' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='90' column='1' id='type-id-1297'/>
@@ -39834,7 +39737,6 @@ 
       <typedef-decl name='ofstream' type-id='type-id-1272' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/iosfwd' line='138' column='1' id='type-id-1278'/>
       <!-- class std::_List_base<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > -->
       <class-decl name='_List_base&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='278' column='1' id='type-id-1165'>
-
           <member-type access='protected'>
             <!-- struct std::_List_base<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > >::_List_impl -->
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='300' column='1' id='type-id-1242'>
@@ -40167,7 +40069,6 @@ 
       </class-decl>
       <!-- struct std::_Vector_base<char, std::allocator<char> > -->
       <class-decl name='_Vector_base&lt;char, std::allocator&lt;char&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1204'>
-
           <member-type access='public'>
             <!-- struct std::_Vector_base<char, std::allocator<char> >::_Vector_impl -->
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1263'>
@@ -41151,8 +41052,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <!-- class vtkSocket -->
     <class-decl name='vtkSocket' visibility='default' is-declaration-only='yes' id='type-id-1289'>
       <member-function access='private'>
@@ -41452,10 +41351,6 @@ 
     <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-1315'/>
     <!-- vtkSocketController* -->
     <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-1314'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- class vtkSubCommunicator -->
@@ -41651,17 +41546,12 @@ 
     <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-1320'/>
     <!-- vtkSubCommunicator* -->
     <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-1319'/>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- int[20] -->
     <array-type-def dimensions='1' type-id='type-id-19' size-in-bits='640' id='type-id-1323'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <!-- class vtkSubGroup -->
     <class-decl name='vtkSubGroup' size-in-bits='3520' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.h' line='49' column='1' id='type-id-1324'>
@@ -42286,7 +42176,6 @@ 
     <pointer-type-def type-id='type-id-1324' size-in-bits='64' id='type-id-1325'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
-
       <!-- void std::__unguarded_linear_insert<int*, int>(int*, int) -->
       <function-decl name='__unguarded_linear_insert&lt;int*, int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2063' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'int*' -->
@@ -42482,8 +42371,5 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index db42c743..18113024 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -890,7 +890,6 @@ 
     <elf-symbol name='vflag' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-
     <!-- const char* strchr(const char*, int) -->
     <function-decl name='strchr' mangled-name='strchr' filepath='/usr/include/string.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
@@ -911,13 +910,6 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-3'/>
     <!-- char -->
@@ -926,25 +918,21 @@ 
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='1024' id='type-id-5'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-6' id='type-id-7'/>
-
     </array-type-def>
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='8' id='type-id-8'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <!-- char[20] -->
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='160' id='type-id-10'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-6' id='type-id-11'/>
-
     </array-type-def>
     <!-- char[4] -->
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='32' id='type-id-12'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-6' id='type-id-13'/>
-
     </array-type-def>
     <!-- struct typedef __va_list_tag __va_list_tag -->
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-14'>
@@ -969,7 +957,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-17'>
       <!-- <anonymous range>[60] -->
       <subrange length='60' type-id='type-id-6' id='type-id-18'/>
-
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-2'/>
@@ -977,7 +964,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='384' id='type-id-19'>
       <!-- <anonymous range>[12] -->
       <subrange length='12' type-id='type-id-6' id='type-id-20'/>
-
     </array-type-def>
     <!-- long int -->
     <type-decl name='long int' size-in-bits='64' id='type-id-21'/>
@@ -985,7 +971,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='192' id='type-id-22'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-6' id='type-id-23'/>
-
     </array-type-def>
     <!-- signed char -->
     <type-decl name='signed char' size-in-bits='8' id='type-id-24'/>
@@ -995,7 +980,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='192' id='type-id-25'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type -->
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-26'/>
@@ -1632,7 +1616,6 @@ 
     <typedef-decl name='source_location' type-id='type-id-15' filepath='../.././gcc/../libcpp/include/line-map.h' line='51' column='1' id='type-id-99'/>
     <!-- struct line_map -->
     <class-decl name='line_map' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='204' column='1' id='type-id-100'>
-
         <member-type access='public'>
           <!-- union line_map::map_u -->
           <union-decl name='map_u' size-in-bits='256' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='210' column='1' id='type-id-101'>
@@ -1845,7 +1828,6 @@ 
     <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-142'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-143'/>
-
     <!-- void* memchr(void*, int, size_t) -->
     <function-decl name='memchr' mangled-name='memchr' filepath='/usr/include/string.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -2752,7 +2734,6 @@ 
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-151'/>
     <!-- void* (void*, typedef size_t)* -->
     <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-150'/>
-
     <!-- void default_diagnostic_finalizer(diagnostic_context*, diagnostic_info*) -->
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
       <!-- parameter of type 'diagnostic_context*' -->
@@ -3900,7 +3881,6 @@ 
         <var-decl name='dummy' type-id='type-id-2' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
       </data-member>
     </class-decl>
-
     <!-- void* ggc_alloc_typed_stat(gt_types_enum, size_t) -->
     <function-decl name='ggc_alloc_typed_stat' mangled-name='_Z20ggc_alloc_typed_stat13gt_types_enumm' filepath='../.././gcc/ggc-none.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20ggc_alloc_typed_stat13gt_types_enumm'>
       <!-- parameter of type 'enum gt_types_enum' -->
@@ -4000,7 +3980,6 @@ 
     </class-decl>
     <!-- linemap_stats* -->
     <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-164'/>
-
     <!-- void dump_line_table_statistics() -->
     <function-decl name='dump_line_table_statistics' mangled-name='_Z26dump_line_table_statisticsv' filepath='../.././gcc/input.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26dump_line_table_statisticsv'>
       <!-- void -->
@@ -4042,7 +4021,6 @@ 
     <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-168'/>
     <!-- wchar_t* -->
     <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-169'/>
-
     <!-- size_t gcc_gettext_width(const char*) -->
     <function-decl name='gcc_gettext_width' mangled-name='_Z17gcc_gettext_widthPKc' filepath='../.././gcc/intl.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17gcc_gettext_widthPKc'>
       <!-- parameter of type 'const char*' -->
@@ -4149,7 +4127,6 @@ 
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-173'/>
     <!-- void* (typedef size_t)* -->
     <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
-
     <!-- void pp_base_set_line_maximum_length(pretty_printer*, int) -->
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
       <!-- parameter of type 'pretty_printer*' -->
@@ -4514,7 +4491,6 @@ 
     <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-195'/>
     <!-- void* (void*, typedef size_t, typedef size_t)* -->
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-198'/>
-
     <!-- obstack symbol_stack_obstack -->
     <var-decl name='symbol_stack_obstack' type-id='type-id-57' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
     <!-- symbol_stack_entry* symbol_stack -->
@@ -4666,7 +4642,6 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-
     <!-- void* vec_gc_p_reserve(void*, int) -->
     <function-decl name='vec_gc_p_reserve' mangled-name='_Z16vec_gc_p_reservePvi' filepath='../.././gcc/vec.c' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16vec_gc_p_reservePvi'>
       <!-- parameter of type 'void*' -->
@@ -4845,26 +4820,20 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
-
-
-
     <!-- const char[31] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='248' id='type-id-209'>
       <!-- <anonymous range>[31] -->
       <subrange length='31' type-id='type-id-6' id='type-id-210'/>
-
     </array-type-def>
     <!-- const char[6] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='48' id='type-id-211'>
       <!-- <anonymous range>[6] -->
       <subrange length='6' type-id='type-id-6' id='type-id-212'/>
-
     </array-type-def>
     <!-- const char[7] -->
     <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='56' id='type-id-213'>
       <!-- <anonymous range>[7] -->
       <subrange length='7' type-id='type-id-6' id='type-id-214'/>
-
     </array-type-def>
     <!-- const char version_string[6] -->
     <var-decl name='version_string' type-id='type-id-211' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
@@ -5542,12 +5511,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-
     <!-- char[256] -->
     <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-251'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <!-- typedef __ssize_t ssize_t -->
     <typedef-decl name='ssize_t' type-id='type-id-253' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-254'/>
@@ -6053,7 +6020,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-271' size-in-bits='2048' id='type-id-272'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <!-- void cpp_set_lang(cpp_reader*, c_lang) -->
     <function-decl name='cpp_set_lang' mangled-name='_Z12cpp_set_langP10cpp_reader6c_lang' filepath='../.././libcpp/init.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_set_langP10cpp_reader6c_lang'>
@@ -6357,11 +6323,9 @@ 
     <array-type-def dimensions='1' type-id='type-id-288' size-in-bits='192' id='type-id-289'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
-
     </array-type-def>
     <!-- struct cpp_token -->
     <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-288'>
-
         <member-type access='public'>
           <!-- union cpp_token::cpp_token_u -->
           <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-290'>
@@ -6471,7 +6435,6 @@ 
     </class-decl>
     <!-- struct cpp_macro -->
     <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-297'>
-
         <member-type access='public'>
           <!-- union cpp_macro::cpp_macro_u -->
           <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-301'>
@@ -6950,7 +6913,6 @@ 
     </class-decl>
     <!-- struct cpp_reader -->
     <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-306'>
-
         <member-type access='public'>
           <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} -->
           <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-307'>
@@ -7499,7 +7461,6 @@ 
     </class-decl>
     <!-- struct cpp_options -->
     <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-228'>
-
         <member-type access='public'>
           <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} -->
           <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-336'>
@@ -7771,7 +7732,6 @@ 
     </class-decl>
     <!-- struct cpp_context -->
     <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-279'>
-
         <member-type access='public'>
           <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} -->
           <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-339'>
@@ -7811,7 +7771,6 @@ 
             </data-member>
           </union-decl>
         </member-type>
-
         <member-type access='public'>
           <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
           <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-343'>
@@ -9422,19 +9381,15 @@ 
     <var-decl name='libiberty_concat_ptr' type-id='type-id-50' mangled-name='libiberty_concat_ptr' visibility='default' filepath='../.././libiberty/concat.c' line='134' column='1' elf-symbol-id='libiberty_concat_ptr'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-
-
     <!-- const demangle_builtin_type_info[33] -->
     <array-type-def dimensions='1' type-id='type-id-418' size-in-bits='8448' id='type-id-419'>
       <!-- <anonymous range>[33] -->
       <subrange length='33' type-id='type-id-6' id='type-id-420'/>
-
     </array-type-def>
     <!-- const demangle_operator_info[58] -->
     <array-type-def dimensions='1' type-id='type-id-421' size-in-bits='11136' id='type-id-422'>
       <!-- <anonymous range>[58] -->
       <subrange length='58' type-id='type-id-6' id='type-id-423'/>
-
     </array-type-def>
     <!-- short int -->
     <type-decl name='short int' size-in-bits='16' id='type-id-424'/>
@@ -10007,12 +9962,10 @@ 
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-
     <!-- const demangler_engine[11] -->
     <array-type-def dimensions='1' type-id='type-id-456' size-in-bits='2112' id='type-id-457'>
       <!-- <anonymous range>[11] -->
       <subrange length='11' type-id='type-id-6' id='type-id-458'/>
-
     </array-type-def>
     <!-- enum demangling_styles -->
     <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-459'>
@@ -10497,12 +10450,10 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-
     <!-- md5_uint32[2] -->
     <array-type-def dimensions='1' type-id='type-id-464' size-in-bits='64' id='type-id-465'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-6' id='type-id-466'/>
-
     </array-type-def>
     <!-- struct md5_ctx -->
     <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-467'>
@@ -11201,7 +11152,6 @@ 
     <array-type-def dimensions='1' type-id='type-id-504' size-in-bits='4096' id='type-id-505'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-6' id='type-id-252'/>
-
     </array-type-def>
     <!-- const unsigned short int -->
     <qualified-type-def type-id='type-id-29' const='yes' id='type-id-504'/>
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index 11bd6a3d..014e7d2b 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -4,32 +4,22 @@ 
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <!-- char*[7] -->
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='448' id='type-id-3'>
       <!-- <anonymous range>[7] -->
       <subrange length='7' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <!-- char[1] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8' id='type-id-6'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <!-- char[] -->
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='infinite' id='type-id-8'>
       <!-- <anonymous range>[] -->
       <subrange length='infinite' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <!-- double -->
     <type-decl name='double' size-in-bits='64' id='type-id-10'/>
@@ -37,10 +27,8 @@ 
     <array-type-def dimensions='2' type-id='type-id-10' size-in-bits='960' id='type-id-11'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-4' id='type-id-12'/>
-
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-13'/>
-
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-14'/>
@@ -48,19 +36,16 @@ 
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='256' id='type-id-16'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-4' id='type-id-17'/>
-
     </array-type-def>
     <!-- int*[4]*[10] -->
     <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='640' id='type-id-19'>
       <!-- <anonymous range>[10] -->
       <subrange length='10' type-id='type-id-4' id='type-id-20'/>
-
     </array-type-def>
     <!-- int[5] -->
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='160' id='type-id-21'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-4' id='type-id-12'/>
-
     </array-type-def>
     <!-- sizetype -->
     <type-decl name='sizetype' size-in-bits='64' id='type-id-4'/>
diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
index e7cd4c9a..eddef776 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -136,12 +136,10 @@ 
     <elf-symbol name='_ZTSN5boost9exceptionE' size='19' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -180,7 +178,6 @@ 
       </data-member>
     </class-decl>
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-22' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-23'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-24'>
             <data-member access='private'>
@@ -438,7 +435,6 @@ 
             <return type-id='type-id-214'/>
           </function-decl>
           <class-decl name='file_descriptor_impl' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='50' column='1' id='type-id-86'>
-
               <member-type access='public'>
                 <enum-decl name='flags' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='52' column='1' id='type-id-249'>
                   <underlying-type type-id='type-id-16'/>
@@ -653,11 +649,9 @@ 
         </namespace-decl>
         <typedef-decl name='stream_offset' type-id='type-id-25' filepath='src/third_party/boost-1.60.0/boost/iostreams/positioning.hpp' line='36' column='1' id='type-id-253'/>
         <class-decl name='file_descriptor' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='46' column='1' id='type-id-99'>
-
             <member-type access='private'>
               <typedef-decl name='handle_type' type-id='type-id-250' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='50' column='1' id='type-id-256'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='char_type' type-id='type-id-2' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='51' column='1' id='type-id-101'/>
             </member-type>
@@ -797,7 +791,6 @@ 
         </enum-decl>
         <class-decl name='file_descriptor_source' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='146' column='1' id='type-id-105'>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-99'/>
-
             <member-type access='private'>
               <typedef-decl name='handle_type' type-id='type-id-11' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='151' column='1' id='type-id-258'/>
             </member-type>
@@ -873,7 +866,6 @@ 
         </class-decl>
         <class-decl name='file_descriptor_sink' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='228' column='1' id='type-id-103'>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-99'/>
-
             <member-type access='private'>
               <typedef-decl name='handle_type' type-id='type-id-11' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='233' column='1' id='type-id-259'/>
             </member-type>
@@ -1014,7 +1006,6 @@ 
         <class-decl name='clone_impl&lt;boost::exception_detail::error_info_injector&lt;std::ios_base::failure&gt; &gt;' size-in-bits='640' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='442' column='1' id='type-id-75'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-79'/>
           <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-73'/>
-
             <member-type access='private'>
               <class-decl name='clone_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='446' column='1' id='type-id-260'/>
             </member-type>
@@ -1142,25 +1133,21 @@ 
       </class-decl>
       <namespace-decl name='detail'>
         <class-decl name='sp_element&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='76' column='1' id='type-id-261'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-86' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-262'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_dereference&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='101' column='1' id='type-id-263'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-87' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='103' column='1' id='type-id-264'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='150' column='1' id='type-id-265'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-88' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='152' column='1' id='type-id-266'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_array_access&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='175' column='1' id='type-id-267'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-18' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='177' column='1' id='type-id-268'/>
             </member-type>
@@ -1223,7 +1210,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='shared_ptr&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='336' column='1' id='type-id-109'>
-
           <member-type access='private'>
             <typedef-decl name='element_type' type-id='type-id-262' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-113'/>
           </member-type>
@@ -1370,7 +1356,6 @@ 
           </function-decl>
         </member-function>
       </class-decl>
-
       <function-decl name='throw_exception&lt;std::ios_base::failure&gt;' mangled-name='_ZN5boost15throw_exceptionINSt8ios_base7failureB5cxx11EEEvRKT_' filepath='src/third_party/boost-1.60.0/boost/throw_exception.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15throw_exceptionINSt8ios_base7failureB5cxx11EEEvRKT_'>
         <parameter type-id='type-id-216' name='e' filepath='src/third_party/boost-1.60.0/boost/throw_exception.hpp' line='62' column='1'/>
         <return type-id='type-id-18'/>
@@ -1387,17 +1372,13 @@ 
         <class-decl name='basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='256' visibility='default' is-declaration-only='yes' id='type-id-271'/>
         <typedef-decl name='wstring' type-id='type-id-271' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='78' column='1' id='type-id-201'/>
       </namespace-decl>
-
-
       <namespace-decl name='_V2'>
         <class-decl name='error_category' size-in-bits='64' visibility='default' is-declaration-only='yes' id='type-id-194'/>
       </namespace-decl>
       <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-272'>
-
           <member-type access='private'>
             <typedef-decl name='openmode' type-id='type-id-273' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-251'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='seekdir' type-id='type-id-274' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='461' column='1' id='type-id-254'/>
           </member-type>
@@ -1648,15 +1629,12 @@ 
       <namespace-decl name='iostreams'>
         <namespace-decl name='detail'>
           <class-decl name='mapped_file_impl' size-in-bits='1088' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='45' column='1' id='type-id-89'>
-
               <member-type access='private'>
                 <typedef-decl name='size_type' type-id='type-id-178' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='47' column='1' id='type-id-158'/>
               </member-type>
-
               <member-type access='private'>
                 <typedef-decl name='param_type' type-id='type-id-175' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='48' column='1' id='type-id-92'/>
               </member-type>
-
               <member-type access='private'>
                 <typedef-decl name='mapmode' type-id='type-id-281' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='49' column='1' id='type-id-280'/>
               </member-type>
@@ -1822,11 +1800,9 @@ 
         </namespace-decl>
         <class-decl name='mapped_file_source' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='149' column='1' id='type-id-107'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-282'/>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-276' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='165' column='1' id='type-id-178'/>
             </member-type>
-
             <member-type access='private'>
               <class-decl name='safe_bool_helper' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='151' column='1' id='type-id-283'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -1834,11 +1810,9 @@ 
                 </data-member>
               </class-decl>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-43' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='166' column='1' id='type-id-284'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='param_type' type-id='type-id-84' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='154' column='1' id='type-id-175'/>
             </member-type>
@@ -1942,7 +1916,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='mapped_file_base' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='47' column='1' id='type-id-282'>
-
             <member-type access='private'>
               <enum-decl name='mapmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='49' column='1' id='type-id-281'>
                 <underlying-type type-id='type-id-16'/>
@@ -1980,19 +1953,15 @@ 
         </class-decl>
         <class-decl name='mapped_file' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='223' column='1' id='type-id-285'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-282'/>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-178' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='237' column='1' id='type-id-286'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='delegate_type' type-id='type-id-107' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='225' column='1' id='type-id-287'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='iterator' type-id='type-id-121' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='238' column='1' id='type-id-288'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_iterator' type-id='type-id-43' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='239' column='1' id='type-id-289'/>
             </member-type>
@@ -2136,11 +2105,8 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
       <namespace-decl name='detail'>
-
         <class-decl name='sp_element&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='76' column='1' id='type-id-298'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-89' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-299'/>
             </member-type>
@@ -2420,19 +2386,16 @@ 
         </class-decl>
         <class-decl name='sp_nothrow_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='71' column='1' id='type-id-300'/>
         <class-decl name='sp_dereference&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='101' column='1' id='type-id-303'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-90' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='103' column='1' id='type-id-304'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='150' column='1' id='type-id-305'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-91' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='152' column='1' id='type-id-306'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_array_access&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='175' column='1' id='type-id-307'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-18' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='177' column='1' id='type-id-308'/>
             </member-type>
@@ -2491,7 +2454,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='shared_ptr&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='336' column='1' id='type-id-115'>
-
           <member-type access='private'>
             <typedef-decl name='element_type' type-id='type-id-299' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-119'/>
           </member-type>
@@ -2641,12 +2603,6 @@ 
       <namespace-decl name='core'>
         <typedef-decl name='typeinfo' type-id='type-id-277' filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-302'/>
       </namespace-decl>
-
-
-
-
-
-
     </namespace-decl>
     <function-decl name='clearerr' filepath='/usr/include/stdio.h' line='826' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
@@ -3378,7 +3334,6 @@ 
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-15'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-43'/>
@@ -3634,7 +3589,6 @@ 
       <parameter type-id='type-id-43'/>
       <return type-id='type-id-121'/>
     </function-decl>
-
     <function-decl name='clock' filepath='/usr/include/time.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-49'/>
     </function-decl>
@@ -3674,7 +3628,6 @@ 
       <parameter type-id='type-id-221'/>
       <return type-id='type-id-32'/>
     </function-decl>
-
     <function-decl name='acos' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-9'/>
@@ -4258,10 +4211,5 @@ 
     <qualified-type-def type-id='type-id-286' const='yes' id='type-id-290'/>
     <qualified-type-def type-id='type-id-295' const='yes' id='type-id-315'/>
     <reference-type-def kind='lvalue' type-id='type-id-315' size-in-bits='64' id='type-id-297'/>
-
-
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index 28df268d..ec0446f3 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -245,22 +245,16 @@ 
     <elf-symbol name='_ZZN5mongo7BSONObjC1EvE21kEmptyObjectPrototype' size='5' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/block_compressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='168' id='type-id-4'>
       <subrange length='21' type-id='type-id-5' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='192' id='type-id-7'>
       <subrange length='24' type-id='type-id-5' id='type-id-8'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='200' id='type-id-9'>
       <subrange length='25' type-id='type-id-5' id='type-id-10'/>
-
     </array-type-def>
     <type-decl name='double' size-in-bits='64' id='type-id-11'/>
     <type-decl name='float' size-in-bits='32' id='type-id-12'/>
@@ -380,7 +374,6 @@ 
     <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-145'/>
     <qualified-type-def type-id='type-id-145' restrict='yes' id='type-id-146'/>
     <namespace-decl name='boost'>
-
       <namespace-decl name='optional_detail'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
           <member-function access='protected' static='yes'>
@@ -405,7 +398,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
             <member-type access='public'>
               <typedef-decl name='rval_reference_type' type-id='type-id-119' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='152' column='1' id='type-id-147'/>
             </member-type>
@@ -458,7 +450,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='private'>
             <typedef-decl name='rval_reference_type' type-id='type-id-147' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='777' column='1' id='type-id-148'/>
           </member-type>
@@ -480,7 +471,6 @@ 
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
         <class-decl name='basic_stringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='3136' visibility='default' is-declaration-only='yes' id='type-id-95'>
-
             <member-type access='private'>
               <typedef-decl name='__string_type' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='669' column='1' id='type-id-149'/>
             </member-type>
@@ -498,21 +488,17 @@ 
           </member-function>
         </class-decl>
         <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='256' visibility='default' is-declaration-only='yes' id='type-id-92'>
-
             <member-type access='private'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-150'>
                 <underlying-type type-id='type-id-18'/>
               </enum-decl>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='size_type' type-id='type-id-152' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='82' column='1' id='type-id-151'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='pointer' type-id='type-id-154' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='86' column='1' id='type-id-153'/>
             </member-type>
-
             <member-type access='private'>
               <typedef-decl name='const_pointer' type-id='type-id-156' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='87' column='1' id='type-id-155'/>
             </member-type>
@@ -839,12 +825,9 @@ 
         </class-decl>
         <class-decl name='basic_stringbuf&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='832' visibility='default' is-declaration-only='yes' id='type-id-162'/>
       </namespace-decl>
-
-
       <typedef-decl name='ptrdiff_t' type-id='type-id-15' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h' line='197' column='1' id='type-id-163'/>
       <typedef-decl name='size_t' type-id='type-id-21' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h' line='196' column='1' id='type-id-51'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='private'>
             <typedef-decl name='size_type' type-id='type-id-51' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='236' column='1' id='type-id-164'/>
           </member-type>
@@ -891,7 +874,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-167' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='75' column='1' id='type-id-166'/>
           </member-type>
@@ -912,15 +894,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;unsigned char&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-168'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-138' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='450' column='1' id='type-id-165'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='445' column='1' id='type-id-126'/>
           </member-type>
@@ -942,7 +921,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-anonymous='yes' naming-typedef-id='type-id-168' visibility='default' is-declaration-only='yes' id='type-id-57'/>
       <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'>
-
           <member-type access='public'>
             <typedef-decl name='__int_type' type-id='type-id-20' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='241' column='1' id='type-id-170'/>
           </member-type>
@@ -974,7 +952,6 @@ 
       </enum-decl>
       <typedef-decl name='memory_order' type-id='type-id-172' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/atomic_base.h' line='63' column='1' id='type-id-171'/>
       <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'>
-
           <member-type access='public'>
             <typedef-decl name='__integral_type' type-id='type-id-20' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/atomic' line='626' column='1' id='type-id-173'/>
           </member-type>
@@ -1017,7 +994,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-176'/>
       <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-177'>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-71' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='453' column='1' id='type-id-178'/>
           </member-type>
@@ -1138,7 +1114,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-184'>
               <underlying-type type-id='type-id-18'/>
@@ -1204,7 +1179,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'>
-
           <member-type access='private'>
             <typedef-decl name='WordType' type-id='type-id-20' filepath='src/mongo/platform/atomic_word.h' line='54' column='1' id='type-id-185'/>
           </member-type>
@@ -1410,7 +1384,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='div' mangled-name='_ZN9__gnu_cxx3divExx' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/cstdlib' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-16'/>
@@ -1418,13 +1391,11 @@ 
         <return type-id='type-id-25'/>
       </function-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-165' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='104' column='1' id='type-id-154'/>
           </member-type>
         <member-type access='public'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
               <member-type access='public'>
                 <typedef-decl name='other' type-id='type-id-168' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='169' column='1' id='type-id-167'/>
               </member-type>
@@ -1450,18 +1421,15 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-164' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='106' column='1' id='type-id-152'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-178' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='105' column='1' id='type-id-156'/>
           </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'/>
     </namespace-decl>
-
     <function-decl name='memchr' filepath='/usr/include/string.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-141'/>
       <parameter type-id='type-id-13'/>
@@ -3115,18 +3083,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-220' size-in-bits='64' id='type-id-221'/>
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-222'/>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public' static='yes'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2EOS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3155,11 +3111,6 @@ 
       <namespace-decl name='__cxx11'>
         <typedef-decl name='string' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='74' column='1' id='type-id-201'/>
       </namespace-decl>
-
-
-
-
-
       <namespace-decl name='this_thread'>
         <function-decl name='get_id' mangled-name='_ZNSt11this_thread6get_idEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
           <return type-id='type-id-24'/>
@@ -3174,11 +3125,9 @@ 
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='private'>
             <typedef-decl name='const_iterator' type-id='type-id-24' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-223'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='iterator' type-id='type-id-28' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-224'/>
           </member-type>
@@ -3224,7 +3173,6 @@ 
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
               <member-type access='private'>
                 <typedef-decl name='type' type-id='type-id-209' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-225'/>
               </member-type>
@@ -3282,7 +3230,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'/>
       <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' type-id='type-id-37' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-226'/>
           </member-type>
@@ -3472,7 +3419,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-
       <class-decl name='FTDCCollectorInterface' size-in-bits='64' visibility='default' is-declaration-only='yes' id='type-id-208'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public'>
@@ -3837,7 +3783,6 @@ 
       <class-decl name='__anonymous_struct__13' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-228'/>
       <class-decl name='__anonymous_struct__14' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-229'/>
       <class-decl name='__anonymous_struct__15' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-230'>
-
           <member-type access='private'>
             <typedef-decl name='bytes_type' type-id='type-id-64' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-239'/>
           </member-type>
@@ -3876,7 +3821,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-232'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-240'>
               <underlying-type type-id='type-id-18'/>
@@ -3926,7 +3870,6 @@ 
       <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
-
     <function-decl name='wcsftime' filepath='/usr/include/wchar.h' line='858' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-144'/>
       <parameter type-id='type-id-26'/>
@@ -3934,9 +3877,6 @@ 
       <parameter type-id='type-id-194'/>
       <return type-id='type-id-26'/>
     </function-decl>
-
-
-
     <function-decl name='clock' filepath='/usr/include/time.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-188'/>
     </function-decl>
@@ -4000,18 +3940,6 @@ 
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-258'/>
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-259'/>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
-
-
-
-
-
       <namespace-decl name='optional_detail'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
           <member-function access='protected'>
@@ -4041,7 +3969,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
             <member-type access='public'>
               <typedef-decl name='reference_type' type-id='type-id-247' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-260'/>
             </member-type>
@@ -4074,7 +4001,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
           <member-type access='private'>
             <typedef-decl name='reference_type' type-id='type-id-260' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-261'/>
           </member-type>
@@ -4096,12 +4022,6 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
@@ -4123,7 +4043,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-263' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='229' column='1' id='type-id-262'/>
           </member-type>
@@ -4162,11 +4081,9 @@ 
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;unsigned long&gt;' type-id='type-id-174' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-264'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-21' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='447' column='1' id='type-id-265'/>
           </member-type>
@@ -4301,7 +4218,6 @@ 
       <class-decl name='__anonymous_struct__22' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-237'/>
     </namespace-decl>
     <namespace-decl name='mongo'>
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4399,7 +4315,6 @@ 
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-255'>
               <underlying-type type-id='type-id-18'/>
@@ -4657,18 +4572,15 @@ 
       <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-236'/>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-241' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <typedef-decl name='false_' type-id='type-id-24' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-241'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-246' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='109' column='1' id='type-id-263'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-265' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='103' column='1' id='type-id-245'/>
           </member-type>
@@ -4678,20 +4590,13 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/controller.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='832' id='type-id-266'>
       <subrange length='104' type-id='type-id-5' id='type-id-267'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='288' id='type-id-268'>
       <subrange length='36' type-id='type-id-5' id='type-id-269'/>
-
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-24' size-in-bits='64' id='type-id-270'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-271'/>
@@ -4720,18 +4625,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-92' size-in-bits='64' id='type-id-160'/>
     <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
-
-
-
-
-
       <namespace-decl name='filesystem'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
           <member-function access='public'>
@@ -4761,7 +4654,6 @@ 
         <class-decl name='basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='3008' visibility='default' is-declaration-only='yes' id='type-id-294'/>
       </namespace-decl>
       <namespace-decl name='chrono'>
-
         <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
           <member-function access='public' static='yes'>
@@ -4772,18 +4664,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-15' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/chrono' line='243' column='1' id='type-id-299'/>
             </member-type>
         </class-decl>
         <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'/>
       </namespace-decl>
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public'>
           <function-decl name='__shared_count' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4882,7 +4768,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='public'>
             <typedef-decl name='result_type' type-id='type-id-301' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1505' column='1' id='type-id-300'/>
           </member-type>
@@ -4915,7 +4800,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-22' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits' line='158' column='1' id='type-id-301'/>
           </member-type>
@@ -4935,7 +4819,6 @@ 
       <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-121'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
               <member-type access='public'>
                 <typedef-decl name='other' type-id='type-id-175' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/allocator.h' line='105' column='1' id='type-id-302'/>
               </member-type>
@@ -4963,7 +4846,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-177'>
-
           <member-type access='private'>
             <typedef-decl name='mutex_type' type-id='type-id-176' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='383' column='1' id='type-id-290'/>
           </member-type>
@@ -5005,7 +4887,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__19' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-234'/>
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' is-declaration-only='yes' id='type-id-303'>
-
           <member-type access='private'>
             <typedef-decl name='__ostream_type' type-id='type-id-303' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream' line='71' column='1' id='type-id-304'/>
           </member-type>
@@ -5203,7 +5084,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__41' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-323'>
-
           <member-type access='private'>
             <typedef-decl name='__allocator_type' type-id='type-id-325' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='514' column='1' id='type-id-324'/>
           </member-type>
@@ -5230,7 +5110,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__42' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-326'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-302' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='65' column='1' id='type-id-327'/>
           </member-type>
@@ -5290,7 +5169,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__48' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-333'>
-
           <member-type access='private'>
             <typedef-decl name='_Class' type-id='type-id-334' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='554' column='1' id='type-id-292'/>
           </member-type>
@@ -5303,11 +5181,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__49' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-335'>
-
           <member-type access='public'>
             <typedef-decl name='__result_type' type-id='type-id-22' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='506' column='1' id='type-id-336'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='__class_type' type-id='type-id-175' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='507' column='1' id='type-id-334'/>
           </member-type>
@@ -5354,7 +5230,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
             <member-type access='private'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-337'>
                 <underlying-type type-id='type-id-18'/>
@@ -5370,7 +5245,6 @@ 
         </class-decl>
       </namespace-decl>
       <namespace-decl name='stdx'>
-
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
           <member-function access='public'>
             <function-decl name='thread&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;, 0&gt;' mangled-name='_ZN5mongo4stdx6threadC2ISt5_BindIFSt7_Mem_fnIMNS_14FTDCControllerEFvvEEPS5_EEJELi0EEEOT_DpOT0_' filepath='src/mongo/stdx/thread.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5388,7 +5262,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
@@ -5407,7 +5280,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-338'>
               <underlying-type type-id='type-id-18'/>
@@ -5425,7 +5297,6 @@ 
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'/>
       <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-121'/>
       <class-decl name='__anonymous_struct__8' is-anonymous='yes' naming-typedef-id='type-id-334' visibility='default' is-declaration-only='yes' id='type-id-175'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-339'>
               <underlying-type type-id='type-id-18'/>
@@ -5541,7 +5412,6 @@ 
       <class-decl name='__anonymous_struct__13' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-228'/>
       <class-decl name='__anonymous_struct__14' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-229'/>
     </namespace-decl>
-
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
@@ -5563,8 +5433,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -5599,21 +5467,8 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-343' size-in-bits='64' id='type-id-344'/>
     <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-345'/>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
-
-
-
-
       <namespace-decl name='detail'>
-
         <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-121' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-346'/>
             </member-type>
@@ -5628,7 +5483,6 @@ 
         <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
         <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'/>
         <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-121'>
-
             <member-type access='private'>
               <typedef-decl name='internal_type' type-id='type-id-346' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-341'/>
             </member-type>
@@ -5662,13 +5516,6 @@ 
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
         <member-function access='public' static='yes'>
@@ -5813,7 +5660,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;mongo::BSONObj&gt;' type-id='type-id-169' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-347'/>
           </member-type>
@@ -5900,7 +5746,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mongo'>
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='public'>
           <function-decl name='readAndAdvance&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo20ConstDataRangeCursor14readAndAdvanceINS_12LittleEndianIjEEEENS_6StatusEPT_' filepath='src/mongo/base/data_range_cursor.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6127,7 +5972,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__21' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-236'/>
     </namespace-decl>
-
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-type access='public'>
@@ -6161,15 +6005,10 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_manager.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='16' id='type-id-348'>
       <subrange length='2' type-id='type-id-5' id='type-id-349'/>
-
     </array-type-def>
     <reference-type-def kind='rvalue' type-id='type-id-1' size-in-bits='64' id='type-id-350'/>
     <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
@@ -6210,7 +6049,6 @@ 
     <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-305'/>
     <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-306'/>
     <namespace-decl name='boost'>
-
       <namespace-decl name='filesystem'>
         <namespace-decl name='detail'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -6229,7 +6067,6 @@ 
           </class-decl>
         </namespace-decl>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='private'>
               <typedef-decl name='string_type' type-id='type-id-92' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='70' column='1' id='type-id-368'/>
             </member-type>
@@ -6359,11 +6196,9 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
       <namespace-decl name='iterators'>
         <namespace-decl name='detail'>
           <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
               <member-type access='private'>
                 <typedef-decl name='reference' type-id='type-id-270' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='645' column='1' id='type-id-390'/>
               </member-type>
@@ -6414,7 +6249,6 @@ 
         </class-decl>
       </namespace-decl>
       <namespace-decl name='detail'>
-
         <function-decl name='sp_enable_shared_from_this' mangled-name='_ZN5boost6detail26sp_enable_shared_from_thisEz' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail26sp_enable_shared_from_thisEz'>
           <parameter is-variadic='yes'/>
           <return type-id='type-id-22'/>
@@ -6511,17 +6345,8 @@ 
         </class-decl>
         <typedef-decl name='sp_typeinfo' type-id='type-id-392' filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp' line='28' column='1' id='type-id-365'/>
       </namespace-decl>
-
-
-
-
-
-
-
-
       <namespace-decl name='system'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='private'>
               <typedef-decl name='unspecified_bool_type' type-id='type-id-140' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-393'/>
             </member-type>
@@ -6583,7 +6408,6 @@ 
       <class-decl name='__anonymous_struct__1' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
       <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
       <class-decl name='__anonymous_struct__3' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='private'>
             <typedef-decl name='element_type' type-id='type-id-346' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-351'/>
           </member-type>
@@ -6604,15 +6428,7 @@ 
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-163' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-394'/>
           </member-type>
@@ -6658,14 +6474,12 @@ 
         <return type-id='type-id-22'/>
       </function-decl>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;char&gt;' type-id='type-id-179' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-395'/>
           </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
       <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-57'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='235' column='1' id='type-id-376'/>
           </member-type>
@@ -6713,7 +6527,6 @@ 
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__6' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' type-id='type-id-121' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-396'/>
           </member-type>
@@ -6739,7 +6552,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-176'>
-
           <member-type access='private'>
             <typedef-decl name='reverse_iterator' type-id='type-id-177' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='235' column='1' id='type-id-397'/>
           </member-type>
@@ -6771,7 +6583,6 @@ 
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__12' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-227'>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc&lt;boost::filesystem::path&gt;' type-id='type-id-228' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-398'/>
           </member-type>
@@ -7000,7 +6811,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='private'>
             <typedef-decl name='difference_type' type-id='type-id-394' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='732' column='1' id='type-id-401'/>
           </member-type>
@@ -7101,7 +6911,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__2' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'>
-
             <member-type access='private'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-402'>
                 <underlying-type type-id='type-id-18'/>
@@ -7114,8 +6923,6 @@ 
           <underlying-type type-id='type-id-18'/>
         </enum-decl>
       </namespace-decl>
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-function access='private'>
           <function-decl name='FTDCFileManager' mangled-name='_ZN5mongo15FTDCFileManagerC2EPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionE' filepath='src/mongo/db/ftdc/file_manager.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManagerC2EPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionE'>
@@ -7270,7 +7077,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__18' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-233'/>
       <class-decl name='__anonymous_struct__19' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-234'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-403'>
               <underlying-type type-id='type-id-18'/>
@@ -7294,13 +7100,10 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-391' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <typedef-decl name='true_' type-id='type-id-24' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-391'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
     </namespace-decl>
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -7316,20 +7119,14 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_reader.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='128' id='type-id-404'>
       <subrange length='16' type-id='type-id-5' id='type-id-405'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='152' id='type-id-406'>
       <subrange length='19' type-id='type-id-5' id='type-id-407'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='280' id='type-id-408'>
       <subrange length='35' type-id='type-id-5' id='type-id-409'/>
-
     </array-type-def>
     <qualified-type-def type-id='type-id-410' const='yes' id='type-id-411'/>
     <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-412'/>
@@ -7346,24 +7143,11 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-421' size-in-bits='64' id='type-id-422'/>
     <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-424'/>
     <namespace-decl name='boost'>
-
-
-
       <namespace-decl name='detail'>
-
         <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       </namespace-decl>
-
-
-
-
-
-
-
-
       <namespace-decl name='filesystem'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='private'>
               <typedef-decl name='value_type' type-id='type-id-2' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='67' column='1' id='type-id-410'/>
             </member-type>
@@ -7399,13 +7183,6 @@ 
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <function-decl name='operator+&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_'>
         <parameter type-id='type-id-71' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1151' column='1'/>
@@ -7441,11 +7218,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-425'>
-
           <member-type access='private'>
             <typedef-decl name='iostate' type-id='type-id-172' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='398' column='1' id='type-id-183'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='openmode' type-id='type-id-426' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-399'/>
           </member-type>
@@ -7650,7 +7425,6 @@ 
     <namespace-decl name='mongo'>
       <namespace-decl name='FTDCBSONUtil'>
       </namespace-decl>
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
@@ -7761,9 +7535,6 @@ 
       <class-decl name='__anonymous_struct__23' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-220'/>
       <class-decl name='__anonymous_struct__24' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-238'/>
     </namespace-decl>
-
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -7793,25 +7564,11 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_writer.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='632' id='type-id-427'>
       <subrange length='79' type-id='type-id-5' id='type-id-428'/>
-
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-429'/>
     <namespace-decl name='boost'>
-
-
-
-
-
-
-
-
-
-
-
-
       <namespace-decl name='filesystem'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       </namespace-decl>
@@ -7840,7 +7597,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
-
             <member-type access='public'>
               <typedef-decl name='argument_type' type-id='type-id-200' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='164' column='1' id='type-id-430'/>
             </member-type>
@@ -7855,7 +7611,6 @@ 
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='private'>
             <typedef-decl name='argument_type' type-id='type-id-430' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='782' column='1' id='type-id-431'/>
           </member-type>
@@ -7881,11 +7636,6 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
       <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-32'/>
@@ -7903,7 +7653,6 @@ 
     <namespace-decl name='mongo'>
       <namespace-decl name='logger'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
             <member-type access='private'>
               <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-432'>
                 <underlying-type type-id='type-id-18'/>
@@ -7911,8 +7660,6 @@ 
             </member-type>
         </class-decl>
       </namespace-decl>
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
         <member-type access='private'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
@@ -7984,7 +7731,6 @@ 
       <class-decl name='__anonymous_struct__9' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-176'/>
       <class-decl name='__anonymous_struct__10' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-177'/>
       <class-decl name='__anonymous_struct__11' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-186'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-433'>
               <underlying-type type-id='type-id-18'/>
@@ -8024,7 +7770,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__17' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-232'/>
     </namespace-decl>
-
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
@@ -8040,8 +7785,6 @@ 
       </class-decl>
       <class-decl name='__anonymous_struct__4' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-169'/>
     </namespace-decl>
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -8057,30 +7800,20 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/util.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
-
-
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='32' id='type-id-434'>
       <subrange length='4' type-id='type-id-5' id='type-id-435'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='40' id='type-id-436'>
       <subrange length='5' type-id='type-id-5' id='type-id-437'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='48' id='type-id-438'>
       <subrange length='6' type-id='type-id-5' id='type-id-439'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='56' id='type-id-440'>
       <subrange length='7' type-id='type-id-5' id='type-id-441'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='64' id='type-id-442'>
       <subrange length='8' type-id='type-id-5' id='type-id-443'/>
-
     </array-type-def>
     <type-decl name='signed char' size-in-bits='8' id='type-id-444'/>
     <qualified-type-def type-id='type-id-245' const='yes' id='type-id-445'/>
@@ -8096,7 +7829,6 @@ 
     <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-455'/>
     <reference-type-def kind='rvalue' type-id='type-id-20' size-in-bits='64' id='type-id-456'/>
     <namespace-decl name='boost'>
-
       <namespace-decl name='filesystem'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
           <member-function access='public'>
@@ -8121,17 +7853,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
-
-
-
-
-
-
-
-
-
       <namespace-decl name='optional_detail'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
         <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
@@ -8151,14 +7872,7 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
     </namespace-decl>
     <namespace-decl name='std'>
-
-
-
-
-
-
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-458' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='230' column='1' id='type-id-457'/>
           </member-type>
@@ -8291,7 +8005,6 @@ 
           <parameter type-id='type-id-125' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='235' column='1'/>
           <return type-id='type-id-24'/>
         </function-decl>
-
         <function-decl name='constructDocumentFromMetrics' mangled-name='_ZN5mongo12FTDCBSONUtil28constructDocumentFromMetricsERKNS_7BSONObjERKSt6vectorImSaImEE' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil28constructDocumentFromMetricsERKNS_7BSONObjERKSt6vectorImSaImEE'>
           <parameter type-id='type-id-200' name='ref' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'/>
           <parameter type-id='type-id-277' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='335' column='1'/>
@@ -8333,14 +8046,11 @@ 
       <class-decl name='__anonymous_struct__5' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-37'/>
       <class-decl name='__anonymous_struct__6' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-174'/>
       <class-decl name='__anonymous_struct__7' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-121'/>
-
-
       <namespace-decl name='FTDCUtil'>
         <function-decl name='getInterimFile' mangled-name='_ZN5mongo8FTDCUtil14getInterimFileERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil14getInterimFileERKN5boost10filesystem4pathE'>
           <parameter type-id='type-id-273' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
           <return type-id='type-id-24'/>
         </function-decl>
-
         <function-decl name='getInterimTempFile' mangled-name='_ZN5mongo8FTDCUtil18getInterimTempFileERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/util.cpp' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil18getInterimTempFileERKN5boost10filesystem4pathE'>
           <parameter type-id='type-id-273' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
           <return type-id='type-id-24'/>
@@ -8862,7 +8572,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__26' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-308'>
-
           <member-type access='private'>
             <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-461'>
               <underlying-type type-id='type-id-18'/>
@@ -8873,7 +8582,6 @@ 
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-446' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='110' column='1' id='type-id-458'/>
           </member-type>
@@ -8910,9 +8618,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'>
@@ -8942,8 +8647,6 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/varint.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
     <namespace-decl name='mongo'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-24'/>
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-28'>
@@ -8971,8 +8674,5 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index 755ea6dc..cbe8d20e 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -43,97 +43,62 @@ 
     <elf-symbol name='__this_module' size='896' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' comp-dir-path='/ws/android/kernel/aosp/common-mainline/out/android-mainline/common' language='LANG_C89'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-1'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='64' id='type-id-3'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='96' id='type-id-5'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-7' size-in-bits='128' id='type-id-8'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='128' id='type-id-10'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-9' size-in-bits='72' id='type-id-12'>
       <subrange length='9' type-id='type-id-1' id='type-id-13'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='4096' id='type-id-15'>
       <subrange length='32' type-id='type-id-1' id='type-id-16'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='256' id='type-id-18'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='bool' size-in-bits='8' id='type-id-20'/>
     <array-type-def dimensions='1' type-id='type-id-21' size-in-bits='256' id='type-id-22'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='char' size-in-bits='8' id='type-id-23'/>
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='2048' id='type-id-25'>
       <subrange length='32' type-id='type-id-1' id='type-id-16'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-24' size-in-bits='192' id='type-id-26'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='1024' id='type-id-27'>
       <subrange length='128' type-id='type-id-1' id='type-id-28'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='128' id='type-id-29'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='16384' id='type-id-30'>
       <subrange length='2048' type-id='type-id-1' id='type-id-31'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='160' id='type-id-32'>
       <subrange length='20' type-id='type-id-1' id='type-id-33'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='256' id='type-id-34'>
       <subrange length='32' type-id='type-id-1' id='type-id-16'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='448' id='type-id-35'>
       <subrange length='56' type-id='type-id-1' id='type-id-36'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='48' id='type-id-37'>
       <subrange length='6' type-id='type-id-1' id='type-id-38'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-23' size-in-bits='64' id='type-id-39'>
       <subrange length='8' type-id='type-id-1' id='type-id-40'/>
-
     </array-type-def>
     <class-decl name='anon_vma' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-41'/>
     <class-decl name='assoc_array_ptr' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-42'/>
@@ -234,181 +199,140 @@ 
     <class-decl name='xol_area' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-137'/>
     <array-type-def dimensions='1' type-id='type-id-138' size-in-bits='192' id='type-id-139'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-140' size-in-bits='256' id='type-id-141'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='256' id='type-id-143'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='512' id='type-id-145'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-146' size-in-bits='4096' id='type-id-147'>
       <subrange length='8' type-id='type-id-1' id='type-id-40'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-148' size-in-bits='192' id='type-id-149'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-150'/>
     <array-type-def dimensions='1' type-id='type-id-150' size-in-bits='128' id='type-id-151'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-152' size-in-bits='16384' id='type-id-153'>
       <subrange length='64' type-id='type-id-1' id='type-id-154'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-155' size-in-bits='infinite' id='type-id-156'>
       <subrange length='infinite' type-id='type-id-1' id='type-id-157'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-158' size-in-bits='384' id='type-id-159'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-160' size-in-bits='infinite' id='type-id-161'>
       <subrange length='infinite' type-id='type-id-1' id='type-id-157'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-162' id='type-id-163'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <type-decl name='long int' size-in-bits='64' id='type-id-164'/>
     <type-decl name='long long int' size-in-bits='64' id='type-id-165'/>
     <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-166'/>
     <array-type-def dimensions='1' type-id='type-id-167' size-in-bits='1728' id='type-id-168'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-169' size-in-bits='2016' id='type-id-170'>
       <subrange length='7' type-id='type-id-1' id='type-id-171'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='128' id='type-id-173'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-174' size-in-bits='2688' id='type-id-175'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-176' size-in-bits='1024' id='type-id-177'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-178' size-in-bits='128' id='type-id-179'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-180' size-in-bits='256' id='type-id-181'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-182' size-in-bits='1344' id='type-id-183'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-184' size-in-bits='384' id='type-id-185'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-186' size-in-bits='2048' id='type-id-187'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='448' id='type-id-189'>
       <subrange length='7' type-id='type-id-1' id='type-id-171'/>
-
     </array-type-def>
     <type-decl name='short int' size-in-bits='16' id='type-id-190'/>
     <type-decl name='signed char' size-in-bits='8' id='type-id-191'/>
     <array-type-def dimensions='1' type-id='type-id-192' size-in-bits='192' id='type-id-193'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-194' size-in-bits='2304' id='type-id-195'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <typedef-decl name='__uint128_t' type-id='type-id-196' id='type-id-14'/>
     <array-type-def dimensions='1' type-id='type-id-197' size-in-bits='512' id='type-id-198'>
       <subrange length='16' type-id='type-id-1' id='type-id-11'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-197' size-in-bits='64' id='type-id-199'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-197' size-in-bits='128' id='type-id-200'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-201' size-in-bits='512' id='type-id-202'>
       <subrange length='8' type-id='type-id-1' id='type-id-40'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-203' size-in-bits='24' id='type-id-204'>
       <subrange length='3' type-id='type-id-1' id='type-id-6'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-203' size-in-bits='32' id='type-id-205'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-203' size-in-bits='64' id='type-id-206'>
       <subrange length='8' type-id='type-id-1' id='type-id-40'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-207'/>
     <type-decl name='unsigned __int128' size-in-bits='128' id='type-id-196'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-208'/>
     <array-type-def dimensions='1' type-id='type-id-208' size-in-bits='256' id='type-id-209'>
       <subrange length='32' type-id='type-id-1' id='type-id-16'/>
-
     </array-type-def>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-210'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-211'/>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='64' id='type-id-212'>
       <subrange length='1' type-id='type-id-1' id='type-id-213'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='128' id='type-id-214'>
       <subrange length='2' type-id='type-id-1' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='2944' id='type-id-215'>
       <subrange length='46' type-id='type-id-1' id='type-id-216'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='256' id='type-id-217'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='infinite' id='type-id-218'>
       <subrange length='infinite' type-id='type-id-1' id='type-id-157'/>
-
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-219'/>
     <array-type-def dimensions='1' type-id='type-id-220' size-in-bits='128' id='type-id-221'>
       <subrange length='1' type-id='type-id-1' id='type-id-213'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-222' size-in-bits='256' id='type-id-223'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='void' id='type-id-224'/>
     <array-type-def dimensions='1' type-id='type-id-225' size-in-bits='256' id='type-id-226'>
       <subrange length='4' type-id='type-id-1' id='type-id-19'/>
-
     </array-type-def>
     <class-decl name='sdhci_host' size-in-bits='8704' is-struct='yes' visibility='default' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.h' line='371' column='1' id='type-id-227'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
index e806f963..4cd83b4f 100644
--- a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
+++ b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
@@ -207,26 +207,19 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='gdbmclose.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-
-
-
     <type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-21'/>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='128' id='type-id-22'>
       <subrange length='1' type-id='type-id-21' id='type-id-23'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='768' id='type-id-24'>
       <subrange length='6' type-id='type-id-21' id='type-id-25'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-26' size-in-bits='192' id='type-id-27'>
       <subrange length='1' type-id='type-id-21' id='type-id-23'/>
-
     </array-type-def>
     <type-decl name='char' size-in-bits='8' id='type-id-28'/>
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='32' id='type-id-29'>
       <subrange length='4' type-id='type-id-21' id='type-id-30'/>
-
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-8'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-31'/>
@@ -516,14 +509,11 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='gdbmdump.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='8' id='type-id-62'>
       <subrange length='1' type-id='type-id-21' id='type-id-23'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='160' id='type-id-63'>
       <subrange length='20' type-id='type-id-21' id='type-id-64'/>
-
     </array-type-def>
     <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-65'/>
     <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-66'/>
@@ -737,10 +727,8 @@ 
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='gdbmload.c' comp-dir-path='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src' language='LANG_C99'>
-
     <array-type-def dimensions='1' type-id='type-id-80' size-in-bits='256' id='type-id-81'>
       <subrange length='2' type-id='type-id-21' id='type-id-82'/>
-
     </array-type-def>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
     <class-decl name='dump_file' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/ben/spack-stage/spack-stage-dQKT1q/spack-src/src/gdbmload.c' line='30' column='1' id='type-id-83'>
diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi
index b99ee499..984d0d3a 100644
--- a/tests/data/test-read-dwarf/libtest23.so.abi
+++ b/tests/data/test-read-dwarf/libtest23.so.abi
@@ -12,7 +12,6 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-3'/>
@@ -42,7 +41,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-15'/>
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='infinite' id='type-id-16'>
       <subrange length='infinite' id='type-id-17'/>
-
     </array-type-def>
     <type-decl name='void' id='type-id-18'/>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-19'/>
@@ -141,7 +139,6 @@ 
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-74'/>
     <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-75'/>
     <namespace-decl name='std'>
-
       <typedef-decl name='string' type-id='type-id-51' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-72'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
@@ -216,7 +213,6 @@ 
         </data-member>
       </class-decl>
     </namespace-decl>
-
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-20'/>
@@ -566,59 +562,45 @@ 
     </function-decl>
     <namespace-decl name='std'>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='112' column='1' id='type-id-51'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-81' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='121' column='1' id='type-id-57'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_CharT_alloc_type' type-id='type-id-83' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='114' column='1' id='type-id-82'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='traits_type' type-id='type-id-85' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='118' column='1' id='type-id-84'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-87' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='119' column='1' id='type-id-86'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-39' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='120' column='1' id='type-id-88'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-90' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='122' column='1' id='type-id-89'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-92' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='123' column='1' id='type-id-91'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-94' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='124' column='1' id='type-id-93'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-96' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='125' column='1' id='type-id-95'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-98' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='126' column='1' id='type-id-97'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-100' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='127' column='1' id='type-id-99'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-102' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='129' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-104' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='130' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-106' filepath='/usr/include/c++/4.8.2/bits/basic_string.h' line='131' column='1' id='type-id-105'/>
           </member-type>
@@ -1746,27 +1728,21 @@ 
       </class-decl>
     </namespace-decl>
     <class-decl name='allocator&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-39'>
-
         <member-type access='public'>
           <typedef-decl name='size_type' type-id='type-id-109' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='95' column='1' id='type-id-81'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-110' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='96' column='1' id='type-id-90'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-36' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='99' column='1' id='type-id-92'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-44' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='100' column='1' id='type-id-94'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-37' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='97' column='1' id='type-id-96'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='const_pointer' type-id='type-id-29' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='98' column='1' id='type-id-98'/>
         </member-type>
@@ -1778,13 +1754,11 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-106'/>
     </namespace-decl>
     <class-decl name='rebind&lt;char&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-111'>
-
         <member-type access='public'>
           <typedef-decl name='other' type-id='type-id-39' filepath='/usr/include/c++/4.8.2/bits/allocator.h' line='105' column='1' id='type-id-83'/>
         </member-type>
     </class-decl>
     <class-decl name='char_traits&lt;char&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-85'>
-
         <member-type access='public'>
           <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/4.8.2/bits/char_traits.h' line='235' column='1' id='type-id-87'/>
         </member-type>
@@ -1797,36 +1771,13 @@ 
       <parameter type-id='type-id-71' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-first-tu.cc' line='12' column='1'/>
       <return type-id='type-id-18'/>
     </function-decl>
-
-
-
-
-
-
-
-
-
-
     <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-21'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
-
     <function-decl name='emit' mangled-name='_Z4emitRSsS_' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z4emitRSsS_'>
       <parameter type-id='type-id-71' name='prefix' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
       <parameter type-id='type-id-71' name='s' filepath='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf/test23-second-tu.cc' line='13' column='1'/>
       <return type-id='type-id-18'/>
     </function-decl>
-
-
-
-
-
-
-
-
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
index 4d1d3402..0afcc121 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
@@ -12,13 +12,10 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -47,7 +44,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-17'/>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='infinite' id='type-id-18'>
       <subrange length='infinite' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='void' id='type-id-20'/>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-21'/>
@@ -58,7 +54,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-27' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-28'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-29' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-27'/>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-27' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-29'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-30'>
             <data-member access='private'>
@@ -245,9 +240,7 @@ 
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-99'/>
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
     <namespace-decl name='std'>
-
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-59'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-90'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-56'/>
@@ -264,39 +257,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-101' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-66'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-56' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-104' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-106' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-105'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-108' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-107'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-110' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-109'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-112' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-111'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-114' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-113'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-115'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -310,7 +294,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-63'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-115'/>
@@ -1445,15 +1428,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-56'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-40'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-101'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-106'/>
           </member-type>
@@ -1487,11 +1467,9 @@ 
         <return type-id='type-id-59'/>
       </function-decl>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-117'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-68'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-72'/>
           </member-type>
@@ -1598,25 +1576,19 @@ 
       <typedef-decl name='ostream' type-id='type-id-118' filepath='/usr/include/c++/5.3.1/iosfwd' line='141' column='1' id='type-id-96'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-40'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-116' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-119'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-34' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-120'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-32' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-121'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-122'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-123'/>
           </member-type>
@@ -2086,7 +2058,6 @@ 
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-15'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-32'/>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
index 7fb22564..82fec255 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
@@ -12,13 +12,10 @@ 
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-3'>
       <subrange length='4' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-6'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -47,7 +44,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-17'/>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='infinite' id='type-id-18'>
       <subrange length='infinite' id='type-id-19'/>
-
     </array-type-def>
     <type-decl name='void' id='type-id-20'/>
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-21'/>
@@ -57,7 +53,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-26' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-27'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-28' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-26'/>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-26' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-28'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-29'>
             <data-member access='private'>
@@ -228,19 +223,15 @@ 
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-79'/>
     <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-80'/>
     <namespace-decl name='std'>
-
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-81'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='235' column='1' id='type-id-60'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-11' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='236' column='1' id='type-id-62'/>
           </member-type>
       </class-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-82'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2670' column='1' id='type-id-83'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-84'/>
@@ -249,39 +240,30 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-85' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2519' column='1' id='type-id-58'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-84' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2518' column='1' id='type-id-86'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-88' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2521' column='1' id='type-id-87'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-90' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2522' column='1' id='type-id-89'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-92' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2525' column='1' id='type-id-91'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-94' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2527' column='1' id='type-id-93'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-96' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2528' column='1' id='type-id-95'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-98' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2529' column='1' id='type-id-97'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2546' column='1' id='type-id-99'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -295,7 +277,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2553' column='1' id='type-id-56'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-99'/>
@@ -319,15 +300,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='92' column='1' id='type-id-84'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-40'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-100' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='95' column='1' id='type-id-85'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='99' column='1' id='type-id-88'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/bits/allocator.h' line='100' column='1' id='type-id-90'/>
           </member-type>
@@ -644,25 +622,19 @@ 
       <return type-id='type-id-72'/>
     </function-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='58' column='1' id='type-id-40'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-100' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='61' column='1' id='type-id-102'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-33' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='63' column='1' id='type-id-103'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-31' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='64' column='1' id='type-id-104'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-42' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='65' column='1' id='type-id-105'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-49' filepath='/usr/include/c++/5.3.1/ext/new_allocator.h' line='66' column='1' id='type-id-106'/>
           </member-type>
@@ -828,7 +800,6 @@ 
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-15'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-31'/>
diff --git a/tests/data/test-read-dwarf/test1.abi b/tests/data/test-read-dwarf/test1.abi
index 1cf67cad..478b7491 100644
--- a/tests/data/test-read-dwarf/test1.abi
+++ b/tests/data/test-read-dwarf/test1.abi
@@ -60,11 +60,9 @@ 
     <class-decl name='s0' size-in-bits='384' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='13' column='1' id='type-id-9'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-7'/>
       <base-class access='public' layout-offset-in-bits='256' is-virtual='yes' type-id='type-id-8'/>
-
         <member-type access='public'>
           <typedef-decl name='integer' type-id='type-id-3' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='15' column='1' id='type-id-10'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='byte' type-id='type-id-5' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='16' column='1' id='type-id-11'/>
         </member-type>
diff --git a/tests/data/test-read-dwarf/test1.hash.abi b/tests/data/test-read-dwarf/test1.hash.abi
index 0bd86868..95c81b58 100644
--- a/tests/data/test-read-dwarf/test1.hash.abi
+++ b/tests/data/test-read-dwarf/test1.hash.abi
@@ -60,11 +60,9 @@ 
     <class-decl name='s0' size-in-bits='384' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='13' column='1' id='10ec88de'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='96c6f7f7'/>
       <base-class access='public' layout-offset-in-bits='256' is-virtual='yes' type-id='95c6f664'/>
-
         <member-type access='public'>
           <typedef-decl name='integer' type-id='95e97e5e' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='15' column='1' id='61814d27'/>
         </member-type>
-
         <member-type access='public'>
           <typedef-decl name='byte' type-id='002ac4a6' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='16' column='1' id='92bf8355'/>
         </member-type>
diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
index bc8d8ae2..5cd2d0d7 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -411,23 +411,16 @@ 
     <elf-symbol name='_ZTVN5boost6system14error_categoryE' size='72' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <type-decl name='char' size-in-bits='8' id='type-id-2'/>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='8' id='type-id-3'>
       <subrange length='1' type-id='type-id-4' id='type-id-5'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='160' id='type-id-6'>
       <subrange length='20' type-id='type-id-4' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-2' size-in-bits='32' id='type-id-8'>
       <subrange length='4' type-id='type-id-4' id='type-id-9'/>
-
     </array-type-def>
     <class-decl name='typedef __va_list_tag __va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-10'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -457,7 +450,6 @@ 
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-22'/>
     <array-type-def dimensions='1' type-id='type-id-22' size-in-bits='infinite' id='type-id-23'>
       <subrange length='infinite' id='type-id-24'/>
-
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-25'/>
     <type-decl name='void' id='type-id-26'/>
@@ -828,11 +820,7 @@ 
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-178'/>
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-179'/>
     <namespace-decl name='std'>
-
-
-
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1' id='type-id-134'>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-138'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-180'/>
@@ -933,7 +921,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1' id='type-id-168'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-131'/>
@@ -950,39 +937,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-181' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-141'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-131' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-182'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-184' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='123' column='1' id='type-id-183'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-186' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='124' column='1' id='type-id-185'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-72' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='127' column='1' id='type-id-187'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-69' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='129' column='1' id='type-id-188'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-190' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='130' column='1' id='type-id-189'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-192' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='131' column='1' id='type-id-191'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='148' column='1' id='type-id-180'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -2268,15 +2246,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-131'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-75'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-181'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-86' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-184'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-111' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-186'/>
           </member-type>
@@ -2303,38 +2278,30 @@ 
       </class-decl>
       <typedef-decl name='size_t' type-id='type-id-22' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-195'/>
       <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-196'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-197'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-41' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-199'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-86' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-200'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-202' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='177' column='1' id='type-id-201'/>
           </member-type>
       </class-decl>
       <typedef-decl name='ptrdiff_t' type-id='type-id-17' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-198'/>
       <class-decl name='iterator_traits&lt;char const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-203'>
-
           <member-type access='public'>
             <typedef-decl name='iterator_category' type-id='type-id-202' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='188' column='1' id='type-id-204'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-205'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-53' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-206'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-111' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-207'/>
           </member-type>
@@ -2342,15 +2309,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-190'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-192'/>
       <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-143'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-53' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-208'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-209'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-53' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-210'/>
           </member-type>
@@ -2395,7 +2359,6 @@ 
       </class-decl>
       <typedef-decl name='string' type-id='type-id-134' filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-211'/>
       <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-146'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-212'/>
           </member-type>
@@ -2410,7 +2373,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-149'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-213'/>
           </member-type>
@@ -2540,25 +2502,19 @@ 
         <parameter type-id='type-id-18'/>
         <return type-id='type-id-36'/>
       </function-decl>
-
       <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-75'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-214'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-41' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-215'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-53' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-216'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-86' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-217'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-111' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-218'/>
           </member-type>
@@ -2620,15 +2576,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-72'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-197' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-219'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-200' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-220'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-199' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-221'/>
           </member-type>
@@ -2736,15 +2689,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-69'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-205' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-222'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-207' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-223'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-206' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-224'/>
           </member-type>
@@ -2996,9 +2946,6 @@ 
       <return type-id='type-id-16'/>
     </function-decl>
     <namespace-decl name='boost'>
-
-
-
       <namespace-decl name='noncopyable_'>
         <class-decl name='noncopyable' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/noncopyable.hpp' line='23' column='1' id='type-id-77'>
           <member-function access='protected' constructor='yes'>
@@ -3037,9 +2984,7 @@ 
         </class-decl>
       </namespace-decl>
       <namespace-decl name='system'>
-
         <class-decl name='error_condition' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='230' column='1' id='type-id-84'>
-
             <member-type access='public'>
               <typedef-decl name='unspecified_bool_type' type-id='type-id-177' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='272' column='1' id='type-id-233'/>
             </member-type>
@@ -3203,7 +3148,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='error_code' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='317' column='1' id='type-id-82'>
-
             <member-type access='public'>
               <typedef-decl name='unspecified_bool_type' type-id='type-id-177' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-234'/>
             </member-type>
@@ -3320,14 +3264,12 @@ 
         </function-decl>
       </namespace-decl>
       <namespace-decl name='filesystem'>
-
         <function-decl name='codecvt_error_category' mangled-name='_ZN5boost10filesystem22codecvt_error_categoryEv' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem22codecvt_error_categoryEv'>
           <return type-id='type-id-102'/>
         </function-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='int_&lt;3&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-127'>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-117' mangled-name='_ZN4mpl_4int_ILi3EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
@@ -3683,7 +3625,6 @@ 
       <parameter type-id='type-id-15'/>
       <return type-id='type-id-19'/>
     </function-decl>
-
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-53'/>
@@ -3869,7 +3810,6 @@ 
       <parameter type-id='type-id-155'/>
       <return type-id='type-id-28'/>
     </function-decl>
-
     <function-type size-in-bits='64' id='type-id-161'>
       <parameter type-id='type-id-12'/>
       <parameter type-id='type-id-12'/>
@@ -3898,19 +3838,15 @@ 
     </class-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
     <array-type-def dimensions='1' type-id='type-id-236' size-in-bits='infinite' id='type-id-237'>
       <subrange length='infinite' id='type-id-24'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-238' size-in-bits='infinite' id='type-id-239'>
       <subrange length='infinite' id='type-id-24'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-240'/>
     <array-type-def dimensions='1' type-id='type-id-22' size-in-bits='39936' id='type-id-241'>
       <subrange length='624' type-id='type-id-4' id='type-id-242'/>
-
     </array-type-def>
     <typedef-decl name='__gthread_once_t' type-id='type-id-243' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='49' column='1' id='type-id-244'/>
     <typedef-decl name='pthread_once_t' type-id='type-id-15' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='168' column='1' id='type-id-243'/>
@@ -4104,11 +4040,7 @@ 
     <qualified-type-def type-id='type-id-178' const='yes' id='type-id-484'/>
     <reference-type-def kind='lvalue' type-id='type-id-484' size-in-bits='64' id='type-id-485'/>
     <namespace-decl name='std'>
-
-
-
       <class-decl name='remove_reference&lt;boost::filesystem::filesystem_error::m_imp*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-486'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-293' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-479'/>
           </member-type>
@@ -4120,7 +4052,6 @@ 
       <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-487'/>
       <class-decl name='codecvt&lt;wchar_t, char, __mbstate_t&gt;' visibility='default' is-declaration-only='yes' id='type-id-488'/>
       <class-decl name='basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1' id='type-id-422'>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-426'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-489'/>
@@ -4221,7 +4152,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1' id='type-id-467'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-419'/>
@@ -4238,39 +4168,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-490' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-429'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-419' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-491'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-493' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='123' column='1' id='type-id-492'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-495' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='124' column='1' id='type-id-494'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-251' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='127' column='1' id='type-id-496'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-248' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='129' column='1' id='type-id-497'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-499' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='130' column='1' id='type-id-498'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-501' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='131' column='1' id='type-id-500'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='148' column='1' id='type-id-489'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -5460,15 +5381,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;wchar_t&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-419'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-254'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-490'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-483' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-493'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-459' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-495'/>
           </member-type>
@@ -5494,29 +5412,23 @@ 
         </member-function>
       </class-decl>
       <class-decl name='iterator_traits&lt;wchar_t*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-502'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-503'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-178' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-504'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-483' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-505'/>
           </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;wchar_t const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-506'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-198' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-507'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-158' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-508'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-459' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-509'/>
           </member-type>
@@ -5524,15 +5436,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;wchar_t const*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-499'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-501'/>
       <class-decl name='initializer_list&lt;wchar_t&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-431'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-158' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-510'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-511'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-158' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-512'/>
           </member-type>
@@ -5577,11 +5486,9 @@ 
       </class-decl>
       <typedef-decl name='wstring' type-id='type-id-422' filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='68' column='1' id='type-id-457'/>
       <class-decl name='locale' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/locale_classes.h' line='62' column='1' id='type-id-434'>
-
           <member-type access='public'>
             <typedef-decl name='category' type-id='type-id-15' filepath='/usr/include/c++/4.9/bits/locale_classes.h' line='67' column='1' id='type-id-442'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='_Impl' size-in-bits='320' visibility='default' filepath='/usr/include/c++/4.9/bits/locale_classes.h' line='475' column='1' id='type-id-438'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -5724,7 +5631,6 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='id' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/locale_classes.h' line='436' column='1' id='type-id-448'>
               <data-member access='private' layout-offset-in-bits='0'>
@@ -5931,7 +5837,6 @@ 
         <return type-id='type-id-26'/>
       </function-decl>
       <class-decl name='remove_reference&lt;boost::filesystem::detail::dir_itr_imp*&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-515'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-278' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-477'/>
           </member-type>
@@ -5972,7 +5877,6 @@ 
         <return type-id='type-id-197'/>
       </function-decl>
       <class-decl name='mersenne_twister_engine&lt;long unsigned int, 32ul, 624ul, 397ul, 31ul, 2567483615ul, 11ul, 4294967295ul, 7ul, 2636928640ul, 15ul, 4022730752ul, 18ul, 1812433253ul&gt;' size-in-bits='40000' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='451' column='1' id='type-id-475'>
-
           <member-type access='public'>
             <typedef-decl name='result_type' type-id='type-id-22' filepath='/usr/include/c++/4.9/bits/random.h' line='482' column='1' id='type-id-452'/>
           </member-type>
@@ -6071,36 +5975,28 @@ 
     </namespace-decl>
     <namespace-decl name='boost'>
       <namespace-decl name='mpl'>
-
-
         <class-decl name='if_&lt;boost::detail::use_operator_brackets_proxy&lt;const boost::filesystem::path, const boost::filesystem::path&amp;&gt;, boost::detail::operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;, const boost::filesystem::path&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='55' column='1' id='type-id-517'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-519' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='70' column='1' id='type-id-518'/>
             </member-type>
         </class-decl>
         <class-decl name='if_c&lt;true, boost::detail::operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;, const boost::filesystem::path&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='34' column='1' id='type-id-520'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-521' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='36' column='1' id='type-id-519'/>
             </member-type>
         </class-decl>
         <class-decl name='if_&lt;boost::detail::use_operator_brackets_proxy&lt;boost::filesystem::directory_entry, boost::filesystem::directory_entry&amp;&gt;, boost::detail::operator_brackets_proxy&lt;boost::filesystem::directory_iterator&gt;, boost::filesystem::directory_entry&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='55' column='1' id='type-id-522'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-524' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='70' column='1' id='type-id-523'/>
             </member-type>
         </class-decl>
         <class-decl name='if_c&lt;true, boost::detail::operator_brackets_proxy&lt;boost::filesystem::directory_iterator&gt;, boost::filesystem::directory_entry&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='34' column='1' id='type-id-525'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-526' filepath='src/third_party/boost-1.56.0/boost/mpl/if.hpp' line='36' column='1' id='type-id-524'/>
             </member-type>
         </class-decl>
       </namespace-decl>
-
       <namespace-decl name='detail'>
-
         <function-decl name='atomic_exchange_and_add' mangled-name='_ZN5boost6detail23atomic_exchange_and_addEPii' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail23atomic_exchange_and_addEPii'>
           <parameter type-id='type-id-462'/>
           <parameter type-id='type-id-15'/>
@@ -6111,13 +6007,11 @@ 
           <return type-id='type-id-26'/>
         </function-decl>
         <class-decl name='sp_element&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='63' column='1' id='type-id-527'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-276' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='65' column='1' id='type-id-528'/>
             </member-type>
         </class-decl>
         <class-decl name='operator_arrow_dispatch&lt;const boost::filesystem::path&amp;, const boost::filesystem::path*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='319' column='1' id='type-id-529'>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-366' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='321' column='1' id='type-id-530'/>
             </member-type>
@@ -6129,14 +6023,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='operator_brackets_result&lt;boost::filesystem::path::iterator, const boost::filesystem::path, const boost::filesystem::path&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='383' column='1' id='type-id-531'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-518' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='389' column='1' id='type-id-532'/>
             </member-type>
         </class-decl>
         <class-decl name='operator_brackets_proxy&lt;boost::filesystem::path::iterator&gt;' visibility='default' is-declaration-only='yes' id='type-id-521'/>
         <class-decl name='operator_arrow_dispatch&lt;boost::filesystem::directory_entry&amp;, boost::filesystem::directory_entry*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='319' column='1' id='type-id-533'>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-283' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='321' column='1' id='type-id-534'/>
             </member-type>
@@ -6148,7 +6040,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='operator_brackets_result&lt;boost::filesystem::directory_iterator, boost::filesystem::directory_entry, boost::filesystem::directory_entry&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='383' column='1' id='type-id-535'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-523' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='389' column='1' id='type-id-536'/>
             </member-type>
@@ -6478,31 +6369,26 @@ 
         </class-decl>
         <class-decl name='sp_nothrow_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/shared_count.hpp' line='60' column='1' id='type-id-537'/>
         <class-decl name='sp_element&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='63' column='1' id='type-id-539'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-291' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='65' column='1' id='type-id-540'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_dereference&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='88' column='1' id='type-id-541'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-292' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='90' column='1' id='type-id-542'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='137' column='1' id='type-id-543'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-293' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='139' column='1' id='type-id-544'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_dereference&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='88' column='1' id='type-id-545'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-277' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='90' column='1' id='type-id-546'/>
             </member-type>
         </class-decl>
         <class-decl name='sp_member_access&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='137' column='1' id='type-id-547'>
-
             <member-type access='public'>
               <typedef-decl name='type' type-id='type-id-278' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='139' column='1' id='type-id-548'/>
             </member-type>
@@ -6668,7 +6554,6 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='shared_ptr&lt;boost::filesystem::detail::dir_itr_imp&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='323' column='1' id='type-id-312'>
-
           <member-type access='public'>
             <typedef-decl name='element_type' type-id='type-id-528' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='332' column='1' id='type-id-316'/>
           </member-type>
@@ -6998,19 +6883,15 @@ 
           </member-function>
         </class-decl>
         <class-decl name='path' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='55' column='1' id='type-id-295'>
-
             <member-type access='public'>
               <typedef-decl name='value_type' type-id='type-id-2' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='66' column='1' id='type-id-376'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='string_type' type-id='type-id-134' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='69' column='1' id='type-id-373'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='codecvt_type' type-id='type-id-488' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='71' column='1' id='type-id-367'/>
             </member-type>
-
             <member-type access='public'>
               <class-decl name='iterator' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/path.hpp' line='569' column='1' id='type-id-298'>
                 <base-class access='public' layout-offset-in-bits='0' type-id='type-id-307'/>
@@ -8190,7 +8071,6 @@ 
         </function-decl>
         <class-decl name='filesystem_error' size-in-bits='448' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/operations.hpp' line='64' column='1' id='type-id-289'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-325'/>
-
             <member-type access='private'>
               <class-decl name='m_imp' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/filesystem/operations.hpp' line='159' column='1' id='type-id-291'>
                 <data-member access='public' layout-offset-in-bits='0'>
@@ -8303,15 +8183,12 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='iterator_facade&lt;boost::filesystem::path::iterator, const boost::filesystem::path, boost::bidirectional_traversal_tag, const boost::filesystem::path&amp;, long int&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='592' column='1' id='type-id-307'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-365' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='630' column='1' id='type-id-556'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-17' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='631' column='1' id='type-id-557'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-530' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='633' column='1' id='type-id-558'/>
           </member-type>
@@ -8388,13 +8265,11 @@ 
         </member-function>
       </class-decl>
       <class-decl name='enable_if_c&lt;true, boost::filesystem::path&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='28' column='1' id='type-id-559'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-296' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='29' column='1' id='type-id-550'/>
           </member-type>
       </class-decl>
       <namespace-decl name='system'>
-
         <function-decl name='system_category' mangled-name='_ZN5boost6system15system_categoryEv' filepath='src/third_party/boost-1.56.0/boost/system/error_code.hpp' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
           <return type-id='type-id-102'/>
         </function-decl>
@@ -8573,15 +8448,12 @@ 
         </class-decl>
       </namespace-decl>
       <class-decl name='iterator_facade&lt;boost::filesystem::directory_iterator, boost::filesystem::directory_entry, boost::single_pass_traversal_tag, boost::filesystem::directory_entry&amp;, long int&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='592' column='1' id='type-id-305'>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-280' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='630' column='1' id='type-id-555'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-17' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='631' column='1' id='type-id-560'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-534' filepath='src/third_party/boost-1.56.0/boost/iterator/iterator_facade.hpp' line='633' column='1' id='type-id-561'/>
           </member-type>
@@ -8660,13 +8532,10 @@ 
       <namespace-decl name='core'>
         <typedef-decl name='typeinfo' type-id='type-id-513' filepath='src/third_party/boost-1.56.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-538'/>
       </namespace-decl>
-
       <class-decl name='shared_ptr&lt;boost::filesystem::filesystem_error::m_imp&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='323' column='1' id='type-id-318'>
-
           <member-type access='public'>
             <typedef-decl name='element_type' type-id='type-id-540' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='332' column='1' id='type-id-322'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='this_type' type-id='type-id-318' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/shared_ptr.hpp' line='328' column='1' id='type-id-562'/>
           </member-type>
@@ -8828,10 +8697,8 @@ 
       </class-decl>
       <namespace-decl name='iterators'>
         <class-decl name='enabled&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='30' column='1' id='type-id-563'>
-
             <member-type access='public'>
               <class-decl name='base&lt;bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='33' column='1' id='type-id-564'>
-
                   <member-type access='public'>
                     <typedef-decl name='type' type-id='type-id-1' filepath='src/third_party/boost-1.56.0/boost/iterator/detail/enable_if.hpp' line='35' column='1' id='type-id-565'/>
                   </member-type>
@@ -8839,9 +8706,6 @@ 
             </member-type>
         </class-decl>
       </namespace-decl>
-
-
-
       <function-decl name='addressof&lt;boost::filesystem::directory_entry&gt;' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-280'/>
         <return type-id='type-id-283'/>
@@ -9048,29 +8912,23 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <function-decl name='__is_null_pointer&lt;char&gt;' mangled-name='_ZN9__gnu_cxx17__is_null_pointerIcEEbPT_' filepath='/usr/include/c++/4.9/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__is_null_pointerIcEEbPT_'>
         <parameter type-id='type-id-41'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='new_allocator&lt;wchar_t&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-254'>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-195' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-567'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-178' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-568'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_pointer' type-id='type-id-158' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-569'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-483' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-570'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-459' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-571'/>
           </member-type>
@@ -9132,15 +8990,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-251'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-503' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-572'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-505' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-573'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-504' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-574'/>
           </member-type>
@@ -9241,15 +9096,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__normal_iterator&lt;wchar_t const*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-248'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-507' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-575'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-509' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-576'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-508' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-577'/>
           </member-type>
@@ -9351,7 +9203,6 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-
       <class-decl name='bool_&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-404'>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-98' mangled-name='_ZN4mpl_5bool_ILb1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
@@ -9420,8 +9271,6 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
     <function-decl name='memchr' mangled-name='memchr' filepath='/usr/include/string.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-12'/>
       <parameter type-id='type-id-15'/>
@@ -9474,7 +9323,6 @@ 
       <parameter type-id='type-id-53'/>
       <return type-id='type-id-53'/>
     </function-decl>
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-578' size-in-bits='64' id='type-id-579'/>
@@ -9491,9 +9339,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-585' size-in-bits='64' id='type-id-592'/>
     <pointer-type-def type-id='type-id-585' size-in-bits='64' id='type-id-593'/>
     <namespace-decl name='std'>
-
-
-
       <function-decl name='operator&lt; &lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStltIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_ES8_'>
         <parameter type-id='type-id-136'/>
         <parameter type-id='type-id-136'/>
@@ -9525,11 +9370,9 @@ 
         <return type-id='type-id-205'/>
       </function-decl>
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/char_traits.h' line='233' column='1' id='type-id-595'>
-
           <member-type access='public'>
             <typedef-decl name='char_type' type-id='type-id-2' filepath='/usr/include/c++/4.9/bits/char_traits.h' line='235' column='1' id='type-id-585'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='int_type' type-id='type-id-15' filepath='/usr/include/c++/4.9/bits/char_traits.h' line='236' column='1' id='type-id-589'/>
           </member-type>
@@ -9633,23 +9476,18 @@ 
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-
       <function-decl name='__is_null_pointer&lt;char const&gt;' mangled-name='_ZN9__gnu_cxx17__is_null_pointerIKcEEbPT_' filepath='/usr/include/c++/4.9/ext/type_traits.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__is_null_pointerIKcEEbPT_'>
         <parameter type-id='type-id-53'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <class-decl name='__enable_if&lt;true, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/type_traits.h' line='47' column='1' id='type-id-596'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1' filepath='/usr/include/c++/4.9/ext/type_traits.h' line='48' column='1' id='type-id-594'/>
           </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-
-
       <namespace-decl name='detail'>
-
         <class-decl name='addr_impl_ref&lt;const boost::filesystem::path&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='25' column='1' id='type-id-578'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='v_' type-id='type-id-584' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='27' column='1'/>
@@ -9692,8 +9530,6 @@ 
           </member-function>
         </class-decl>
       </namespace-decl>
-
-
       <namespace-decl name='filesystem'>
         <namespace-decl name='path_traits'>
           <function-decl name='dispatch&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZN5boost10filesystem11path_traits8dispatchISsEEvRKSsRT_RKSt7codecvtIwc11__mbstate_tE' filepath='src/third_party/boost-1.56.0/boost/filesystem/path_traits.hpp' line='171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem11path_traits8dispatchISsEEvRKSsRT_RKSt7codecvtIwc11__mbstate_tE'>
@@ -9713,11 +9549,6 @@ 
           </function-decl>
         </namespace-decl>
       </namespace-decl>
-
-
-
-
-
       <function-decl name='addressof&lt;const boost::filesystem::path&gt;' filepath='src/third_party/boost-1.56.0/boost/core/addressof.hpp' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-365'/>
         <return type-id='type-id-366'/>
@@ -9728,10 +9559,6 @@ 
         <return type-id='type-id-565'/>
       </function-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-598' size-in-bits='64' id='type-id-599'/>
@@ -9754,23 +9581,16 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-619' size-in-bits='64' id='type-id-620'/>
     <reference-type-def kind='lvalue' type-id='type-id-457' size-in-bits='64' id='type-id-621'/>
     <namespace-decl name='std'>
-
-
-
       <class-decl name='__codecvt_abstract_base&lt;wchar_t, char, __mbstate_t&gt;' visibility='default' is-declaration-only='yes' id='type-id-604'>
-
           <member-type access='public'>
             <typedef-decl name='result' type-id='type-id-623' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='73' column='1' id='type-id-622'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='state_type' type-id='type-id-49' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='76' column='1' id='type-id-619'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='extern_type' type-id='type-id-2' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='75' column='1' id='type-id-607'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='intern_type' type-id='type-id-27' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='74' column='1' id='type-id-611'/>
           </member-type>
@@ -9802,7 +9622,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='codecvt_base' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='46' column='1' id='type-id-624'>
-
           <member-type access='public'>
             <enum-decl name='result' filepath='/usr/include/c++/4.9/bits/codecvt.h' line='49' column='1' id='type-id-623'>
               <underlying-type type-id='type-id-240'/>
@@ -9814,13 +9633,7 @@ 
           </member-type>
       </class-decl>
     </namespace-decl>
-
     <namespace-decl name='boost'>
-
-
-
-
-
       <namespace-decl name='filesystem'>
         <namespace-decl name='path_traits'>
           <function-decl name='convert' mangled-name='_ZN5boost10filesystem11path_traits7convertEPKcS3_RSbIwSt11char_traitsIwESaIwEERKSt7codecvtIwc11__mbstate_tE' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem11path_traits7convertEPKcS3_RSbIwSt11char_traitsIwESaIwEERKSt7codecvtIwc11__mbstate_tE'>
@@ -9944,30 +9757,17 @@ 
         </member-function>
       </class-decl>
     </namespace-decl>
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
-
-
-
       <function-decl name='operator!=&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_'>
         <parameter type-id='type-id-136'/>
         <parameter type-id='type-id-53'/>
         <return type-id='type-id-1'/>
       </function-decl>
     </namespace-decl>
-
     <namespace-decl name='boost'>
-
-
-
-
-
       <namespace-decl name='filesystem'>
-
         <function-decl name='native' mangled-name='_ZN5boost10filesystem6nativeERKSs' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem6nativeERKSs'>
           <parameter type-id='type-id-456'/>
           <return type-id='type-id-1'/>
@@ -9993,28 +9793,12 @@ 
           <return type-id='type-id-1'/>
         </function-decl>
       </namespace-decl>
-
-
-
-
-
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-551'/>
     <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-626'/>
-
-
     <namespace-decl name='boost'>
-
-
-
-
-
       <namespace-decl name='filesystem'>
         <namespace-decl name='path_traits'>
           <function-decl name='dispatch&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZN5boost10filesystem11path_traits8dispatchISsEEvRKSbIwSt11char_traitsIwESaIwEERT_RKSt7codecvtIwc11__mbstate_tE' filepath='src/third_party/boost-1.56.0/boost/filesystem/path_traits.hpp' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem11path_traits8dispatchISsEEvRKSbIwSt11char_traitsIwESaIwEERT_RKSt7codecvtIwc11__mbstate_tE'>
@@ -10032,27 +9816,16 @@ 
           </function-decl>
         </namespace-decl>
       </namespace-decl>
-
-
-
-
-
       <class-decl name='enable_if_c&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='28' column='1' id='type-id-627'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-26' filepath='src/third_party/boost-1.56.0/boost/core/enable_if.hpp' line='29' column='1' id='type-id-625'/>
           </member-type>
       </class-decl>
     </namespace-decl>
-
-
-
-
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-628'/>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-629'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-630'>
             <data-member access='private'>
@@ -10081,8 +9854,6 @@ 
     <reference-type-def kind='lvalue' type-id='type-id-50' size-in-bits='64' id='type-id-642'/>
     <reference-type-def kind='lvalue' type-id='type-id-178' size-in-bits='64' id='type-id-643'/>
     <namespace-decl name='std'>
-
-
       <class-decl name='numeric_limits&lt;wchar_t&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/limits' line='650' column='1' id='type-id-644'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-98' visibility='default' filepath='/usr/include/c++/4.9/limits' line='652' column='1'/>
@@ -10214,9 +9985,6 @@ 
         <enumerator name='round_toward_neg_infinity' value='3'/>
       </enum-decl>
     </namespace-decl>
-
-
-
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <namespace-decl name='detail'>
@@ -10332,7 +10100,5 @@ 
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index 6789be55..e4027a02 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -634,58 +634,34 @@ 
     <elf-symbol name='_ZTVN5mongo36ExportedScramIterationCountParameterE' size='80' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/auth/sasl_options.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <type-decl name='bool' size-in-bits='8' id='type-id-1'/>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='112' id='type-id-2'>
       <subrange length='14' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <type-decl name='char' size-in-bits='8' id='type-id-5'/>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='96' id='type-id-6'>
       <subrange length='12' type-id='type-id-3' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='112' id='type-id-8'>
       <subrange length='14' type-id='type-id-3' id='type-id-4'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='128' id='type-id-9'>
       <subrange length='16' type-id='type-id-3' id='type-id-10'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='8' id='type-id-11'>
       <subrange length='1' type-id='type-id-3' id='type-id-12'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='160' id='type-id-13'>
       <subrange length='20' type-id='type-id-3' id='type-id-14'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='336' id='type-id-15'>
       <subrange length='42' type-id='type-id-3' id='type-id-16'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='32' id='type-id-17'>
       <subrange length='4' type-id='type-id-3' id='type-id-18'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='400' id='type-id-19'>
       <subrange length='50' type-id='type-id-3' id='type-id-20'/>
-
     </array-type-def>
     <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-21'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -714,7 +690,6 @@ 
     <type-decl name='int' size-in-bits='32' id='type-id-29'/>
     <array-type-def dimensions='1' type-id='type-id-29' size-in-bits='320' id='type-id-30'>
       <subrange length='10' type-id='type-id-3' id='type-id-31'/>
-
     </array-type-def>
     <type-decl name='long double' size-in-bits='128' id='type-id-32'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-23'/>
@@ -725,39 +700,31 @@ 
     <type-decl name='sizetype' size-in-bits='64' id='type-id-3'/>
     <array-type-def dimensions='1' type-id='type-id-37' size-in-bits='6400' id='type-id-38'>
       <subrange length='100' type-id='type-id-3' id='type-id-39'/>
-
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-40'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-41'/>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='832' id='type-id-42'>
       <subrange length='104' type-id='type-id-3' id='type-id-43'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='96' id='type-id-44'>
       <subrange length='12' type-id='type-id-3' id='type-id-7'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='128' id='type-id-45'>
       <subrange length='16' type-id='type-id-3' id='type-id-10'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='24' id='type-id-46'>
       <subrange length='3' type-id='type-id-3' id='type-id-47'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-41' size-in-bits='40' id='type-id-48'>
       <subrange length='5' type-id='type-id-3' id='type-id-49'/>
-
     </array-type-def>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-25'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-50'/>
     <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='39936' id='type-id-51'>
       <subrange length='624' type-id='type-id-3' id='type-id-52'/>
-
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='infinite' id='type-id-53'>
       <subrange length='infinite' id='type-id-54'/>
-
     </array-type-def>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-55'/>
     <type-decl name='void' id='type-id-56'/>
@@ -887,7 +854,6 @@ 
     <typedef-decl name='mbstate_t' type-id='type-id-79' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-80'/>
     <typedef-decl name='__mbstate_t' type-id='type-id-81' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-79'/>
     <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-79' visibility='default' filepath='/usr/include/wchar.h' line='83' column='1' id='type-id-81'>
-
         <member-type access='public'>
           <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='86' column='1' id='type-id-82'>
             <data-member access='private'>
@@ -2644,8 +2610,6 @@ 
     <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-2179'/>
     <pointer-type-def type-id='type-id-2179' size-in-bits='64' id='type-id-2180'/>
     <namespace-decl name='std'>
-
-
       <namespace-decl name='__detail'>
         <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='77' column='1' id='type-id-1879'>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -2692,43 +2656,33 @@ 
         <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1646' column='1' id='type-id-975'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-955'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-984'/>
-
             <member-type access='public'>
               <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1652' column='1' id='type-id-2181'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='value_type' type-id='type-id-1294' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-2182'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1655' column='1' id='type-id-2183'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__hash_code' type-id='type-id-2185' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1667' column='1' id='type-id-2184'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_type' type-id='type-id-958' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-1863'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='iterator' type-id='type-id-2187' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1672' column='1' id='type-id-2186'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='const_iterator' type-id='type-id-2189' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1676' column='1' id='type-id-2188'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='local_iterator' type-id='type-id-2191' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1681' column='1' id='type-id-2190'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='const_local_iterator' type-id='type-id-2193' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1687' column='1' id='type-id-2192'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__ireturn_type' type-id='type-id-2195' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1691' column='1' id='type-id-2194'/>
             </member-type>
@@ -2776,15 +2730,12 @@ 
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-978'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-987'/>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-990'/>
-
             <member-type access='public'>
               <typedef-decl name='hasher' type-id='type-id-1161' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2196'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='__hash_code' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1251' column='1' id='type-id-2185'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='__node_type' type-id='type-id-961' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-958'/>
             </member-type>
@@ -2953,15 +2904,12 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Mod_range_hashing' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='440' column='1' id='type-id-1005'>
-
             <member-type access='public'>
               <typedef-decl name='first_argument_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='442' column='1' id='type-id-2197'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='second_argument_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='443' column='1' id='type-id-2198'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='result_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='444' column='1' id='type-id-2199'/>
             </member-type>
@@ -3061,11 +3009,9 @@ 
         <class-decl name='_Local_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2191'/>
         <class-decl name='_Local_const_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2193'/>
         <class-decl name='_Map_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='548' column='1' id='type-id-996'>
-
             <member-type access='public'>
               <typedef-decl name='key_type' type-id='type-id-2181' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-999'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='mapped_type' type-id='type-id-2200' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-1002'/>
             </member-type>
@@ -3102,23 +3048,18 @@ 
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
         </class-decl>
         <class-decl name='_Insert_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='685' column='1' id='type-id-1875'>
-
             <member-type access='protected'>
               <typedef-decl name='__hashtable' type-id='type-id-687' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='690' column='1' id='type-id-1877'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='value_type' type-id='type-id-2182' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-993'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='iterator' type-id='type-id-2186' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='697' column='1' id='type-id-2202'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='const_iterator' type-id='type-id-2188' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='698' column='1' id='type-id-2203'/>
             </member-type>
-
             <member-type access='protected'>
               <typedef-decl name='__ireturn_type' type-id='type-id-2194' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='702' column='1' id='type-id-2204'/>
             </member-type>
@@ -3174,7 +3115,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Equality&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1803' column='1' id='type-id-949'>
-
             <member-type access='public'>
               <typedef-decl name='__hashtable' type-id='type-id-687' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1807' column='1' id='type-id-952'/>
             </member-type>
@@ -3188,19 +3128,15 @@ 
         </class-decl>
         <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1889' column='1' id='type-id-968'>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-981'/>
-
             <member-type access='public'>
               <typedef-decl name='__node_type' type-id='type-id-2206' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1894' column='1' id='type-id-1859'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_alloc_type' type-id='type-id-1081' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-972'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__node_base' type-id='type-id-1849' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1904' column='1' id='type-id-1857'/>
             </member-type>
-
             <member-type access='public'>
               <typedef-decl name='__bucket_type' type-id='type-id-1858' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1905' column='1' id='type-id-1854'/>
             </member-type>
@@ -3282,7 +3218,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-1009'>
-
             <member-type access='public'>
               <typedef-decl name='_State' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='487' column='1' id='type-id-2207'/>
             </member-type>
@@ -3355,7 +3290,6 @@ 
       <namespace-decl name='chrono'>
         <namespace-decl name='_V2'>
           <class-decl name='system_clock' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='716' column='1' id='type-id-2208'>
-
               <member-type access='public'>
                 <typedef-decl name='time_point' type-id='type-id-1139' filepath='/usr/include/c++/4.9/chrono' line='721' column='1' id='type-id-1115'/>
               </member-type>
@@ -3382,7 +3316,6 @@ 
           </class-decl>
         </namespace-decl>
         <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='546' column='1' id='type-id-1139'>
-
             <member-type access='public'>
               <typedef-decl name='duration' type-id='type-id-1118' filepath='/usr/include/c++/4.9/chrono' line='549' column='1' id='type-id-1142'/>
             </member-type>
@@ -3434,7 +3367,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1118'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-23' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1122'/>
             </member-type>
@@ -3557,7 +3489,6 @@ 
           </member-function>
         </class-decl>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1125'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-23' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1129'/>
             </member-type>
@@ -3681,7 +3612,6 @@ 
         </class-decl>
         <typedef-decl name='milliseconds' type-id='type-id-1125' filepath='/usr/include/c++/4.9/chrono' line='533' column='1' id='type-id-2209'/>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1132'>
-
             <member-type access='public'>
               <typedef-decl name='rep' type-id='type-id-23' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1136'/>
             </member-type>
@@ -3805,7 +3735,6 @@ 
         </class-decl>
         <typedef-decl name='seconds' type-id='type-id-1132' filepath='/usr/include/c++/4.9/chrono' line='536' column='1' id='type-id-2210'/>
       </namespace-decl>
-
       <enum-decl name='_Ios_Openmode' filepath='/usr/include/c++/4.9/bits/ios_base.h' line='103' column='1' id='type-id-2211'>
         <underlying-type type-id='type-id-40'/>
         <enumerator name='_S_app' value='1'/>
@@ -3822,7 +3751,6 @@ 
         <return type-id='type-id-2211'/>
       </function-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1' id='type-id-37'>
-
           <member-type access='private'>
             <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1' id='type-id-1989'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1042'/>
@@ -3839,39 +3767,30 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2212' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-1113'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1042' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-2213'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2215' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='123' column='1' id='type-id-2214'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2217' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='124' column='1' id='type-id-2216'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-129' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='127' column='1' id='type-id-2218'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-126' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='129' column='1' id='type-id-2219'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2221' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='130' column='1' id='type-id-2220'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2223' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='131' column='1' id='type-id-2222'/>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='148' column='1' id='type-id-2224'>
               <data-member access='public' layout-offset-in-bits='0'>
@@ -3885,7 +3804,6 @@ 
               </data-member>
             </class-decl>
           </member-type>
-
           <member-type access='private'>
             <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-1110'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2224'/>
@@ -5154,15 +5072,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1042'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-144'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2212'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-215' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-2215'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-361' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-2217'/>
           </member-type>
@@ -5188,63 +5103,50 @@ 
         </member-function>
       </class-decl>
       <class-decl name='iterator_traits&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-2225'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-2226'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1107' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2228'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1106' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2229'/>
           </member-type>
       </class-decl>
       <typedef-decl name='ptrdiff_t' type-id='type-id-23' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-2227'/>
       <class-decl name='iterator_traits&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-2230'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-2231'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-2232'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-2233'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1983' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-2234'/>
           </member-type>
       </class-decl>
       <typedef-decl name='size_t' type-id='type-id-50' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-1334'/>
       <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-2235'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-2236'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-71' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-2237'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-215' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-2238'/>
           </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;char const*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-2239'>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-2240'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-84' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2241'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-361' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2242'/>
           </member-type>
@@ -5252,15 +5154,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char const*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2221'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2223'/>
       <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1168'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-84' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2243'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-2244'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-84' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2245'/>
           </member-type>
@@ -5304,7 +5203,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='remove_reference&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2246'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1105' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2074'/>
           </member-type>
@@ -5314,7 +5212,6 @@ 
         <return type-id='type-id-1106'/>
       </function-decl>
       <class-decl name='remove_reference&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2247'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-37' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2084'/>
           </member-type>
@@ -5329,50 +5226,39 @@ 
         <return type-id='type-id-37'/>
       </function-decl>
       <class-decl name='__add_ref&lt;mongo::BSONObjBuilder*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='62' column='1' id='type-id-2248'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-1517' filepath='/usr/include/c++/4.9/tuple' line='63' column='1' id='type-id-2249'/>
           </member-type>
       </class-decl>
       <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1416'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-897'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1587' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1423'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2251' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2250'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2253' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2252'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2255' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2254'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2257' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2256'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2259' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2258'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2261' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2260'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2263' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2262'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-2264'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1048' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1420'/>
           </member-type>
@@ -5856,7 +5742,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-897'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1809'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1048'/>
@@ -5898,15 +5783,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2268' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2251'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2269' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-900'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1048' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-903'/>
           </member-type>
@@ -6013,22 +5895,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1048'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-148'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2270'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1592' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2271'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1587' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2272'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2273'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1048' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2274'/>
                 </member-type>
@@ -6056,35 +5933,27 @@ 
         </member-function>
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2275'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2272' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1957'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2271' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2276'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2276' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2277'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2279' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2278'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2278' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2280'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2270' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2281'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2281' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2282'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2284' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2283'/>
           </member-type>
@@ -6179,15 +6048,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;**&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2287'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1592' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2288'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2285'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2279'/>
           </member-type>
@@ -6199,37 +6065,31 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2289'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1587' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1893'/>
           </member-type>
       </class-decl>
       <class-decl name='make_unsigned&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1666' column='1' id='type-id-2290'>
-
           <member-type access='public'>
             <typedef-decl name='type' type-id='type-id-2291' filepath='/usr/include/c++/4.9/type_traits' line='1667' column='1' id='type-id-2286'/>
           </member-type>
       </class-decl>
       <class-decl name='__make_unsigned_selector&lt;long int, true, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1634' column='1' id='type-id-2292'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2293' filepath='/usr/include/c++/4.9/type_traits' line='1641' column='1' id='type-id-2291'/>
           </member-type>
       </class-decl>
       <class-decl name='__match_cv_qualifiers&lt;long int, long unsigned int, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1578' column='1' id='type-id-2294'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2295' filepath='/usr/include/c++/4.9/type_traits' line='1583' column='1' id='type-id-2293'/>
           </member-type>
       </class-decl>
       <class-decl name='__cv_selector&lt;long unsigned int, false, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1560' column='1' id='type-id-2296'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-50' filepath='/usr/include/c++/4.9/type_traits' line='1561' column='1' id='type-id-2295'/>
           </member-type>
       </class-decl>
       <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1177'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2297'/>
           </member-type>
@@ -6245,7 +6105,6 @@ 
       </class-decl>
       <typedef-decl name='false_type' type-id='type-id-1177' filepath='/usr/include/c++/4.9/type_traits' line='90' column='1' id='type-id-2267'/>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2298'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2274' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2284'/>
           </member-type>
@@ -6254,7 +6113,6 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;**, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2263'/>
       <class-decl name='initializer_list&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' visibility='default' is-declaration-only='yes' id='type-id-2265'/>
       <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1180'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2299'/>
           </member-type>
@@ -6273,7 +6131,6 @@ 
       <class-decl name='unique_ptr&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;, std::default_delete&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2300'/>
       <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/atomic' line='617' column='1' id='type-id-1102'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-942'/>
-
           <member-type access='public'>
             <typedef-decl name='__integral_type' type-id='type-id-25' filepath='/usr/include/c++/4.9/atomic' line='619' column='1' id='type-id-2301'/>
           </member-type>
@@ -6313,7 +6170,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-942'>
-
           <member-type access='private'>
             <typedef-decl name='__int_type' type-id='type-id-25' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='356' column='1' id='type-id-1842'/>
           </member-type>
@@ -6548,39 +6404,30 @@ 
       <typedef-decl name='memory_order' type-id='type-id-2303' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='64' column='1' id='type-id-2302'/>
       <class-decl name='list&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1223'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-727'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-582' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1230'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2305' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2304'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2307' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2306'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2309' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-2308'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2311' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2310'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2313' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2312'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2315' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2314'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='468' column='1' id='type-id-2316'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1060' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='470' column='1' id='type-id-1227'/>
           </member-type>
@@ -7061,7 +6908,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_base&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-727'>
-
           <member-type access='protected'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1701'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1066'/>
@@ -7096,15 +6942,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Node_alloc_type' type-id='type-id-2318' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-730'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2320' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2319'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1060' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-2321'/>
           </member-type>
@@ -7245,27 +7088,21 @@ 
       </class-decl>
       <class-decl name='allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1060'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-156'/>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1633' filepath='/usr/include/c++/4.9/bits/allocator.h' line='99' column='1' id='type-id-2305'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-584' filepath='/usr/include/c++/4.9/bits/allocator.h' line='100' column='1' id='type-id-2307'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2322'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1066' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2318'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2323'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1060' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2320'/>
                 </member-type>
@@ -7299,39 +7136,30 @@ 
       <class-decl name='initializer_list&lt;mongo::optionenvironment::OptionSection&gt;' visibility='default' is-declaration-only='yes' id='type-id-2317'/>
       <class-decl name='list&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1213'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-721'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-578' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1220'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2325' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2324'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2327' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2326'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2329' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-2328'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2331' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2330'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2333' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2332'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2335' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2334'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='468' column='1' id='type-id-2336'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1057' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='470' column='1' id='type-id-1217'/>
           </member-type>
@@ -7812,7 +7640,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_List_base&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-721'>
-
           <member-type access='protected'>
             <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1695'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1063'/>
@@ -7847,15 +7674,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Node_alloc_type' type-id='type-id-2338' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-724'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2340' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2339'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1057' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-2341'/>
           </member-type>
@@ -7996,43 +7820,33 @@ 
       </class-decl>
       <class-decl name='vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1446'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-924'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1455'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2343' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2342'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2345' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2344'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2347' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2346'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-135' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2348'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-132' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2349'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2351' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2350'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2353' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2352'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-1453'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1084' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1450'/>
           </member-type>
@@ -8559,7 +8373,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-924'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1830'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1084'/>
@@ -8614,15 +8427,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2354' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2343'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2355' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-927'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1084' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-930'/>
           </member-type>
@@ -8749,31 +8559,24 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1084'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-172'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2356'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2357'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2358'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2359'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1084' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2360'/>
                 </member-type>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2361'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1069' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2362'/>
                 </member-type>
@@ -8845,35 +8648,27 @@ 
       </class-decl>
       <class-decl name='_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-820'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2363'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2358' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1965'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2357' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2364'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2364' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2365'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2367' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2366'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2366' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2368'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2356' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2369'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2369' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2370'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2372' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2371'/>
           </member-type>
@@ -9005,15 +8800,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2374'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1985' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2375'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2373'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2367'/>
           </member-type>
@@ -9025,19 +8817,16 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2376'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1901'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2377'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2360' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2372'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2378'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2362' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2379'/>
           </member-type>
@@ -9045,15 +8834,12 @@ 
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2351'/>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2353'/>
       <class-decl name='initializer_list&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1171'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-1107' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2380'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-2381'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-1107' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2382'/>
           </member-type>
@@ -9097,47 +8883,36 @@ 
         </member-function>
       </class-decl>
       <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1265'>
-
           <member-type access='private'>
             <typedef-decl name='_Rep_type' type-id='type-id-789' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2383'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='99' column='1' id='type-id-1272'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='mapped_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1275'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1302' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='101' column='1' id='type-id-1278'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_compare' type-id='type-id-1209' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='102' column='1' id='type-id-2384'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1096' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='103' column='1' id='type-id-1269'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2386' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='149' column='1' id='type-id-2385'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2388' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='150' column='1' id='type-id-2387'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2390' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='151' column='1' id='type-id-2389'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2392' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='153' column='1' id='type-id-2391'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2394' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='154' column='1' id='type-id-2393'/>
           </member-type>
@@ -9507,7 +9282,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-789'>
-
           <member-type access='protected'>
             <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1743'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1078'/>
@@ -9556,59 +9330,45 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='366' column='1' id='type-id-2390'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='_Node_allocator' type-id='type-id-2399' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-793'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1757' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='354' column='1' id='type-id-1739'/>
           </member-type>
-
           <member-type access='protected'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-838' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='355' column='1' id='type-id-2400'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='key_type' type-id='type-id-37' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-799'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1302' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='359' column='1' id='type-id-802'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-804' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2401'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1756' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2402'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Link_type' type-id='type-id-835' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2403'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1096' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-796'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-814' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-2386'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-805' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2388'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2404' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='587' column='1' id='type-id-2392'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2405' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='588' column='1' id='type-id-2394'/>
           </member-type>
@@ -10215,15 +9975,12 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1078'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-168'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2406'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1756' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2407'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-832' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2408'/>
           </member-type>
@@ -10280,11 +10037,9 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='92' column='1' id='type-id-836'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-1757' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='94' column='1' id='type-id-2409'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Const_Base_ptr' type-id='type-id-838' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='95' column='1' id='type-id-2410'/>
           </member-type>
@@ -10331,7 +10086,6 @@ 
         <enumerator name='_S_black' value='1'/>
       </enum-decl>
       <class-decl name='aligned_storage&lt;16ul, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2412'>
-
           <member-type access='public'>
             <union-decl name='type' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2413'>
               <member-type access='private'>
@@ -10347,7 +10101,6 @@ 
           </member-type>
       </class-decl>
       <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1302'>
-
           <member-type access='public'>
             <typedef-decl name='first_type' type-id='type-id-1105' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='98' column='1' id='type-id-2415'/>
           </member-type>
@@ -10420,35 +10173,27 @@ 
       </class-decl>
       <class-decl name='binary_function&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-2416'/>
       <class-decl name='allocator_traits&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2417'>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-2418' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1971'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__pointer' type-id='type-id-2420' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-2419'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2419' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2421'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__const_void_pointer' type-id='type-id-2423' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2422'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_void_pointer' type-id='type-id-2422' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-2424'/>
           </member-type>
-
           <member-type access='private'>
             <typedef-decl name='__size_type' type-id='type-id-2426' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2425'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-2425' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-2427'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind_alloc' type-id='type-id-2429' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2428'/>
           </member-type>
@@ -10544,22 +10289,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1096'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-180'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2426'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2420'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1302' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2418'/>
           </member-type>
-
           <member-type access='public'>
             <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2431'>
-
                 <member-type access='public'>
                   <typedef-decl name='other' type-id='type-id-1078' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2432'/>
                 </member-type>
@@ -10587,15 +10327,12 @@ 
         </member-function>
       </class-decl>
       <class-decl name='pointer_traits&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2433'>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-2434'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='difference_type' type-id='type-id-2227' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-2430'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='rebind' type-id='type-id-26' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2423'/>
           </member-type>
@@ -10607,35 +10344,28 @@ 
         </member-function>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2435'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-1302' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1907'/>
           </member-type>
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-2436'>
-
           <member-type access='public'>
             <typedef-decl name='__type' type-id='type-id-2432' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2429'/>
           </member-type>
       </class-decl>
       <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='172' column='1' id='type-id-814'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-2409' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='182' column='1' id='type-id-2437'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2068' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='175' column='1' id='type-id-2438'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='176' column='1' id='type-id-2439'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-814' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='181' column='1' id='type-id-817'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-1756' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='183' column='1' id='type-id-2440'/>
           </member-type>
@@ -10716,27 +10446,21 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='242' column='1' id='type-id-805'>
-
           <member-type access='public'>
             <typedef-decl name='_Base_ptr' type-id='type-id-2410' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='254' column='1' id='type-id-2441'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-1304' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='245' column='1' id='type-id-2442'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-1305' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='246' column='1' id='type-id-2443'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-814' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='248' column='1' id='type-id-811'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Self' type-id='type-id-805' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='253' column='1' id='type-id-808'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Link_type' type-id='type-id-835' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='255' column='1' id='type-id-2444'/>
           </member-type>
@@ -10884,15 +10608,12 @@ 
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2397'/>
       <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2398'/>
       <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1174'>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-1305' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2445'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/initializer_list' line='53' column='1' id='type-id-2446'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-1305' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2447'/>
           </member-type>
@@ -10939,43 +10660,33 @@ 
       <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-1348'/>
       <class-decl name='vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1458'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-933'/>
-
           <member-type access='public'>
             <typedef-decl name='value_type' type-id='type-id-1330' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-1465'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2449' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2448'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reference' type-id='type-id-2451' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2450'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reference' type-id='type-id-2453' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2452'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='iterator' type-id='type-id-2455' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2454'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_iterator' type-id='type-id-2457' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2456'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='const_reverse_iterator' type-id='type-id-2459' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2458'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='reverse_iterator' type-id='type-id-2461' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2460'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='236' column='1' id='type-id-2462'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1099' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-1462'/>
           </member-type>
@@ -11466,7 +11177,6 @@ 
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-933'>
-
           <member-type access='public'>
             <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1837'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1099'/>
@@ -11508,15 +11218,12 @@ 
               </member-function>
             </class-decl>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2464' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2449'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='_Tp_alloc_type' type-id='type-id-2465' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-936'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='allocator_type' type-id='type-id-1099' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-939'/>
           </member-type>
@@ -11630,22 +11337,17 @@ 
       </class-decl>
       <class-decl name='allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1099'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-182'/>
-
           <member-type access='public'>
             <typedef-decl name='size_type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-2466'/>
           </member-type>
-
           <member-type access='public'>
             <typedef-decl name='pointer' type-id='type-id-2105' filepath='/usr/include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2467'/>
           </member-type>
-
           <membe