diff --git a/configure.ac b/configure.ac
index 15633bf2..2da4d152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ dnl The minor version number of the abixml version should be changed
 dnl each time and old version of libabigail can't handle a new version
 dnl of abixml.  Note however that when the major version number is
 dnl changed, the minor version number should be set to zero.
-ABIXML_VERSION_MINOR=2
+ABIXML_VERSION_MINOR=3
 LIBABIGAIL_SO_CURRENT=libabigail_so_current
 LIBABIGAIL_SO_REVISION=libabigail_so_revision
 LIBABIGAIL_SO_AGE=libabigail_so_age
diff --git a/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi b/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi
index 506ba75b..081084c7 100644
--- a/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi
+++ b/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-variable-symbols>
     <!-- signed char -->
     <elf-symbol name='a' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi
index 6ca5c79d..70220c37 100644
--- a/tests/data/test-annotate/libtest23.so.abi
+++ b/tests/data/test-annotate/libtest23.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
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 c813b9ba..ea1a1dd8 100644
--- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi
index c813b9ba..ea1a1dd8 100644
--- a/tests/data/test-annotate/libtest24-drop-fns.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
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 d75e67ee..f6052484 100644
--- a/tests/data/test-annotate/test-anonymous-members-0.o.abi
+++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <!-- foo(S&) -->
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi b/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
index 02e54955..dc347f04 100644
--- a/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
+++ b/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <!-- main -->
     <elf-symbol name='main' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/test0.abi b/tests/data/test-annotate/test0.abi
index 8ce539d9..d823a674 100644
--- a/tests/data/test-annotate/test0.abi
+++ b/tests/data/test-annotate/test0.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test1.abi b/tests/data/test-annotate/test1.abi
index e1e449a7..a777f536 100644
--- a/tests/data/test-annotate/test1.abi
+++ b/tests/data/test-annotate/test1.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index 850b1255..5ca7521f 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libdbus-1.so.3'>
+<abi-corpus version='2.3' soname='libdbus-1.so.3'>
   <elf-needed>
     <dependency name='librt.so.1'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index e7f0e2c6..2eda9a97 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libGLU.so.1'>
+<abi-corpus version='2.3' soname='libGLU.so.1'>
   <elf-needed>
     <dependency name='libGL.so.1'/>
     <dependency name='libstdc++.so.6'/>
@@ -186,51 +186,51 @@
         <var-decl name='global_grid_nu' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26688'>
-        <!-- void(*OpenGLCurveEvaluator::beginCallBackN)(GLenum) -->
+        <!-- void (* OpenGLCurveEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26752'>
-        <!-- void(*OpenGLCurveEvaluator::endCallBackN)(void) -->
+        <!-- void (* OpenGLCurveEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26816'>
-        <!-- void(*OpenGLCurveEvaluator::vertexCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLCurveEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26880'>
-        <!-- void(*OpenGLCurveEvaluator::normalCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLCurveEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26944'>
-        <!-- void(*OpenGLCurveEvaluator::colorCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLCurveEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27008'>
-        <!-- void(*OpenGLCurveEvaluator::texcoordCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLCurveEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='133' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27072'>
-        <!-- void(*OpenGLCurveEvaluator::beginCallBackData)(GLenum, void*) -->
+        <!-- void (* OpenGLCurveEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27136'>
-        <!-- void(*OpenGLCurveEvaluator::endCallBackData)(void*) -->
+        <!-- void (* OpenGLCurveEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27200'>
-        <!-- void(*OpenGLCurveEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLCurveEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27264'>
-        <!-- void(*OpenGLCurveEvaluator::normalCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLCurveEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27328'>
-        <!-- void(*OpenGLCurveEvaluator::colorCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLCurveEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27392'>
-        <!-- void(*OpenGLCurveEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLCurveEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glcurveval.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='27456'>
@@ -578,9 +578,9 @@
     <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-23'/>
     <!-- curveEvalMachine* -->
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-33'/>
-    <!-- void(*)(const GLfloat*) -->
+    <!-- void (*)(const GLfloat*) -->
     <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-13'/>
-    <!-- void(*)(const GLfloat*, void*) -->
+    <!-- void (*)(const GLfloat*, void*) -->
     <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-16'/>
     <!-- CurveMap* -->
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-20'/>
@@ -1096,51 +1096,51 @@
         <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
+        <!-- void (* OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <!-- void(*OpenGLSurfaceEvaluator::endCallBackN)(void) -->
+        <!-- void (* OpenGLSurfaceEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
-        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
-        <!-- void(*OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
-        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
-        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
@@ -2252,7 +2252,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void(*)(GLenum) errorCallbackType -->
+    <!-- typedef void (*)(GLenum) errorCallbackType -->
     <typedef-decl name='errorCallbackType' type-id='type-id-11' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-48'/>
     <!-- GLfloat(*)[4] -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-51'/>
@@ -2883,51 +2883,51 @@
         <var-decl name='output_triangles' type-id='type-id-10' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='189' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
+        <!-- void (* OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
         <var-decl name='beginCallBackN' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='193' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
-        <!-- void(*OpenGLSurfaceEvaluator::endCallBackN)(void) -->
+        <!-- void (* OpenGLSurfaceEvaluator::endCallBackN)(void) -->
         <var-decl name='endCallBackN' type-id='type-id-12' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='194' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='704'>
-        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
         <var-decl name='vertexCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='195' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='768'>
-        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
         <var-decl name='normalCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='196' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
         <var-decl name='colorCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='197' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='896'>
-        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
         <var-decl name='texcoordCallBackN' type-id='type-id-13' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='198' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='960'>
-        <!-- void(*OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
         <var-decl name='beginCallBackData' type-id='type-id-14' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='200' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1024'>
-        <!-- void(*OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
         <var-decl name='endCallBackData' type-id='type-id-15' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='201' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1088'>
-        <!-- void(*OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
         <var-decl name='vertexCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1152'>
-        <!-- void(*OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
         <var-decl name='normalCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='203' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1216'>
-        <!-- void(*OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
         <var-decl name='colorCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='204' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1280'>
-        <!-- void(*OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
+        <!-- void (* OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
         <var-decl name='texcoordCallBackData' type-id='type-id-16' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='205' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1344'>
@@ -14368,7 +14368,7 @@
     <!-- struct PFVS -->
     <class-decl name='PFVS' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-261' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-263'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- void(*PFVS::__pfn)(NurbsTessellator*, void*) -->
+        <!-- void (* PFVS::__pfn)(NurbsTessellator*, void*) -->
         <var-decl name='__pfn' type-id='type-id-264' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -14386,7 +14386,7 @@
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
     <!-- NurbsTessellator* -->
     <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-79'/>
-    <!-- void(*)(NurbsTessellator*, void*) -->
+    <!-- void (*)(NurbsTessellator*, void*) -->
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-264'/>
     <!-- void (NurbsTessellator*, void*) -->
     <function-type size-in-bits='64' id='type-id-265'>
@@ -22310,7 +22310,7 @@
         <var-decl name='frame' type-id='type-id-17' visibility='default' filepath='libtess/dict.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- int(*DictList::leq)(void*, DictListKey, DictListKey) -->
+        <!-- int (* DictList::leq)(void*, DictListKey, DictListKey) -->
         <var-decl name='leq' type-id='type-id-383' visibility='default' filepath='libtess/dict.h' line='97' column='1'/>
       </data-member>
     </class-decl>
@@ -22429,7 +22429,7 @@
         <var-decl name='mesh' type-id='type-id-396' visibility='default' filepath='libtess/tess.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void(*GLUtesselator::callError)(GLenum) -->
+        <!-- void (* GLUtesselator::callError)(GLenum) -->
         <var-decl name='callError' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
@@ -22469,7 +22469,7 @@
         <var-decl name='event' type-id='type-id-389' visibility='default' filepath='libtess/tess.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- void(*GLUtesselator::callCombine)(GLdouble*, void**, GLfloat*, void**) -->
+        <!-- void (* GLUtesselator::callCombine)(GLdouble*, void**, GLfloat*, void**) -->
         <var-decl name='callCombine' type-id='type-id-399' visibility='default' filepath='libtess/tess.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
@@ -22485,23 +22485,23 @@
         <var-decl name='lonelyTriList' type-id='type-id-387' visibility='default' filepath='libtess/tess.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <!-- void(*GLUtesselator::callBegin)(GLenum) -->
+        <!-- void (* GLUtesselator::callBegin)(GLenum) -->
         <var-decl name='callBegin' type-id='type-id-11' visibility='default' filepath='libtess/tess.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <!-- void(*GLUtesselator::callEdgeFlag)(GLboolean) -->
+        <!-- void (* GLUtesselator::callEdgeFlag)(GLboolean) -->
         <var-decl name='callEdgeFlag' type-id='type-id-400' visibility='default' filepath='libtess/tess.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <!-- void(*GLUtesselator::callVertex)(void*) -->
+        <!-- void (* GLUtesselator::callVertex)(void*) -->
         <var-decl name='callVertex' type-id='type-id-15' visibility='default' filepath='libtess/tess.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <!-- void(*GLUtesselator::callEnd)(void) -->
+        <!-- void (* GLUtesselator::callEnd)(void) -->
         <var-decl name='callEnd' type-id='type-id-12' visibility='default' filepath='libtess/tess.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <!-- void(*GLUtesselator::callMesh)(GLUmesh*) -->
+        <!-- void (* GLUtesselator::callMesh)(GLUmesh*) -->
         <var-decl name='callMesh' type-id='type-id-401' visibility='default' filepath='libtess/tess.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
@@ -22517,27 +22517,27 @@
         <var-decl name='cache' type-id='type-id-368' visibility='default' filepath='libtess/tess.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27328'>
-        <!-- void(*GLUtesselator::callBeginData)(GLenum, void*) -->
+        <!-- void (* GLUtesselator::callBeginData)(GLenum, void*) -->
         <var-decl name='callBeginData' type-id='type-id-14' visibility='default' filepath='libtess/tess.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27392'>
-        <!-- void(*GLUtesselator::callEdgeFlagData)(GLboolean, void*) -->
+        <!-- void (* GLUtesselator::callEdgeFlagData)(GLboolean, void*) -->
         <var-decl name='callEdgeFlagData' type-id='type-id-402' visibility='default' filepath='libtess/tess.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27456'>
-        <!-- void(*GLUtesselator::callVertexData)(void*, void*) -->
+        <!-- void (* GLUtesselator::callVertexData)(void*, void*) -->
         <var-decl name='callVertexData' type-id='type-id-403' visibility='default' filepath='libtess/tess.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27520'>
-        <!-- void(*GLUtesselator::callEndData)(void*) -->
+        <!-- void (* GLUtesselator::callEndData)(void*) -->
         <var-decl name='callEndData' type-id='type-id-15' visibility='default' filepath='libtess/tess.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27584'>
-        <!-- void(*GLUtesselator::callErrorData)(GLenum, void*) -->
+        <!-- void (* GLUtesselator::callErrorData)(GLenum, void*) -->
         <var-decl name='callErrorData' type-id='type-id-14' visibility='default' filepath='libtess/tess.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27648'>
-        <!-- void(*GLUtesselator::callCombineData)(GLdouble*, void**, GLfloat*, void**, void*) -->
+        <!-- void (* GLUtesselator::callCombineData)(GLdouble*, void**, GLfloat*, void**, void*) -->
         <var-decl name='callCombineData' type-id='type-id-404' visibility='default' filepath='libtess/tess.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
@@ -22629,7 +22629,7 @@
         <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq-heap.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- int(*PriorityQHeap::leq)(PQHeapKey, PQHeapKey) -->
+        <!-- int (* PriorityQHeap::leq)(PQHeapKey, PQHeapKey) -->
         <var-decl name='leq' type-id='type-id-416' visibility='default' filepath='libtess/priorityq-heap.h' line='92' column='1'/>
       </data-member>
     </class-decl>
@@ -22660,7 +22660,7 @@
         <var-decl name='initialized' type-id='type-id-10' visibility='default' filepath='libtess/priorityq.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- int(*PriorityQSort::leq)(PQSortKey, PQSortKey) -->
+        <!-- int (* PriorityQSort::leq)(PQSortKey, PQSortKey) -->
         <var-decl name='leq' type-id='type-id-416' visibility='default' filepath='libtess/priorityq.h' line='103' column='1'/>
       </data-member>
     </class-decl>
@@ -22763,27 +22763,27 @@
     <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-418'/>
     <!-- PriorityQSort* -->
     <pointer-type-def type-id='type-id-429' size-in-bits='64' id='type-id-398'/>
-    <!-- int(*)(PQHeapKey, PQHeapKey) -->
+    <!-- int (*)(PQHeapKey, PQHeapKey) -->
     <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-416'/>
-    <!-- int(*)(void*, DictListKey, DictListKey) -->
+    <!-- int (*)(void*, DictListKey, DictListKey) -->
     <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-383'/>
-    <!-- void(*)(GLUmesh*) -->
+    <!-- void (*)(GLUmesh*) -->
     <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-401'/>
-    <!-- void(*)(GLboolean) -->
+    <!-- void (*)(GLboolean) -->
     <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-400'/>
-    <!-- void(*)(GLboolean, void*) -->
+    <!-- void (*)(GLboolean, void*) -->
     <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-402'/>
-    <!-- void(*)(GLdouble*, void**, GLfloat*, void**) -->
+    <!-- void (*)(GLdouble*, void**, GLfloat*, void**) -->
     <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-399'/>
-    <!-- void(*)(GLdouble*, void**, GLfloat*, void**, void*) -->
+    <!-- void (*)(GLdouble*, void**, GLfloat*, void**, void*) -->
     <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-404'/>
-    <!-- void(*)(GLenum) -->
+    <!-- void (*)(GLenum) -->
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-11'/>
-    <!-- void(*)(GLenum, void*) -->
+    <!-- void (*)(GLenum, void*) -->
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-14'/>
-    <!-- void(*)(void*) -->
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-15'/>
-    <!-- void(*)(void*, void*) -->
+    <!-- void (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-403'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-184'/>
@@ -23370,7 +23370,7 @@
         <var-decl name='drawStyle' type-id='type-id-60' visibility='default' filepath='libutil/quad.c' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void(*GLUquadric::errorCallback)(GLint) -->
+        <!-- void (* GLUquadric::errorCallback)(GLint) -->
         <var-decl name='errorCallback' type-id='type-id-455' visibility='default' filepath='libutil/quad.c' line='50' column='1'/>
       </data-member>
     </class-decl>
@@ -23378,13 +23378,13 @@
     <typedef-decl name='GLUquadric' type-id='type-id-454' filepath='../../../include/GL/glu.h' line='275' column='1' id='type-id-456'/>
     <!-- typedef unsigned char GLboolean -->
     <typedef-decl name='GLboolean' type-id='type-id-443' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-49'/>
-    <!-- typedef void(*)(void) _GLUfuncptr -->
+    <!-- typedef void (*)(void) _GLUfuncptr -->
     <typedef-decl name='_GLUfuncptr' type-id='type-id-12' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-22'/>
     <!-- GLUquadric* -->
     <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
-    <!-- void(*)(GLint) -->
+    <!-- void (*)(GLint) -->
     <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-455'/>
-    <!-- void(*)(void) -->
+    <!-- void (*)(void) -->
     <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-12'/>
     <!-- GLUquadric* gluNewQuadric() -->
     <function-decl name='gluNewQuadric' mangled-name='gluNewQuadric' filepath='libutil/quad.c' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluNewQuadric'>
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 65e69956..409f9efa 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libtsan.so.0'>
+<abi-corpus version='2.3' soname='libtsan.so.0'>
   <elf-needed>
     <dependency name='librt.so.1'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index 98d5282e..f14fb4dc 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libharfbuzz.so.0'>
+<abi-corpus version='2.3' soname='libharfbuzz.so.0'>
   <elf-needed>
     <dependency name='libglib-2.0.so.0'/>
     <dependency name='libfreetype.so.6'/>
@@ -973,7 +973,7 @@
     <typedef-decl name='hb_blob_t' type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.h' line='65' column='1' id='type-id-43'/>
     <!-- typedef int hb_bool_t -->
     <typedef-decl name='hb_bool_t' type-id='type-id-11' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='73' column='1' id='type-id-40'/>
-    <!-- typedef void(*)(void*) hb_destroy_func_t -->
+    <!-- typedef void (*)(void*) hb_destroy_func_t -->
     <typedef-decl name='hb_destroy_func_t' type-id='type-id-44' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='339' column='1' id='type-id-20'/>
     <!-- typedef pthread_mutex_t hb_mutex_impl_t -->
     <typedef-decl name='hb_mutex_impl_t' type-id='type-id-45' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-mutex-private.hh' line='59' column='1' id='type-id-29'/>
@@ -1085,7 +1085,7 @@
     <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-26'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-60'/>
-    <!-- void(*)(void*) -->
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-44'/>
     <!-- hb_blob_t* hb_blob_create(const char*, unsigned int, hb_memory_mode_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_blob_create' mangled-name='hb_blob_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.cc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_blob_create'>
@@ -2395,23 +2395,23 @@
     <typedef-decl name='hb_position_t' type-id='type-id-126' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='76' column='1' id='type-id-103'/>
     <!-- typedef hb_segment_properties_t hb_segment_properties_t -->
     <typedef-decl name='hb_segment_properties_t' type-id='type-id-104' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='72' column='1' id='type-id-85'/>
-    <!-- typedef hb_unicode_combining_class_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_combining_class_func_t -->
+    <!-- typedef hb_unicode_combining_class_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_combining_class_func_t -->
     <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-127' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-109'/>
-    <!-- typedef hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_compose_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_compose_func_t -->
     <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-128' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-114'/>
-    <!-- typedef unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_decompose_compatibility_func_t -->
+    <!-- typedef unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_decompose_compatibility_func_t -->
     <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-129' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-116'/>
-    <!-- typedef hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) hb_unicode_decompose_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) hb_unicode_decompose_func_t -->
     <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-130' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-115'/>
-    <!-- typedef unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_eastasian_width_func_t -->
+    <!-- typedef unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_eastasian_width_func_t -->
     <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-110'/>
     <!-- typedef hb_unicode_funcs_t hb_unicode_funcs_t -->
     <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-132'/>
-    <!-- typedef hb_unicode_general_category_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_general_category_func_t -->
+    <!-- typedef hb_unicode_general_category_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_general_category_func_t -->
     <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-133' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-111'/>
-    <!-- typedef hb_codepoint_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_mirroring_func_t -->
+    <!-- typedef hb_codepoint_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_mirroring_func_t -->
     <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-112'/>
-    <!-- typedef hb_script_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_script_func_t -->
+    <!-- typedef hb_script_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_script_func_t -->
     <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-134' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-113'/>
     <!-- typedef _hb_var_int_t hb_var_int_t -->
     <typedef-decl name='hb_var_int_t' type-id='type-id-135' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-101'/>
@@ -2502,9 +2502,9 @@
     <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-149'/>
     <!-- const unsigned int -->
     <qualified-type-def type-id='type-id-18' const='yes' id='type-id-89'/>
-    <!-- hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-130'/>
-    <!-- hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-128'/>
     <!-- hb_buffer_t* -->
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-91'/>
@@ -2524,19 +2524,19 @@
     <reference-type-def kind='lvalue' type-id='type-id-124' size-in-bits='64' id='type-id-98'/>
     <!-- hb_glyph_position_t* -->
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-87'/>
-    <!-- hb_script_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <!-- hb_script_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-134'/>
-    <!-- hb_unicode_combining_class_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <!-- hb_unicode_combining_class_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-127'/>
     <!-- hb_unicode_funcs_t* -->
     <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-118'/>
     <!-- hb_unicode_funcs_t* -->
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-84'/>
-    <!-- hb_unicode_general_category_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <!-- hb_unicode_general_category_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-133'/>
-    <!-- unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <!-- unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-129'/>
-    <!-- unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <!-- unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-131'/>
     <!-- struct hb_font_t -->
     <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-121'>
@@ -4826,15 +4826,15 @@
     <typedef-decl name='hb_feature_t' type-id='type-id-198' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='48' column='1' id='type-id-219'/>
     <!-- typedef hb_font_funcs_t hb_font_funcs_t -->
     <typedef-decl name='hb_font_funcs_t' type-id='type-id-199' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-220'/>
-    <!-- typedef hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, void*) hb_font_get_glyph_advance_func_t -->
+    <!-- typedef hb_position_t (*)(hb_font_t*, void*, hb_codepoint_t, void*) hb_font_get_glyph_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_advance_func_t' type-id='type-id-221' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='102' column='1' id='type-id-222'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_contour_point_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_contour_point_func_t -->
     <typedef-decl name='hb_font_get_glyph_contour_point_func_t' type-id='type-id-223' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='127' column='1' id='type-id-210'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) hb_font_get_glyph_extents_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) hb_font_get_glyph_extents_func_t -->
     <typedef-decl name='hb_font_get_glyph_extents_func_t' type-id='type-id-224' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='123' column='1' id='type-id-209'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) hb_font_get_glyph_from_name_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) hb_font_get_glyph_from_name_func_t -->
     <typedef-decl name='hb_font_get_glyph_from_name_func_t' type-id='type-id-225' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='137' column='1' id='type-id-212'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_font_get_glyph_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_font_get_glyph_func_t -->
     <typedef-decl name='hb_font_get_glyph_func_t' type-id='type-id-226' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='97' column='1' id='type-id-202'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_h_advance_func_t' type-id='type-id-222' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='103' column='1' id='type-id-203'/>
@@ -4842,11 +4842,11 @@
     <typedef-decl name='hb_font_get_glyph_h_kerning_func_t' type-id='type-id-227' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='116' column='1' id='type-id-207'/>
     <!-- typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t -->
     <typedef-decl name='hb_font_get_glyph_h_origin_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='110' column='1' id='type-id-205'/>
-    <!-- typedef hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) hb_font_get_glyph_kerning_func_t -->
+    <!-- typedef hb_position_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) hb_font_get_glyph_kerning_func_t -->
     <typedef-decl name='hb_font_get_glyph_kerning_func_t' type-id='type-id-229' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='115' column='1' id='type-id-227'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) hb_font_get_glyph_name_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) hb_font_get_glyph_name_func_t -->
     <typedef-decl name='hb_font_get_glyph_name_func_t' type-id='type-id-230' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='133' column='1' id='type-id-211'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_origin_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_origin_func_t -->
     <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-231' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-228'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_v_advance_func_t' type-id='type-id-222' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='104' column='1' id='type-id-204'/>
@@ -4856,7 +4856,7 @@
     <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-206'/>
     <!-- typedef hb_glyph_extents_t hb_glyph_extents_t -->
     <typedef-decl name='hb_glyph_extents_t' type-id='type-id-214' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-232'/>
-    <!-- typedef hb_blob_t*(*)(hb_face_t*, hb_tag_t, void*) hb_reference_table_func_t -->
+    <!-- typedef hb_blob_t* (*)(hb_face_t*, hb_tag_t, void*) hb_reference_table_func_t -->
     <typedef-decl name='hb_reference_table_func_t' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-196'/>
     <!-- typedef typedef hb_bool_t (hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) hb_shape_func_t -->
     <typedef-decl name='hb_shape_func_t' type-id='type-id-234' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-235'/>
@@ -5067,19 +5067,19 @@
     <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
     <!-- hb_auto_trace_t<0, bool>* -->
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
-    <!-- hb_blob_t*(*)(hb_face_t*, hb_tag_t, void*) -->
+    <!-- hb_blob_t* (*)(hb_face_t*, hb_tag_t, void*) -->
     <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-233'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-225'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
     <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-230'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-226'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
     <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-224'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
     <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-231'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
     <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-223'/>
     <!-- hb_face_t* -->
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-160'/>
@@ -5093,9 +5093,9 @@
     <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-159'/>
     <!-- hb_glyph_extents_t* -->
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-164'/>
-    <!-- hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
+    <!-- hb_position_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-229'/>
-    <!-- hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, void*) -->
+    <!-- hb_position_t (*)(hb_font_t*, void*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-221'/>
     <!-- hb_position_t* -->
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-163'/>
@@ -10262,7 +10262,7 @@
         <var-decl name='y' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='77' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void*(*)(FT_Memory, long int) FT_Alloc_Func -->
+    <!-- typedef void* (*)(FT_Memory, long int) FT_Alloc_Func -->
     <typedef-decl name='FT_Alloc_Func' type-id='type-id-637' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='90' column='1' id='type-id-622'/>
     <!-- typedef FT_BBox_ FT_BBox -->
     <typedef-decl name='FT_BBox' type-id='type-id-578' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='120' column='1' id='type-id-595'/>
@@ -10278,11 +10278,11 @@
     <typedef-decl name='FT_Face' type-id='type-id-640' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='440' column='1' id='type-id-585'/>
     <!-- typedef long int FT_Fixed -->
     <typedef-decl name='FT_Fixed' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='284' column='1' id='type-id-610'/>
-    <!-- typedef void(*)(FT_Memory, void*) FT_Free_Func -->
+    <!-- typedef void (*)(FT_Memory, void*) FT_Free_Func -->
     <typedef-decl name='FT_Free_Func' type-id='type-id-641' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='111' column='1' id='type-id-623'/>
     <!-- typedef FT_Generic_ FT_Generic -->
     <typedef-decl name='FT_Generic' type-id='type-id-604' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='460' column='1' id='type-id-594'/>
-    <!-- typedef void(*)(void*) FT_Generic_Finalizer -->
+    <!-- typedef void (*)(void*) FT_Generic_Finalizer -->
     <typedef-decl name='FT_Generic_Finalizer' type-id='type-id-44' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='424' column='1' id='type-id-605'/>
     <!-- typedef FT_GlyphSlotRec_* FT_GlyphSlot -->
     <typedef-decl name='FT_GlyphSlot' type-id='type-id-642' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='492' column='1' id='type-id-596'/>
@@ -10304,7 +10304,7 @@
     <typedef-decl name='FT_Outline' type-id='type-id-625' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-614'/>
     <!-- typedef long int FT_Pos -->
     <typedef-decl name='FT_Pos' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-579'/>
-    <!-- typedef void*(*)(FT_Memory, long int, long int, void*) FT_Realloc_Func -->
+    <!-- typedef void* (*)(FT_Memory, long int, long int, void*) FT_Realloc_Func -->
     <typedef-decl name='FT_Realloc_Func' type-id='type-id-645' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='146' column='1' id='type-id-624'/>
     <!-- typedef short int FT_Short -->
     <typedef-decl name='FT_Short' type-id='type-id-80' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-583'/>
@@ -10316,9 +10316,9 @@
     <typedef-decl name='FT_Stream' type-id='type-id-647' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='196' column='1' id='type-id-601'/>
     <!-- typedef FT_StreamDesc_ FT_StreamDesc -->
     <typedef-decl name='FT_StreamDesc' type-id='type-id-648' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-633'/>
-    <!-- typedef void(*)(FT_Stream) FT_Stream_CloseFunc -->
+    <!-- typedef void (*)(FT_Stream) FT_Stream_CloseFunc -->
     <typedef-decl name='FT_Stream_CloseFunc' type-id='type-id-649' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='268' column='1' id='type-id-635'/>
-    <!-- typedef unsigned long int(*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) FT_Stream_IoFunc -->
+    <!-- typedef unsigned long int (*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) FT_Stream_IoFunc -->
     <typedef-decl name='FT_Stream_IoFunc' type-id='type-id-650' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='251' column='1' id='type-id-634'/>
     <!-- typedef char FT_String -->
     <typedef-decl name='FT_String' type-id='type-id-2' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='183' column='1' id='type-id-651'/>
@@ -10365,15 +10365,15 @@
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-627'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-581'/>
-    <!-- unsigned long int(*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
+    <!-- unsigned long int (*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
     <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-650'/>
-    <!-- void(*)(FT_Memory, void*) -->
+    <!-- void (*)(FT_Memory, void*) -->
     <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-641'/>
-    <!-- void(*)(FT_Stream) -->
+    <!-- void (*)(FT_Stream) -->
     <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-649'/>
-    <!-- void*(*)(FT_Memory, long int) -->
+    <!-- void* (*)(FT_Memory, long int) -->
     <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-637'/>
-    <!-- void*(*)(FT_Memory, long int, long int, void*) -->
+    <!-- void* (*)(FT_Memory, long int, long int, void*) -->
     <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-645'/>
     <!-- FT_DriverRec_* -->
     <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-658'/>
@@ -13329,7 +13329,7 @@
         <!-- 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-921'>
           <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 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-957' 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-956'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -14644,7 +14644,7 @@
     <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-1324'/>
     <!-- OT::hb_apply_context_t::matcher_t* -->
     <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-1326'/>
-    <!-- OT::hb_apply_context_t::return_t(*)(OT::hb_apply_context_t*, unsigned int) -->
+    <!-- OT::hb_apply_context_t::return_t (*)(OT::hb_apply_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-1328'/>
     <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
     <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-1330'/>
@@ -14652,19 +14652,19 @@
     <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-1332'/>
     <!-- OT::hb_closure_context_t* -->
     <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-1334'/>
-    <!-- OT::hb_closure_context_t::return_t(*)(OT::hb_closure_context_t*, unsigned int) -->
+    <!-- OT::hb_closure_context_t::return_t (*)(OT::hb_closure_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
     <!-- OT::hb_collect_glyphs_context_t* -->
     <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
-    <!-- OT::hb_collect_glyphs_context_t::return_t(*)(OT::hb_collect_glyphs_context_t*, unsigned int) -->
+    <!-- OT::hb_collect_glyphs_context_t::return_t (*)(OT::hb_collect_glyphs_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
     <!-- OT::hb_get_coverage_context_t* -->
     <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
     <!-- OT::hb_would_apply_context_t* -->
     <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
-    <!-- bool(*)(hb_codepoint_t, const OT::USHORT&, void*) -->
+    <!-- bool (*)(hb_codepoint_t, const OT::USHORT&, void*) -->
     <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
-    <!-- bool(*)(hb_set_t*, const OT::USHORT&, void*) -->
+    <!-- bool (*)(hb_set_t*, const OT::USHORT&, void*) -->
     <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
     <!-- bool* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1349'/>
@@ -15714,9 +15714,9 @@
     <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-994'/>
     <!-- hb_set_digest_t* -->
     <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1744'/>
-    <!-- void(*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
+    <!-- void (*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
     <pointer-type-def type-id='type-id-1745' size-in-bits='64' id='type-id-957'/>
-    <!-- void(*)(hb_set_t*, const OT::USHORT&, void*) -->
+    <!-- void (*)(hb_set_t*, const OT::USHORT&, void*) -->
     <pointer-type-def type-id='type-id-1746' size-in-bits='64' id='type-id-1747'/>
     <reference-type-def kind='lvalue' type-id='type-id-1748' size-in-bits='64' id='type-id-1749'/>
     <reference-type-def kind='lvalue' type-id='type-id-1750' size-in-bits='64' id='type-id-1751'/>
@@ -27178,7 +27178,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <!-- typedef bool(*)(hb_codepoint_t, const OT::USHORT&, void*) OT::hb_apply_context_t::matcher_t::match_func_t -->
+              <!-- typedef bool (*)(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-1346' 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-1837'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
@@ -27515,7 +27515,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <!-- typedef OT::hb_apply_context_t::return_t(*)(OT::hb_apply_context_t*, unsigned int) OT::hb_apply_context_t::recurse_func_t -->
+          <!-- 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-1328' 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-1889'/>
         </member-type>
         <data-member access='public' static='yes'>
@@ -28029,7 +28029,7 @@
       <!-- 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-1333'>
         <member-type access='public'>
-          <!-- typedef OT::hb_closure_context_t::return_t(*)(OT::hb_closure_context_t*, unsigned int) OT::hb_closure_context_t::recurse_func_t -->
+          <!-- 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-1336' 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-1891'/>
         </member-type>
         <member-type access='public'>
@@ -28260,7 +28260,7 @@
       <!-- 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-1337'>
         <member-type access='public'>
-          <!-- 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 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-1340' 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-1892'/>
         </member-type>
         <data-member access='public' static='yes'>
@@ -29213,9 +29213,9 @@
       <typedef-decl name='Value' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-912'/>
       <!-- typedef Value[1] OT::ValueRecord -->
       <typedef-decl name='ValueRecord' type-id='type-id-913' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1871'/>
-      <!-- typedef void(*)(hb_set_t*, const OT::USHORT&, void*) OT::collect_glyphs_func_t -->
+      <!-- typedef void (*)(hb_set_t*, const OT::USHORT&, void*) OT::collect_glyphs_func_t -->
       <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1747' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1839'/>
-      <!-- typedef bool(*)(hb_set_t*, const OT::USHORT&, void*) OT::intersects_func_t -->
+      <!-- typedef bool (*)(hb_set_t*, const OT::USHORT&, void*) OT::intersects_func_t -->
       <typedef-decl name='intersects_func_t' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1838'/>
       <!-- struct OT::Supplier<OT::EntryExitRecord> -->
       <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1748'/>
@@ -30768,23 +30768,23 @@
         <var-decl name='name' type-id='type-id-2013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void(*hb_ot_complex_shaper_t::collect_features)(hb_ot_shape_planner_t*) -->
+        <!-- void (* hb_ot_complex_shaper_t::collect_features)(hb_ot_shape_planner_t*) -->
         <var-decl name='collect_features' type-id='type-id-2017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void(*hb_ot_complex_shaper_t::override_features)(hb_ot_shape_planner_t*) -->
+        <!-- void (* hb_ot_complex_shaper_t::override_features)(hb_ot_shape_planner_t*) -->
         <var-decl name='override_features' type-id='type-id-2017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void*(*hb_ot_complex_shaper_t::data_create)(const hb_ot_shape_plan_t*) -->
+        <!-- void* (* hb_ot_complex_shaper_t::data_create)(const hb_ot_shape_plan_t*) -->
         <var-decl name='data_create' type-id='type-id-2018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- void(*hb_ot_complex_shaper_t::data_destroy)(void*) -->
+        <!-- void (* hb_ot_complex_shaper_t::data_destroy)(void*) -->
         <var-decl name='data_destroy' type-id='type-id-44' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- void(*hb_ot_complex_shaper_t::preprocess_text)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
+        <!-- void (* hb_ot_complex_shaper_t::preprocess_text)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
         <var-decl name='preprocess_text' type-id='type-id-2019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
@@ -30792,15 +30792,15 @@
         <var-decl name='normalization_preference' type-id='type-id-2014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- bool(*hb_ot_complex_shaper_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
+        <!-- bool (* hb_ot_complex_shaper_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <var-decl name='decompose' type-id='type-id-2020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- bool(*hb_ot_complex_shaper_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
+        <!-- bool (* hb_ot_complex_shaper_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <!-- void(*hb_ot_complex_shaper_t::setup_masks)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
+        <!-- void (* hb_ot_complex_shaper_t::setup_masks)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
         <var-decl name='setup_masks' type-id='type-id-2019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
@@ -30831,11 +30831,11 @@
         <var-decl name='unicode' type-id='type-id-84' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- bool(*hb_ot_shape_normalize_context_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
+        <!-- bool (* hb_ot_shape_normalize_context_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <var-decl name='decompose' type-id='type-id-2020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- bool(*hb_ot_shape_normalize_context_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
+        <!-- bool (* hb_ot_shape_normalize_context_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
       </data-member>
     </class-decl>
@@ -31001,9 +31001,9 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- bool(*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
+    <!-- bool (*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
     <pointer-type-def type-id='type-id-2028' size-in-bits='64' id='type-id-2020'/>
-    <!-- bool(*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
+    <!-- bool (*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
     <pointer-type-def type-id='type-id-2029' size-in-bits='64' id='type-id-2021'/>
     <!-- const hb_ot_complex_shaper_t -->
     <qualified-type-def type-id='type-id-2016' const='yes' id='type-id-2030'/>
@@ -31029,11 +31029,11 @@
     <reference-type-def kind='lvalue' type-id='type-id-2023' size-in-bits='64' id='type-id-2035'/>
     <!-- hb_ot_shape_planner_t* -->
     <pointer-type-def type-id='type-id-2023' size-in-bits='64' id='type-id-2024'/>
-    <!-- void(*)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
+    <!-- void (*)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
     <pointer-type-def type-id='type-id-2036' size-in-bits='64' id='type-id-2019'/>
-    <!-- void(*)(hb_ot_shape_planner_t*) -->
+    <!-- void (*)(hb_ot_shape_planner_t*) -->
     <pointer-type-def type-id='type-id-2037' size-in-bits='64' id='type-id-2017'/>
-    <!-- void*(*)(const hb_ot_shape_plan_t*) -->
+    <!-- void* (*)(const hb_ot_shape_plan_t*) -->
     <pointer-type-def type-id='type-id-2038' size-in-bits='64' id='type-id-2018'/>
     <!-- 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'>
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 f29ab0bf..2dcbb963 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
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libvtkRenderingLIC-6.1.so.1'>
+<abi-corpus version='2.3' soname='libvtkRenderingLIC-6.1.so.1'>
   <elf-needed>
     <dependency name='libvtkIOLegacy-6.1.so.1'/>
     <dependency name='libvtkIOXML-6.1.so.1'/>
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 67e0c80b..20468d2f 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
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libtcmalloc_and_profiler.so.4'>
+<abi-corpus version='2.3' soname='libtcmalloc_and_profiler.so.4'>
   <elf-needed>
     <dependency name='libunwind.so.8'/>
     <dependency name='libpthread.so.0'/>
@@ -2732,13 +2732,13 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr 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 -->
+    <!-- typedef int (*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) ListAllProcessThreadsCallBack -->
     <typedef-decl name='ListAllProcessThreadsCallBack' type-id='type-id-77' filepath='./src/base/thread_lister.h' line='48' column='1' id='type-id-78'/>
     <!-- typedef int __pid_t -->
     <typedef-decl name='__pid_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-79'/>
     <!-- typedef __pid_t pid_t -->
     <typedef-decl name='pid_t' type-id='type-id-79' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-80'/>
-    <!-- int(*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) -->
+    <!-- int (*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) -->
     <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-77'/>
     <!-- pid_t* -->
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-82'/>
@@ -3869,9 +3869,9 @@
       <!-- void -->
       <return type-id='type-id-75'/>
     </function-decl>
-    <!-- int atexit(void(*)(void)) -->
+    <!-- int atexit(void (*)(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(*)(void)' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-162'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -4237,11 +4237,11 @@
         <var-decl name='kHashMultiplier' type-id='type-id-191' visibility='default' filepath='src/addressmap-inl.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <!-- void*(*AddressMap<HeapProfileTable::AllocValue>::alloc_)(unsigned long int) -->
+        <!-- void* (* AddressMap<HeapProfileTable::AllocValue>::alloc_)(unsigned long int) -->
         <var-decl name='alloc_' type-id='type-id-192' visibility='default' filepath='src/addressmap-inl.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <!-- void(*AddressMap<HeapProfileTable::AllocValue>::dealloc_)(void*) -->
+        <!-- void (* AddressMap<HeapProfileTable::AllocValue>::dealloc_)(void*) -->
         <var-decl name='dealloc_' type-id='type-id-193' visibility='default' filepath='src/addressmap-inl.h' line='252' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
@@ -4249,13 +4249,13 @@
         <var-decl name='allocated_' type-id='type-id-194' visibility='default' filepath='src/addressmap-inl.h' line='253' column='1'/>
       </data-member>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void*(*)(unsigned long int), void(*)(void*)) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void* (*)(unsigned long int), void (*)(void*)) -->
         <function-decl name='AddressMap' filepath='src/addressmap-inl.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
-          <!-- parameter of type 'void(*)(void*)' -->
+          <!-- parameter of type 'void (*)(void*)' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -4273,26 +4273,26 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<void (*)(const void*, const HeapProfileTable::AllocInfo&)>(void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)), void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<void (*)(const void*, const HeapProfileTable::AllocInfo&)>(void (*)(void*, HeapProfileTable::AllocValue*, void (*)(void*, const HeapProfileTable::AllocInfo&)), void (*)(void*, const HeapProfileTable::AllocInfo&)) -->
         <function-decl name='Iterate&lt;void (*)(const void*, const HeapProfileTable::AllocInfo&amp;)&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&))' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, void (*)(void*, const HeapProfileTable::AllocInfo&))' -->
           <parameter type-id='type-id-197'/>
-          <!-- parameter of type 'void(*)(void*, const HeapProfileTable::AllocInfo&)' -->
+          <!-- parameter of type 'void (*)(void*, const HeapProfileTable::AllocInfo&)' -->
           <parameter type-id='type-id-198'/>
           <!-- void -->
           <return type-id='type-id-75'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void*(*)(unsigned long int), void(*)(void*)) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void* (*)(unsigned long int), void (*)(void*)) -->
         <function-decl name='AddressMap' mangled-name='_ZN10AddressMapIN16HeapProfileTable10AllocValueEEC2EPFPvmEPFvS3_E' filepath='src/addressmap-inl.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10AddressMapIN16HeapProfileTable10AllocValueEEC2EPFPvmEPFvS3_E'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
-          <!-- parameter of type 'void(*)(void*)' -->
+          <!-- parameter of type 'void (*)(void*)' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -4310,11 +4310,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<char*>(void(*)(void*, HeapProfileTable::AllocValue*, char*), char*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<char*>(void (*)(void*, HeapProfileTable::AllocValue*, char*), char*) -->
         <function-decl name='Iterate&lt;char*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, char*)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, char*)' -->
           <parameter type-id='type-id-199'/>
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-3'/>
@@ -4334,11 +4334,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::AddNonLiveArgs*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*), HeapProfileTable::AddNonLiveArgs*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::AddNonLiveArgs*>(void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*), HeapProfileTable::AddNonLiveArgs*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::AddNonLiveArgs*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)' -->
           <parameter type-id='type-id-201'/>
           <!-- parameter of type 'HeapProfileTable::AddNonLiveArgs*' -->
           <parameter type-id='type-id-202'/>
@@ -4347,11 +4347,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*), HeapProfileTable::Snapshot*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot*>(void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*), HeapProfileTable::Snapshot*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::Snapshot*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)' -->
           <parameter type-id='type-id-203'/>
           <!-- parameter of type 'HeapProfileTable::Snapshot*' -->
           <parameter type-id='type-id-204'/>
@@ -4382,11 +4382,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<const HeapProfileTable::DumpArgs&>(void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&), const HeapProfileTable::DumpArgs&) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<const HeapProfileTable::DumpArgs&>(void (*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&), const HeapProfileTable::DumpArgs&) -->
         <function-decl name='Iterate&lt;const HeapProfileTable::DumpArgs&amp;&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)' -->
           <parameter type-id='type-id-207'/>
           <!-- parameter of type 'const HeapProfileTable::DumpArgs&' -->
           <parameter type-id='type-id-208'/>
@@ -4395,11 +4395,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot::ReportState*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*), HeapProfileTable::Snapshot::ReportState*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot::ReportState*>(void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*), HeapProfileTable::Snapshot::ReportState*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::Snapshot::ReportState*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)' -->
           <parameter type-id='type-id-209'/>
           <!-- parameter of type 'HeapProfileTable::Snapshot::ReportState*' -->
           <parameter type-id='type-id-210'/>
@@ -4437,11 +4437,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- const HeapProfileTable::AllocValue* AddressMap<HeapProfileTable::AllocValue>::FindInside(size_t(*)(const HeapProfileTable::AllocValue&), unsigned long int, void*, void**) -->
+        <!-- const HeapProfileTable::AllocValue* AddressMap<HeapProfileTable::AllocValue>::FindInside(size_t (*)(const HeapProfileTable::AllocValue&), unsigned long int, void*, void**) -->
         <function-decl name='FindInside' mangled-name='_ZN10AddressMapIN16HeapProfileTable10AllocValueEE10FindInsideEPFmRKS1_EmPKvPS8_' filepath='src/addressmap-inl.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'size_t(*)(const HeapProfileTable::AllocValue&)' -->
+          <!-- parameter of type 'size_t (*)(const HeapProfileTable::AllocValue&)' -->
           <parameter type-id='type-id-212'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-19'/>
@@ -4507,7 +4507,7 @@
     <!-- class GoogleInitializer -->
     <class-decl name='GoogleInitializer' size-in-bits='128' visibility='default' filepath='src/base/googleinit.h' line='39' column='1' id='type-id-215'>
       <member-type access='private'>
-        <!-- typedef void(*)(void) GoogleInitializer::VoidFunction -->
+        <!-- typedef void (*)(void) GoogleInitializer::VoidFunction -->
         <typedef-decl name='VoidFunction' type-id='type-id-162' filepath='src/base/googleinit.h' line='41' column='1' id='type-id-216'/>
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -4730,7 +4730,7 @@
     <!-- 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-220'>
       <member-type access='private'>
-        <!-- typedef void(*)(void) HeapCleaner::void_function -->
+        <!-- typedef void (*)(void) HeapCleaner::void_function -->
         <typedef-decl name='void_function' type-id='type-id-162' filepath='./src/gperftools/heap-checker.h' line='405' column='1' id='type-id-221'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -5734,11 +5734,11 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void(*)(const HeapProfileTable::AllocContextInfo&) HeapProfileTable::AllocContextIterator -->
+        <!-- typedef void (*)(const HeapProfileTable::AllocContextInfo&) HeapProfileTable::AllocContextIterator -->
         <typedef-decl name='AllocContextIterator' type-id='type-id-278' filepath='src/heap-profile-table.h' line='147' column='1' id='type-id-277'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void(*)(void*, const HeapProfileTable::AllocInfo&) HeapProfileTable::AllocIterator -->
+        <!-- typedef void (*)(void*, const HeapProfileTable::AllocInfo&) HeapProfileTable::AllocIterator -->
         <typedef-decl name='AllocIterator' type-id='type-id-198' filepath='src/heap-profile-table.h' line='138' column='1' id='type-id-279'/>
       </member-type>
       <member-type access='private'>
@@ -5746,11 +5746,11 @@
         <typedef-decl name='AllocationMap' type-id='type-id-182' filepath='src/heap-profile-table.h' line='224' column='1' id='type-id-270'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void*(*)(size_t) HeapProfileTable::Allocator -->
+        <!-- typedef void* (*)(size_t) HeapProfileTable::Allocator -->
         <typedef-decl name='Allocator' type-id='type-id-192' filepath='src/heap-profile-table.h' line='83' column='1' id='type-id-271'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void(*)(void*) HeapProfileTable::DeAllocator -->
+        <!-- typedef void (*)(void*) HeapProfileTable::DeAllocator -->
         <typedef-decl name='DeAllocator' type-id='type-id-193' filepath='src/heap-profile-table.h' line='84' column='1' id='type-id-272'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -6601,7 +6601,7 @@
       <member-function access='private' static='yes'>
         <!-- void MemoryRegionMap::IterateBuckets<HeapProfileTable::BufferArgs*>(HeapProfileTable::BufferArgs*) -->
         <function-decl name='IterateBuckets&lt;HeapProfileTable::BufferArgs*&gt;' filepath='src/memory_region_map.h' line='402' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'void(*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*)' -->
+          <!-- parameter of type 'void (*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*)' -->
           <parameter type-id='type-id-314'/>
           <!-- parameter of type 'HeapProfileTable::BufferArgs*' -->
           <parameter type-id='type-id-257'/>
@@ -6612,7 +6612,7 @@
       <member-function access='private' static='yes'>
         <!-- void MemoryRegionMap::HandleSavedRegionsLocked() -->
         <function-decl name='HandleSavedRegionsLocked' mangled-name='_ZN15MemoryRegionMap24HandleSavedRegionsLockedEPFvRKNS_6RegionEE' filepath='src/memory_region_map.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MemoryRegionMap24HandleSavedRegionsLockedEPFvRKNS_6RegionEE'>
-          <!-- parameter of type 'void(*)(const MemoryRegionMap::Region&)' -->
+          <!-- parameter of type 'void (*)(const MemoryRegionMap::Region&)' -->
           <parameter type-id='type-id-315'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -7722,13 +7722,13 @@
     <typedef-decl name='LibraryLiveObjectsStacks' type-id='type-id-379' filepath='src/heap-checker.cc' line='397' column='1' id='type-id-380'/>
     <!-- typedef std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > LiveObjectsStack -->
     <typedef-decl name='LiveObjectsStack' type-id='type-id-381' filepath='src/heap-checker.cc' line='384' column='1' id='type-id-382'/>
-    <!-- typedef void(*)(void*) MallocHook_DeleteHook -->
+    <!-- typedef void (*)(void*) MallocHook_DeleteHook -->
     <typedef-decl name='MallocHook_DeleteHook' type-id='type-id-193' filepath='./src/gperftools/malloc_hook_c.h' line='76' column='1' id='type-id-383'/>
-    <!-- typedef void(*)(void*, void*, size_t, int, int, int, off_t) MallocHook_MmapHook -->
+    <!-- typedef void (*)(void*, void*, size_t, int, int, int, off_t) MallocHook_MmapHook -->
     <typedef-decl name='MallocHook_MmapHook' type-id='type-id-384' filepath='./src/gperftools/malloc_hook_c.h' line='99' column='1' id='type-id-385'/>
-    <!-- typedef void(*)(void*, size_t) MallocHook_NewHook -->
+    <!-- typedef void (*)(void*, size_t) MallocHook_NewHook -->
     <typedef-decl name='MallocHook_NewHook' type-id='type-id-386' filepath='./src/gperftools/malloc_hook_c.h' line='70' column='1' id='type-id-387'/>
-    <!-- typedef void(*)(void*, ptrdiff_t) MallocHook_SbrkHook -->
+    <!-- typedef void (*)(void*, ptrdiff_t) MallocHook_SbrkHook -->
     <typedef-decl name='MallocHook_SbrkHook' type-id='type-id-388' filepath='./src/gperftools/malloc_hook_c.h' line='144' column='1' id='type-id-389'/>
     <!-- typedef int RawFD -->
     <typedef-decl name='RawFD' type-id='type-id-1' filepath='./src/base/logging.h' line='251' column='1' id='type-id-85'/>
@@ -8305,7 +8305,7 @@
     <qualified-type-def type-id='type-id-41' const='yes' id='type-id-191'/>
     <!-- const unsigned long int* -->
     <pointer-type-def type-id='type-id-639' size-in-bits='64' id='type-id-640'/>
-    <!-- size_t(*)(const HeapProfileTable::AllocValue&) -->
+    <!-- size_t (*)(const HeapProfileTable::AllocValue&) -->
     <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-212'/>
     <!-- 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> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-642'/>
@@ -8461,33 +8461,33 @@
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-726'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-333'/>
-    <!-- void(*)(const HeapProfileTable::AllocContextInfo&) -->
+    <!-- void (*)(const HeapProfileTable::AllocContextInfo&) -->
     <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-278'/>
-    <!-- void(*)(void) const -->
+    <!-- void (*)(void) const -->
     <qualified-type-def type-id='type-id-162' const='yes' id='type-id-728'/>
-    <!-- void(*)(void) const& -->
+    <!-- void (*)(void) const& -->
     <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
-    <!-- void(*)(void) const* -->
+    <!-- void (*)(void) const* -->
     <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-730'/>
-    <!-- void(*)(void)& -->
+    <!-- void (*)(void)& -->
     <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-731'/>
-    <!-- void(*)(void)* -->
+    <!-- void (*)(void)* -->
     <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-732'/>
-    <!-- void(*)(void)* const -->
+    <!-- void (*)(void)* const -->
     <qualified-type-def type-id='type-id-732' const='yes' id='type-id-733'/>
-    <!-- void(*)(void)* const& -->
+    <!-- void (*)(void)* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-733' size-in-bits='64' id='type-id-734'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, void (*)(void*, const HeapProfileTable::AllocInfo&)) -->
     <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-197'/>
-    <!-- void(*)(void*, const HeapProfileTable::AllocInfo&) -->
+    <!-- void (*)(void*, const HeapProfileTable::AllocInfo&) -->
     <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-198'/>
-    <!-- void(*)(void*, ptrdiff_t) -->
+    <!-- void (*)(void*, ptrdiff_t) -->
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-388'/>
-    <!-- void(*)(void*, ptrdiff_t)* -->
+    <!-- void (*)(void*, ptrdiff_t)* -->
     <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-738'/>
-    <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
+    <!-- void (*)(void*, void*, size_t, int, int, int, off_t) -->
     <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-384'/>
-    <!-- void(*)(void*, void*, size_t, int, int, int, off_t)* -->
+    <!-- void (*)(void*, void*, size_t, int, int, int, off_t)* -->
     <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-740'/>
     <!-- void* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-741' size-in-bits='64' id='type-id-369'/>
@@ -11004,13 +11004,13 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::vector(unsigned long int, void(*)(void) const&, const std::allocator<void (*)()>&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::vector(unsigned long int, void (*)(void) const&, const std::allocator<void (*)()>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- parameter of type 'void(*)(void) const&' -->
+            <!-- parameter of type 'void (*)(void) const&' -->
             <parameter type-id='type-id-729'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
             <parameter type-id='type-id-575'/>
@@ -11041,13 +11041,13 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void(*)(void)& std::vector<void (*)(), std::allocator<void (*)()> >::operator[](unsigned long int) -->
+          <!-- void (*)(void)& std::vector<void (*)(), std::allocator<void (*)()> >::operator[](unsigned long int) -->
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIPFvvESaIS1_EEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- void(*)(void)& -->
+            <!-- void (*)(void)& -->
             <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
@@ -11101,24 +11101,24 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::push_back(void(*)(void) const&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::push_back(void (*)(void) const&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void) const&' -->
+            <!-- parameter of type 'void (*)(void) const&' -->
             <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >, void(*)(void) const&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >, void (*)(void) const&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >' -->
             <parameter type-id='type-id-416'/>
-            <!-- parameter of type 'void(*)(void) const&' -->
+            <!-- parameter of type 'void (*)(void) const&' -->
             <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
@@ -12111,15 +12111,15 @@
             <!-- class std::allocator<void (*)()> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-573'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_start -->
+              <!-- void (*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_finish -->
+              <!-- void (*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_finish -->
               <var-decl name='_M_finish' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_end_of_storage -->
+              <!-- void (*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_end_of_storage -->
               <var-decl name='_M_end_of_storage' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
@@ -12202,11 +12202,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_deallocate(void(*)(void)*, unsigned long int) -->
+          <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_deallocate(void (*)(void)*, unsigned long int) -->
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-681' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
@@ -12224,13 +12224,13 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_allocate(unsigned long int) -->
+          <!-- void (*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_allocate(unsigned long int) -->
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -12459,11 +12459,11 @@
       <!-- struct std::__miter_base<void (**)(), false> -->
       <class-decl name='__miter_base&lt;void (**)(), 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' id='type-id-788'>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__miter_base<void (**)(), false>::__b() -->
+          <!-- void (*)(void)* std::__miter_base<void (**)(), false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -12507,11 +12507,11 @@
       <!-- struct std::__niter_base<void (**)(), false> -->
       <class-decl name='__niter_base&lt;void (**)(), 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='267' column='1' id='type-id-792'>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__niter_base<void (**)(), false>::__b() -->
+          <!-- void (*)(void)* std::__niter_base<void (**)(), false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__niter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -13189,15 +13189,15 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::__copy_move_a<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::__copy_move_a<false, void (**)(), void (**)()>(void (*)(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(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::__copy_move_a2<false, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
@@ -13211,15 +13211,15 @@
         <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
         <return type-id='type-id-410'/>
       </function-decl>
-      <!-- void(*)(void)* std::__copy_move_a2<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::__copy_move_a2<false, void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='__copy_move_a2&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='431' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::copy<__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
@@ -13233,15 +13233,15 @@
         <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
         <return type-id='type-id-410'/>
       </function-decl>
-      <!-- void(*)(void)* std::copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::copy<void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__copy_move_backward_a<false, AllocObject*, AllocObject*>(AllocObject*, AllocObject*, AllocObject*) -->
@@ -13255,15 +13255,15 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::__copy_move_backward_a<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::__copy_move_backward_a<false, void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='__copy_move_backward_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='582' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__copy_move_backward_a<false, void**, void**>(void**, void**, void**) -->
@@ -13288,15 +13288,15 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::__copy_move_backward_a2<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::__copy_move_backward_a2<false, void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='__copy_move_backward_a2&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='600' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__copy_move_backward_a2<false, void**, void**>(void**, void**, void**) -->
@@ -13321,15 +13321,15 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::copy_backward<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::copy_backward<void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='copy_backward&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::copy_backward<void**, void**>(void**, void**, void**) -->
@@ -13343,11 +13343,11 @@
         <!-- void** -->
         <return type-id='type-id-174'/>
       </function-decl>
-      <!-- void std::_Destroy<void (**)()>(void(*)(void)*, void(*)(void)*) -->
+      <!-- void std::_Destroy<void (**)()>(void (*)(void)*, void (*)(void)*) -->
       <function-decl name='_Destroy&lt;void (**)()&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 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -13374,11 +13374,11 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::_Destroy<void (**)(), void (*)()>(void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
+      <!-- void std::_Destroy<void (**)(), void (*)()>(void (*)(void)*, void (*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='_Destroy&lt;void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
         <parameter type-id='type-id-687'/>
@@ -13430,15 +13430,15 @@
         <!-- struct std::pair<long unsigned int, long unsigned int> -->
         <return type-id='type-id-622'/>
       </function-decl>
-      <!-- void(*)(void)* std::uninitialized_copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::uninitialized_copy<void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&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 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__uninitialized_copy_a<AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >(AllocObject*, AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
@@ -13480,17 +13480,17 @@
         <!-- void** -->
         <return type-id='type-id-174'/>
       </function-decl>
-      <!-- void(*)(void)* std::__uninitialized_copy_a<void (**)(), void (**)(), void (*)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
+      <!-- void (*)(void)* std::__uninitialized_copy_a<void (**)(), void (**)(), void (*)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='__uninitialized_copy_a&lt;void (**)(), void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
         <parameter type-id='type-id-687'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__uninitialized_move_a<AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >(AllocObject*, AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
@@ -13506,17 +13506,17 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::__uninitialized_move_a<void (**)(), void (**)(), std::allocator<void (*)()> >(void(*)(void)*, void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
+      <!-- void (*)(void)* std::__uninitialized_move_a<void (**)(), void (**)(), std::allocator<void (*)()> >(void (*)(void)*, void (*)(void)*, void (*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='__uninitialized_move_a&lt;void (**)(), void (**)(), std::allocator&lt;void (*)()&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
         <parameter type-id='type-id-687'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__uninitialized_move_a<void**, void**, STL_Allocator<void*, HeapLeakChecker::Allocator> >(void**, void**, void**, STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
@@ -13910,7 +13910,7 @@
       <!-- class __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > > -->
       <class-decl name='__normal_iterator&lt;void (**)(), std::vector&lt;void (*)(), std::allocator&lt;void (*)()&gt; &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/stl_iterator.h' line='669' column='1' id='type-id-416'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <!-- void(*)(void)* __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::_M_current -->
+          <!-- void (*)(void)* __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::_M_current -->
           <var-decl name='_M_current' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
         <member-function access='private'>
@@ -13923,31 +13923,31 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator(void(*)(void)* const&) -->
+          <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator(void (*)(void)* const&) -->
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='686' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-418' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)* const&' -->
+            <!-- parameter of type 'void (*)(void)* const&' -->
             <parameter type-id='type-id-734'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void(*)(void)* const& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::base() -->
+          <!-- void (*)(void)* const& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::base() -->
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEE4baseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <!-- void(*)(void)* const& -->
+            <!-- void (*)(void)* const& -->
             <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void(*)(void)& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::operator*() -->
+          <!-- void (*)(void)& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::operator*() -->
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <!-- void(*)(void)& -->
+            <!-- void (*)(void)& -->
             <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
@@ -14042,11 +14042,11 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::deallocate(void(*)(void)*, unsigned long int) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::deallocate(void (*)(void)*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
@@ -14055,7 +14055,7 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void(*)(void)* __gnu_cxx::new_allocator<void (*)()>::allocate(unsigned long int, void*) -->
+          <!-- void (*)(void)* __gnu_cxx::new_allocator<void (*)()>::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
@@ -14063,29 +14063,29 @@
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-73'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::construct(void(*)(void)*, void(*)(void) const&) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::construct(void (*)(void)*, void (*)(void) const&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- parameter of type 'void(*)(void) const&' -->
+            <!-- parameter of type 'void (*)(void) const&' -->
             <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::destroy(void(*)(void)*) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::destroy(void (*)(void)*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
             <!-- void -->
             <return type-id='type-id-75'/>
@@ -14242,20 +14242,20 @@
             <var-decl name='priv_data' type-id='type-id-178' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- void(*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::GetSingular() -->
+            <!-- void (*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_miiilEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-488' is-artificial='yes'/>
-              <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
+              <!-- void (*)(void*, void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-384'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Traverse(void(*)(void*, void*, size_t, int, int, int, off_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Traverse(void (*)(void*, void*, size_t, int, int, int, off_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_miiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-488' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)*' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, int, int, int, off_t)*' -->
               <parameter type-id='type-id-740'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -14282,33 +14282,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
+            <!-- void (*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
-              <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
+              <!-- void (*)(void*, void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-384'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Remove(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Remove(void (*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Add(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Add(void (*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -14326,20 +14326,20 @@
             <var-decl name='priv_data' type-id='type-id-178' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- void(*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::GetSingular() -->
+            <!-- void (*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvlEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-490' is-artificial='yes'/>
-              <!-- void(*)(void*, ptrdiff_t) -->
+              <!-- void (*)(void*, ptrdiff_t) -->
               <return type-id='type-id-388'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Traverse(void(*)(void*, ptrdiff_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Traverse(void (*)(void*, ptrdiff_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvlEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-490' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, ptrdiff_t)*' -->
+              <!-- parameter of type 'void (*)(void*, ptrdiff_t)*' -->
               <parameter type-id='type-id-738'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -14366,33 +14366,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::ExchangeSingular(void(*)(void*, ptrdiff_t)) -->
+            <!-- void (*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::ExchangeSingular(void (*)(void*, ptrdiff_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
-              <!-- void(*)(void*, ptrdiff_t) -->
+              <!-- void (*)(void*, ptrdiff_t) -->
               <return type-id='type-id-388'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Remove(void(*)(void*, ptrdiff_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Remove(void (*)(void*, ptrdiff_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Add(void(*)(void*, ptrdiff_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Add(void (*)(void*, ptrdiff_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -14503,13 +14503,13 @@
       <!-- void -->
       <return type-id='type-id-75'/>
     </function-type>
-    <!-- void (void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
+    <!-- void (void*, HeapProfileTable::AllocValue*, void (*)(void*, const HeapProfileTable::AllocInfo&)) -->
     <function-type size-in-bits='64' id='type-id-735'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-73'/>
       <!-- parameter of type 'HeapProfileTable::AllocValue*' -->
       <parameter type-id='type-id-213'/>
-      <!-- parameter of type 'void(*)(void*, const HeapProfileTable::AllocInfo&)' -->
+      <!-- parameter of type 'void (*)(void*, const HeapProfileTable::AllocInfo&)' -->
       <parameter type-id='type-id-198'/>
       <!-- void -->
       <return type-id='type-id-75'/>
@@ -14583,7 +14583,7 @@
     <pointer-type-def type-id='type-id-859' size-in-bits='64' id='type-id-860'/>
     <!-- __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
     <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-862'/>
-    <!-- bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*) -->
+    <!-- bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*) -->
     <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-864'/>
     <!-- bool* -->
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-127'/>
@@ -14693,17 +14693,17 @@
     <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-924'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>* -->
     <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
-    <!-- void(*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*) -->
+    <!-- void (*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*) -->
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-314'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*) -->
     <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-201'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*) -->
     <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-203'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*) -->
     <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-209'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, char*) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, char*) -->
     <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-199'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&) -->
     <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-207'/>
     <!-- AddressMap<HeapProfileTable::AllocValue>::Cluster* -->
     <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-205'/>
@@ -16382,7 +16382,7 @@
         <!-- const HeapProfileTable::Snapshot::Entry& -->
         <return type-id='type-id-267'/>
       </function-decl>
-      <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__median&lt;HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
         <parameter type-id='type-id-855'/>
@@ -16390,7 +16390,7 @@
         <parameter type-id='type-id-855'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
         <parameter type-id='type-id-855'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- HeapProfileTable::AllocValue::Bucket* const& -->
         <return type-id='type-id-855'/>
@@ -16406,7 +16406,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__heap_select<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__heap_select<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__heap_select&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt13__heap_selectIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_S7_T0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__heap_selectIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_S7_T0_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1913' column='1'/>
@@ -16414,7 +16414,7 @@
         <parameter type-id='type-id-280' name='__middle' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1914' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1915' column='1'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1915' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16428,13 +16428,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__unguarded_linear_insert<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__unguarded_linear_insert<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_linear_insert&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2079' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16448,13 +16448,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt16__insertion_sortIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_T0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__insertion_sortIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_T0_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2119' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2120' column='1'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2120' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16468,13 +16468,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__unguarded_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__unguarded_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2154' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16488,13 +16488,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__final_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__final_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__final_insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2188' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16510,7 +16510,7 @@
         <!-- HeapProfileTable::Snapshot::Entry* -->
         <return type-id='type-id-265'/>
       </function-decl>
-      <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_partition&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16518,7 +16518,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- HeapProfileTable::AllocValue::Bucket** -->
         <return type-id='type-id-280'/>
@@ -16534,7 +16534,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__introsort_loop<HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, long int, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__introsort_loop<HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, long int, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__introsort_loop&lt;HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt16__introsort_loopIPP17HeapProfileBucketlPFbP16HeapProfileStatsS4_EEvT_S7_T0_T1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__introsort_loopIPP17HeapProfileBucketlPFbP16HeapProfileStatsS4_EEvT_S7_T0_T1_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2277' column='1'/>
@@ -16542,7 +16542,7 @@
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2278' column='1'/>
         <!-- parameter of type 'long int' -->
         <parameter type-id='type-id-18' name='__depth_limit' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2279' column='1'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2279' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16565,7 +16565,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::partial_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::partial_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='partial_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='5095' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16573,7 +16573,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16587,13 +16587,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='5244' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16750,7 +16750,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__push_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__push_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__push_heap&lt;HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16760,7 +16760,7 @@
         <parameter type-id='type-id-18'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16789,7 +16789,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__adjust_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__adjust_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__adjust_heap&lt;HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt13__adjust_heapIPP17HeapProfileBucketlS1_PFbP16HeapProfileStatsS4_EEvT_T0_S8_T1_T2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__adjust_heapIPP17HeapProfileBucketlS1_PFbP16HeapProfileStatsS4_EEvT_T0_S8_T1_T2_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='295' column='1'/>
@@ -16799,12 +16799,12 @@
         <parameter type-id='type-id-18' name='__len' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255' name='__value' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__pop_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__pop_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__pop_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16812,7 +16812,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16826,13 +16826,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::make_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::make_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='make_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16846,13 +16846,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::sort_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::sort_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='sort_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -17278,7 +17278,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
     <!-- tcmalloc::Logger* -->
     <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
-    <!-- void(*)(const char*, int) -->
+    <!-- void (*)(const char*, int) -->
     <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1018'/>
     <!-- namespace base -->
     <namespace-decl name='base'>
@@ -17384,7 +17384,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- void(*tcmalloc::log_message_writer)(const char*, int) -->
+      <!-- void (* tcmalloc::log_message_writer)(const char*, int) -->
       <var-decl name='log_message_writer' type-id='type-id-1018' mangled-name='_ZN8tcmalloc18log_message_writerE' visibility='default' filepath='src/internal_logging.cc' line='63' column='1' elf-symbol-id='_ZN8tcmalloc18log_message_writerE'/>
       <!-- void tcmalloc::Log(tcmalloc::LogMode, const char*, int, tcmalloc::LogItem, tcmalloc::LogItem, tcmalloc::LogItem, tcmalloc::LogItem) -->
       <function-decl name='Log' mangled-name='_ZN8tcmalloc3LogENS_7LogModeEPKciNS_7LogItemES3_S3_S3_' filepath='src/internal_logging.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc3LogENS_7LogModeEPKciNS_7LogItemES3_S3_S3_'>
@@ -18013,17 +18013,17 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <!-- typedef int(*)(void*, size_t, int, int, int, off_t, void**) MallocHook_MmapReplacement -->
+    <!-- typedef int (*)(void*, size_t, int, int, int, off_t, void**) MallocHook_MmapReplacement -->
     <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-1047' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-1048'/>
-    <!-- typedef void(*)(void*, void*, size_t, size_t, int, void*) MallocHook_MremapHook -->
+    <!-- typedef void (*)(void*, void*, size_t, size_t, int, void*) MallocHook_MremapHook -->
     <typedef-decl name='MallocHook_MremapHook' type-id='type-id-1049' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-1050'/>
-    <!-- typedef void(*)(void*, size_t) MallocHook_MunmapHook -->
+    <!-- typedef void (*)(void*, size_t) MallocHook_MunmapHook -->
     <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-386' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-1051'/>
-    <!-- typedef int(*)(void*, size_t, int*) MallocHook_MunmapReplacement -->
+    <!-- typedef int (*)(void*, size_t, int*) MallocHook_MunmapReplacement -->
     <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-1052' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-1053'/>
-    <!-- typedef void(*)(void*, size_t, int, int, int, off_t) MallocHook_PreMmapHook -->
+    <!-- typedef void (*)(void*, size_t, int, int, int, off_t) MallocHook_PreMmapHook -->
     <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-1054' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-1055'/>
-    <!-- typedef void(*)(ptrdiff_t) MallocHook_PreSbrkHook -->
+    <!-- typedef void (*)(ptrdiff_t) MallocHook_PreSbrkHook -->
     <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-1056' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-1057'/>
     <!-- base::internal::HookList<int (*)(const void*, size_t, int*)>* -->
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
@@ -18055,25 +18055,25 @@
     <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1076'/>
     <!-- const base::internal::HookList<void (*)(ptrdiff_t)>* -->
     <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
-    <!-- int(*)(void*, size_t, int*) -->
+    <!-- int (*)(void*, size_t, int*) -->
     <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1052'/>
-    <!-- int(*)(void*, size_t, int*)* -->
+    <!-- int (*)(void*, size_t, int*)* -->
     <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1079'/>
-    <!-- int(*)(void*, size_t, int, int, int, off_t, void**) -->
+    <!-- int (*)(void*, size_t, int, int, int, off_t, void**) -->
     <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1047'/>
-    <!-- int(*)(void*, size_t, int, int, int, off_t, void**)* -->
+    <!-- int (*)(void*, size_t, int, int, int, off_t, void**)* -->
     <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1081'/>
-    <!-- void(*)(ptrdiff_t) -->
+    <!-- void (*)(ptrdiff_t) -->
     <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1056'/>
-    <!-- void(*)(ptrdiff_t)* -->
+    <!-- void (*)(ptrdiff_t)* -->
     <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1083'/>
-    <!-- void(*)(void*, size_t, int, int, int, off_t) -->
+    <!-- void (*)(void*, size_t, int, int, int, off_t) -->
     <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1054'/>
-    <!-- void(*)(void*, size_t, int, int, int, off_t)* -->
+    <!-- void (*)(void*, size_t, int, int, int, off_t)* -->
     <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1085'/>
-    <!-- void(*)(void*, void*, size_t, size_t, int, void*) -->
+    <!-- void (*)(void*, void*, size_t, size_t, int, void*) -->
     <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1049'/>
-    <!-- void(*)(void*, void*, size_t, size_t, int, void*)* -->
+    <!-- void (*)(void*, void*, size_t, size_t, int, void*)* -->
     <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1087'/>
     <!-- volatile base::subtle::Atomic64* -->
     <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-108'/>
@@ -18200,11 +18200,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int(*)(void*, size_t, int*)*, int) -->
+            <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int (*)(void*, size_t, int*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE8TraverseEPS6_i' filepath='src/malloc_hook.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1069' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int*)*' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int*)*' -->
               <parameter type-id='type-id-1079'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18222,11 +18222,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int(*)(void*, size_t, int*)) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int (*)(void*, size_t, int*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE6RemoveES6_' filepath='src/malloc_hook.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1059' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int*)' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int*)' -->
               <parameter type-id='type-id-1052'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18242,11 +18242,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int(*)(void*, size_t, int*)) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int (*)(void*, size_t, int*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE3AddES6_' filepath='src/malloc_hook.cc' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1059' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int*)' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int*)' -->
               <parameter type-id='type-id-1052'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18264,11 +18264,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int(*)(void*, size_t, int, int, int, off_t, void**)*, int) -->
+            <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int (*)(void*, size_t, int, int, int, off_t, void**)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE8TraverseEPS7_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1071' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)*' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int, int, int, off_t, void**)*' -->
               <parameter type-id='type-id-1081'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18295,22 +18295,22 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int(*)(void*, size_t, int, int, int, off_t, void**)) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int (*)(void*, size_t, int, int, int, off_t, void**)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE6RemoveES7_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1061' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int, int, int, off_t, void**)' -->
               <parameter type-id='type-id-1047'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int(*)(void*, size_t, int, int, int, off_t, void**)) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int (*)(void*, size_t, int, int, int, off_t, void**)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE3AddES7_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1061' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int, int, int, off_t, void**)' -->
               <parameter type-id='type-id-1047'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18330,11 +18330,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void(*)(void*, void*, size_t, size_t, int, void*)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void (*)(void*, void*, size_t, size_t, int, void*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1073' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)*' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, size_t, int, void*)*' -->
               <parameter type-id='type-id-1087'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18361,33 +18361,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, void*, size_t, size_t, int, void*) base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void(*)(void*, void*, size_t, size_t, int, void*)) -->
+            <!-- void (*)(void*, void*, size_t, size_t, int, void*) base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void (*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
-              <!-- void(*)(void*, void*, size_t, size_t, int, void*) -->
+              <!-- void (*)(void*, void*, size_t, size_t, int, void*) -->
               <return type-id='type-id-1049'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void(*)(void*, void*, size_t, size_t, int, void*)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void (*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void(*)(void*, void*, size_t, size_t, int, void*)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void (*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18407,11 +18407,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void(*)(void*, size_t, int, int, int, off_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void (*)(void*, size_t, int, int, int, off_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1075' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)*' -->
+              <!-- parameter of type 'void (*)(void*, size_t, int, int, int, off_t)*' -->
               <parameter type-id='type-id-1085'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18438,33 +18438,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void(*)(void*, size_t, int, int, int, off_t)) -->
+            <!-- void (*)(void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
-              <!-- void(*)(void*, size_t, int, int, int, off_t) -->
+              <!-- void (*)(void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-1054'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void(*)(void*, size_t, int, int, int, off_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void (*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void(*)(void*, size_t, int, int, int, off_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void (*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18482,11 +18482,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void(*)(ptrdiff_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void (*)(ptrdiff_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvlEE8TraverseEPS3_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1077' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(ptrdiff_t)*' -->
+              <!-- parameter of type 'void (*)(ptrdiff_t)*' -->
               <parameter type-id='type-id-1083'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18513,33 +18513,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(ptrdiff_t) base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void(*)(ptrdiff_t)) -->
+            <!-- void (*)(ptrdiff_t) base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void (*)(ptrdiff_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvlEE16ExchangeSingularES3_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
-              <!-- void(*)(ptrdiff_t) -->
+              <!-- void (*)(ptrdiff_t) -->
               <return type-id='type-id-1056'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void(*)(ptrdiff_t)) -->
+            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void (*)(ptrdiff_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvlEE6RemoveES3_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void(*)(ptrdiff_t)) -->
+            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void (*)(ptrdiff_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvlEE3AddES3_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18916,11 +18916,11 @@
     <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
     <!-- pthread_once_t* -->
     <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
-    <!-- int perftools_pthread_key_create(pthread_key_t*, void(*)(void*)) -->
+    <!-- int perftools_pthread_key_create(pthread_key_t*, void (*)(void*)) -->
     <function-decl name='perftools_pthread_key_create' mangled-name='_Z28perftools_pthread_key_createPjPFvPvE' filepath='src/maybe_threads.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28perftools_pthread_key_createPjPFvPvE'>
       <!-- parameter of type 'pthread_key_t*' -->
       <parameter type-id='type-id-1099' name='key' filepath='src/maybe_threads.cc' line='90' column='1'/>
-      <!-- parameter of type 'void(*)(void*)' -->
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-193' name='destr_function' filepath='src/maybe_threads.cc' line='91' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -18948,11 +18948,11 @@
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
-    <!-- int perftools_pthread_once(pthread_once_t*, void(*)(void)) -->
+    <!-- int perftools_pthread_once(pthread_once_t*, void (*)(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*' -->
       <parameter type-id='type-id-1101' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
-      <!-- parameter of type 'void(*)(void)' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-162' name='init_routine' filepath='src/maybe_threads.cc' line='129' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -19320,7 +19320,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-306' size-in-bits='64' id='type-id-1144'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1145'/>
-    <!-- void(*)(const MemoryRegionMap::Region&) -->
+    <!-- void (*)(const MemoryRegionMap::Region&) -->
     <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-315'/>
     <!-- const std::_Rb_tree_node<MemoryRegionMap::Region> -->
     <qualified-type-def type-id='type-id-1147' const='yes' id='type-id-1148'/>
@@ -20487,7 +20487,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void(*)(int, siginfo_t*, void*, void*) ProfileHandlerCallback -->
+    <!-- typedef void (*)(int, siginfo_t*, void*, void*) ProfileHandlerCallback -->
     <typedef-decl name='ProfileHandlerCallback' type-id='type-id-1186' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1179'/>
     <!-- typedef int pthread_once_t -->
     <typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-1100'/>
@@ -20575,7 +20575,7 @@
     <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1230'/>
     <!-- timer_id_holder* -->
     <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-1185'/>
-    <!-- void(*)(int, siginfo_t*, void*, void*) -->
+    <!-- void (*)(int, siginfo_t*, void*, void*) -->
     <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1186'/>
     <!-- const std::_List_node<ProfileHandlerToken*> -->
     <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1233'/>
@@ -21259,7 +21259,7 @@
         <var-decl name='collector_' type-id='type-id-1251' visibility='default' filepath='src/profiler.cc' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
-        <!-- int(*CpuProfiler::filter_)(void*) -->
+        <!-- int (* CpuProfiler::filter_)(void*) -->
         <var-decl name='filter_' type-id='type-id-1252' visibility='default' filepath='src/profiler.cc' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
@@ -21691,7 +21691,7 @@
     <!-- struct ProfilerOptions -->
     <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1272'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- int(*ProfilerOptions::filter_in_thread)(void*) -->
+        <!-- int (* ProfilerOptions::filter_in_thread)(void*) -->
         <var-decl name='filter_in_thread' type-id='type-id-1252' visibility='default' filepath='./src/gperftools/profiler.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -21923,7 +21923,7 @@
     <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1291'/>
     <!-- const ProfilerOptions* -->
     <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1255'/>
-    <!-- int(*)(void*) -->
+    <!-- int (*)(void*) -->
     <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1252'/>
     <!-- siginfo_t* -->
     <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1177'/>
@@ -26215,15 +26215,15 @@
         <var-decl name='root_' type-id='type-id-1429' visibility='default' filepath='src/pagemap.h' line='229' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <!-- void*(*TCMalloc_PageMap3<35>::allocator_)(unsigned long int) -->
+        <!-- void* (* TCMalloc_PageMap3<35>::allocator_)(unsigned long int) -->
         <var-decl name='allocator_' type-id='type-id-192' visibility='default' filepath='src/pagemap.h' line='230' column='1'/>
       </data-member>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -26241,22 +26241,22 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -26857,7 +26857,7 @@
     <typedef-decl name='_IO_lock_t' type-id='type-id-75' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-1458'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-149' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-1459'/>
-    <!-- typedef int(*)(void*, void*) __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-1460' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-163'/>
     <!-- typedef long int __off64_t -->
     <typedef-decl name='__off64_t' type-id='type-id-18' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-156'/>
@@ -27141,7 +27141,7 @@
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-6'/>
     <!-- const wchar_t** -->
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-14'/>
-    <!-- int(*)(void*, void*) -->
+    <!-- int (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-1460'/>
     <!-- int* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1023'/>
@@ -27213,25 +27213,25 @@
     <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-23'/>
     <!-- uint64_t* -->
     <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-1578'/>
-    <!-- void(*)(void) -->
+    <!-- void (*)(void) -->
     <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-162'/>
-    <!-- void(*)(void*) -->
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-193'/>
-    <!-- void(*)(void*)* -->
+    <!-- void (*)(void*)* -->
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-1580'/>
-    <!-- void(*)(void*, size_t) -->
+    <!-- void (*)(void*, size_t) -->
     <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-386'/>
-    <!-- void(*)(void*, size_t)* -->
+    <!-- void (*)(void*, size_t)* -->
     <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-1582'/>
-    <!-- void(*)(void*, void*) -->
+    <!-- void (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
-    <!-- void*(*)(size_t, size_t, void*) -->
+    <!-- void* (*)(size_t, size_t, void*) -->
     <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
-    <!-- void*(*)(size_t, void*) -->
+    <!-- void* (*)(size_t, void*) -->
     <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
-    <!-- void*(*)(unsigned long int) -->
+    <!-- void* (*)(unsigned long int) -->
     <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-192'/>
-    <!-- void*(*)(void*, size_t, void*) -->
+    <!-- void* (*)(void*, size_t, void*) -->
     <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-174'/>
@@ -27631,11 +27631,11 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void std::_Destroy_aux<true>::__destroy<void (**)()>(void(*)(void)*) -->
+          <!-- void std::_Destroy_aux<true>::__destroy<void (**)()>(void (*)(void)*) -->
           <function-decl name='__destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
             <!-- void -->
             <return type-id='type-id-75'/>
@@ -27865,15 +27865,15 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<void (*)()>(void(*)(void) const*, void(*)(void)*) -->
+          <!-- void (*)(void)* std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<void (*)()>(void (*)(void) const*, void (*)(void)*) -->
           <function-decl name='__copy_m&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void) const*' -->
+            <!-- parameter of type 'void (*)(void) const*' -->
             <parameter type-id='type-id-730'/>
-            <!-- parameter of type 'void(*)(void) const*' -->
+            <!-- parameter of type 'void (*)(void) const*' -->
             <parameter type-id='type-id-730'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -27933,15 +27933,15 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<void (*)()>(void(*)(void) const*, void(*)(void)*) -->
+          <!-- void (*)(void)* std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<void (*)()>(void (*)(void) const*, void (*)(void)*) -->
           <function-decl name='__copy_move_b&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void) const*' -->
+            <!-- parameter of type 'void (*)(void) const*' -->
             <parameter type-id='type-id-730'/>
-            <!-- parameter of type 'void(*)(void) const*' -->
+            <!-- parameter of type 'void (*)(void) const*' -->
             <parameter type-id='type-id-730'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -28012,15 +28012,15 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__uninitialized_copy<true>::uninitialized_copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*) -->
+          <!-- void (*)(void)* std::__uninitialized_copy<true>::uninitialized_copy<void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*) -->
           <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -29414,20 +29414,20 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*) base::internal::HookList<void (*)(const void*)>::GetSingular() -->
+            <!-- void (*)(void*) base::internal::HookList<void (*)(const void*)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1497' is-artificial='yes'/>
-              <!-- void(*)(void*) -->
+              <!-- void (*)(void*) -->
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*)>::Traverse(void(*)(void*)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*)>::Traverse(void (*)(void*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1497' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*)*' -->
+              <!-- parameter of type 'void (*)(void*)*' -->
               <parameter type-id='type-id-1580'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -29445,33 +29445,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*) base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void(*)(void*)) -->
+            <!-- void (*)(void*) base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void (*)(void*)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*)' -->
+              <!-- parameter of type 'void (*)(void*)' -->
               <parameter type-id='type-id-193'/>
-              <!-- void(*)(void*) -->
+              <!-- void (*)(void*) -->
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void(*)(void*)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void (*)(void*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*)' -->
+              <!-- parameter of type 'void (*)(void*)' -->
               <parameter type-id='type-id-193'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void(*)(void*)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void (*)(void*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*)' -->
+              <!-- parameter of type 'void (*)(void*)' -->
               <parameter type-id='type-id-193'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -29498,11 +29498,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
+            <!-- void (*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1499' is-artificial='yes'/>
-              <!-- void(*)(void*, size_t) -->
+              <!-- void (*)(void*, size_t) -->
               <return type-id='type-id-386'/>
             </function-decl>
           </member-function>
@@ -29516,11 +29516,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void(*)(void*, size_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void (*)(void*, size_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1499' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t)*' -->
+              <!-- parameter of type 'void (*)(void*, size_t)*' -->
               <parameter type-id='type-id-1582'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -29529,33 +29529,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void(*)(void*, size_t)) -->
+            <!-- void (*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void (*)(void*, size_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
-              <!-- void(*)(void*, size_t) -->
+              <!-- void (*)(void*, size_t) -->
               <return type-id='type-id-386'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void(*)(void*, size_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void (*)(void*, size_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void(*)(void*, size_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void (*)(void*, size_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -33076,13 +33076,13 @@
         <return type-id='type-id-73'/>
       </function-decl>
     </namespace-decl>
-    <!-- void*(*__malloc_hook)(size_t, void*) -->
+    <!-- void* (* __malloc_hook)(size_t, void*) -->
     <var-decl name='__malloc_hook' type-id='type-id-1588' mangled-name='__malloc_hook' visibility='default' filepath='src/libc_override_glibc.h' line='135' column='1' elf-symbol-id='__malloc_hook'/>
-    <!-- void*(*__realloc_hook)(void*, size_t, void*) -->
+    <!-- void* (* __realloc_hook)(void*, size_t, void*) -->
     <var-decl name='__realloc_hook' type-id='type-id-1590' mangled-name='__realloc_hook' visibility='default' filepath='src/libc_override_glibc.h' line='137' column='1' elf-symbol-id='__realloc_hook'/>
-    <!-- void(*__free_hook)(void*, void*) -->
+    <!-- void (* __free_hook)(void*, void*) -->
     <var-decl name='__free_hook' type-id='type-id-1584' mangled-name='__free_hook' visibility='default' filepath='src/libc_override_glibc.h' line='139' column='1' elf-symbol-id='__free_hook'/>
-    <!-- void*(*__memalign_hook)(size_t, size_t, void*) -->
+    <!-- void* (* __memalign_hook)(size_t, size_t, void*) -->
     <var-decl name='__memalign_hook' type-id='type-id-1586' mangled-name='__memalign_hook' visibility='default' filepath='src/libc_override_glibc.h' line='141' column='1' elf-symbol-id='__memalign_hook'/>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
diff --git a/tests/data/test-annotate/test2.so.abi b/tests/data/test-annotate/test2.so.abi
index 218d0df7..4a6155de 100644
--- a/tests/data/test-annotate/test2.so.abi
+++ b/tests/data/test-annotate/test2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
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 a6759aa3..b8a708cd 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
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libvtkParallelCore-6.1.so.1'>
+<abi-corpus version='2.3' soname='libvtkParallelCore-6.1.so.1'>
   <elf-needed>
     <dependency name='libvtkIOLegacy-6.1.so.1'/>
     <dependency name='libvtkIOCore-6.1.so.1'/>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 3f28dbde..94229e2e 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test3.so.abi b/tests/data/test-annotate/test3.so.abi
index ffd5b4f4..330ccd99 100644
--- a/tests/data/test-annotate/test3.so.abi
+++ b/tests/data/test-annotate/test3.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-annotate/test4.so.abi b/tests/data/test-annotate/test4.so.abi
index b478fe5c..6f037047 100644
--- a/tests/data/test-annotate/test4.so.abi
+++ b/tests/data/test-annotate/test4.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-annotate/test5.o.abi b/tests/data/test-annotate/test5.o.abi
index 7d6dab6d..54f086c0 100644
--- a/tests/data/test-annotate/test5.o.abi
+++ b/tests/data/test-annotate/test5.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <!-- bar(void*) -->
     <elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/test6.so.abi b/tests/data/test-annotate/test6.so.abi
index a313c769..d6ea7b0f 100644
--- a/tests/data/test-annotate/test6.so.abi
+++ b/tests/data/test-annotate/test6.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index f9120693..804716cd 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <!-- foo(S&) -->
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
index b17505f8..ce7abff0 100644
--- a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
+++ b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-btf/test0.o.abi b/tests/data/test-read-btf/test0.o.abi
index 123b14f5..f5ede627 100644
--- a/tests/data/test-read-btf/test0.o.abi
+++ b/tests/data/test-read-btf/test0.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-btf/test0.o'>
+<abi-corpus version='2.3' path='data/test-read-btf/test0.o'>
   <elf-function-symbols>
     <elf-symbol name='fn0' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-btf/test1.o.abi b/tests/data/test-read-btf/test1.o.abi
index 8043693a..ea01f284 100644
--- a/tests/data/test-read-btf/test1.o.abi
+++ b/tests/data/test-read-btf/test1.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-btf/test1.o'>
+<abi-corpus version='2.3' path='data/test-read-btf/test1.o'>
   <elf-function-symbols>
     <elf-symbol name='fn0' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/PR27700/test-PR27700.abi b/tests/data/test-read-ctf/PR27700/test-PR27700.abi
index 7ce82097..4d488b6a 100644
--- a/tests/data/test-read-ctf/PR27700/test-PR27700.abi
+++ b/tests/data/test-read-ctf/PR27700/test-PR27700.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/PR27700/test-PR27700.o'>
+<abi-corpus version='2.3' path='data/test-read-common/PR27700/test-PR27700.o'>
   <elf-function-symbols>
     <elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test-PR26568-1.o.abi b/tests/data/test-read-ctf/test-PR26568-1.o.abi
index 378ef14a..7d829a36 100644
--- a/tests/data/test-read-ctf/test-PR26568-1.o.abi
+++ b/tests/data/test-read-ctf/test-PR26568-1.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test-PR26568-1.o'>
+<abi-corpus version='2.3' path='data/test-read-common/test-PR26568-1.o'>
   <elf-function-symbols>
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test-PR26568-2.o.abi b/tests/data/test-read-ctf/test-PR26568-2.o.abi
index 5163c2ee..513c7289 100644
--- a/tests/data/test-read-ctf/test-PR26568-2.o.abi
+++ b/tests/data/test-read-ctf/test-PR26568-2.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test-PR26568-2.o'>
+<abi-corpus version='2.3' path='data/test-read-common/test-PR26568-2.o'>
   <elf-function-symbols>
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test-alias.o.abi b/tests/data/test-read-ctf/test-alias.o.abi
index cec8a2c6..13072d0f 100644
--- a/tests/data/test-read-ctf/test-alias.o.abi
+++ b/tests/data/test-read-ctf/test-alias.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-alias.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-alias.o'>
   <elf-function-symbols>
     <elf-symbol name='alias_func' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='main_func' type='func-type' binding='global-binding' visibility='default-visibility' alias='alias_func' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi b/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
index 463455c7..fee89f2f 100644
--- a/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
+++ b/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-ambiguous-struct-A.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-ambiguous-struct-A.o'>
   <elf-variable-symbols>
     <elf-symbol name='foo' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi b/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
index ba34d7a3..6c6f6b70 100644
--- a/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
+++ b/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-ambiguous-struct-B.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-ambiguous-struct-B.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='24' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-anonymous-fields.o.abi b/tests/data/test-read-ctf/test-anonymous-fields.o.abi
index 34234d1f..8cb8257c 100644
--- a/tests/data/test-read-ctf/test-anonymous-fields.o.abi
+++ b/tests/data/test-read-ctf/test-anonymous-fields.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-anonymous-fields.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-anonymous-fields.o'>
   <elf-variable-symbols>
     <elf-symbol name='t' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-array-mdimension.abi b/tests/data/test-read-ctf/test-array-mdimension.abi
index 88a36fca..3e9f2179 100644
--- a/tests/data/test-read-ctf/test-array-mdimension.abi
+++ b/tests/data/test-read-ctf/test-array-mdimension.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-array-mdimension.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-array-mdimension.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='120' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-array-of-pointers.abi b/tests/data/test-read-ctf/test-array-of-pointers.abi
index ac67f98a..dee9c103 100644
--- a/tests/data/test-read-ctf/test-array-of-pointers.abi
+++ b/tests/data/test-read-ctf/test-array-of-pointers.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-array-of-pointers.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-array-of-pointers.o'>
   <elf-variable-symbols>
     <elf-symbol name='t' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-array-size.abi b/tests/data/test-read-ctf/test-array-size.abi
index f47c8955..e504a1dc 100644
--- a/tests/data/test-read-ctf/test-array-size.abi
+++ b/tests/data/test-read-ctf/test-array-size.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-array-size.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-array-size.o'>
   <elf-variable-symbols>
     <elf-symbol name='bar' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='baz' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-bitfield-enum.abi b/tests/data/test-read-ctf/test-bitfield-enum.abi
index d1505469..fedaf255 100644
--- a/tests/data/test-read-ctf/test-bitfield-enum.abi
+++ b/tests/data/test-read-ctf/test-bitfield-enum.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-bitfield-enum.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-bitfield-enum.o'>
   <elf-variable-symbols>
     <elf-symbol name='e' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-bitfield.abi b/tests/data/test-read-ctf/test-bitfield.abi
index 7a28278e..0484539a 100644
--- a/tests/data/test-read-ctf/test-bitfield.abi
+++ b/tests/data/test-read-ctf/test-bitfield.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-bitfield.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-bitfield.o'>
   <elf-variable-symbols>
     <elf-symbol name='f' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='fb' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-callback.abi b/tests/data/test-read-ctf/test-callback.abi
index 96ea10f0..3d51043c 100644
--- a/tests/data/test-read-ctf/test-callback.abi
+++ b/tests/data/test-read-ctf/test-callback.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-callback.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-callback.o'>
   <elf-function-symbols>
     <elf-symbol name='assign' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='f2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-callback2.abi b/tests/data/test-read-ctf/test-callback2.abi
index 8f140e85..37b14c19 100644
--- a/tests/data/test-read-ctf/test-callback2.abi
+++ b/tests/data/test-read-ctf/test-callback2.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-callback2.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-callback2.o'>
   <elf-variable-symbols>
     <elf-symbol name='s0' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi b/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
index 0e9e5741..a203300a 100644
--- a/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
+++ b/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-conflicting-type-syms-a.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-conflicting-type-syms-a.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='ignore2' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi b/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
index 1722e93a..11142929 100644
--- a/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
+++ b/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-conflicting-type-syms-b.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-conflicting-type-syms-b.o'>
   <elf-variable-symbols>
     <elf-symbol name='b' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='ignore1' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-const-array.abi b/tests/data/test-read-ctf/test-const-array.abi
index 4b2bc3d2..8c019f7d 100644
--- a/tests/data/test-read-ctf/test-const-array.abi
+++ b/tests/data/test-read-ctf/test-const-array.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-const-array.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-const-array.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='32' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-dynamic-array.o.abi b/tests/data/test-read-ctf/test-dynamic-array.o.abi
index 6cd00ad8..f187c583 100644
--- a/tests/data/test-read-ctf/test-dynamic-array.o.abi
+++ b/tests/data/test-read-ctf/test-dynamic-array.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-dynamic-array.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-dynamic-array.o'>
   <elf-function-symbols>
     <elf-symbol name='use_struct_s' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test-enum-many.o.hash.abi b/tests/data/test-read-ctf/test-enum-many.o.hash.abi
index 761d3469..f1ae0363 100644
--- a/tests/data/test-read-ctf/test-enum-many.o.hash.abi
+++ b/tests/data/test-read-ctf/test-enum-many.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-enum-many.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-enum-many.o'>
   <elf-variable-symbols>
     <elf-symbol name='bar' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='foo' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-enum-symbol.o.hash.abi b/tests/data/test-read-ctf/test-enum-symbol.o.hash.abi
index 236f2399..a4f97b11 100644
--- a/tests/data/test-read-ctf/test-enum-symbol.o.hash.abi
+++ b/tests/data/test-read-ctf/test-enum-symbol.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-enum-symbol.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-enum-symbol.o'>
   <elf-variable-symbols>
     <elf-symbol name='primary1' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-enum.o.abi b/tests/data/test-read-ctf/test-enum.o.abi
index ca02fdf4..f92bd16a 100644
--- a/tests/data/test-read-ctf/test-enum.o.abi
+++ b/tests/data/test-read-ctf/test-enum.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-enum.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-enum.o'>
   <elf-variable-symbols>
     <elf-symbol name='bar' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='foo' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-fallback.abi b/tests/data/test-read-ctf/test-fallback.abi
index 1ed9508c..ca7d86b7 100644
--- a/tests/data/test-read-ctf/test-fallback.abi
+++ b/tests/data/test-read-ctf/test-fallback.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-fallback.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-fallback.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-forward-type-decl.abi b/tests/data/test-read-ctf/test-forward-type-decl.abi
index 46caf6a0..20c8efe9 100644
--- a/tests/data/test-read-ctf/test-forward-type-decl.abi
+++ b/tests/data/test-read-ctf/test-forward-type-decl.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-forward-type-decl.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-forward-type-decl.o'>
   <elf-variable-symbols>
     <elf-symbol name='addr' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-functions-declaration.abi b/tests/data/test-read-ctf/test-functions-declaration.abi
index 84f50c39..04cdae4c 100644
--- a/tests/data/test-read-ctf/test-functions-declaration.abi
+++ b/tests/data/test-read-ctf/test-functions-declaration.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-functions-declaration.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-functions-declaration.o'>
   <elf-function-symbols>
     <elf-symbol name='attribute_container_add_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='attribute_container_device_trigger' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-linux-module.abi b/tests/data/test-read-ctf/test-linux-module.abi
index 7f4806cc..89066149 100644
--- a/tests/data/test-read-ctf/test-linux-module.abi
+++ b/tests/data/test-read-ctf/test-linux-module.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-linux-module.ko'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-linux-module.ko'>
   <elf-function-symbols>
     <elf-symbol name='testexport' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x533ba8e8'/>
     <elf-symbol name='testexport2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x65900b2f'/>
diff --git a/tests/data/test-read-ctf/test-list-struct.abi b/tests/data/test-read-ctf/test-list-struct.abi
index bcbbfc81..1f506d48 100644
--- a/tests/data/test-read-ctf/test-list-struct.abi
+++ b/tests/data/test-read-ctf/test-list-struct.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-list-struct.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-list-struct.o'>
   <elf-variable-symbols>
     <elf-symbol name='n1' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='n2' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test0.abi b/tests/data/test-read-ctf/test0.abi
index 0cc90924..0c8dc0ae 100644
--- a/tests/data/test-read-ctf/test0.abi
+++ b/tests/data/test-read-ctf/test0.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test0'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test0'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test0.hash.abi b/tests/data/test-read-ctf/test0.hash.abi
index e554f91d..a1fb5fab 100644
--- a/tests/data/test-read-ctf/test0.hash.abi
+++ b/tests/data/test-read-ctf/test0.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test0'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test0'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test1.so.abi b/tests/data/test-read-ctf/test1.so.abi
index 94530753..3c208642 100644
--- a/tests/data/test-read-ctf/test1.so.abi
+++ b/tests/data/test-read-ctf/test1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test1.so'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test1.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test1.so.hash.abi b/tests/data/test-read-ctf/test1.so.hash.abi
index f70ed683..e2266db4 100644
--- a/tests/data/test-read-ctf/test1.so.hash.abi
+++ b/tests/data/test-read-ctf/test1.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test1.so'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test1.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test2.so.abi b/tests/data/test-read-ctf/test2.so.abi
index db4a958e..98d74608 100644
--- a/tests/data/test-read-ctf/test2.so.abi
+++ b/tests/data/test-read-ctf/test2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test2.so'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test2.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test2.so.hash.abi b/tests/data/test-read-ctf/test2.so.hash.abi
index 5997abb1..477a9324 100644
--- a/tests/data/test-read-ctf/test2.so.hash.abi
+++ b/tests/data/test-read-ctf/test2.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test2.so'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test2.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test3.so.abi b/tests/data/test-read-ctf/test3.so.abi
index 253f9c08..a59e91f9 100644
--- a/tests/data/test-read-ctf/test3.so.abi
+++ b/tests/data/test-read-ctf/test3.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test3.so' soname='test3.so.1'>
+<abi-corpus version='2.3' path='data/test-read-common/test3.so' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test3.so.hash.abi b/tests/data/test-read-ctf/test3.so.hash.abi
index dff5fdc8..78019858 100644
--- a/tests/data/test-read-ctf/test3.so.hash.abi
+++ b/tests/data/test-read-ctf/test3.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test3.so' soname='test3.so.1'>
+<abi-corpus version='2.3' path='data/test-read-common/test3.so' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test4.so.abi b/tests/data/test-read-ctf/test4.so.abi
index 90549d45..7dd602b4 100644
--- a/tests/data/test-read-ctf/test4.so.abi
+++ b/tests/data/test-read-ctf/test4.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test4.so'>
+<abi-corpus version='2.3' path='data/test-read-common/test4.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test4.so.hash.abi b/tests/data/test-read-ctf/test4.so.hash.abi
index 13712aa2..1f09041e 100644
--- a/tests/data/test-read-ctf/test4.so.hash.abi
+++ b/tests/data/test-read-ctf/test4.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test4.so'>
+<abi-corpus version='2.3' path='data/test-read-common/test4.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test5.o.abi b/tests/data/test-read-ctf/test5.o.abi
index be354278..816e301a 100644
--- a/tests/data/test-read-ctf/test5.o.abi
+++ b/tests/data/test-read-ctf/test5.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test5.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test5.o'>
   <elf-function-symbols>
     <elf-symbol name='bar' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='bar2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test7.o.abi b/tests/data/test-read-ctf/test7.o.abi
index 16c44565..6491db59 100644
--- a/tests/data/test-read-ctf/test7.o.abi
+++ b/tests/data/test-read-ctf/test7.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test7.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test7.o'>
   <elf-function-symbols>
     <elf-symbol name='first_type_constructor' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test8.o.abi b/tests/data/test-read-ctf/test8.o.abi
index c5913fb6..d1e7321c 100644
--- a/tests/data/test-read-ctf/test8.o.abi
+++ b/tests/data/test-read-ctf/test8.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test8.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test8.o'>
   <elf-function-symbols>
     <elf-symbol name='bar' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test9.o.abi b/tests/data/test-read-ctf/test9.o.abi
index a1def56f..eb58fa3a 100644
--- a/tests/data/test-read-ctf/test9.o.abi
+++ b/tests/data/test-read-ctf/test9.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test9.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test9.o'>
   <elf-function-symbols>
     <elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
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 c90a38fd..23799fc9 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/cached/third_party/boost-1.60.0/libboost_system.so'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index 678c67f0..2ba39ed1 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/cached/third_party/s2/libs2.so'/>
     <dependency name='build/cached/third_party/s2/util/math/libmath.so'/>
diff --git a/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi b/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
index 8a962550..ca49b9b8 100644
--- a/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
+++ b/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_ZN4stac14buggy_functionEPFvPFfiiEE' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index e9ce423b..971e60aa 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='__sdhci_add_host' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x74ae518'/>
     <elf-symbol name='__sdhci_read_caps' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x711f65c'/>
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 97b171e8..d8369a63 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
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libgdbm.so.6'>
+<abi-corpus version='2.3' soname='libgdbm.so.6'>
   <elf-needed>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-x86-64.so.2'/>
diff --git a/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi b/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
index 8460c0ce..f2d363d2 100644
--- a/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
+++ b/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/PR27700/test-PR27700.abi b/tests/data/test-read-dwarf/PR27700/test-PR27700.abi
index c4223bd6..11134e4d 100644
--- a/tests/data/test-read-dwarf/PR27700/test-PR27700.abi
+++ b/tests/data/test-read-dwarf/PR27700/test-PR27700.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi b/tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi
index 4d10a3ef..1b138c9d 100644
--- a/tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi
+++ b/tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-variable-symbols>
     <elf-symbol name='_ZN1N1S1DE' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-dwarf/PR29443-missing-xx.o.abi b/tests/data/test-read-dwarf/PR29443-missing-xx.o.abi
index 963c21e6..ba0c1992 100644
--- a/tests/data/test-read-dwarf/PR29443-missing-xx.o.abi
+++ b/tests/data/test-read-dwarf/PR29443-missing-xx.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='xx' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi b/tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi
index 122a075a..2af2cbd3 100644
--- a/tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi
+++ b/tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi
@@ -1,2 +1,2 @@
-<abi-corpus version='2.2' soname='libkjava.so.1'>
+<abi-corpus version='2.3' soname='libkjava.so.1'>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi
index 53fa11ad..e221b36b 100644
--- a/tests/data/test-read-dwarf/libtest23.so.abi
+++ b/tests/data/test-read-dwarf/libtest23.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
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 041cfa9e..3f76ba1a 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
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
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 041cfa9e..3f76ba1a 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-read-dwarf/test-PR26568-1.o.abi b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
index 114adc6f..86ffc190 100644
--- a/tests/data/test-read-dwarf/test-PR26568-1.o.abi
+++ b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test-PR26568-2.o.abi b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
index b9186d4a..3d6d6ea7 100644
--- a/tests/data/test-read-dwarf/test-PR26568-2.o.abi
+++ b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test-fallback.abi b/tests/data/test-read-dwarf/test-fallback.abi
index 14879bee..92cf7c59 100644
--- a/tests/data/test-read-dwarf/test-fallback.abi
+++ b/tests/data/test-read-dwarf/test-fallback.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-dwarf/test-libaaudio.so.abi b/tests/data/test-read-dwarf/test-libaaudio.so.abi
index 5033c7c1..51da7928 100644
--- a/tests/data/test-read-dwarf/test-libaaudio.so.abi
+++ b/tests/data/test-read-dwarf/test-libaaudio.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libaaudio.so'>
+<abi-corpus version='2.3' soname='libaaudio.so'>
   <elf-needed>
     <dependency name='libaaudio_internal.so'/>
     <dependency name='libaudioclient.so'/>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 3b7d5ad6..39be9340 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libandroid.so'>
+<abi-corpus version='2.3' soname='libandroid.so'>
   <elf-needed>
     <dependency name='liblog.so'/>
     <dependency name='libhidlbase.so'/>
diff --git a/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi b/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi
index 39980bcd..dd2582b3 100644
--- a/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi
+++ b/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='main' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test-suppressed-alias.o.abi b/tests/data/test-read-dwarf/test-suppressed-alias.o.abi
index 5bdc88d6..8c465da0 100644
--- a/tests/data/test-read-dwarf/test-suppressed-alias.o.abi
+++ b/tests/data/test-read-dwarf/test-suppressed-alias.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='alias_func' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='main_func' type='func-type' binding='global-binding' visibility='default-visibility' alias='alias_func' is-defined='yes'/>
diff --git a/tests/data/test-read-dwarf/test0.abi b/tests/data/test-read-dwarf/test0.abi
index 618004c1..e98a0a0d 100644
--- a/tests/data/test-read-dwarf/test0.abi
+++ b/tests/data/test-read-dwarf/test0.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test0.hash.abi b/tests/data/test-read-dwarf/test0.hash.abi
index 715f3cdf..88e26c21 100644
--- a/tests/data/test-read-dwarf/test0.hash.abi
+++ b/tests/data/test-read-dwarf/test0.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test1.abi b/tests/data/test-read-dwarf/test1.abi
index 2216ee7c..3e70c9df 100644
--- a/tests/data/test-read-dwarf/test1.abi
+++ b/tests/data/test-read-dwarf/test1.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test1.hash.abi b/tests/data/test-read-dwarf/test1.hash.abi
index 966ced1d..5b081f54 100644
--- a/tests/data/test-read-dwarf/test1.hash.abi
+++ b/tests/data/test-read-dwarf/test1.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
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 07c1c623..40a55874 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/debug/third_party/boost-1.56.0/libboost_system.so'/>
     <dependency name='librt.so.1'/>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index 5702c50d..b9669a7c 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/debug/mongo/db/libserver_parameters.so'/>
     <dependency name='build/debug/mongo/libbase.so'/>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index 90914ded..7041825c 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/debug/mongo/bson/mutable/libmutable_bson.so'/>
     <dependency name='build/debug/mongo/bson/util/libbson_extract.so'/>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index b3888eaf..257a053c 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libdbus-1.so.3'>
+<abi-corpus version='2.3' soname='libdbus-1.so.3'>
   <elf-needed>
     <dependency name='librt.so.1'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index 4ab5abc9..62af1d15 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libGLU.so.1'>
+<abi-corpus version='2.3' soname='libGLU.so.1'>
   <elf-needed>
     <dependency name='libGL.so.1'/>
     <dependency name='libstdc++.so.6'/>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index 739e5931..3e63f32c 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libtsan.so.0'>
+<abi-corpus version='2.3' soname='libtsan.so.0'>
   <elf-needed>
     <dependency name='librt.so.1'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index fff19e37..52ae084c 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='liboffloadmic_host.so.5'>
+<abi-corpus version='2.3' soname='liboffloadmic_host.so.5'>
   <elf-needed>
     <dependency name='libdl.so.2'/>
     <dependency name='libstdc++.so.6'/>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index c5c9654a..1fc419ab 100644
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libharfbuzz.so.0'>
+<abi-corpus version='2.3' soname='libharfbuzz.so.0'>
   <elf-needed>
     <dependency name='libglib-2.0.so.0'/>
     <dependency name='libfreetype.so.6'/>
diff --git a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index 698dcce2..69237e27 100644
--- a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libvtkRenderingLIC-6.1.so.1'>
+<abi-corpus version='2.3' soname='libvtkRenderingLIC-6.1.so.1'>
   <elf-needed>
     <dependency name='libvtkIOLegacy-6.1.so.1'/>
     <dependency name='libvtkIOXML-6.1.so.1'/>
diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 31ea116e..68579bfa 100644
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libtcmalloc_and_profiler.so.4'>
+<abi-corpus version='2.3' soname='libtcmalloc_and_profiler.so.4'>
   <elf-needed>
     <dependency name='libunwind.so.8'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-read-dwarf/test2.so.abi b/tests/data/test-read-dwarf/test2.so.abi
index f8adb180..84696d10 100644
--- a/tests/data/test-read-dwarf/test2.so.abi
+++ b/tests/data/test-read-dwarf/test2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test2.so.hash.abi b/tests/data/test-read-dwarf/test2.so.hash.abi
index fdb78c88..a69e6dd3 100644
--- a/tests/data/test-read-dwarf/test2.so.hash.abi
+++ b/tests/data/test-read-dwarf/test2.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
index b38cbdd6..e59603d2 100644
--- a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libvtkParallelCore-6.1.so.1'>
+<abi-corpus version='2.3' soname='libvtkParallelCore-6.1.so.1'>
   <elf-needed>
     <dependency name='libvtkIOLegacy-6.1.so.1'/>
     <dependency name='libvtkIOCore-6.1.so.1'/>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index d0efa871..36a5274a 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
index 751afce2..51ff158d 100644
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libstdc++.so.6'>
+<abi-corpus version='2.3' soname='libstdc++.so.6'>
   <elf-needed>
     <dependency name='libm.so.6'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-read-dwarf/test3-alias-1.so.hash.abi b/tests/data/test-read-dwarf/test3-alias-1.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3-alias-1.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3-alias-1.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3-alias-2.so.hash.abi b/tests/data/test-read-dwarf/test3-alias-2.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3-alias-2.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3-alias-2.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3-alias-3.so.hash.abi b/tests/data/test-read-dwarf/test3-alias-3.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3-alias-3.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3-alias-3.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3-alias-4.so.hash.abi b/tests/data/test-read-dwarf/test3-alias-4.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3-alias-4.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3-alias-4.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3.so.abi b/tests/data/test-read-dwarf/test3.so.abi
index e14bcbde..beae2ec6 100644
--- a/tests/data/test-read-dwarf/test3.so.abi
+++ b/tests/data/test-read-dwarf/test3.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3.so.hash.abi b/tests/data/test-read-dwarf/test3.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test4.so.abi b/tests/data/test-read-dwarf/test4.so.abi
index 94f62310..0aa540aa 100644
--- a/tests/data/test-read-dwarf/test4.so.abi
+++ b/tests/data/test-read-dwarf/test4.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test4.so.hash.abi b/tests/data/test-read-dwarf/test4.so.hash.abi
index d6328c8c..38e4b195 100644
--- a/tests/data/test-read-dwarf/test4.so.hash.abi
+++ b/tests/data/test-read-dwarf/test4.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test5.o.abi b/tests/data/test-read-dwarf/test5.o.abi
index d34b5f17..2ff2513f 100644
--- a/tests/data/test-read-dwarf/test5.o.abi
+++ b/tests/data/test-read-dwarf/test5.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test5.o.hash.abi b/tests/data/test-read-dwarf/test5.o.hash.abi
index a915111a..bfdf6c85 100644
--- a/tests/data/test-read-dwarf/test5.o.hash.abi
+++ b/tests/data/test-read-dwarf/test5.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test6.so.abi b/tests/data/test-read-dwarf/test6.so.abi
index 9007c596..33c70691 100644
--- a/tests/data/test-read-dwarf/test6.so.abi
+++ b/tests/data/test-read-dwarf/test6.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test6.so.hash.abi b/tests/data/test-read-dwarf/test6.so.hash.abi
index 67688333..3d33e88e 100644
--- a/tests/data/test-read-dwarf/test6.so.hash.abi
+++ b/tests/data/test-read-dwarf/test6.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read-dwarf/test7.so.abi
index 706a74bb..d03484ba 100644
--- a/tests/data/test-read-dwarf/test7.so.abi
+++ b/tests/data/test-read-dwarf/test7.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test7.so.hash.abi b/tests/data/test-read-dwarf/test7.so.hash.abi
index d451ff0f..d6646baa 100644
--- a/tests/data/test-read-dwarf/test7.so.hash.abi
+++ b/tests/data/test-read-dwarf/test7.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
index 2d1a6417..a09854be 100644
--- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
+++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
index a6e3f429..e5e8863e 100644
--- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
+++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
index 632f5650..b06ade20 100644
--- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
+++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/debug/third_party/boost-1.56.0/libboost_system.so'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-write/test-crc.xml b/tests/data/test-read-write/test-crc.xml
index 5b3ac93e..6e50fc4d 100644
--- a/tests/data/test-read-write/test-crc.xml
+++ b/tests/data/test-read-write/test-crc.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='tests/data/test-symtab/kernel-modversions/one_of_each.ko' architecture='elf-amd-x86_64'>
+<abi-corpus version='2.3' path='tests/data/test-symtab/kernel-modversions/one_of_each.ko' architecture='elf-amd-x86_64'>
   <elf-function-symbols>
     <elf-symbol name='exported_function' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe52d5bcf'/>
     <elf-symbol name='exported_function_gpl' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfda43846'/>
diff --git a/tests/data/test-read-write/test26.xml b/tests/data/test-read-write/test26.xml
index 973733e6..975c1c68 100644
--- a/tests/data/test-read-write/test26.xml
+++ b/tests/data/test-read-write/test26.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='libtest-v0.so'>
+<abi-corpus version='2.3' path='libtest-v0.so'>
   <elf-function-symbols>
     <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-write/test27.xml b/tests/data/test-read-write/test27.xml
index 6494f078..cd2a004b 100644
--- a/tests/data/test-read-write/test27.xml
+++ b/tests/data/test-read-write/test27.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='repr7' architecture='elf-amd-x86_64'>
+<abi-corpus version='2.3' path='repr7' architecture='elf-amd-x86_64'>
   <elf-function-symbols>
     <elf-symbol name='_Z2fni' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-write/test28-without-std-fns-ref.xml b/tests/data/test-read-write/test28-without-std-fns-ref.xml
index 4402f610..3230c839 100644
--- a/tests/data/test-read-write/test28-without-std-fns-ref.xml
+++ b/tests/data/test-read-write/test28-without-std-fns-ref.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
+<abi-corpus version='2.3' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-read-write/test28-without-std-vars-ref.xml b/tests/data/test-read-write/test28-without-std-vars-ref.xml
index a32026b5..42cda200 100644
--- a/tests/data/test-read-write/test28-without-std-vars-ref.xml
+++ b/tests/data/test-read-write/test28-without-std-vars-ref.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
+<abi-corpus version='2.3' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
