diff --git a/cpp/ql/src/semmle/code/cpp/Element.qll b/cpp/ql/src/semmle/code/cpp/Element.qll
index 77a27d49725..8076f62583a 100644
--- a/cpp/ql/src/semmle/code/cpp/Element.qll
+++ b/cpp/ql/src/semmle/code/cpp/Element.qll
@@ -197,7 +197,8 @@ class Element extends ElementBase {
     initialisers(underlyingElement(this), unresolveElement(result), _, _) or
     exprconv(unresolveElement(result), underlyingElement(this)) or
     param_decl_bind(underlyingElement(this), _, unresolveElement(result)) or
-    using_container(unresolveElement(result), underlyingElement(this))
+    using_container(unresolveElement(result), underlyingElement(this)) or
+    static_asserts(unresolveElement(this), _, _, _, underlyingElement(result))
   }
 
   /** Gets the closest `Element` enclosing this one. */
@@ -278,12 +279,12 @@ class StaticAssert extends Locatable, @static_assert {
   /**
    * Gets the expression which this static assertion ensures is true.
    */
-  Expr getCondition() { static_asserts(underlyingElement(this), unresolveElement(result), _, _) }
+  Expr getCondition() { static_asserts(underlyingElement(this), unresolveElement(result), _, _, _) }
 
   /**
    * Gets the message which will be reported by the compiler if this static assertion fails.
    */
-  string getMessage() { static_asserts(underlyingElement(this), _, result, _) }
+  string getMessage() { static_asserts(underlyingElement(this), _, result, _, _) }
 
-  override Location getLocation() { static_asserts(underlyingElement(this), _, _, result) }
+  override Location getLocation() { static_asserts(underlyingElement(this), _, _, result, _) }
 }
diff --git a/cpp/ql/src/semmlecode.cpp.dbscheme b/cpp/ql/src/semmlecode.cpp.dbscheme
index 025827d85c3..098850d25c4 100644
--- a/cpp/ql/src/semmlecode.cpp.dbscheme
+++ b/cpp/ql/src/semmlecode.cpp.dbscheme
@@ -508,7 +508,8 @@ static_asserts(
     unique int id: @static_assert,
     int condition : @expr ref,
     string message : string ref,
-    int location: @location_default ref
+    int location: @location_default ref,
+    int enclosing : @element ref
 );
 
 // each function has an ordered list of parameters
diff --git a/cpp/ql/src/semmlecode.cpp.dbscheme.stats b/cpp/ql/src/semmlecode.cpp.dbscheme.stats
index 5a46cae4c17..60326c98b90 100644
--- a/cpp/ql/src/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/src/semmlecode.cpp.dbscheme.stats
@@ -1,7 +1,7 @@
 <dbstats>
   <typesizes><e>
 <k>@compilation</k>
-<v>9550</v>
+<v>9552</v>
 </e>
 <e>
 <k>@externalDataElement</k>
@@ -25,7 +25,7 @@
 </e>
 <e>
 <k>@location_default</k>
-<v>8812005</v>
+<v>8813620</v>
 </e>
 <e>
 <k>@location_stmt</k>
@@ -37,43 +37,43 @@
 </e>
 <e>
 <k>@diagnostic</k>
-<v>68684</v>
+<v>68697</v>
 </e>
 <e>
 <k>@file</k>
-<v>60011</v>
+<v>60022</v>
 </e>
 <e>
 <k>@folder</k>
-<v>10943</v>
+<v>10945</v>
 </e>
 <e>
 <k>@macroinvocation</k>
-<v>35573550</v>
+<v>35579191</v>
 </e>
 <e>
 <k>@function</k>
-<v>3467595</v>
+<v>3468230</v>
 </e>
 <e>
 <k>@fun_decl</k>
-<v>3539887</v>
+<v>3540536</v>
 </e>
 <e>
 <k>@var_decl</k>
-<v>5359092</v>
+<v>5359964</v>
 </e>
 <e>
 <k>@type_decl</k>
-<v>1331886</v>
+<v>1332130</v>
 </e>
 <e>
 <k>@namespace_decl</k>
-<v>136843</v>
+<v>136868</v>
 </e>
 <e>
 <k>@using</k>
-<v>291384</v>
+<v>291437</v>
 </e>
 <e>
 <k>@static_assert</k>
@@ -81,11 +81,11 @@
 </e>
 <e>
 <k>@parameter</k>
-<v>4627024</v>
+<v>4627872</v>
 </e>
 <e>
 <k>@membervariable</k>
-<v>305627</v>
+<v>305683</v>
 </e>
 <e>
 <k>@globalvariable</k>
@@ -105,19 +105,19 @@
 </e>
 <e>
 <k>@derivedtype</k>
-<v>4630204</v>
+<v>4463015</v>
 </e>
 <e>
 <k>@decltype</k>
-<v>46996</v>
+<v>47004</v>
 </e>
 <e>
 <k>@usertype</k>
-<v>4193084</v>
+<v>4193852</v>
 </e>
 <e>
 <k>@mangledname</k>
-<v>483589</v>
+<v>483678</v>
 </e>
 <e>
 <k>@type_mention</k>
@@ -125,11 +125,11 @@
 </e>
 <e>
 <k>@routinetype</k>
-<v>430398</v>
+<v>430477</v>
 </e>
 <e>
 <k>@ptrtomember</k>
-<v>12631</v>
+<v>12634</v>
 </e>
 <e>
 <k>@specifier</k>
@@ -173,19 +173,19 @@
 </e>
 <e>
 <k>@derivation</k>
-<v>390189</v>
+<v>390261</v>
 </e>
 <e>
 <k>@frienddecl</k>
-<v>240298</v>
+<v>240342</v>
 </e>
 <e>
 <k>@comment</k>
-<v>1580013</v>
+<v>1580303</v>
 </e>
 <e>
 <k>@namespace</k>
-<v>7686</v>
+<v>7687</v>
 </e>
 <e>
 <k>@specialnamequalifyingelement</k>
@@ -204,8 +204,28 @@
 <v>1664822</v>
 </e>
 <e>
+<k>@c_style_cast</k>
+<v>4235362</v>
+</e>
+<e>
+<k>@indirect</k>
+<v>294273</v>
+</e>
+<e>
+<k>@varaccess</k>
+<v>5318255</v>
+</e>
+<e>
+<k>@routineexpr</k>
+<v>2265730</v>
+</e>
+<e>
+<k>@literal</k>
+<v>4380627</v>
+</e>
+<e>
 <k>@errorexpr</k>
-<v>48706</v>
+<v>48715</v>
 </e>
 <e>
 <k>@address_of</k>
@@ -213,15 +233,11 @@
 </e>
 <e>
 <k>@reference_to</k>
-<v>1058090</v>
-</e>
-<e>
-<k>@indirect</k>
-<v>294273</v>
+<v>1057889</v>
 </e>
 <e>
 <k>@ref_indirect</k>
-<v>1253936</v>
+<v>1253836</v>
 </e>
 <e>
 <k>@array_to_pointer</k>
@@ -229,7 +245,7 @@
 </e>
 <e>
 <k>@vacuous_destructor_call</k>
-<v>5120</v>
+<v>5121</v>
 </e>
 <e>
 <k>@assume</k>
@@ -277,11 +293,11 @@
 </e>
 <e>
 <k>@preincrexpr</k>
-<v>62511</v>
+<v>62522</v>
 </e>
 <e>
 <k>@predecrexpr</k>
-<v>24791</v>
+<v>24796</v>
 </e>
 <e>
 <k>@conditionalexpr</k>
@@ -341,7 +357,7 @@
 </e>
 <e>
 <k>@pdiffexpr</k>
-<v>25076</v>
+<v>25081</v>
 </e>
 <e>
 <k>@lshiftexpr</k>
@@ -377,7 +393,7 @@
 </e>
 <e>
 <k>@ltexpr</k>
-<v>51732</v>
+<v>51742</v>
 </e>
 <e>
 <k>@geexpr</k>
@@ -409,7 +425,7 @@
 </e>
 <e>
 <k>@assignmulexpr</k>
-<v>6907</v>
+<v>6909</v>
 </e>
 <e>
 <k>@assigndivexpr</k>
@@ -457,7 +473,7 @@
 </e>
 <e>
 <k>@commaexpr</k>
-<v>10734</v>
+<v>10725</v>
 </e>
 <e>
 <k>@subscriptexpr</k>
@@ -469,7 +485,7 @@
 </e>
 <e>
 <k>@callexpr</k>
-<v>226789</v>
+<v>226819</v>
 </e>
 <e>
 <k>@vastartexpr</k>
@@ -477,7 +493,7 @@
 </e>
 <e>
 <k>@vaargexpr</k>
-<v>986</v>
+<v>987</v>
 </e>
 <e>
 <k>@vaendexpr</k>
@@ -488,28 +504,24 @@
 <v>30</v>
 </e>
 <e>
-<k>@varaccess</k>
-<v>5318255</v>
-</e>
-<e>
 <k>@thisaccess</k>
 <v>1167122</v>
 </e>
 <e>
 <k>@new_expr</k>
-<v>32127</v>
+<v>32133</v>
 </e>
 <e>
 <k>@delete_expr</k>
-<v>5964</v>
+<v>5966</v>
 </e>
 <e>
 <k>@throw_expr</k>
-<v>22313</v>
+<v>22317</v>
 </e>
 <e>
 <k>@condition_decl</k>
-<v>7028</v>
+<v>7007</v>
 </e>
 <e>
 <k>@braced_init_list</k>
@@ -517,7 +529,7 @@
 </e>
 <e>
 <k>@type_id</k>
-<v>4418</v>
+<v>4419</v>
 </e>
 <e>
 <k>@runtime_sizeof</k>
@@ -536,10 +548,6 @@
 <v>156384</v>
 </e>
 <e>
-<k>@routineexpr</k>
-<v>2265918</v>
-</e>
-<e>
 <k>@type_operand</k>
 <v>123307</v>
 </e>
@@ -636,10 +644,6 @@
 <v>109</v>
 </e>
 <e>
-<k>@literal</k>
-<v>4380627</v>
-</e>
-<e>
 <k>@uuidof</k>
 <v>845</v>
 </e>
@@ -661,15 +665,15 @@
 </e>
 <e>
 <k>@ctordirectinit</k>
-<v>90176</v>
+<v>90192</v>
 </e>
 <e>
 <k>@ctorvirtualinit</k>
-<v>6228</v>
+<v>6229</v>
 </e>
 <e>
 <k>@ctorfieldinit</k>
-<v>196010</v>
+<v>196046</v>
 </e>
 <e>
 <k>@ctordelegatinginit</k>
@@ -677,7 +681,7 @@
 </e>
 <e>
 <k>@dtordirectdestruct</k>
-<v>29134</v>
+<v>29139</v>
 </e>
 <e>
 <k>@dtorvirtualdestruct</k>
@@ -685,11 +689,11 @@
 </e>
 <e>
 <k>@dtorfielddestruct</k>
-<v>29901</v>
+<v>29907</v>
 </e>
 <e>
 <k>@static_cast</k>
-<v>214716</v>
+<v>214756</v>
 </e>
 <e>
 <k>@reinterpret_cast</k>
@@ -697,15 +701,11 @@
 </e>
 <e>
 <k>@const_cast</k>
-<v>5307</v>
+<v>5308</v>
 </e>
 <e>
 <k>@dynamic_cast</k>
-<v>986</v>
-</e>
-<e>
-<k>@c_style_cast</k>
-<v>4235362</v>
+<v>987</v>
 </e>
 <e>
 <k>@lambdaexpr</k>
@@ -713,7 +713,7 @@
 </e>
 <e>
 <k>@param_ref</k>
-<v>85877</v>
+<v>85893</v>
 </e>
 <e>
 <k>@noopexpr</k>
@@ -817,7 +817,7 @@
 </e>
 <e>
 <k>@noexceptexpr</k>
-<v>17522</v>
+<v>17525</v>
 </e>
 <e>
 <k>@builtinshufflevector</k>
@@ -829,7 +829,7 @@
 </e>
 <e>
 <k>@builtinaddressof</k>
-<v>3969</v>
+<v>3970</v>
 </e>
 <e>
 <k>@vec_fill</k>
@@ -856,12 +856,20 @@
 <v>1269739</v>
 </e>
 <e>
+<k>@stmt_return</k>
+<v>1130183</v>
+</e>
+<e>
+<k>@stmt_block</k>
+<v>1325089</v>
+</e>
+<e>
 <k>@stmt_if</k>
 <v>523914</v>
 </e>
 <e>
 <k>@stmt_while</k>
-<v>30998</v>
+<v>30992</v>
 </e>
 <e>
 <k>@stmt_goto</k>
@@ -872,14 +880,6 @@
 <v>81478</v>
 </e>
 <e>
-<k>@stmt_return</k>
-<v>1130009</v>
-</e>
-<e>
-<k>@stmt_block</k>
-<v>1325000</v>
-</e>
-<e>
 <k>@stmt_end_test_while</k>
 <v>149714</v>
 </e>
@@ -901,7 +901,7 @@
 </e>
 <e>
 <k>@stmt_try_block</k>
-<v>17960</v>
+<v>17963</v>
 </e>
 <e>
 <k>@stmt_microsoft_try</k>
@@ -909,7 +909,7 @@
 </e>
 <e>
 <k>@stmt_decl</k>
-<v>613064</v>
+<v>613078</v>
 </e>
 <e>
 <k>@stmt_set_vla_size</k>
@@ -948,40 +948,40 @@
 <v>3</v>
 </e>
 <e>
+<k>@ppd_plain_include</k>
+<v>290757</v>
+</e>
+<e>
 <k>@ppd_if</k>
-<v>156064</v>
+<v>156093</v>
 </e>
 <e>
 <k>@ppd_ifdef</k>
-<v>61075</v>
+<v>61086</v>
 </e>
 <e>
 <k>@ppd_ifndef</k>
-<v>83312</v>
+<v>83327</v>
 </e>
 <e>
 <k>@ppd_elif</k>
-<v>20625</v>
+<v>20628</v>
 </e>
 <e>
 <k>@ppd_else</k>
-<v>57654</v>
+<v>57664</v>
 </e>
 <e>
 <k>@ppd_endif</k>
-<v>300452</v>
-</e>
-<e>
-<k>@ppd_plain_include</k>
-<v>290704</v>
+<v>300507</v>
 </e>
 <e>
 <k>@ppd_define</k>
-<v>318007</v>
+<v>318065</v>
 </e>
 <e>
 <k>@ppd_undef</k>
-<v>19243</v>
+<v>19247</v>
 </e>
 <e>
 <k>@ppd_line</k>
@@ -1038,11 +1038,11 @@
 </typesizes>
   <stats><relation>
 <name>compilations</name>
-<cardinality>9550</cardinality>
+<cardinality>9552</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>9550</v>
+<v>9552</v>
 </e>
 <e>
 <k>cwd</k>
@@ -1060,7 +1060,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9550</v>
+<v>9552</v>
 </b>
 </bs>
 </hist>
@@ -1382,11 +1382,11 @@
 </relation>
 <relation>
 <name>compilation_compiling_files</name>
-<cardinality>9550</cardinality>
+<cardinality>9552</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>9550</v>
+<v>9552</v>
 </e>
 <e>
 <k>num</k>
@@ -1394,7 +1394,7 @@
 </e>
 <e>
 <k>file</k>
-<v>4846</v>
+<v>4847</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -1408,7 +1408,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9550</v>
+<v>9552</v>
 </b>
 </bs>
 </hist>
@@ -1424,7 +1424,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9550</v>
+<v>9552</v>
 </b>
 </bs>
 </hist>
@@ -1477,7 +1477,7 @@
 <b>
 <a>2</a>
 <b>3</b>
-<v>4550</v>
+<v>4551</v>
 </b>
 <b>
 <a>3</a>
@@ -1498,7 +1498,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4846</v>
+<v>4847</v>
 </b>
 </bs>
 </hist>
@@ -1508,11 +1508,11 @@
 </relation>
 <relation>
 <name>compilation_time</name>
-<cardinality>38114</cardinality>
+<cardinality>38121</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>9528</v>
+<v>9530</v>
 </e>
 <e>
 <k>num</k>
@@ -1524,7 +1524,7 @@
 </e>
 <e>
 <k>seconds</k>
-<v>12390</v>
+<v>13401</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -1538,7 +1538,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9528</v>
+<v>9530</v>
 </b>
 </bs>
 </hist>
@@ -1554,7 +1554,7 @@
 <b>
 <a>4</a>
 <b>5</b>
-<v>9528</v>
+<v>9530</v>
 </b>
 </bs>
 </hist>
@@ -1568,14 +1568,19 @@
 <budget>12</budget>
 <bs>
 <b>
+<a>2</a>
+<b>3</b>
+<v>10</v>
+</b>
+<b>
 <a>3</a>
 <b>4</b>
-<v>2576</v>
+<v>2588</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>6951</v>
+<v>6931</v>
 </b>
 </bs>
 </hist>
@@ -1621,8 +1626,8 @@
 <budget>12</budget>
 <bs>
 <b>
-<a>1130</a>
-<b>1131</b>
+<a>1222</a>
+<b>1223</b>
 <v>10</v>
 </b>
 </bs>
@@ -1669,8 +1674,8 @@
 <budget>12</budget>
 <bs>
 <b>
-<a>7</a>
-<b>8</b>
+<a>6</a>
+<b>7</b>
 <v>10</v>
 </b>
 <b>
@@ -1679,13 +1684,13 @@
 <v>10</v>
 </b>
 <b>
-<a>582</a>
-<b>583</b>
+<a>613</a>
+<b>614</b>
 <v>10</v>
 </b>
 <b>
-<a>658</a>
-<b>659</b>
+<a>724</a>
+<b>725</b>
 <v>10</v>
 </b>
 </bs>
@@ -1702,22 +1707,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8355</v>
+<v>9420</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>2379</v>
+<v>2719</v>
 </b>
 <b>
 <a>3</a>
-<b>4</b>
-<v>899</v>
+<b>6</b>
+<v>1096</v>
 </b>
 <b>
-<a>4</a>
-<b>646</b>
-<v>756</v>
+<a>6</a>
+<b>630</b>
+<v>164</v>
 </b>
 </bs>
 </hist>
@@ -1733,7 +1738,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>12390</v>
+<v>13401</v>
 </b>
 </bs>
 </hist>
@@ -1749,12 +1754,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>10954</v>
+<v>11932</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>1436</v>
+<v>1458</v>
+</b>
+<b>
+<a>3</a>
+<b>4</b>
+<v>10</v>
 </b>
 </bs>
 </hist>
@@ -1764,15 +1774,15 @@
 </relation>
 <relation>
 <name>diagnostic_for</name>
-<cardinality>846937</cardinality>
+<cardinality>847092</cardinality>
 <columnsizes>
 <e>
 <k>diagnostic</k>
-<v>68684</v>
+<v>68697</v>
 </e>
 <e>
 <k>compilation</k>
-<v>9221</v>
+<v>9223</v>
 </e>
 <e>
 <k>file_number</k>
@@ -1780,7 +1790,7 @@
 </e>
 <e>
 <k>file_number_diagnostic_number</k>
-<v>6502</v>
+<v>6503</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -1794,12 +1804,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9254</v>
+<v>9256</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>56732</v>
+<v>56743</v>
 </b>
 <b>
 <a>254</a>
@@ -1820,7 +1830,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>68684</v>
+<v>68697</v>
 </b>
 </bs>
 </hist>
@@ -1836,7 +1846,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>68684</v>
+<v>68697</v>
 </b>
 </bs>
 </hist>
@@ -1857,7 +1867,7 @@
 <b>
 <a>7</a>
 <b>8</b>
-<v>5811</v>
+<v>5812</v>
 </b>
 <b>
 <a>8</a>
@@ -1893,7 +1903,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9221</v>
+<v>9223</v>
 </b>
 </bs>
 </hist>
@@ -1914,7 +1924,7 @@
 <b>
 <a>7</a>
 <b>8</b>
-<v>5811</v>
+<v>5812</v>
 </b>
 <b>
 <a>8</a>
@@ -2008,7 +2018,7 @@
 <b>
 <a>5</a>
 <b>6</b>
-<v>953</v>
+<v>954</v>
 </b>
 <b>
 <a>7</a>
@@ -2059,7 +2069,7 @@
 <b>
 <a>10</a>
 <b>11</b>
-<v>953</v>
+<v>954</v>
 </b>
 <b>
 <a>14</a>
@@ -2094,7 +2104,7 @@
 <b>
 <a>254</a>
 <b>255</b>
-<v>2620</v>
+<v>2621</v>
 </b>
 <b>
 <a>309</a>
@@ -2115,7 +2125,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6502</v>
+<v>6503</v>
 </b>
 </bs>
 </hist>
@@ -2125,19 +2135,19 @@
 </relation>
 <relation>
 <name>compilation_finished</name>
-<cardinality>9550</cardinality>
+<cardinality>9552</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>9550</v>
+<v>9552</v>
 </e>
 <e>
 <k>cpu_seconds</k>
-<v>7993</v>
+<v>8378</v>
 </e>
 <e>
 <k>elapsed_seconds</k>
-<v>197</v>
+<v>208</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -2151,7 +2161,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9550</v>
+<v>9552</v>
 </b>
 </bs>
 </hist>
@@ -2167,7 +2177,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9550</v>
+<v>9552</v>
 </b>
 </bs>
 </hist>
@@ -2183,17 +2193,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6864</v>
+<v>7391</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>855</v>
+<v>833</v>
 </b>
 <b>
 <a>3</a>
-<b>8</b>
-<v>274</v>
+<b>6</b>
+<v>153</v>
 </b>
 </bs>
 </hist>
@@ -2209,12 +2219,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>7500</v>
+<v>8126</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>493</v>
+<v>252</v>
 </b>
 </bs>
 </hist>
@@ -2230,66 +2240,71 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>32</v>
+<v>54</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>32</v>
+<v>21</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>21</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
 <v>10</v>
 </b>
 <b>
-<a>12</a>
-<b>13</b>
+<a>5</a>
+<b>6</b>
 <v>10</v>
 </b>
 <b>
-<a>16</a>
-<b>17</b>
+<a>6</a>
+<b>7</b>
 <v>10</v>
 </b>
 <b>
-<a>26</a>
-<b>27</b>
+<a>8</a>
+<b>9</b>
 <v>10</v>
 </b>
 <b>
-<a>38</a>
-<b>39</b>
+<a>21</a>
+<b>22</b>
 <v>10</v>
 </b>
 <b>
-<a>99</a>
-<b>100</b>
+<a>29</a>
+<b>30</b>
 <v>10</v>
 </b>
 <b>
-<a>100</a>
-<b>101</b>
+<a>44</a>
+<b>45</b>
 <v>10</v>
 </b>
 <b>
-<a>140</a>
-<b>141</b>
+<a>82</a>
+<b>83</b>
 <v>10</v>
 </b>
 <b>
-<a>195</a>
-<b>196</b>
+<a>102</a>
+<b>103</b>
 <v>10</v>
 </b>
 <b>
-<a>221</a>
-<b>222</b>
+<a>147</a>
+<b>148</b>
+<v>10</v>
+</b>
+<b>
+<a>183</a>
+<b>184</b>
+<v>10</v>
+</b>
+<b>
+<a>232</a>
+<b>233</b>
 <v>10</v>
 </b>
 </bs>
@@ -2306,66 +2321,71 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>32</v>
+<v>54</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>32</v>
+<v>21</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>21</v>
-</b>
-<b>
-<a>9</a>
-<b>10</b>
 <v>10</v>
 </b>
 <b>
-<a>11</a>
-<b>12</b>
+<a>5</a>
+<b>6</b>
 <v>10</v>
 </b>
 <b>
-<a>16</a>
-<b>17</b>
+<a>6</a>
+<b>7</b>
 <v>10</v>
 </b>
 <b>
-<a>25</a>
-<b>26</b>
+<a>8</a>
+<b>9</b>
 <v>10</v>
 </b>
 <b>
-<a>37</a>
-<b>38</b>
+<a>21</a>
+<b>22</b>
 <v>10</v>
 </b>
 <b>
-<a>77</a>
-<b>78</b>
+<a>28</a>
+<b>29</b>
 <v>10</v>
 </b>
 <b>
-<a>89</a>
-<b>90</b>
+<a>43</a>
+<b>44</b>
 <v>10</v>
 </b>
 <b>
-<a>134</a>
-<b>135</b>
+<a>80</a>
+<b>81</b>
 <v>10</v>
 </b>
 <b>
-<a>176</a>
-<b>177</b>
+<a>86</a>
+<b>87</b>
 <v>10</v>
 </b>
 <b>
-<a>185</a>
-<b>186</b>
+<a>142</a>
+<b>143</b>
+<v>10</v>
+</b>
+<b>
+<a>166</a>
+<b>167</b>
+<v>10</v>
+</b>
+<b>
+<a>190</a>
+<b>191</b>
 <v>10</v>
 </b>
 </bs>
@@ -5269,11 +5289,11 @@
 </relation>
 <relation>
 <name>header_to_external_package</name>
-<cardinality>8530</cardinality>
+<cardinality>8532</cardinality>
 <columnsizes>
 <e>
 <k>fileid</k>
-<v>8530</v>
+<v>8532</v>
 </e>
 <e>
 <k>package</k>
@@ -5291,7 +5311,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8530</v>
+<v>8532</v>
 </b>
 </bs>
 </hist>
@@ -6560,31 +6580,31 @@
 </relation>
 <relation>
 <name>locations_default</name>
-<cardinality>8812005</cardinality>
+<cardinality>8813620</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>8812005</v>
+<v>8813620</v>
 </e>
 <e>
 <k>container</k>
-<v>70954</v>
+<v>70967</v>
 </e>
 <e>
 <k>startLine</k>
-<v>150604</v>
+<v>150631</v>
 </e>
 <e>
 <k>startColumn</k>
-<v>5460</v>
+<v>5461</v>
 </e>
 <e>
 <k>endLine</k>
-<v>150428</v>
+<v>150456</v>
 </e>
 <e>
 <k>endColumn</k>
-<v>10625</v>
+<v>10627</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -6598,7 +6618,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8812005</v>
+<v>8813620</v>
 </b>
 </bs>
 </hist>
@@ -6614,7 +6634,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8812005</v>
+<v>8813620</v>
 </b>
 </bs>
 </hist>
@@ -6630,7 +6650,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8812005</v>
+<v>8813620</v>
 </b>
 </bs>
 </hist>
@@ -6646,7 +6666,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8812005</v>
+<v>8813620</v>
 </b>
 </bs>
 </hist>
@@ -6662,7 +6682,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8812005</v>
+<v>8813620</v>
 </b>
 </bs>
 </hist>
@@ -6678,62 +6698,62 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>11524</v>
+<v>11526</v>
 </b>
 <b>
 <a>2</a>
 <b>19</b>
-<v>6096</v>
+<v>6097</v>
 </b>
 <b>
 <a>19</a>
 <b>25</b>
-<v>5482</v>
+<v>5483</v>
 </b>
 <b>
 <a>25</a>
 <b>31</b>
-<v>5515</v>
+<v>5516</v>
 </b>
 <b>
 <a>31</a>
 <b>41</b>
-<v>5822</v>
+<v>5823</v>
 </b>
 <b>
 <a>41</a>
 <b>54</b>
-<v>5526</v>
+<v>5527</v>
 </b>
 <b>
 <a>54</a>
 <b>72</b>
-<v>5603</v>
+<v>5604</v>
 </b>
 <b>
 <a>72</a>
 <b>99</b>
-<v>5416</v>
+<v>5417</v>
 </b>
 <b>
 <a>99</a>
 <b>137</b>
-<v>5383</v>
+<v>5384</v>
 </b>
 <b>
 <a>137</a>
 <b>220</b>
-<v>5328</v>
+<v>5329</v>
 </b>
 <b>
 <a>220</a>
 <b>430</b>
-<v>5328</v>
+<v>5329</v>
 </b>
 <b>
 <a>430</a>
 <b>20913</b>
-<v>3925</v>
+<v>3926</v>
 </b>
 </bs>
 </hist>
@@ -6749,57 +6769,57 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>11524</v>
+<v>11526</v>
 </b>
 <b>
 <a>2</a>
 <b>15</b>
-<v>6008</v>
+<v>6009</v>
 </b>
 <b>
 <a>15</a>
 <b>20</b>
-<v>6140</v>
+<v>6141</v>
 </b>
 <b>
 <a>20</a>
 <b>25</b>
-<v>5548</v>
+<v>5549</v>
 </b>
 <b>
 <a>25</a>
 <b>32</b>
-<v>6096</v>
+<v>6097</v>
 </b>
 <b>
 <a>32</a>
 <b>41</b>
-<v>5679</v>
+<v>5680</v>
 </b>
 <b>
 <a>41</a>
 <b>53</b>
-<v>5723</v>
+<v>5724</v>
 </b>
 <b>
 <a>53</a>
 <b>71</b>
-<v>5592</v>
+<v>5593</v>
 </b>
 <b>
 <a>71</a>
 <b>99</b>
-<v>5449</v>
+<v>5450</v>
 </b>
 <b>
 <a>99</a>
 <b>158</b>
-<v>5328</v>
+<v>5329</v>
 </b>
 <b>
 <a>158</a>
 <b>351</b>
-<v>5361</v>
+<v>5362</v>
 </b>
 <b>
 <a>351</a>
@@ -6820,57 +6840,57 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>11524</v>
+<v>11526</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>6008</v>
+<v>6009</v>
 </b>
 <b>
 <a>4</a>
 <b>8</b>
-<v>6546</v>
+<v>6547</v>
 </b>
 <b>
 <a>8</a>
 <b>11</b>
-<v>5394</v>
+<v>5395</v>
 </b>
 <b>
 <a>11</a>
 <b>14</b>
-<v>5778</v>
+<v>5779</v>
 </b>
 <b>
 <a>14</a>
 <b>18</b>
-<v>6250</v>
+<v>6251</v>
 </b>
 <b>
 <a>18</a>
 <b>23</b>
-<v>5756</v>
+<v>5757</v>
 </b>
 <b>
 <a>23</a>
 <b>29</b>
-<v>5833</v>
+<v>5834</v>
 </b>
 <b>
 <a>29</a>
 <b>37</b>
-<v>5690</v>
+<v>5691</v>
 </b>
 <b>
 <a>37</a>
 <b>50</b>
-<v>5668</v>
+<v>5669</v>
 </b>
 <b>
 <a>50</a>
 <b>78</b>
-<v>5383</v>
+<v>5384</v>
 </b>
 <b>
 <a>78</a>
@@ -6891,57 +6911,57 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>11524</v>
+<v>11526</v>
 </b>
 <b>
 <a>2</a>
 <b>15</b>
-<v>5986</v>
+<v>5987</v>
 </b>
 <b>
 <a>15</a>
 <b>20</b>
-<v>6162</v>
+<v>6163</v>
 </b>
 <b>
 <a>20</a>
 <b>25</b>
-<v>5493</v>
+<v>5494</v>
 </b>
 <b>
 <a>25</a>
 <b>32</b>
-<v>6107</v>
+<v>6108</v>
 </b>
 <b>
 <a>32</a>
 <b>41</b>
-<v>5668</v>
+<v>5669</v>
 </b>
 <b>
 <a>41</a>
 <b>53</b>
-<v>5723</v>
+<v>5724</v>
 </b>
 <b>
 <a>53</a>
 <b>70</b>
-<v>5383</v>
+<v>5384</v>
 </b>
 <b>
 <a>70</a>
 <b>96</b>
-<v>5339</v>
+<v>5340</v>
 </b>
 <b>
 <a>96</a>
 <b>153</b>
-<v>5394</v>
+<v>5395</v>
 </b>
 <b>
 <a>153</a>
 <b>333</b>
-<v>5350</v>
+<v>5351</v>
 </b>
 <b>
 <a>333</a>
@@ -6962,57 +6982,57 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>11524</v>
+<v>11526</v>
 </b>
 <b>
 <a>2</a>
 <b>14</b>
-<v>5734</v>
+<v>5735</v>
 </b>
 <b>
 <a>14</a>
 <b>19</b>
-<v>6118</v>
+<v>6119</v>
 </b>
 <b>
 <a>19</a>
 <b>23</b>
-<v>5712</v>
+<v>5713</v>
 </b>
 <b>
 <a>23</a>
 <b>28</b>
-<v>6414</v>
+<v>6415</v>
 </b>
 <b>
 <a>28</a>
 <b>33</b>
-<v>5515</v>
+<v>5516</v>
 </b>
 <b>
 <a>33</a>
 <b>40</b>
-<v>5953</v>
+<v>5955</v>
 </b>
 <b>
 <a>40</a>
 <b>47</b>
-<v>5350</v>
+<v>5351</v>
 </b>
 <b>
 <a>47</a>
 <b>57</b>
-<v>5603</v>
+<v>5604</v>
 </b>
 <b>
 <a>57</a>
 <b>69</b>
-<v>5636</v>
+<v>5637</v>
 </b>
 <b>
 <a>69</a>
 <b>91</b>
-<v>5328</v>
+<v>5329</v>
 </b>
 <b>
 <a>91</a>
@@ -7033,52 +7053,52 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>30844</v>
+<v>30850</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>18026</v>
+<v>18029</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>17949</v>
+<v>17953</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>9714</v>
+<v>9716</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>13706</v>
+<v>13708</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>13410</v>
+<v>13412</v>
 </b>
 <b>
 <a>9</a>
 <b>13</b>
-<v>13201</v>
+<v>13204</v>
 </b>
 <b>
 <a>13</a>
 <b>32</b>
-<v>11568</v>
+<v>11570</v>
 </b>
 <b>
 <a>32</a>
 <b>127</b>
-<v>11304</v>
+<v>11306</v>
 </b>
 <b>
 <a>127</a>
 <b>6472</b>
-<v>10877</v>
+<v>10879</v>
 </b>
 </bs>
 </hist>
@@ -7094,42 +7114,42 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>55647</v>
+<v>55657</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>33432</v>
+<v>33438</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>9901</v>
+<v>9903</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>8432</v>
+<v>8433</v>
 </b>
 <b>
 <a>5</a>
 <b>8</b>
-<v>12905</v>
+<v>12908</v>
 </b>
 <b>
 <a>8</a>
 <b>27</b>
-<v>11491</v>
+<v>11493</v>
 </b>
 <b>
 <a>27</a>
 <b>123</b>
-<v>11337</v>
+<v>11339</v>
 </b>
 <b>
 <a>123</a>
 <b>6472</b>
-<v>7456</v>
+<v>7457</v>
 </b>
 </bs>
 </hist>
@@ -7145,52 +7165,52 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>31952</v>
+<v>31957</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>17861</v>
+<v>17865</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>19791</v>
+<v>19795</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>9583</v>
+<v>9585</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>13914</v>
+<v>13917</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>13826</v>
+<v>13829</v>
 </b>
 <b>
 <a>9</a>
 <b>13</b>
-<v>12708</v>
+<v>12710</v>
 </b>
 <b>
 <a>13</a>
 <b>27</b>
-<v>11480</v>
+<v>11482</v>
 </b>
 <b>
 <a>27</a>
 <b>62</b>
-<v>11348</v>
+<v>11350</v>
 </b>
 <b>
 <a>62</a>
 <b>153</b>
-<v>8136</v>
+<v>8137</v>
 </b>
 </bs>
 </hist>
@@ -7206,22 +7226,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>112950</v>
+<v>112971</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>17412</v>
+<v>17415</v>
 </b>
 <b>
 <a>3</a>
 <b>7</b>
-<v>12533</v>
+<v>12535</v>
 </b>
 <b>
 <a>7</a>
 <b>184</b>
-<v>7708</v>
+<v>7709</v>
 </b>
 </bs>
 </hist>
@@ -7237,52 +7257,52 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>31798</v>
+<v>31804</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>17774</v>
+<v>17777</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>18640</v>
+<v>18643</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>9868</v>
+<v>9870</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>13728</v>
+<v>13730</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>13772</v>
+<v>13774</v>
 </b>
 <b>
 <a>9</a>
 <b>13</b>
-<v>12730</v>
+<v>12732</v>
 </b>
 <b>
 <a>13</a>
 <b>29</b>
-<v>11655</v>
+<v>11657</v>
 </b>
 <b>
 <a>29</a>
 <b>74</b>
-<v>11348</v>
+<v>11350</v>
 </b>
 <b>
 <a>74</a>
 <b>258</b>
-<v>9287</v>
+<v>9289</v>
 </b>
 </bs>
 </hist>
@@ -7603,52 +7623,52 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>30559</v>
+<v>30565</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>18059</v>
+<v>18062</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>17807</v>
+<v>17810</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>9868</v>
+<v>9870</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>13772</v>
+<v>13774</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>13454</v>
+<v>13456</v>
 </b>
 <b>
 <a>9</a>
 <b>13</b>
-<v>13048</v>
+<v>13050</v>
 </b>
 <b>
 <a>13</a>
 <b>31</b>
-<v>11458</v>
+<v>11460</v>
 </b>
 <b>
 <a>31</a>
 <b>124</b>
-<v>11293</v>
+<v>11296</v>
 </b>
 <b>
 <a>124</a>
 <b>6472</b>
-<v>11107</v>
+<v>11109</v>
 </b>
 </bs>
 </hist>
@@ -7664,42 +7684,42 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>55362</v>
+<v>55372</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>33333</v>
+<v>33339</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>9868</v>
+<v>9870</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>8541</v>
+<v>8543</v>
 </b>
 <b>
 <a>5</a>
 <b>8</b>
-<v>13103</v>
+<v>13105</v>
 </b>
 <b>
 <a>8</a>
 <b>27</b>
-<v>11326</v>
+<v>11328</v>
 </b>
 <b>
 <a>27</a>
 <b>121</b>
-<v>11293</v>
+<v>11296</v>
 </b>
 <b>
 <a>121</a>
 <b>6472</b>
-<v>7598</v>
+<v>7600</v>
 </b>
 </bs>
 </hist>
@@ -7715,22 +7735,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>112161</v>
+<v>112181</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>17247</v>
+<v>17251</v>
 </b>
 <b>
 <a>3</a>
 <b>7</b>
-<v>12072</v>
+<v>12074</v>
 </b>
 <b>
 <a>7</a>
 <b>46</b>
-<v>8947</v>
+<v>8949</v>
 </b>
 </bs>
 </hist>
@@ -7746,57 +7766,57 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>31645</v>
+<v>31650</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>17938</v>
+<v>17942</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>19737</v>
+<v>19740</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>9605</v>
+<v>9607</v>
 </b>
 <b>
 <a>5</a>
 <b>6</b>
-<v>7861</v>
+<v>7863</v>
 </b>
 <b>
 <a>6</a>
 <b>7</b>
-<v>6129</v>
+<v>6130</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>13837</v>
+<v>13840</v>
 </b>
 <b>
 <a>9</a>
 <b>13</b>
-<v>12708</v>
+<v>12710</v>
 </b>
 <b>
 <a>13</a>
 <b>27</b>
-<v>11491</v>
+<v>11493</v>
 </b>
 <b>
 <a>27</a>
 <b>62</b>
-<v>11348</v>
+<v>11350</v>
 </b>
 <b>
 <a>62</a>
 <b>153</b>
-<v>8125</v>
+<v>8126</v>
 </b>
 </bs>
 </hist>
@@ -7812,52 +7832,52 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>31546</v>
+<v>31552</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>17741</v>
+<v>17744</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>18629</v>
+<v>18632</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>9934</v>
+<v>9936</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>13815</v>
+<v>13818</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>13772</v>
+<v>13774</v>
 </b>
 <b>
 <a>9</a>
 <b>13</b>
-<v>12785</v>
+<v>12787</v>
 </b>
 <b>
 <a>13</a>
 <b>29</b>
-<v>11513</v>
+<v>11515</v>
 </b>
 <b>
 <a>29</a>
 <b>74</b>
-<v>11359</v>
+<v>11361</v>
 </b>
 <b>
 <a>74</a>
 <b>258</b>
-<v>9331</v>
+<v>9332</v>
 </b>
 </bs>
 </hist>
@@ -7873,7 +7893,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4210</v>
+<v>4211</v>
 </b>
 <b>
 <a>2</a>
@@ -7888,7 +7908,7 @@
 <b>
 <a>4</a>
 <b>5</b>
-<v>646</v>
+<v>647</v>
 </b>
 <b>
 <a>5</a>
@@ -7929,17 +7949,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4835</v>
+<v>4836</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>1282</v>
+<v>1283</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>953</v>
+<v>954</v>
 </b>
 <b>
 <a>4</a>
@@ -7980,7 +8000,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4243</v>
+<v>4244</v>
 </b>
 <b>
 <a>2</a>
@@ -7995,7 +8015,7 @@
 <b>
 <a>4</a>
 <b>5</b>
-<v>635</v>
+<v>636</v>
 </b>
 <b>
 <a>5</a>
@@ -8036,17 +8056,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4868</v>
+<v>4869</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>1326</v>
+<v>1327</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>942</v>
+<v>943</v>
 </b>
 <b>
 <a>4</a>
@@ -8087,7 +8107,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4243</v>
+<v>4244</v>
 </b>
 <b>
 <a>2</a>
@@ -8102,7 +8122,7 @@
 <b>
 <a>4</a>
 <b>5</b>
-<v>635</v>
+<v>636</v>
 </b>
 <b>
 <a>5</a>
@@ -11606,23 +11626,23 @@
 </relation>
 <relation>
 <name>numlines</name>
-<cardinality>499159</cardinality>
+<cardinality>499251</cardinality>
 <columnsizes>
 <e>
 <k>element_id</k>
-<v>492197</v>
+<v>492287</v>
 </e>
 <e>
 <k>num_lines</k>
-<v>9342</v>
+<v>9343</v>
 </e>
 <e>
 <k>num_code</k>
-<v>7291</v>
+<v>7293</v>
 </e>
 <e>
 <k>num_comment</k>
-<v>3936</v>
+<v>3937</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -11636,12 +11656,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>485311</v>
+<v>485400</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>6886</v>
+<v>6887</v>
 </b>
 </bs>
 </hist>
@@ -11657,12 +11677,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>485366</v>
+<v>485454</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>6831</v>
+<v>6832</v>
 </b>
 </bs>
 </hist>
@@ -11678,7 +11698,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>492120</v>
+<v>492210</v>
 </b>
 <b>
 <a>2</a>
@@ -11699,7 +11719,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4254</v>
+<v>4255</v>
 </b>
 <b>
 <a>2</a>
@@ -11750,12 +11770,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4320</v>
+<v>4321</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>1260</v>
+<v>1261</v>
 </b>
 <b>
 <a>3</a>
@@ -11801,12 +11821,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4309</v>
+<v>4310</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>1260</v>
+<v>1261</v>
 </b>
 <b>
 <a>3</a>
@@ -11847,7 +11867,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3179</v>
+<v>3180</v>
 </b>
 <b>
 <a>2</a>
@@ -11882,7 +11902,7 @@
 <b>
 <a>101</a>
 <b>7978</b>
-<v>328</v>
+<v>329</v>
 </b>
 </bs>
 </hist>
@@ -11898,7 +11918,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3201</v>
+<v>3202</v>
 </b>
 <b>
 <a>2</a>
@@ -11908,7 +11928,7 @@
 <b>
 <a>3</a>
 <b>4</b>
-<v>635</v>
+<v>636</v>
 </b>
 <b>
 <a>4</a>
@@ -11918,7 +11938,7 @@
 <b>
 <a>6</a>
 <b>10</b>
-<v>635</v>
+<v>636</v>
 </b>
 <b>
 <a>10</a>
@@ -11949,7 +11969,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3190</v>
+<v>3191</v>
 </b>
 <b>
 <a>2</a>
@@ -11959,7 +11979,7 @@
 <b>
 <a>3</a>
 <b>4</b>
-<v>635</v>
+<v>636</v>
 </b>
 <b>
 <a>4</a>
@@ -11984,7 +12004,7 @@
 <b>
 <a>27</a>
 <b>34</b>
-<v>317</v>
+<v>318</v>
 </b>
 </bs>
 </hist>
@@ -12000,7 +12020,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1885</v>
+<v>1886</v>
 </b>
 <b>
 <a>2</a>
@@ -12015,12 +12035,12 @@
 <b>
 <a>4</a>
 <b>7</b>
-<v>328</v>
+<v>329</v>
 </b>
 <b>
 <a>7</a>
 <b>13</b>
-<v>328</v>
+<v>329</v>
 </b>
 <b>
 <a>14</a>
@@ -12051,7 +12071,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1896</v>
+<v>1897</v>
 </b>
 <b>
 <a>2</a>
@@ -12071,7 +12091,7 @@
 <b>
 <a>7</a>
 <b>13</b>
-<v>328</v>
+<v>329</v>
 </b>
 <b>
 <a>13</a>
@@ -12102,7 +12122,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1896</v>
+<v>1897</v>
 </b>
 <b>
 <a>2</a>
@@ -12117,7 +12137,7 @@
 <b>
 <a>4</a>
 <b>7</b>
-<v>328</v>
+<v>329</v>
 </b>
 <b>
 <a>7</a>
@@ -12147,11 +12167,11 @@
 </relation>
 <relation>
 <name>diagnostics</name>
-<cardinality>68684</cardinality>
+<cardinality>68697</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>68684</v>
+<v>68697</v>
 </e>
 <e>
 <k>severity</k>
@@ -12167,7 +12187,7 @@
 </e>
 <e>
 <k>full_error_message</k>
-<v>59474</v>
+<v>59485</v>
 </e>
 <e>
 <k>location</k>
@@ -12185,7 +12205,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>68684</v>
+<v>68697</v>
 </b>
 </bs>
 </hist>
@@ -12201,7 +12221,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>68684</v>
+<v>68697</v>
 </b>
 </bs>
 </hist>
@@ -12217,7 +12237,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>68684</v>
+<v>68697</v>
 </b>
 </bs>
 </hist>
@@ -12233,7 +12253,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>68684</v>
+<v>68697</v>
 </b>
 </bs>
 </hist>
@@ -12249,7 +12269,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>68684</v>
+<v>68697</v>
 </b>
 </bs>
 </hist>
@@ -12665,7 +12685,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>59463</v>
+<v>59474</v>
 </b>
 <b>
 <a>841</a>
@@ -12686,7 +12706,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>59474</v>
+<v>59485</v>
 </b>
 </bs>
 </hist>
@@ -12702,7 +12722,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>59474</v>
+<v>59485</v>
 </b>
 </bs>
 </hist>
@@ -12718,7 +12738,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>59474</v>
+<v>59485</v>
 </b>
 </bs>
 </hist>
@@ -12734,7 +12754,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>59474</v>
+<v>59485</v>
 </b>
 </bs>
 </hist>
@@ -12844,19 +12864,19 @@
 </relation>
 <relation>
 <name>files</name>
-<cardinality>60011</cardinality>
+<cardinality>60022</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>60011</v>
+<v>60022</v>
 </e>
 <e>
 <k>name</k>
-<v>60011</v>
+<v>60022</v>
 </e>
 <e>
 <k>simple</k>
-<v>41052</v>
+<v>41060</v>
 </e>
 <e>
 <k>ext</k>
@@ -12878,7 +12898,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60011</v>
+<v>60022</v>
 </b>
 </bs>
 </hist>
@@ -12894,7 +12914,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60011</v>
+<v>60022</v>
 </b>
 </bs>
 </hist>
@@ -12910,7 +12930,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60011</v>
+<v>60022</v>
 </b>
 </bs>
 </hist>
@@ -12926,7 +12946,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60011</v>
+<v>60022</v>
 </b>
 </bs>
 </hist>
@@ -12942,7 +12962,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60011</v>
+<v>60022</v>
 </b>
 </bs>
 </hist>
@@ -12958,7 +12978,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60011</v>
+<v>60022</v>
 </b>
 </bs>
 </hist>
@@ -12974,7 +12994,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60011</v>
+<v>60022</v>
 </b>
 </bs>
 </hist>
@@ -12990,7 +13010,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60011</v>
+<v>60022</v>
 </b>
 </bs>
 </hist>
@@ -13006,17 +13026,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>31173</v>
+<v>31179</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6195</v>
+<v>6196</v>
 </b>
 <b>
 <a>3</a>
 <b>7</b>
-<v>3234</v>
+<v>3235</v>
 </b>
 <b>
 <a>7</a>
@@ -13037,17 +13057,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>31173</v>
+<v>31179</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6195</v>
+<v>6196</v>
 </b>
 <b>
 <a>3</a>
 <b>7</b>
-<v>3234</v>
+<v>3235</v>
 </b>
 <b>
 <a>7</a>
@@ -13068,12 +13088,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>36699</v>
+<v>36706</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>3782</v>
+<v>3783</v>
 </b>
 <b>
 <a>3</a>
@@ -13094,7 +13114,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>41052</v>
+<v>41060</v>
 </b>
 </bs>
 </hist>
@@ -13352,19 +13372,19 @@
 </relation>
 <relation>
 <name>folders</name>
-<cardinality>10943</cardinality>
+<cardinality>10945</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>10943</v>
+<v>10945</v>
 </e>
 <e>
 <k>name</k>
-<v>10943</v>
+<v>10945</v>
 </e>
 <e>
 <k>simple</k>
-<v>3135</v>
+<v>3136</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -13378,7 +13398,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>10943</v>
+<v>10945</v>
 </b>
 </bs>
 </hist>
@@ -13394,7 +13414,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>10943</v>
+<v>10945</v>
 </b>
 </bs>
 </hist>
@@ -13410,7 +13430,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>10943</v>
+<v>10945</v>
 </b>
 </bs>
 </hist>
@@ -13426,7 +13446,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>10943</v>
+<v>10945</v>
 </b>
 </bs>
 </hist>
@@ -13508,15 +13528,15 @@
 </relation>
 <relation>
 <name>containerparent</name>
-<cardinality>70932</cardinality>
+<cardinality>70945</cardinality>
 <columnsizes>
 <e>
 <k>parent</k>
-<v>10943</v>
+<v>10945</v>
 </e>
 <e>
 <k>child</k>
-<v>70932</v>
+<v>70945</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -13581,7 +13601,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>70932</v>
+<v>70945</v>
 </b>
 </bs>
 </hist>
@@ -13591,11 +13611,11 @@
 </relation>
 <relation>
 <name>fileannotations</name>
-<cardinality>5149627</cardinality>
+<cardinality>5150571</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>4824</v>
+<v>4825</v>
 </e>
 <e>
 <k>kind</k>
@@ -13603,11 +13623,11 @@
 </e>
 <e>
 <k>name</k>
-<v>54616</v>
+<v>54626</v>
 </e>
 <e>
 <k>value</k>
-<v>44638</v>
+<v>44646</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -13842,42 +13862,42 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8925</v>
+<v>8927</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6030</v>
+<v>6031</v>
 </b>
 <b>
 <a>3</a>
 <b>6</b>
-<v>4517</v>
+<v>4518</v>
 </b>
 <b>
 <a>6</a>
 <b>8</b>
-<v>4451</v>
+<v>4452</v>
 </b>
 <b>
 <a>8</a>
 <b>14</b>
-<v>4407</v>
+<v>4408</v>
 </b>
 <b>
 <a>14</a>
 <b>18</b>
-<v>3914</v>
+<v>3915</v>
 </b>
 <b>
 <a>18</a>
 <b>21</b>
-<v>4243</v>
+<v>4244</v>
 </b>
 <b>
 <a>21</a>
 <b>34</b>
-<v>4396</v>
+<v>4397</v>
 </b>
 <b>
 <a>34</a>
@@ -13887,12 +13907,12 @@
 <b>
 <a>129</a>
 <b>236</b>
-<v>4155</v>
+<v>4156</v>
 </b>
 <b>
 <a>236</a>
 <b>395</b>
-<v>4111</v>
+<v>4112</v>
 </b>
 <b>
 <a>395</a>
@@ -13913,7 +13933,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>54616</v>
+<v>54626</v>
 </b>
 </bs>
 </hist>
@@ -13929,12 +13949,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9978</v>
+<v>9979</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>8048</v>
+<v>8049</v>
 </b>
 <b>
 <a>3</a>
@@ -13944,42 +13964,42 @@
 <b>
 <a>4</a>
 <b>6</b>
-<v>3958</v>
+<v>3959</v>
 </b>
 <b>
 <a>6</a>
 <b>10</b>
-<v>4879</v>
+<v>4880</v>
 </b>
 <b>
 <a>10</a>
 <b>14</b>
-<v>3486</v>
+<v>3487</v>
 </b>
 <b>
 <a>14</a>
 <b>18</b>
-<v>4495</v>
+<v>4496</v>
 </b>
 <b>
 <a>18</a>
 <b>23</b>
-<v>4199</v>
+<v>4200</v>
 </b>
 <b>
 <a>23</a>
 <b>44</b>
-<v>4396</v>
+<v>4397</v>
 </b>
 <b>
 <a>44</a>
 <b>97</b>
-<v>4155</v>
+<v>4156</v>
 </b>
 <b>
 <a>97</a>
 <b>405</b>
-<v>4100</v>
+<v>4101</v>
 </b>
 <b>
 <a>421</a>
@@ -14000,7 +14020,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6896</v>
+<v>6898</v>
 </b>
 <b>
 <a>2</a>
@@ -14010,7 +14030,7 @@
 <b>
 <a>5</a>
 <b>8</b>
-<v>3234</v>
+<v>3235</v>
 </b>
 <b>
 <a>8</a>
@@ -14030,17 +14050,17 @@
 <b>
 <a>25</a>
 <b>40</b>
-<v>3234</v>
+<v>3235</v>
 </b>
 <b>
 <a>40</a>
 <b>195</b>
-<v>3519</v>
+<v>3520</v>
 </b>
 <b>
 <a>195</a>
 <b>207</b>
-<v>3508</v>
+<v>3509</v>
 </b>
 <b>
 <a>207</a>
@@ -14055,12 +14075,12 @@
 <b>
 <a>328</a>
 <b>407</b>
-<v>3837</v>
+<v>3838</v>
 </b>
 <b>
 <a>407</a>
 <b>441</b>
-<v>1282</v>
+<v>1283</v>
 </b>
 </bs>
 </hist>
@@ -14076,7 +14096,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>44627</v>
+<v>44635</v>
 </b>
 <b>
 <a>2</a>
@@ -14097,12 +14117,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6918</v>
+<v>6920</v>
 </b>
 <b>
 <a>2</a>
 <b>5</b>
-<v>2510</v>
+<v>2511</v>
 </b>
 <b>
 <a>5</a>
@@ -14112,7 +14132,7 @@
 <b>
 <a>8</a>
 <b>16</b>
-<v>3497</v>
+<v>3498</v>
 </b>
 <b>
 <a>16</a>
@@ -14127,17 +14147,17 @@
 <b>
 <a>21</a>
 <b>31</b>
-<v>3881</v>
+<v>3882</v>
 </b>
 <b>
 <a>31</a>
 <b>41</b>
-<v>3530</v>
+<v>3531</v>
 </b>
 <b>
 <a>41</a>
 <b>54</b>
-<v>3530</v>
+<v>3531</v>
 </b>
 <b>
 <a>54</a>
@@ -14448,19 +14468,19 @@
 </relation>
 <relation>
 <name>macroinvocations</name>
-<cardinality>35573550</cardinality>
+<cardinality>35579191</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>35573550</v>
+<v>35579191</v>
 </e>
 <e>
 <k>macro_id</k>
-<v>81217</v>
+<v>81232</v>
 </e>
 <e>
 <k>location</k>
-<v>761081</v>
+<v>761220</v>
 </e>
 <e>
 <k>kind</k>
@@ -14478,7 +14498,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>35573550</v>
+<v>35579191</v>
 </b>
 </bs>
 </hist>
@@ -14494,7 +14514,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>35573550</v>
+<v>35579191</v>
 </b>
 </bs>
 </hist>
@@ -14510,7 +14530,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>35573550</v>
+<v>35579191</v>
 </b>
 </bs>
 </hist>
@@ -14526,52 +14546,52 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>17017</v>
+<v>17020</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>16557</v>
+<v>16560</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>3574</v>
+<v>3575</v>
 </b>
 <b>
 <a>4</a>
 <b>6</b>
-<v>7193</v>
+<v>7194</v>
 </b>
 <b>
 <a>6</a>
 <b>11</b>
-<v>6896</v>
+<v>6898</v>
 </b>
 <b>
 <a>11</a>
 <b>19</b>
-<v>6173</v>
+<v>6174</v>
 </b>
 <b>
 <a>19</a>
 <b>40</b>
-<v>6173</v>
+<v>6174</v>
 </b>
 <b>
 <a>40</a>
 <b>105</b>
-<v>6195</v>
+<v>6196</v>
 </b>
 <b>
 <a>105</a>
 <b>487</b>
-<v>6107</v>
+<v>6108</v>
 </b>
 <b>
 <a>488</a>
 <b>196960</b>
-<v>5328</v>
+<v>5329</v>
 </b>
 </bs>
 </hist>
@@ -14587,32 +14607,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>43213</v>
+<v>43221</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>10745</v>
+<v>10747</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>5339</v>
+<v>5340</v>
 </b>
 <b>
 <a>4</a>
 <b>6</b>
-<v>6973</v>
+<v>6975</v>
 </b>
 <b>
 <a>6</a>
 <b>13</b>
-<v>6721</v>
+<v>6722</v>
 </b>
 <b>
 <a>13</a>
 <b>66</b>
-<v>6107</v>
+<v>6108</v>
 </b>
 <b>
 <a>66</a>
@@ -14633,12 +14653,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>75077</v>
+<v>75091</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6140</v>
+<v>6141</v>
 </b>
 </bs>
 </hist>
@@ -14654,7 +14674,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>284333</v>
+<v>284418</v>
 </b>
 <b>
 <a>2</a>
@@ -14664,32 +14684,32 @@
 <b>
 <a>3</a>
 <b>4</b>
-<v>43443</v>
+<v>43451</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>58586</v>
+<v>58596</v>
 </b>
 <b>
 <a>5</a>
 <b>8</b>
-<v>63564</v>
+<v>63575</v>
 </b>
 <b>
 <a>8</a>
 <b>17</b>
-<v>61151</v>
+<v>61163</v>
 </b>
 <b>
 <a>17</a>
 <b>80</b>
-<v>57149</v>
+<v>57160</v>
 </b>
 <b>
 <a>80</a>
 <b>258137</b>
-<v>15372</v>
+<v>15375</v>
 </b>
 </bs>
 </hist>
@@ -14705,12 +14725,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>712385</v>
+<v>712516</v>
 </b>
 <b>
 <a>2</a>
 <b>354</b>
-<v>48695</v>
+<v>48704</v>
 </b>
 </bs>
 </hist>
@@ -14726,7 +14746,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>761081</v>
+<v>761220</v>
 </b>
 </bs>
 </hist>
@@ -14745,8 +14765,8 @@
 <v>10</v>
 </b>
 <b>
-<a>3216594</a>
-<b>3216595</b>
+<a>3216514</a>
+<b>3216515</b>
 <v>10</v>
 </b>
 </bs>
@@ -14799,15 +14819,15 @@
 </relation>
 <relation>
 <name>macroparent</name>
-<cardinality>31697519</cardinality>
+<cardinality>31702483</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>31697519</v>
+<v>31702483</v>
 </e>
 <e>
 <k>parent_id</k>
-<v>24675496</v>
+<v>24679513</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -14821,7 +14841,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>31697519</v>
+<v>31702483</v>
 </b>
 </bs>
 </hist>
@@ -14837,17 +14857,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>18986039</v>
+<v>18989189</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>4852278</v>
+<v>4853014</v>
 </b>
 <b>
 <a>3</a>
 <b>88</b>
-<v>837178</v>
+<v>837309</v>
 </b>
 </bs>
 </hist>
@@ -14935,11 +14955,11 @@
 </relation>
 <relation>
 <name>macro_argument_unexpanded</name>
-<cardinality>92630311</cardinality>
+<cardinality>92646221</cardinality>
 <columnsizes>
 <e>
 <k>invocation</k>
-<v>27414610</v>
+<v>27419041</v>
 </e>
 <e>
 <k>argument_index</k>
@@ -14947,7 +14967,7 @@
 </e>
 <e>
 <k>text</k>
-<v>312612</v>
+<v>312669</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -14961,22 +14981,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>7655065</v>
+<v>7656336</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>11464681</v>
+<v>11466332</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>6260141</v>
+<v>6261277</v>
 </b>
 <b>
 <a>4</a>
 <b>67</b>
-<v>2034721</v>
+<v>2035094</v>
 </b>
 </bs>
 </hist>
@@ -14992,22 +15012,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>7723004</v>
+<v>7724288</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>11618553</v>
+<v>11620232</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>6088758</v>
+<v>6089863</v>
 </b>
 <b>
 <a>4</a>
 <b>67</b>
-<v>1984293</v>
+<v>1984656</v>
 </b>
 </bs>
 </hist>
@@ -15023,7 +15043,7 @@
 <b>
 <a>50787</a>
 <b>50788</b>
-<v>635</v>
+<v>636</v>
 </b>
 <b>
 <a>50989</a>
@@ -15031,8 +15051,8 @@
 <v>54</v>
 </b>
 <b>
-<a>756485</a>
-<b>2500192</b>
+<a>756484</a>
+<b>2500138</b>
 <v>32</v>
 </b>
 </bs>
@@ -15049,7 +15069,7 @@
 <b>
 <a>2</a>
 <b>3</b>
-<v>635</v>
+<v>636</v>
 </b>
 <b>
 <a>13</a>
@@ -15075,57 +15095,57 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>37895</v>
+<v>37902</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>61118</v>
+<v>61163</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>14090</v>
+<v>14092</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>42138</v>
+<v>42135</v>
 </b>
 <b>
 <a>5</a>
 <b>8</b>
-<v>25296</v>
+<v>25289</v>
 </b>
 <b>
 <a>8</a>
 <b>12</b>
-<v>15120</v>
+<v>15112</v>
 </b>
 <b>
 <a>12</a>
 <b>16</b>
-<v>21765</v>
+<v>21780</v>
 </b>
 <b>
 <a>16</a>
 <b>21</b>
-<v>23936</v>
+<v>23940</v>
 </b>
 <b>
 <a>21</a>
 <b>41</b>
-<v>24967</v>
+<v>24971</v>
 </b>
 <b>
 <a>41</a>
 <b>121</b>
-<v>23794</v>
+<v>23787</v>
 </b>
 <b>
 <a>121</a>
 <b>567376</b>
-<v>22489</v>
+<v>22493</v>
 </b>
 </bs>
 </hist>
@@ -15141,17 +15161,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>226021</v>
+<v>226063</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>76294</v>
+<v>76308</v>
 </b>
 <b>
 <a>3</a>
 <b>9</b>
-<v>10296</v>
+<v>10298</v>
 </b>
 </bs>
 </hist>
@@ -15161,11 +15181,11 @@
 </relation>
 <relation>
 <name>macro_argument_expanded</name>
-<cardinality>92630311</cardinality>
+<cardinality>92646221</cardinality>
 <columnsizes>
 <e>
 <k>invocation</k>
-<v>27414610</v>
+<v>27419041</v>
 </e>
 <e>
 <k>argument_index</k>
@@ -15173,7 +15193,7 @@
 </e>
 <e>
 <k>text</k>
-<v>189409</v>
+<v>189444</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -15187,22 +15207,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>7655065</v>
+<v>7656336</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>11464681</v>
+<v>11466332</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>6260141</v>
+<v>6261277</v>
 </b>
 <b>
 <a>4</a>
 <b>67</b>
-<v>2034721</v>
+<v>2035094</v>
 </b>
 </bs>
 </hist>
@@ -15218,22 +15238,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>11162979</v>
+<v>11164761</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>9892749</v>
+<v>9894243</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>5268762</v>
+<v>5269716</v>
 </b>
 <b>
 <a>4</a>
 <b>9</b>
-<v>1090118</v>
+<v>1090318</v>
 </b>
 </bs>
 </hist>
@@ -15249,7 +15269,7 @@
 <b>
 <a>50787</a>
 <b>50788</b>
-<v>635</v>
+<v>636</v>
 </b>
 <b>
 <a>50989</a>
@@ -15257,8 +15277,8 @@
 <v>54</v>
 </b>
 <b>
-<a>756485</a>
-<b>2500192</b>
+<a>756484</a>
+<b>2500138</b>
 <v>32</v>
 </b>
 </bs>
@@ -15301,22 +15321,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>22862</v>
+<v>22866</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>38180</v>
+<v>38220</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>6239</v>
+<v>6240</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>15186</v>
+<v>15178</v>
 </b>
 <b>
 <a>5</a>
@@ -15326,37 +15346,37 @@
 <b>
 <a>6</a>
 <b>7</b>
-<v>22039</v>
+<v>22032</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>15471</v>
+<v>15463</v>
 </b>
 <b>
 <a>9</a>
 <b>15</b>
-<v>16480</v>
+<v>16494</v>
 </b>
 <b>
 <a>15</a>
 <b>28</b>
-<v>14254</v>
+<v>14257</v>
 </b>
 <b>
 <a>28</a>
 <b>77</b>
-<v>14331</v>
+<v>14322</v>
 </b>
 <b>
 <a>77</a>
 <b>337</b>
-<v>14320</v>
+<v>14322</v>
 </b>
 <b>
 <a>338</a>
-<b>1133308</b>
-<v>7291</v>
+<b>1133296</b>
+<v>7293</v>
 </b>
 </bs>
 </hist>
@@ -15372,17 +15392,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>95614</v>
+<v>95632</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>79474</v>
+<v>79488</v>
 </b>
 <b>
 <a>3</a>
 <b>6</b>
-<v>14243</v>
+<v>14246</v>
 </b>
 <b>
 <a>6</a>
@@ -15397,15 +15417,15 @@
 </relation>
 <relation>
 <name>functions</name>
-<cardinality>3467595</cardinality>
+<cardinality>3468230</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>3467595</v>
+<v>3468230</v>
 </e>
 <e>
 <k>name</k>
-<v>288335</v>
+<v>288388</v>
 </e>
 <e>
 <k>kind</k>
@@ -15423,7 +15443,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3467595</v>
+<v>3468230</v>
 </b>
 </bs>
 </hist>
@@ -15439,7 +15459,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3467595</v>
+<v>3468230</v>
 </b>
 </bs>
 </hist>
@@ -15455,27 +15475,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>195363</v>
+<v>195399</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>28311</v>
+<v>28316</v>
 </b>
 <b>
 <a>3</a>
 <b>5</b>
-<v>26074</v>
+<v>26079</v>
 </b>
 <b>
 <a>5</a>
 <b>13</b>
-<v>22160</v>
+<v>22164</v>
 </b>
 <b>
 <a>13</a>
 <b>123517</b>
-<v>16425</v>
+<v>16428</v>
 </b>
 </bs>
 </hist>
@@ -15491,7 +15511,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>286877</v>
+<v>286930</v>
 </b>
 <b>
 <a>2</a>
@@ -15598,15 +15618,15 @@
 </relation>
 <relation>
 <name>function_entry_point</name>
-<cardinality>1008374</cardinality>
+<cardinality>1008526</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1005447</v>
+<v>1005609</v>
 </e>
 <e>
 <k>entry_point</k>
-<v>1008374</v>
+<v>1008526</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -15620,12 +15640,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1002793</v>
+<v>1002966</v>
 </b>
 <b>
 <a>2</a>
 <b>9</b>
-<v>2653</v>
+<v>2643</v>
 </b>
 </bs>
 </hist>
@@ -15641,7 +15661,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1008374</v>
+<v>1008526</v>
 </b>
 </bs>
 </hist>
@@ -15651,15 +15671,15 @@
 </relation>
 <relation>
 <name>function_return_type</name>
-<cardinality>3477760</cardinality>
+<cardinality>3478397</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>3467124</v>
+<v>3467759</v>
 </e>
 <e>
 <k>return_type</k>
-<v>1023375</v>
+<v>1023562</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -15673,12 +15693,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3456981</v>
+<v>3457614</v>
 </b>
 <b>
 <a>2</a>
 <b>6</b>
-<v>10142</v>
+<v>10144</v>
 </b>
 </bs>
 </hist>
@@ -15694,17 +15714,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>299103</v>
+<v>299158</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>662571</v>
+<v>662692</v>
 </b>
 <b>
 <a>3</a>
 <b>84263</b>
-<v>61700</v>
+<v>61711</v>
 </b>
 </bs>
 </hist>
@@ -15725,37 +15745,37 @@
 </relation>
 <relation>
 <name>function_deleted</name>
-<cardinality>56173</cardinality>
+<cardinality>56184</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>56173</v>
+<v>56184</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>function_defaulted</name>
-<cardinality>12927</cardinality>
+<cardinality>12930</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>12927</v>
+<v>12930</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>member_function_this_type</name>
-<cardinality>523250</cardinality>
+<cardinality>523345</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>522921</v>
+<v>523345</v>
 </e>
 <e>
 <k>this_type</k>
-<v>171339</v>
+<v>171370</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -15769,12 +15789,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>522592</v>
-</b>
-<b>
-<a>2</a>
-<b>3</b>
-<v>328</v>
+<v>523345</v>
 </b>
 </bs>
 </hist>
@@ -15790,32 +15805,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>62533</v>
+<v>62544</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>44550</v>
+<v>44558</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>22291</v>
+<v>22295</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>15011</v>
+<v>15013</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>13684</v>
+<v>13686</v>
 </b>
 <b>
 <a>7</a>
 <b>36</b>
-<v>12872</v>
+<v>12875</v>
 </b>
 <b>
 <a>40</a>
@@ -15830,27 +15845,27 @@
 </relation>
 <relation>
 <name>fun_decls</name>
-<cardinality>3543155</cardinality>
+<cardinality>3543804</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>3539887</v>
+<v>3540536</v>
 </e>
 <e>
 <k>function</k>
-<v>3374162</v>
+<v>3374780</v>
 </e>
 <e>
 <k>type_id</k>
-<v>1010304</v>
+<v>1010489</v>
 </e>
 <e>
 <k>name</k>
-<v>256789</v>
+<v>256836</v>
 </e>
 <e>
 <k>location</k>
-<v>795291</v>
+<v>795437</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -15864,7 +15879,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3539887</v>
+<v>3540536</v>
 </b>
 </bs>
 </hist>
@@ -15880,12 +15895,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3536905</v>
+<v>3537553</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>2982</v>
+<v>2983</v>
 </b>
 </bs>
 </hist>
@@ -15901,7 +15916,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3539887</v>
+<v>3540536</v>
 </b>
 </bs>
 </hist>
@@ -15917,7 +15932,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3539887</v>
+<v>3540536</v>
 </b>
 </bs>
 </hist>
@@ -15933,12 +15948,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3238163</v>
+<v>3238757</v>
 </b>
 <b>
 <a>2</a>
 <b>9</b>
-<v>135998</v>
+<v>136023</v>
 </b>
 </bs>
 </hist>
@@ -15954,12 +15969,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3357506</v>
+<v>3358122</v>
 </b>
 <b>
 <a>2</a>
 <b>6</b>
-<v>16655</v>
+<v>16658</v>
 </b>
 </bs>
 </hist>
@@ -15975,7 +15990,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3374162</v>
+<v>3374780</v>
 </b>
 </bs>
 </hist>
@@ -15991,12 +16006,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3286541</v>
+<v>3287143</v>
 </b>
 <b>
 <a>2</a>
 <b>9</b>
-<v>87621</v>
+<v>87637</v>
 </b>
 </bs>
 </hist>
@@ -16012,17 +16027,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>280276</v>
+<v>280327</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>660948</v>
+<v>661069</v>
 </b>
 <b>
 <a>3</a>
 <b>89606</b>
-<v>69079</v>
+<v>69092</v>
 </b>
 </bs>
 </hist>
@@ -16038,17 +16053,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>292107</v>
+<v>292161</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>657297</v>
+<v>657417</v>
 </b>
 <b>
 <a>3</a>
 <b>83378</b>
-<v>60899</v>
+<v>60910</v>
 </b>
 </bs>
 </hist>
@@ -16064,12 +16079,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>943780</v>
+<v>943952</v>
 </b>
 <b>
 <a>2</a>
 <b>7512</b>
-<v>66524</v>
+<v>66536</v>
 </b>
 </bs>
 </hist>
@@ -16085,17 +16100,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>912924</v>
+<v>913091</v>
 </b>
 <b>
 <a>2</a>
 <b>6</b>
-<v>80132</v>
+<v>80146</v>
 </b>
 <b>
 <a>6</a>
 <b>22467</b>
-<v>17247</v>
+<v>17251</v>
 </b>
 </bs>
 </hist>
@@ -16111,32 +16126,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>153521</v>
+<v>153549</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>29298</v>
+<v>29303</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>15932</v>
+<v>15935</v>
 </b>
 <b>
 <a>4</a>
 <b>6</b>
-<v>19517</v>
+<v>19521</v>
 </b>
 <b>
 <a>6</a>
 <b>13</b>
-<v>20197</v>
+<v>20201</v>
 </b>
 <b>
 <a>13</a>
 <b>123766</b>
-<v>18322</v>
+<v>18325</v>
 </b>
 </bs>
 </hist>
@@ -16152,32 +16167,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>164146</v>
+<v>164176</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>28476</v>
+<v>28481</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>14451</v>
+<v>14454</v>
 </b>
 <b>
 <a>4</a>
 <b>7</b>
-<v>21633</v>
+<v>21637</v>
 </b>
 <b>
 <a>7</a>
 <b>25</b>
-<v>19638</v>
+<v>19641</v>
 </b>
 <b>
 <a>25</a>
 <b>123501</b>
-<v>8443</v>
+<v>8444</v>
 </b>
 </bs>
 </hist>
@@ -16193,17 +16208,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>224289</v>
+<v>224330</v>
 </b>
 <b>
 <a>2</a>
 <b>5</b>
-<v>20866</v>
+<v>20870</v>
 </b>
 <b>
 <a>5</a>
 <b>63265</b>
-<v>11633</v>
+<v>11636</v>
 </b>
 </bs>
 </hist>
@@ -16219,27 +16234,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>164639</v>
+<v>164669</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>43454</v>
+<v>43462</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>16436</v>
+<v>16439</v>
 </b>
 <b>
 <a>4</a>
 <b>8</b>
-<v>20570</v>
+<v>20574</v>
 </b>
 <b>
 <a>8</a>
 <b>8921</b>
-<v>11688</v>
+<v>11690</v>
 </b>
 </bs>
 </hist>
@@ -16255,27 +16270,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>522657</v>
+<v>522753</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>143860</v>
+<v>143887</v>
 </b>
 <b>
 <a>3</a>
 <b>5</b>
-<v>64847</v>
+<v>64858</v>
 </b>
 <b>
 <a>5</a>
 <b>125</b>
-<v>59682</v>
+<v>59693</v>
 </b>
 <b>
 <a>125</a>
 <b>3043</b>
-<v>4243</v>
+<v>4244</v>
 </b>
 </bs>
 </hist>
@@ -16291,22 +16306,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>537581</v>
+<v>537679</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>156821</v>
+<v>156850</v>
 </b>
 <b>
 <a>3</a>
 <b>9</b>
-<v>64331</v>
+<v>64343</v>
 </b>
 <b>
 <a>9</a>
 <b>3043</b>
-<v>36557</v>
+<v>36564</v>
 </b>
 </bs>
 </hist>
@@ -16322,17 +16337,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>701661</v>
+<v>701790</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>61776</v>
+<v>61788</v>
 </b>
 <b>
 <a>4</a>
 <b>1522</b>
-<v>31853</v>
+<v>31859</v>
 </b>
 </bs>
 </hist>
@@ -16348,12 +16363,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>770291</v>
+<v>770432</v>
 </b>
 <b>
 <a>2</a>
 <b>134</b>
-<v>25000</v>
+<v>25004</v>
 </b>
 </bs>
 </hist>
@@ -16363,11 +16378,11 @@
 </relation>
 <relation>
 <name>fun_def</name>
-<cardinality>1230547</cardinality>
+<cardinality>1230773</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1230547</v>
+<v>1230773</v>
 </e>
 </columnsizes>
 <dependencies/>
@@ -16590,26 +16605,26 @@
 </relation>
 <relation>
 <name>fun_decl_empty_throws</name>
-<cardinality>1420692</cardinality>
+<cardinality>1420952</cardinality>
 <columnsizes>
 <e>
 <k>fun_decl</k>
-<v>1420692</v>
+<v>1420952</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>fun_decl_noexcept</name>
-<cardinality>32905</cardinality>
+<cardinality>32912</cardinality>
 <columnsizes>
 <e>
 <k>fun_decl</k>
-<v>32116</v>
+<v>32122</v>
 </e>
 <e>
 <k>constant</k>
-<v>32785</v>
+<v>32791</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -16623,7 +16638,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>31327</v>
+<v>31332</v>
 </b>
 <b>
 <a>2</a>
@@ -16644,7 +16659,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>32664</v>
+<v>32670</v>
 </b>
 <b>
 <a>2</a>
@@ -16659,11 +16674,11 @@
 </relation>
 <relation>
 <name>fun_decl_empty_noexcept</name>
-<cardinality>391878</cardinality>
+<cardinality>391950</cardinality>
 <columnsizes>
 <e>
 <k>fun_decl</k>
-<v>391878</v>
+<v>391950</v>
 </e>
 </columnsizes>
 <dependencies/>
@@ -16718,11 +16733,11 @@
 </relation>
 <relation>
 <name>param_decl_bind</name>
-<cardinality>4650566</cardinality>
+<cardinality>4651418</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>4650566</v>
+<v>4651418</v>
 </e>
 <e>
 <k>index</k>
@@ -16730,7 +16745,7 @@
 </e>
 <e>
 <k>fun_decl</k>
-<v>3071122</v>
+<v>3071685</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -16744,7 +16759,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4650566</v>
+<v>4651418</v>
 </b>
 </bs>
 </hist>
@@ -16760,7 +16775,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4650566</v>
+<v>4651418</v>
 </b>
 </bs>
 </hist>
@@ -16858,22 +16873,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2194832</v>
+<v>2195234</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>478479</v>
+<v>478567</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>242666</v>
+<v>242711</v>
 </b>
 <b>
 <a>4</a>
 <b>65</b>
-<v>155143</v>
+<v>155172</v>
 </b>
 </bs>
 </hist>
@@ -16889,22 +16904,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2194832</v>
+<v>2195234</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>478479</v>
+<v>478567</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>242666</v>
+<v>242711</v>
 </b>
 <b>
 <a>4</a>
 <b>65</b>
-<v>155143</v>
+<v>155172</v>
 </b>
 </bs>
 </hist>
@@ -16914,27 +16929,27 @@
 </relation>
 <relation>
 <name>var_decls</name>
-<cardinality>5367940</cardinality>
+<cardinality>5368814</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>5359092</v>
+<v>5359964</v>
 </e>
 <e>
 <k>variable</k>
-<v>5131261</v>
+<v>5132080</v>
 </e>
 <e>
 <k>type_id</k>
-<v>2007363</v>
+<v>2007720</v>
 </e>
 <e>
 <k>name</k>
-<v>126283</v>
+<v>126307</v>
 </e>
 <e>
 <k>location</k>
-<v>1232192</v>
+<v>1232418</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -16948,7 +16963,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5359092</v>
+<v>5359964</v>
 </b>
 </bs>
 </hist>
@@ -16964,12 +16979,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5350429</v>
+<v>5351300</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>8662</v>
+<v>8663</v>
 </b>
 </bs>
 </hist>
@@ -16985,7 +17000,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5359092</v>
+<v>5359964</v>
 </b>
 </bs>
 </hist>
@@ -17001,7 +17016,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5359048</v>
+<v>5359920</v>
 </b>
 <b>
 <a>2</a>
@@ -17022,12 +17037,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4943803</v>
+<v>4944577</v>
 </b>
 <b>
 <a>2</a>
 <b>9</b>
-<v>187457</v>
+<v>187503</v>
 </b>
 </bs>
 </hist>
@@ -17043,12 +17058,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5095931</v>
+<v>5096734</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>35329</v>
+<v>35346</v>
 </b>
 </bs>
 </hist>
@@ -17064,12 +17079,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5113695</v>
+<v>5114511</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>17565</v>
+<v>17569</v>
 </b>
 </bs>
 </hist>
@@ -17085,12 +17100,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5023069</v>
+<v>5023869</v>
 </b>
 <b>
 <a>2</a>
 <b>9</b>
-<v>108191</v>
+<v>108211</v>
 </b>
 </bs>
 </hist>
@@ -17106,22 +17121,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1580539</v>
+<v>1580829</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>228850</v>
+<v>228892</v>
 </b>
 <b>
 <a>3</a>
 <b>11</b>
-<v>156942</v>
+<v>156948</v>
 </b>
 <b>
 <a>11</a>
 <b>5924</b>
-<v>41031</v>
+<v>41049</v>
 </b>
 </bs>
 </hist>
@@ -17137,22 +17152,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1604728</v>
+<v>1605022</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>219618</v>
+<v>219658</v>
 </b>
 <b>
 <a>3</a>
 <b>13</b>
-<v>151108</v>
+<v>151125</v>
 </b>
 <b>
 <a>13</a>
 <b>5424</b>
-<v>31908</v>
+<v>31914</v>
 </b>
 </bs>
 </hist>
@@ -17168,17 +17183,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1832537</v>
+<v>1832862</v>
 </b>
 <b>
 <a>2</a>
 <b>5</b>
-<v>151207</v>
+<v>151235</v>
 </b>
 <b>
 <a>5</a>
 <b>772</b>
-<v>23618</v>
+<v>23622</v>
 </b>
 </bs>
 </hist>
@@ -17194,17 +17209,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1758162</v>
+<v>1758473</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>154464</v>
+<v>154470</v>
 </b>
 <b>
 <a>4</a>
 <b>3608</b>
-<v>94737</v>
+<v>94776</v>
 </b>
 </bs>
 </hist>
@@ -17220,42 +17235,42 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>52083</v>
+<v>52159</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>19276</v>
+<v>19236</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>10910</v>
+<v>10890</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>7686</v>
+<v>7687</v>
 </b>
 <b>
 <a>5</a>
 <b>8</b>
-<v>10515</v>
+<v>10517</v>
 </b>
 <b>
 <a>8</a>
 <b>15</b>
-<v>9506</v>
+<v>9508</v>
 </b>
 <b>
 <a>15</a>
 <b>47</b>
-<v>9528</v>
+<v>9530</v>
 </b>
 <b>
 <a>47</a>
 <b>165630</b>
-<v>6776</v>
+<v>6777</v>
 </b>
 </bs>
 </hist>
@@ -17271,37 +17286,37 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>54901</v>
+<v>54977</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>18826</v>
+<v>18786</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>11809</v>
+<v>11789</v>
 </b>
 <b>
 <a>4</a>
 <b>6</b>
-<v>11195</v>
+<v>11197</v>
 </b>
 <b>
 <a>6</a>
 <b>11</b>
-<v>10734</v>
+<v>10736</v>
 </b>
 <b>
 <a>11</a>
 <b>27</b>
-<v>9484</v>
+<v>9486</v>
 </b>
 <b>
 <a>27</a>
 <b>164602</b>
-<v>9331</v>
+<v>9332</v>
 </b>
 </bs>
 </hist>
@@ -17317,32 +17332,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>76283</v>
+<v>76319</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>16897</v>
+<v>16878</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>8859</v>
+<v>8861</v>
 </b>
 <b>
 <a>4</a>
 <b>7</b>
-<v>10471</v>
+<v>10473</v>
 </b>
 <b>
 <a>7</a>
 <b>27</b>
-<v>9517</v>
+<v>9519</v>
 </b>
 <b>
 <a>27</a>
 <b>125807</b>
-<v>4254</v>
+<v>4255</v>
 </b>
 </bs>
 </hist>
@@ -17358,32 +17373,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>72807</v>
+<v>72820</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>19024</v>
+<v>19027</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>6973</v>
+<v>6975</v>
 </b>
 <b>
 <a>4</a>
 <b>7</b>
-<v>11184</v>
+<v>11186</v>
 </b>
 <b>
 <a>7</a>
 <b>21</b>
-<v>9747</v>
+<v>9749</v>
 </b>
 <b>
 <a>21</a>
 <b>10073</b>
-<v>6546</v>
+<v>6547</v>
 </b>
 </bs>
 </hist>
@@ -17399,22 +17414,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>892233</v>
+<v>892484</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>149124</v>
+<v>149063</v>
 </b>
 <b>
 <a>3</a>
 <b>6</b>
-<v>113389</v>
+<v>113420</v>
 </b>
 <b>
 <a>6</a>
 <b>128450</b>
-<v>77445</v>
+<v>77449</v>
 </b>
 </bs>
 </hist>
@@ -17430,22 +17445,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>940983</v>
+<v>941244</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>114551</v>
+<v>114484</v>
 </b>
 <b>
 <a>3</a>
 <b>6</b>
-<v>102632</v>
+<v>102662</v>
 </b>
 <b>
 <a>6</a>
 <b>128224</b>
-<v>74024</v>
+<v>74027</v>
 </b>
 </bs>
 </hist>
@@ -17461,17 +17476,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1055162</v>
+<v>1055377</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>85099</v>
+<v>85093</v>
 </b>
 <b>
 <a>3</a>
 <b>118388</b>
-<v>91930</v>
+<v>91947</v>
 </b>
 </bs>
 </hist>
@@ -17487,12 +17502,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1223223</v>
+<v>1223447</v>
 </b>
 <b>
 <a>2</a>
 <b>52</b>
-<v>8969</v>
+<v>8971</v>
 </b>
 </bs>
 </hist>
@@ -17502,11 +17517,11 @@
 </relation>
 <relation>
 <name>var_def</name>
-<cardinality>2437137</cardinality>
+<cardinality>2437474</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>2437137</v>
+<v>2437474</v>
 </e>
 </columnsizes>
 <dependencies/>
@@ -17576,19 +17591,19 @@
 </relation>
 <relation>
 <name>type_decls</name>
-<cardinality>1331886</cardinality>
+<cardinality>1332130</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1331886</v>
+<v>1332130</v>
 </e>
 <e>
 <k>type_id</k>
-<v>1300142</v>
+<v>1300380</v>
 </e>
 <e>
 <k>location</k>
-<v>1086621</v>
+<v>1086820</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -17602,7 +17617,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1331886</v>
+<v>1332130</v>
 </b>
 </bs>
 </hist>
@@ -17618,7 +17633,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1331886</v>
+<v>1332130</v>
 </b>
 </bs>
 </hist>
@@ -17634,12 +17649,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1277050</v>
+<v>1277284</v>
 </b>
 <b>
 <a>2</a>
 <b>24</b>
-<v>23092</v>
+<v>23096</v>
 </b>
 </bs>
 </hist>
@@ -17655,12 +17670,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1278344</v>
+<v>1278578</v>
 </b>
 <b>
 <a>2</a>
 <b>24</b>
-<v>21798</v>
+<v>21802</v>
 </b>
 </bs>
 </hist>
@@ -17676,12 +17691,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1031171</v>
+<v>1031360</v>
 </b>
 <b>
 <a>2</a>
 <b>506</b>
-<v>55450</v>
+<v>55460</v>
 </b>
 </bs>
 </hist>
@@ -17697,12 +17712,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1032651</v>
+<v>1032840</v>
 </b>
 <b>
 <a>2</a>
 <b>506</b>
-<v>53969</v>
+<v>53979</v>
 </b>
 </bs>
 </hist>
@@ -17712,45 +17727,45 @@
 </relation>
 <relation>
 <name>type_def</name>
-<cardinality>937551</cardinality>
+<cardinality>937723</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>937551</v>
+<v>937723</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>type_decl_top</name>
-<cardinality>268642</cardinality>
+<cardinality>268691</cardinality>
 <columnsizes>
 <e>
 <k>type_decl</k>
-<v>268642</v>
+<v>268691</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>namespace_decls</name>
-<cardinality>136843</cardinality>
+<cardinality>136868</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>136843</v>
+<v>136868</v>
 </e>
 <e>
 <k>namespace_id</k>
-<v>7675</v>
+<v>7676</v>
 </e>
 <e>
 <k>location</k>
-<v>122226</v>
+<v>122249</v>
 </e>
 <e>
 <k>bodylocation</k>
-<v>122555</v>
+<v>122578</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -17764,7 +17779,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>136843</v>
+<v>136868</v>
 </b>
 </bs>
 </hist>
@@ -17780,7 +17795,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>136843</v>
+<v>136868</v>
 </b>
 </bs>
 </hist>
@@ -17796,7 +17811,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>136843</v>
+<v>136868</v>
 </b>
 </bs>
 </hist>
@@ -17812,7 +17827,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3618</v>
+<v>3619</v>
 </b>
 <b>
 <a>2</a>
@@ -17827,7 +17842,7 @@
 <b>
 <a>4</a>
 <b>7</b>
-<v>646</v>
+<v>647</v>
 </b>
 <b>
 <a>7</a>
@@ -17863,7 +17878,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3618</v>
+<v>3619</v>
 </b>
 <b>
 <a>2</a>
@@ -17878,7 +17893,7 @@
 <b>
 <a>4</a>
 <b>7</b>
-<v>646</v>
+<v>647</v>
 </b>
 <b>
 <a>7</a>
@@ -17914,7 +17929,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3618</v>
+<v>3619</v>
 </b>
 <b>
 <a>2</a>
@@ -17929,7 +17944,7 @@
 <b>
 <a>4</a>
 <b>7</b>
-<v>646</v>
+<v>647</v>
 </b>
 <b>
 <a>7</a>
@@ -17965,12 +17980,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>113849</v>
+<v>113870</v>
 </b>
 <b>
 <a>2</a>
 <b>8</b>
-<v>8377</v>
+<v>8378</v>
 </b>
 </bs>
 </hist>
@@ -17986,12 +18001,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>113849</v>
+<v>113870</v>
 </b>
 <b>
 <a>2</a>
 <b>8</b>
-<v>8377</v>
+<v>8378</v>
 </b>
 </bs>
 </hist>
@@ -18007,7 +18022,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>121481</v>
+<v>121503</v>
 </b>
 <b>
 <a>2</a>
@@ -18028,12 +18043,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>114540</v>
+<v>114561</v>
 </b>
 <b>
 <a>2</a>
 <b>11</b>
-<v>8015</v>
+<v>8016</v>
 </b>
 </bs>
 </hist>
@@ -18049,12 +18064,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>114540</v>
+<v>114561</v>
 </b>
 <b>
 <a>2</a>
 <b>9</b>
-<v>8015</v>
+<v>8016</v>
 </b>
 </bs>
 </hist>
@@ -18070,7 +18085,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>122161</v>
+<v>122183</v>
 </b>
 <b>
 <a>2</a>
@@ -18085,19 +18100,19 @@
 </relation>
 <relation>
 <name>usings</name>
-<cardinality>291384</cardinality>
+<cardinality>291437</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>291384</v>
+<v>291437</v>
 </e>
 <e>
 <k>element_id</k>
-<v>46392</v>
+<v>46401</v>
 </e>
 <e>
 <k>location</k>
-<v>23859</v>
+<v>23864</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -18111,7 +18126,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>291384</v>
+<v>291437</v>
 </b>
 </bs>
 </hist>
@@ -18127,7 +18142,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>291384</v>
+<v>291437</v>
 </b>
 </bs>
 </hist>
@@ -18143,7 +18158,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>39386</v>
+<v>39393</v>
 </b>
 <b>
 <a>2</a>
@@ -18153,7 +18168,7 @@
 <b>
 <a>4</a>
 <b>127</b>
-<v>3256</v>
+<v>3257</v>
 </b>
 </bs>
 </hist>
@@ -18169,7 +18184,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>39386</v>
+<v>39393</v>
 </b>
 <b>
 <a>2</a>
@@ -18179,7 +18194,7 @@
 <b>
 <a>4</a>
 <b>127</b>
-<v>3256</v>
+<v>3257</v>
 </b>
 </bs>
 </hist>
@@ -18195,12 +18210,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>18059</v>
+<v>18062</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>2236</v>
+<v>2237</v>
 </b>
 <b>
 <a>3</a>
@@ -18226,12 +18241,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>18059</v>
+<v>18062</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>2236</v>
+<v>2237</v>
 </b>
 <b>
 <a>3</a>
@@ -18251,15 +18266,15 @@
 </relation>
 <relation>
 <name>using_container</name>
-<cardinality>458008</cardinality>
+<cardinality>458092</cardinality>
 <columnsizes>
 <e>
 <k>parent</k>
-<v>11228</v>
+<v>11230</v>
 </e>
 <e>
 <k>child</k>
-<v>291384</v>
+<v>291437</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -18273,12 +18288,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3212</v>
+<v>3213</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>942</v>
+<v>943</v>
 </b>
 <b>
 <a>4</a>
@@ -18303,7 +18318,7 @@
 <b>
 <a>178</a>
 <b>179</b>
-<v>1260</v>
+<v>1261</v>
 </b>
 <b>
 <a>179</a>
@@ -18329,17 +18344,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>215813</v>
+<v>215852</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>50362</v>
+<v>50371</v>
 </b>
 <b>
 <a>3</a>
 <b>11</b>
-<v>23136</v>
+<v>23140</v>
 </b>
 <b>
 <a>13</a>
@@ -18372,6 +18387,10 @@
 <k>location</k>
 <v>16721</v>
 </e>
+<e>
+<k>enclosing</k>
+<v>1724</v>
+</e>
 </columnsizes>
 <dependencies>
 <dep>
@@ -18423,6 +18442,22 @@
 </val>
 </dep>
 <dep>
+<src>id</src>
+<trg>enclosing</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>130659</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+<dep>
 <src>condition</src>
 <trg>id</trg>
 <val>
@@ -18471,6 +18506,22 @@
 </val>
 </dep>
 <dep>
+<src>condition</src>
+<trg>enclosing</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>130659</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+<dep>
 <src>message</src>
 <trg>id</trg>
 <val>
@@ -18574,6 +18625,42 @@
 </val>
 </dep>
 <dep>
+<src>message</src>
+<trg>enclosing</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>23513</v>
+</b>
+<b>
+<a>2</a>
+<b>3</b>
+<v>182</v>
+</b>
+<b>
+<a>3</a>
+<b>4</b>
+<v>2654</v>
+</b>
+<b>
+<a>4</a>
+<b>11</b>
+<v>1301</v>
+</b>
+<b>
+<a>12</a>
+<b>21</b>
+<v>2055</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+<dep>
 <src>location</src>
 <trg>id</trg>
 <val>
@@ -18716,19 +18803,209 @@
 </hist>
 </val>
 </dep>
+<dep>
+<src>location</src>
+<trg>enclosing</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>3441</v>
+</b>
+<b>
+<a>2</a>
+<b>3</b>
+<v>6194</v>
+</b>
+<b>
+<a>3</a>
+<b>4</b>
+<v>1125</v>
+</b>
+<b>
+<a>4</a>
+<b>5</b>
+<v>3715</v>
+</b>
+<b>
+<a>5</a>
+<b>6</b>
+<v>188</v>
+</b>
+<b>
+<a>13</a>
+<b>14</b>
+<v>2036</v>
+</b>
+<b>
+<a>16</a>
+<b>21</b>
+<v>19</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+<dep>
+<src>enclosing</src>
+<trg>id</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>1171</v>
+</b>
+<b>
+<a>2</a>
+<b>3</b>
+<v>130</v>
+</b>
+<b>
+<a>3</a>
+<b>7</b>
+<v>136</v>
+</b>
+<b>
+<a>9</a>
+<b>108</b>
+<v>136</v>
+</b>
+<b>
+<a>170</a>
+<b>347</b>
+<v>130</v>
+</b>
+<b>
+<a>348</a>
+<b>10697</b>
+<v>19</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+<dep>
+<src>enclosing</src>
+<trg>condition</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>1171</v>
+</b>
+<b>
+<a>2</a>
+<b>3</b>
+<v>130</v>
+</b>
+<b>
+<a>3</a>
+<b>7</b>
+<v>136</v>
+</b>
+<b>
+<a>9</a>
+<b>108</b>
+<v>136</v>
+</b>
+<b>
+<a>170</a>
+<b>347</b>
+<v>130</v>
+</b>
+<b>
+<a>348</a>
+<b>10697</b>
+<v>19</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+<dep>
+<src>enclosing</src>
+<trg>message</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>1327</v>
+</b>
+<b>
+<a>2</a>
+<b>5</b>
+<v>136</v>
+</b>
+<b>
+<a>5</a>
+<b>180</b>
+<v>130</v>
+</b>
+<b>
+<a>211</a>
+<b>2870</b>
+<v>130</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
+<dep>
+<src>enclosing</src>
+<trg>location</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs>
+<b>
+<a>1</a>
+<b>2</b>
+<v>1314</v>
+</b>
+<b>
+<a>2</a>
+<b>5</b>
+<v>149</v>
+</b>
+<b>
+<a>5</a>
+<b>180</b>
+<v>130</v>
+</b>
+<b>
+<a>211</a>
+<b>1886</b>
+<v>130</v>
+</b>
+</bs>
+</hist>
+</val>
+</dep>
 </dependencies>
 </relation>
 <relation>
 <name>params</name>
-<cardinality>4644085</cardinality>
+<cardinality>4644936</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>4627024</v>
+<v>4627872</v>
 </e>
 <e>
 <k>function</k>
-<v>3043304</v>
+<v>3043862</v>
 </e>
 <e>
 <k>index</k>
@@ -18736,7 +19013,7 @@
 </e>
 <e>
 <k>type_id</k>
-<v>1856463</v>
+<v>1856803</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -18750,7 +19027,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4626355</v>
+<v>4627203</v>
 </b>
 <b>
 <a>2</a>
@@ -18771,7 +19048,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4627024</v>
+<v>4627872</v>
 </b>
 </bs>
 </hist>
@@ -18787,12 +19064,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4611980</v>
+<v>4612825</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>15043</v>
+<v>15046</v>
 </b>
 </bs>
 </hist>
@@ -18808,22 +19085,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2166224</v>
+<v>2166621</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>475026</v>
+<v>475113</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>244409</v>
+<v>244454</v>
 </b>
 <b>
 <a>4</a>
 <b>65</b>
-<v>157643</v>
+<v>157672</v>
 </b>
 </bs>
 </hist>
@@ -18839,22 +19116,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2166224</v>
+<v>2166621</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>475026</v>
+<v>475113</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>244409</v>
+<v>244454</v>
 </b>
 <b>
 <a>4</a>
 <b>65</b>
-<v>157643</v>
+<v>157672</v>
 </b>
 </bs>
 </hist>
@@ -18870,22 +19147,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2282782</v>
+<v>2283201</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>470881</v>
+<v>470967</v>
 </b>
 <b>
 <a>3</a>
 <b>5</b>
-<v>254278</v>
+<v>254325</v>
 </b>
 <b>
 <a>5</a>
 <b>20</b>
-<v>35362</v>
+<v>35368</v>
 </b>
 </bs>
 </hist>
@@ -19024,22 +19301,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1504453</v>
+<v>1504729</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>186679</v>
+<v>186713</v>
 </b>
 <b>
 <a>3</a>
 <b>14</b>
-<v>139463</v>
+<v>139489</v>
 </b>
 <b>
 <a>14</a>
 <b>5175</b>
-<v>25866</v>
+<v>25871</v>
 </b>
 </bs>
 </hist>
@@ -19055,22 +19332,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1524311</v>
+<v>1524590</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>179815</v>
+<v>179848</v>
 </b>
 <b>
 <a>3</a>
 <b>23</b>
-<v>139694</v>
+<v>139719</v>
 </b>
 <b>
 <a>23</a>
 <b>4690</b>
-<v>12642</v>
+<v>12644</v>
 </b>
 </bs>
 </hist>
@@ -19086,12 +19363,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1744795</v>
+<v>1745115</v>
 </b>
 <b>
 <a>2</a>
 <b>65</b>
-<v>111667</v>
+<v>111688</v>
 </b>
 </bs>
 </hist>
@@ -19189,19 +19466,19 @@
 </relation>
 <relation>
 <name>membervariables</name>
-<cardinality>310243</cardinality>
+<cardinality>310300</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>305627</v>
+<v>305683</v>
 </e>
 <e>
 <k>type_id</k>
-<v>132895</v>
+<v>132920</v>
 </e>
 <e>
 <k>name</k>
-<v>53213</v>
+<v>53222</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -19215,12 +19492,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>301164</v>
+<v>301220</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>4462</v>
+<v>4463</v>
 </b>
 </bs>
 </hist>
@@ -19236,7 +19513,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>305627</v>
+<v>305683</v>
 </b>
 </bs>
 </hist>
@@ -19252,22 +19529,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>108049</v>
+<v>108068</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>12269</v>
+<v>12272</v>
 </b>
 <b>
 <a>3</a>
 <b>9</b>
-<v>10054</v>
+<v>10056</v>
 </b>
 <b>
 <a>9</a>
 <b>1712</b>
-<v>2521</v>
+<v>2522</v>
 </b>
 </bs>
 </hist>
@@ -19283,17 +19560,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>115099</v>
+<v>115120</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>9089</v>
+<v>9091</v>
 </b>
 <b>
 <a>3</a>
 <b>266</b>
-<v>8706</v>
+<v>8707</v>
 </b>
 </bs>
 </hist>
@@ -19309,17 +19586,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>28092</v>
+<v>28097</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>8168</v>
+<v>8170</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>5372</v>
+<v>5373</v>
 </b>
 <b>
 <a>4</a>
@@ -19329,12 +19606,12 @@
 <b>
 <a>6</a>
 <b>15</b>
-<v>4089</v>
+<v>4090</v>
 </b>
 <b>
 <a>15</a>
 <b>1967</b>
-<v>3475</v>
+<v>3476</v>
 </b>
 </bs>
 </hist>
@@ -19350,12 +19627,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>34287</v>
+<v>34293</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6853</v>
+<v>6854</v>
 </b>
 <b>
 <a>3</a>
@@ -19365,7 +19642,7 @@
 <b>
 <a>4</a>
 <b>7</b>
-<v>4298</v>
+<v>4299</v>
 </b>
 <b>
 <a>7</a>
@@ -21629,15 +21906,15 @@
 </relation>
 <relation>
 <name>derivedtypes</name>
-<cardinality>4630204</cardinality>
+<cardinality>4463015</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>4630204</v>
+<v>4463015</v>
 </e>
 <e>
 <k>name</k>
-<v>2324208</v>
+<v>2202834</v>
 </e>
 <e>
 <k>kind</k>
@@ -21645,7 +21922,7 @@
 </e>
 <e>
 <k>type_id</k>
-<v>2775550</v>
+<v>2610500</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -21659,7 +21936,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4630204</v>
+<v>4463015</v>
 </b>
 </bs>
 </hist>
@@ -21675,7 +21952,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4630204</v>
+<v>4463015</v>
 </b>
 </bs>
 </hist>
@@ -21691,7 +21968,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4630204</v>
+<v>4463015</v>
 </b>
 </bs>
 </hist>
@@ -21707,17 +21984,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1682503</v>
+<v>1593463</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>523359</v>
+<v>493877</v>
 </b>
 <b>
 <a>3</a>
 <b>45177</b>
-<v>118345</v>
+<v>115493</v>
 </b>
 </bs>
 </hist>
@@ -21733,7 +22010,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2324175</v>
+<v>2202801</v>
 </b>
 <b>
 <a>2</a>
@@ -21754,17 +22031,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1682744</v>
+<v>1593704</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>523129</v>
+<v>493647</v>
 </b>
 <b>
 <a>3</a>
 <b>45159</b>
-<v>118334</v>
+<v>115482</v>
 </b>
 </bs>
 </hist>
@@ -21808,8 +22085,8 @@
 <v>10</v>
 </b>
 <b>
-<a>112323</a>
-<b>112324</b>
+<a>97001</a>
+<b>97002</b>
 <v>10</v>
 </b>
 <b>
@@ -21859,8 +22136,8 @@
 <v>10</v>
 </b>
 <b>
-<a>59447</a>
-<b>59448</b>
+<a>48341</a>
+<b>48342</b>
 <v>10</v>
 </b>
 <b>
@@ -21910,8 +22187,8 @@
 <v>10</v>
 </b>
 <b>
-<a>111992</a>
-<b>111993</b>
+<a>96670</a>
+<b>96671</b>
 <v>10</v>
 </b>
 <b>
@@ -21933,22 +22210,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1704948</v>
+<v>1541019</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>369630</v>
+<v>369478</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>628985</v>
+<v>628070</v>
 </b>
 <b>
 <a>4</a>
 <b>202</b>
-<v>71985</v>
+<v>71932</v>
 </b>
 </bs>
 </hist>
@@ -21964,22 +22241,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1706165</v>
+<v>1542236</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>369476</v>
+<v>369325</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>627922</v>
+<v>627006</v>
 </b>
 <b>
 <a>4</a>
 <b>198</b>
-<v>71985</v>
+<v>71932</v>
 </b>
 </bs>
 </hist>
@@ -21995,22 +22272,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1706483</v>
+<v>1542554</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>370759</v>
+<v>370608</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>627878</v>
+<v>626962</v>
 </b>
 <b>
 <a>4</a>
 <b>7</b>
-<v>70428</v>
+<v>70375</v>
 </b>
 </bs>
 </hist>
@@ -22020,11 +22297,11 @@
 </relation>
 <relation>
 <name>pointerishsize</name>
-<cardinality>3375193</cardinality>
+<cardinality>3375811</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>3375193</v>
+<v>3375811</v>
 </e>
 <e>
 <k>size</k>
@@ -22046,7 +22323,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3375193</v>
+<v>3375811</v>
 </b>
 </bs>
 </hist>
@@ -22062,7 +22339,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3375193</v>
+<v>3375811</v>
 </b>
 </bs>
 </hist>
@@ -22141,11 +22418,11 @@
 </relation>
 <relation>
 <name>arraysizes</name>
-<cardinality>17193</cardinality>
+<cardinality>17196</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>17193</v>
+<v>17196</v>
 </e>
 <e>
 <k>num_elements</k>
@@ -22153,7 +22430,7 @@
 </e>
 <e>
 <k>bytesize</k>
-<v>2510</v>
+<v>2511</v>
 </e>
 <e>
 <k>alignment</k>
@@ -22171,7 +22448,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>17193</v>
+<v>17196</v>
 </b>
 </bs>
 </hist>
@@ -22187,7 +22464,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>17193</v>
+<v>17196</v>
 </b>
 </bs>
 </hist>
@@ -22203,7 +22480,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>17193</v>
+<v>17196</v>
 </b>
 </bs>
 </hist>
@@ -22224,7 +22501,7 @@
 <b>
 <a>2</a>
 <b>3</b>
-<v>1271</v>
+<v>1272</v>
 </b>
 <b>
 <a>3</a>
@@ -22265,7 +22542,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1589</v>
+<v>1590</v>
 </b>
 <b>
 <a>2</a>
@@ -22301,7 +22578,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1589</v>
+<v>1590</v>
 </b>
 <b>
 <a>2</a>
@@ -22388,7 +22665,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1907</v>
+<v>1908</v>
 </b>
 <b>
 <a>2</a>
@@ -22419,7 +22696,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1951</v>
+<v>1952</v>
 </b>
 <b>
 <a>2</a>
@@ -22577,15 +22854,15 @@
 </relation>
 <relation>
 <name>typedefbase</name>
-<cardinality>1819324</cardinality>
+<cardinality>1819658</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1819324</v>
+<v>1819658</v>
 </e>
 <e>
 <k>type_id</k>
-<v>847211</v>
+<v>847366</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -22599,7 +22876,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1819324</v>
+<v>1819658</v>
 </b>
 </bs>
 </hist>
@@ -22615,22 +22892,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>656518</v>
+<v>656639</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>87895</v>
+<v>87911</v>
 </b>
 <b>
 <a>3</a>
 <b>6</b>
-<v>69583</v>
+<v>69596</v>
 </b>
 <b>
 <a>6</a>
 <b>5503</b>
-<v>33213</v>
+<v>33219</v>
 </b>
 </bs>
 </hist>
@@ -22640,19 +22917,19 @@
 </relation>
 <relation>
 <name>decltypes</name>
-<cardinality>46996</cardinality>
+<cardinality>47004</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>46996</v>
+<v>47004</v>
 </e>
 <e>
 <k>expr</k>
-<v>43432</v>
+<v>43440</v>
 </e>
 <e>
 <k>base_type</k>
-<v>8629</v>
+<v>8631</v>
 </e>
 <e>
 <k>parentheses_would_change_meaning</k>
@@ -22670,7 +22947,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>46996</v>
+<v>47004</v>
 </b>
 </bs>
 </hist>
@@ -22686,7 +22963,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>46996</v>
+<v>47004</v>
 </b>
 </bs>
 </hist>
@@ -22702,7 +22979,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>46996</v>
+<v>47004</v>
 </b>
 </bs>
 </hist>
@@ -22718,12 +22995,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>40153</v>
+<v>40161</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>3278</v>
+<v>3279</v>
 </b>
 </bs>
 </hist>
@@ -22739,12 +23016,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>40153</v>
+<v>40161</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>3278</v>
+<v>3279</v>
 </b>
 </bs>
 </hist>
@@ -22760,7 +23037,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>43432</v>
+<v>43440</v>
 </b>
 </bs>
 </hist>
@@ -22776,12 +23053,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5822</v>
+<v>5823</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>2521</v>
+<v>2522</v>
 </b>
 <b>
 <a>3</a>
@@ -22802,12 +23079,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2313</v>
+<v>2314</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>5701</v>
+<v>5702</v>
 </b>
 <b>
 <a>3</a>
@@ -22828,7 +23105,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>8629</v>
+<v>8631</v>
 </b>
 </bs>
 </hist>
@@ -22901,15 +23178,15 @@
 </relation>
 <relation>
 <name>usertypes</name>
-<cardinality>4193084</cardinality>
+<cardinality>4193852</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>4193084</v>
+<v>4193852</v>
 </e>
 <e>
 <k>name</k>
-<v>879229</v>
+<v>879390</v>
 </e>
 <e>
 <k>kind</k>
@@ -22927,7 +23204,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4193084</v>
+<v>4193852</v>
 </b>
 </bs>
 </hist>
@@ -22943,7 +23220,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4193084</v>
+<v>4193852</v>
 </b>
 </bs>
 </hist>
@@ -22959,22 +23236,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>577351</v>
+<v>577457</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>194760</v>
+<v>194796</v>
 </b>
 <b>
 <a>3</a>
 <b>7</b>
-<v>69298</v>
+<v>69311</v>
 </b>
 <b>
 <a>7</a>
 <b>32744</b>
-<v>37818</v>
+<v>37825</v>
 </b>
 </bs>
 </hist>
@@ -22990,12 +23267,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>826596</v>
+<v>826748</v>
 </b>
 <b>
 <a>2</a>
 <b>10</b>
-<v>52632</v>
+<v>52641</v>
 </b>
 </bs>
 </hist>
@@ -23132,11 +23409,11 @@
 </relation>
 <relation>
 <name>usertypesize</name>
-<cardinality>1386327</cardinality>
+<cardinality>1386581</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1386327</v>
+<v>1386581</v>
 </e>
 <e>
 <k>size</k>
@@ -23158,7 +23435,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1386327</v>
+<v>1386581</v>
 </b>
 </bs>
 </hist>
@@ -23174,7 +23451,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1386327</v>
+<v>1386581</v>
 </b>
 </bs>
 </hist>
@@ -23427,15 +23704,15 @@
 </relation>
 <relation>
 <name>mangled_name</name>
-<cardinality>4189805</cardinality>
+<cardinality>4190573</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>4189805</v>
+<v>4190573</v>
 </e>
 <e>
 <k>mangled_name</k>
-<v>483589</v>
+<v>483678</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -23449,7 +23726,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4189805</v>
+<v>4190573</v>
 </b>
 </bs>
 </hist>
@@ -23465,32 +23742,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>292031</v>
+<v>292084</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>62281</v>
+<v>62292</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>33333</v>
+<v>33339</v>
 </b>
 <b>
 <a>4</a>
 <b>7</b>
-<v>36963</v>
+<v>36969</v>
 </b>
 <b>
 <a>7</a>
 <b>24</b>
-<v>37061</v>
+<v>37068</v>
 </b>
 <b>
 <a>24</a>
 <b>8580</b>
-<v>21919</v>
+<v>21923</v>
 </b>
 </bs>
 </hist>
@@ -23500,59 +23777,59 @@
 </relation>
 <relation>
 <name>is_pod_class</name>
-<cardinality>589105</cardinality>
+<cardinality>589213</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>589105</v>
+<v>589213</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>is_standard_layout_class</name>
-<cardinality>1158979</cardinality>
+<cardinality>1159191</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1158979</v>
+<v>1159191</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>is_complete</name>
-<cardinality>1364825</cardinality>
+<cardinality>1365075</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1364825</v>
+<v>1365075</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>is_class_template</name>
-<cardinality>225308</cardinality>
+<cardinality>225350</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>225308</v>
+<v>225350</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>class_instantiation</name>
-<cardinality>1157586</cardinality>
+<cardinality>1157798</cardinality>
 <columnsizes>
 <e>
 <k>to</k>
-<v>1156018</v>
+<v>1156230</v>
 </e>
 <e>
 <k>from</k>
-<v>68015</v>
+<v>68028</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -23566,7 +23843,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1154538</v>
+<v>1154749</v>
 </b>
 <b>
 <a>2</a>
@@ -23587,47 +23864,47 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>19956</v>
+<v>19959</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>11995</v>
+<v>11997</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>6853</v>
+<v>6854</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>4616</v>
+<v>4617</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>5636</v>
+<v>5637</v>
 </b>
 <b>
 <a>7</a>
 <b>11</b>
-<v>6052</v>
+<v>6053</v>
 </b>
 <b>
 <a>11</a>
 <b>20</b>
-<v>5197</v>
+<v>5198</v>
 </b>
 <b>
 <a>20</a>
 <b>84</b>
-<v>5109</v>
+<v>5110</v>
 </b>
 <b>
 <a>84</a>
 <b>4845</b>
-<v>2598</v>
+<v>2599</v>
 </b>
 </bs>
 </hist>
@@ -23637,11 +23914,11 @@
 </relation>
 <relation>
 <name>class_template_argument</name>
-<cardinality>3035464</cardinality>
+<cardinality>3036020</cardinality>
 <columnsizes>
 <e>
 <k>type_id</k>
-<v>1392566</v>
+<v>1392821</v>
 </e>
 <e>
 <k>index</k>
@@ -23649,7 +23926,7 @@
 </e>
 <e>
 <k>arg_type</k>
-<v>860752</v>
+<v>860910</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -23663,27 +23940,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>567011</v>
+<v>567115</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>433655</v>
+<v>433734</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>244936</v>
+<v>244981</v>
 </b>
 <b>
 <a>4</a>
 <b>7</b>
-<v>122786</v>
+<v>122808</v>
 </b>
 <b>
 <a>7</a>
 <b>113</b>
-<v>24177</v>
+<v>24182</v>
 </b>
 </bs>
 </hist>
@@ -23699,22 +23976,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>593239</v>
+<v>593348</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>445881</v>
+<v>445962</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>258390</v>
+<v>258437</v>
 </b>
 <b>
 <a>4</a>
 <b>113</b>
-<v>95055</v>
+<v>95073</v>
 </b>
 </bs>
 </hist>
@@ -23822,27 +24099,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>522186</v>
+<v>522282</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>187402</v>
+<v>187437</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>56700</v>
+<v>56710</v>
 </b>
 <b>
 <a>4</a>
 <b>11</b>
-<v>67379</v>
+<v>67392</v>
 </b>
 <b>
 <a>11</a>
 <b>11852</b>
-<v>27083</v>
+<v>27088</v>
 </b>
 </bs>
 </hist>
@@ -23858,17 +24135,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>746322</v>
+<v>746458</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>95527</v>
+<v>95544</v>
 </b>
 <b>
 <a>3</a>
 <b>22</b>
-<v>18903</v>
+<v>18907</v>
 </b>
 </bs>
 </hist>
@@ -23878,11 +24155,11 @@
 </relation>
 <relation>
 <name>class_template_argument_value</name>
-<cardinality>345737</cardinality>
+<cardinality>345800</cardinality>
 <columnsizes>
 <e>
 <k>type_id</k>
-<v>223806</v>
+<v>223847</v>
 </e>
 <e>
 <k>index</k>
@@ -23890,7 +24167,7 @@
 </e>
 <e>
 <k>arg_value</k>
-<v>328182</v>
+<v>328242</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -23904,17 +24181,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>201449</v>
+<v>201486</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>13706</v>
+<v>13708</v>
 </b>
 <b>
 <a>3</a>
 <b>14</b>
-<v>8651</v>
+<v>8652</v>
 </b>
 </bs>
 </hist>
@@ -23930,17 +24207,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>189826</v>
+<v>189860</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>16919</v>
+<v>16922</v>
 </b>
 <b>
 <a>3</a>
 <b>37</b>
-<v>16787</v>
+<v>16790</v>
 </b>
 <b>
 <a>44</a>
@@ -24083,12 +24360,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>310945</v>
+<v>311002</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>17236</v>
+<v>17240</v>
 </b>
 </bs>
 </hist>
@@ -24104,7 +24381,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>328182</v>
+<v>328242</v>
 </b>
 </bs>
 </hist>
@@ -24114,15 +24391,15 @@
 </relation>
 <relation>
 <name>is_proxy_class_for</name>
-<cardinality>46371</cardinality>
+<cardinality>46379</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>46371</v>
+<v>46379</v>
 </e>
 <e>
 <k>templ_param_id</k>
-<v>46371</v>
+<v>46379</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -24136,7 +24413,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>46371</v>
+<v>46379</v>
 </b>
 </bs>
 </hist>
@@ -24152,7 +24429,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>46371</v>
+<v>46379</v>
 </b>
 </bs>
 </hist>
@@ -24468,26 +24745,26 @@
 </relation>
 <relation>
 <name>is_function_template</name>
-<cardinality>983582</cardinality>
+<cardinality>983763</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>983582</v>
+<v>983763</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>function_instantiation</name>
-<cardinality>708185</cardinality>
+<cardinality>708315</cardinality>
 <columnsizes>
 <e>
 <k>to</k>
-<v>708185</v>
+<v>708315</v>
 </e>
 <e>
 <k>from</k>
-<v>129310</v>
+<v>129334</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -24501,7 +24778,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>708185</v>
+<v>708315</v>
 </b>
 </bs>
 </hist>
@@ -24517,37 +24794,37 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>60998</v>
+<v>61009</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>30833</v>
+<v>30839</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>7346</v>
+<v>7347</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>8815</v>
+<v>8817</v>
 </b>
 <b>
 <a>5</a>
 <b>10</b>
-<v>10000</v>
+<v>10001</v>
 </b>
 <b>
 <a>10</a>
 <b>71</b>
-<v>9704</v>
+<v>9705</v>
 </b>
 <b>
 <a>71</a>
 <b>653</b>
-<v>1611</v>
+<v>1612</v>
 </b>
 </bs>
 </hist>
@@ -24557,11 +24834,11 @@
 </relation>
 <relation>
 <name>function_template_argument</name>
-<cardinality>1910191</cardinality>
+<cardinality>1910541</cardinality>
 <columnsizes>
 <e>
 <k>function_id</k>
-<v>1054175</v>
+<v>1054368</v>
 </e>
 <e>
 <k>index</k>
@@ -24569,7 +24846,7 @@
 </e>
 <e>
 <k>arg_type</k>
-<v>338391</v>
+<v>338453</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -24583,22 +24860,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>583480</v>
+<v>583587</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>290956</v>
+<v>291009</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>127742</v>
+<v>127765</v>
 </b>
 <b>
 <a>4</a>
 <b>21</b>
-<v>51996</v>
+<v>52005</v>
 </b>
 </bs>
 </hist>
@@ -24614,22 +24891,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>597899</v>
+<v>598009</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>288642</v>
+<v>288695</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>110922</v>
+<v>110942</v>
 </b>
 <b>
 <a>4</a>
 <b>21</b>
-<v>56711</v>
+<v>56721</v>
 </b>
 </bs>
 </hist>
@@ -24867,27 +25144,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>226087</v>
+<v>226128</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>45110</v>
+<v>45118</v>
 </b>
 <b>
 <a>3</a>
 <b>6</b>
-<v>27664</v>
+<v>27669</v>
 </b>
 <b>
 <a>6</a>
 <b>19</b>
-<v>25603</v>
+<v>25607</v>
 </b>
 <b>
 <a>19</a>
 <b>2030</b>
-<v>13925</v>
+<v>13928</v>
 </b>
 </bs>
 </hist>
@@ -24903,12 +25180,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>314772</v>
+<v>314830</v>
 </b>
 <b>
 <a>2</a>
 <b>12</b>
-<v>23618</v>
+<v>23622</v>
 </b>
 </bs>
 </hist>
@@ -24918,11 +25195,11 @@
 </relation>
 <relation>
 <name>function_template_argument_value</name>
-<cardinality>198028</cardinality>
+<cardinality>198064</cardinality>
 <columnsizes>
 <e>
 <k>function_id</k>
-<v>107062</v>
+<v>107081</v>
 </e>
 <e>
 <k>index</k>
@@ -24930,7 +25207,7 @@
 </e>
 <e>
 <k>arg_value</k>
-<v>170571</v>
+<v>170602</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -24944,12 +25221,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>101546</v>
+<v>101565</v>
 </b>
 <b>
 <a>2</a>
 <b>14</b>
-<v>5515</v>
+<v>5516</v>
 </b>
 </bs>
 </hist>
@@ -24965,17 +25242,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>84945</v>
+<v>84961</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>16173</v>
+<v>16176</v>
 </b>
 <b>
 <a>3</a>
 <b>113</b>
-<v>5943</v>
+<v>5944</v>
 </b>
 </bs>
 </hist>
@@ -25103,12 +25380,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>143619</v>
+<v>143645</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>26447</v>
+<v>26452</v>
 </b>
 <b>
 <a>3</a>
@@ -25129,7 +25406,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>170571</v>
+<v>170602</v>
 </b>
 </bs>
 </hist>
@@ -25139,26 +25416,26 @@
 </relation>
 <relation>
 <name>is_variable_template</name>
-<cardinality>17807</cardinality>
+<cardinality>17810</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>17807</v>
+<v>17810</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>variable_instantiation</name>
-<cardinality>35800</cardinality>
+<cardinality>35807</cardinality>
 <columnsizes>
 <e>
 <k>to</k>
-<v>35800</v>
+<v>35807</v>
 </e>
 <e>
 <k>from</k>
-<v>6469</v>
+<v>6470</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -25172,7 +25449,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>35800</v>
+<v>35807</v>
 </b>
 </bs>
 </hist>
@@ -25188,12 +25465,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2236</v>
+<v>2237</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>1907</v>
+<v>1908</v>
 </b>
 <b>
 <a>3</a>
@@ -25580,15 +25857,15 @@
 </relation>
 <relation>
 <name>routinetypes</name>
-<cardinality>430398</cardinality>
+<cardinality>430477</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>430398</v>
+<v>430477</v>
 </e>
 <e>
 <k>return_type</k>
-<v>177534</v>
+<v>177566</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -25602,7 +25879,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>430398</v>
+<v>430477</v>
 </b>
 </bs>
 </hist>
@@ -25618,17 +25895,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>143082</v>
+<v>143108</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>18125</v>
+<v>18128</v>
 </b>
 <b>
 <a>3</a>
 <b>9</b>
-<v>13322</v>
+<v>13324</v>
 </b>
 <b>
 <a>9</a>
@@ -25643,11 +25920,11 @@
 </relation>
 <relation>
 <name>routinetypeargs</name>
-<cardinality>719710</cardinality>
+<cardinality>719841</cardinality>
 <columnsizes>
 <e>
 <k>routine</k>
-<v>351779</v>
+<v>351843</v>
 </e>
 <e>
 <k>index</k>
@@ -25655,7 +25932,7 @@
 </e>
 <e>
 <k>type_id</k>
-<v>205528</v>
+<v>205565</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -25669,27 +25946,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>161898</v>
+<v>161927</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>95932</v>
+<v>95950</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>53925</v>
+<v>53935</v>
 </b>
 <b>
 <a>4</a>
 <b>6</b>
-<v>32324</v>
+<v>32330</v>
 </b>
 <b>
 <a>6</a>
 <b>33</b>
-<v>7697</v>
+<v>7698</v>
 </b>
 </bs>
 </hist>
@@ -25705,22 +25982,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>186712</v>
+<v>186746</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>96689</v>
+<v>96707</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>47653</v>
+<v>47662</v>
 </b>
 <b>
 <a>4</a>
 <b>22</b>
-<v>20723</v>
+<v>20727</v>
 </b>
 </bs>
 </hist>
@@ -25878,27 +26155,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>122391</v>
+<v>122413</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>40833</v>
+<v>40841</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>13212</v>
+<v>13215</v>
 </b>
 <b>
 <a>4</a>
 <b>7</b>
-<v>16633</v>
+<v>16636</v>
 </b>
 <b>
 <a>7</a>
 <b>1349</b>
-<v>12456</v>
+<v>12458</v>
 </b>
 </bs>
 </hist>
@@ -25914,17 +26191,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>154080</v>
+<v>154108</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>39430</v>
+<v>39437</v>
 </b>
 <b>
 <a>3</a>
 <b>33</b>
-<v>12017</v>
+<v>12019</v>
 </b>
 </bs>
 </hist>
@@ -25934,19 +26211,19 @@
 </relation>
 <relation>
 <name>ptrtomembers</name>
-<cardinality>12631</cardinality>
+<cardinality>12634</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>12631</v>
+<v>12634</v>
 </e>
 <e>
 <k>type_id</k>
-<v>9397</v>
+<v>9398</v>
 </e>
 <e>
 <k>class_id</k>
-<v>6359</v>
+<v>6360</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -25960,7 +26237,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>12631</v>
+<v>12634</v>
 </b>
 </bs>
 </hist>
@@ -25976,7 +26253,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>12631</v>
+<v>12634</v>
 </b>
 </bs>
 </hist>
@@ -25992,7 +26269,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9035</v>
+<v>9036</v>
 </b>
 <b>
 <a>2</a>
@@ -26013,7 +26290,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9035</v>
+<v>9036</v>
 </b>
 <b>
 <a>2</a>
@@ -26034,7 +26311,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5339</v>
+<v>5340</v>
 </b>
 <b>
 <a>2</a>
@@ -26060,7 +26337,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>5339</v>
+<v>5340</v>
 </b>
 <b>
 <a>2</a>
@@ -26128,11 +26405,11 @@
 </relation>
 <relation>
 <name>typespecifiers</name>
-<cardinality>1500944</cardinality>
+<cardinality>1333183</cardinality>
 <columnsizes>
 <e>
 <k>type_id</k>
-<v>1494058</v>
+<v>1326296</v>
 </e>
 <e>
 <k>spec_id</k>
@@ -26150,12 +26427,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1487172</v>
+<v>1319408</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6886</v>
+<v>6887</v>
 </b>
 </bs>
 </hist>
@@ -26199,8 +26476,8 @@
 <v>10</v>
 </b>
 <b>
-<a>111858</a>
-<b>111859</b>
+<a>96536</a>
+<b>96537</b>
 <v>10</v>
 </b>
 </bs>
@@ -26211,11 +26488,11 @@
 </relation>
 <relation>
 <name>funspecifiers</name>
-<cardinality>11101038</cardinality>
+<cardinality>11122308</cardinality>
 <columnsizes>
 <e>
 <k>func_id</k>
-<v>3417156</v>
+<v>3417782</v>
 </e>
 <e>
 <k>spec_id</k>
@@ -26233,27 +26510,27 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>342250</v>
+<v>342313</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>436911</v>
+<v>421966</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>842562</v>
+<v>853858</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>1677020</v>
+<v>1680881</v>
 </b>
 <b>
 <a>5</a>
 <b>8</b>
-<v>118411</v>
+<v>118761</v>
 </b>
 </bs>
 </hist>
@@ -26327,8 +26604,8 @@
 <v>10</v>
 </b>
 <b>
-<a>137685</a>
-<b>137686</b>
+<a>139439</a>
+<b>139440</b>
 <v>10</v>
 </b>
 <b>
@@ -27617,15 +27894,15 @@
 </relation>
 <relation>
 <name>typeattributes</name>
-<cardinality>19320</cardinality>
+<cardinality>19323</cardinality>
 <columnsizes>
 <e>
 <k>type_id</k>
-<v>17938</v>
+<v>17942</v>
 </e>
 <e>
 <k>spec_id</k>
-<v>19320</v>
+<v>19323</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -27639,7 +27916,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>17236</v>
+<v>17240</v>
 </b>
 <b>
 <a>2</a>
@@ -27660,7 +27937,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>19320</v>
+<v>19323</v>
 </b>
 </bs>
 </hist>
@@ -27670,15 +27947,15 @@
 </relation>
 <relation>
 <name>funcattributes</name>
-<cardinality>304333</cardinality>
+<cardinality>304389</cardinality>
 <columnsizes>
 <e>
 <k>func_id</k>
-<v>164211</v>
+<v>164242</v>
 </e>
 <e>
 <k>spec_id</k>
-<v>304333</v>
+<v>304389</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -27692,17 +27969,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>89671</v>
+<v>89688</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>12576</v>
+<v>12579</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>59956</v>
+<v>59967</v>
 </b>
 <b>
 <a>4</a>
@@ -27723,7 +28000,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>304333</v>
+<v>304389</v>
 </b>
 </bs>
 </hist>
@@ -27839,15 +28116,15 @@
 </relation>
 <relation>
 <name>unspecifiedtype</name>
-<cardinality>9281768</cardinality>
+<cardinality>9115432</cardinality>
 <columnsizes>
 <e>
 <k>type_id</k>
-<v>9281768</v>
+<v>9115432</v>
 </e>
 <e>
 <k>unspecified_type_id</k>
-<v>5011819</v>
+<v>5012737</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -27861,7 +28138,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>9281768</v>
+<v>9115432</v>
 </b>
 </bs>
 </hist>
@@ -27877,22 +28154,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2685220</v>
+<v>2736029</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>1947648</v>
+<v>1962021</v>
 </b>
 <b>
 <a>3</a>
-<b>42</b>
-<v>375957</v>
-</b>
-<b>
-<a>42</a>
 <b>7950</b>
-<v>2993</v>
+<v>314687</v>
 </b>
 </bs>
 </hist>
@@ -27902,11 +28174,11 @@
 </relation>
 <relation>
 <name>member</name>
-<cardinality>4920776</cardinality>
+<cardinality>4921678</cardinality>
 <columnsizes>
 <e>
 <k>parent</k>
-<v>814338</v>
+<v>814487</v>
 </e>
 <e>
 <k>index</k>
@@ -27914,7 +28186,7 @@
 </e>
 <e>
 <k>child</k>
-<v>4905217</v>
+<v>4906116</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -27928,47 +28200,47 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>42313</v>
+<v>42321</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>223740</v>
+<v>223781</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>204585</v>
+<v>204622</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>86908</v>
+<v>86924</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>65888</v>
+<v>65900</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>61601</v>
+<v>61612</v>
 </b>
 <b>
 <a>9</a>
 <b>15</b>
-<v>62040</v>
+<v>62051</v>
 </b>
 <b>
 <a>15</a>
 <b>47</b>
-<v>61173</v>
+<v>61184</v>
 </b>
 <b>
 <a>47</a>
 <b>245</b>
-<v>6085</v>
+<v>6086</v>
 </b>
 </bs>
 </hist>
@@ -27984,47 +28256,47 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>41656</v>
+<v>41663</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>223565</v>
+<v>223606</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>199343</v>
+<v>199380</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>89715</v>
+<v>89732</v>
 </b>
 <b>
 <a>5</a>
 <b>7</b>
-<v>66360</v>
+<v>66372</v>
 </b>
 <b>
 <a>7</a>
 <b>9</b>
-<v>61678</v>
+<v>61689</v>
 </b>
 <b>
 <a>9</a>
 <b>15</b>
-<v>62961</v>
+<v>62972</v>
 </b>
 <b>
 <a>15</a>
 <b>42</b>
-<v>61261</v>
+<v>61272</v>
 </b>
 <b>
 <a>42</a>
 <b>281</b>
-<v>7796</v>
+<v>7797</v>
 </b>
 </bs>
 </hist>
@@ -28182,7 +28454,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4905217</v>
+<v>4906116</v>
 </b>
 </bs>
 </hist>
@@ -28198,12 +28470,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4889866</v>
+<v>4890762</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>15351</v>
+<v>15353</v>
 </b>
 </bs>
 </hist>
@@ -28213,15 +28485,15 @@
 </relation>
 <relation>
 <name>enclosingfunction</name>
-<cardinality>125055</cardinality>
+<cardinality>125078</cardinality>
 <columnsizes>
 <e>
 <k>child</k>
-<v>125055</v>
+<v>125078</v>
 </e>
 <e>
 <k>parent</k>
-<v>71393</v>
+<v>71406</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -28235,7 +28507,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>125055</v>
+<v>125078</v>
 </b>
 </bs>
 </hist>
@@ -28251,22 +28523,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>38333</v>
+<v>38340</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>21074</v>
+<v>21078</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>6535</v>
+<v>6536</v>
 </b>
 <b>
 <a>4</a>
 <b>7</b>
-<v>5372</v>
+<v>5373</v>
 </b>
 <b>
 <a>7</a>
@@ -28281,15 +28553,15 @@
 </relation>
 <relation>
 <name>derivations</name>
-<cardinality>390189</cardinality>
+<cardinality>390261</cardinality>
 <columnsizes>
 <e>
 <k>derivation</k>
-<v>390189</v>
+<v>390261</v>
 </e>
 <e>
 <k>sub</k>
-<v>364378</v>
+<v>364444</v>
 </e>
 <e>
 <k>index</k>
@@ -28297,11 +28569,11 @@
 </e>
 <e>
 <k>super</k>
-<v>235659</v>
+<v>235703</v>
 </e>
 <e>
 <k>location</k>
-<v>86963</v>
+<v>86979</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -28315,7 +28587,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>390189</v>
+<v>390261</v>
 </b>
 </bs>
 </hist>
@@ -28331,7 +28603,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>390189</v>
+<v>390261</v>
 </b>
 </bs>
 </hist>
@@ -28347,7 +28619,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>390189</v>
+<v>390261</v>
 </b>
 </bs>
 </hist>
@@ -28363,7 +28635,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>390189</v>
+<v>390261</v>
 </b>
 </bs>
 </hist>
@@ -28379,12 +28651,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>341812</v>
+<v>341874</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>22565</v>
+<v>22570</v>
 </b>
 </bs>
 </hist>
@@ -28400,12 +28672,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>351428</v>
+<v>351492</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>12949</v>
+<v>12952</v>
 </b>
 </bs>
 </hist>
@@ -28421,12 +28693,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>341823</v>
+<v>341885</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>22555</v>
+<v>22559</v>
 </b>
 </bs>
 </hist>
@@ -28442,12 +28714,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>351417</v>
+<v>351481</v>
 </b>
 <b>
 <a>2</a>
 <b>7</b>
-<v>12960</v>
+<v>12963</v>
 </b>
 </bs>
 </hist>
@@ -28627,12 +28899,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>220879</v>
+<v>220919</v>
 </b>
 <b>
 <a>2</a>
 <b>1142</b>
-<v>14780</v>
+<v>14783</v>
 </b>
 </bs>
 </hist>
@@ -28648,12 +28920,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>220890</v>
+<v>220930</v>
 </b>
 <b>
 <a>2</a>
 <b>1142</b>
-<v>14769</v>
+<v>14772</v>
 </b>
 </bs>
 </hist>
@@ -28669,7 +28941,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>235210</v>
+<v>235253</v>
 </b>
 <b>
 <a>2</a>
@@ -28690,12 +28962,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>228302</v>
+<v>228344</v>
 </b>
 <b>
 <a>2</a>
 <b>439</b>
-<v>7357</v>
+<v>7358</v>
 </b>
 </bs>
 </hist>
@@ -28711,22 +28983,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>66338</v>
+<v>66350</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>8388</v>
+<v>8389</v>
 </b>
 <b>
 <a>3</a>
 <b>7</b>
-<v>6611</v>
+<v>6613</v>
 </b>
 <b>
 <a>7</a>
 <b>795</b>
-<v>5625</v>
+<v>5626</v>
 </b>
 </bs>
 </hist>
@@ -28742,22 +29014,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>68575</v>
+<v>68587</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6370</v>
+<v>6371</v>
 </b>
 <b>
 <a>3</a>
 <b>8</b>
-<v>7039</v>
+<v>7040</v>
 </b>
 <b>
 <a>8</a>
 <b>795</b>
-<v>4978</v>
+<v>4979</v>
 </b>
 </bs>
 </hist>
@@ -28773,7 +29045,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>86941</v>
+<v>86957</v>
 </b>
 <b>
 <a>2</a>
@@ -28794,22 +29066,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>69276</v>
+<v>69289</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>8201</v>
+<v>8203</v>
 </b>
 <b>
 <a>3</a>
 <b>9</b>
-<v>6524</v>
+<v>6525</v>
 </b>
 <b>
 <a>9</a>
 <b>795</b>
-<v>2960</v>
+<v>2961</v>
 </b>
 </bs>
 </hist>
@@ -28819,11 +29091,11 @@
 </relation>
 <relation>
 <name>derspecifiers</name>
-<cardinality>392569</cardinality>
+<cardinality>392641</cardinality>
 <columnsizes>
 <e>
 <k>der_id</k>
-<v>390156</v>
+<v>390228</v>
 </e>
 <e>
 <k>spec_id</k>
@@ -28841,7 +29113,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>387744</v>
+<v>387815</v>
 </b>
 <b>
 <a>2</a>
@@ -28887,11 +29159,11 @@
 </relation>
 <relation>
 <name>direct_base_offsets</name>
-<cardinality>310496</cardinality>
+<cardinality>310552</cardinality>
 <columnsizes>
 <e>
 <k>der_id</k>
-<v>310496</v>
+<v>310552</v>
 </e>
 <e>
 <k>offset</k>
@@ -28909,7 +29181,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>310496</v>
+<v>310552</v>
 </b>
 </bs>
 </hist>
@@ -28995,11 +29267,11 @@
 </relation>
 <relation>
 <name>virtual_base_offsets</name>
-<cardinality>6337</cardinality>
+<cardinality>6338</cardinality>
 <columnsizes>
 <e>
 <k>sub</k>
-<v>3508</v>
+<v>3509</v>
 </e>
 <e>
 <k>super</k>
@@ -29052,7 +29324,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2960</v>
+<v>2961</v>
 </b>
 <b>
 <a>2</a>
@@ -29286,23 +29558,23 @@
 </relation>
 <relation>
 <name>frienddecls</name>
-<cardinality>240298</cardinality>
+<cardinality>240342</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>240298</v>
+<v>240342</v>
 </e>
 <e>
 <k>type_id</k>
-<v>27280</v>
+<v>27285</v>
 </e>
 <e>
 <k>decl_id</k>
-<v>49035</v>
+<v>49044</v>
 </e>
 <e>
 <k>location</k>
-<v>7302</v>
+<v>7304</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -29316,7 +29588,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>240298</v>
+<v>240342</v>
 </b>
 </bs>
 </hist>
@@ -29332,7 +29604,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>240298</v>
+<v>240342</v>
 </b>
 </bs>
 </hist>
@@ -29348,7 +29620,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>240298</v>
+<v>240342</v>
 </b>
 </bs>
 </hist>
@@ -29364,17 +29636,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6217</v>
+<v>6218</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>10230</v>
+<v>10232</v>
 </b>
 <b>
 <a>3</a>
 <b>5</b>
-<v>1984</v>
+<v>1985</v>
 </b>
 <b>
 <a>5</a>
@@ -29384,7 +29656,7 @@
 <b>
 <a>6</a>
 <b>8</b>
-<v>2313</v>
+<v>2314</v>
 </b>
 <b>
 <a>8</a>
@@ -29415,17 +29687,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6217</v>
+<v>6218</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>10230</v>
+<v>10232</v>
 </b>
 <b>
 <a>3</a>
 <b>5</b>
-<v>1984</v>
+<v>1985</v>
 </b>
 <b>
 <a>5</a>
@@ -29435,7 +29707,7 @@
 <b>
 <a>6</a>
 <b>8</b>
-<v>2313</v>
+<v>2314</v>
 </b>
 <b>
 <a>8</a>
@@ -29466,12 +29738,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>25701</v>
+<v>25706</v>
 </b>
 <b>
 <a>2</a>
 <b>31</b>
-<v>1578</v>
+<v>1579</v>
 </b>
 </bs>
 </hist>
@@ -29487,7 +29759,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>33684</v>
+<v>33690</v>
 </b>
 <b>
 <a>2</a>
@@ -29502,12 +29774,12 @@
 <b>
 <a>7</a>
 <b>23</b>
-<v>3804</v>
+<v>3805</v>
 </b>
 <b>
 <a>23</a>
 <b>394</b>
-<v>2532</v>
+<v>2533</v>
 </b>
 </bs>
 </hist>
@@ -29523,7 +29795,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>33684</v>
+<v>33690</v>
 </b>
 <b>
 <a>2</a>
@@ -29538,12 +29810,12 @@
 <b>
 <a>7</a>
 <b>23</b>
-<v>3804</v>
+<v>3805</v>
 </b>
 <b>
 <a>23</a>
 <b>394</b>
-<v>2532</v>
+<v>2533</v>
 </b>
 </bs>
 </hist>
@@ -29559,7 +29831,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>48498</v>
+<v>48507</v>
 </b>
 <b>
 <a>2</a>
@@ -29580,12 +29852,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6239</v>
+<v>6240</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>942</v>
+<v>943</v>
 </b>
 <b>
 <a>3</a>
@@ -29606,7 +29878,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6864</v>
+<v>6865</v>
 </b>
 <b>
 <a>2</a>
@@ -29627,7 +29899,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>6250</v>
+<v>6251</v>
 </b>
 <b>
 <a>2</a>
@@ -29647,19 +29919,19 @@
 </relation>
 <relation>
 <name>comments</name>
-<cardinality>1580013</cardinality>
+<cardinality>1580303</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1580013</v>
+<v>1580303</v>
 </e>
 <e>
 <k>contents</k>
-<v>784019</v>
+<v>784163</v>
 </e>
 <e>
 <k>location</k>
-<v>1580013</v>
+<v>1580303</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -29673,7 +29945,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1580013</v>
+<v>1580303</v>
 </b>
 </bs>
 </hist>
@@ -29689,7 +29961,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1580013</v>
+<v>1580303</v>
 </b>
 </bs>
 </hist>
@@ -29705,17 +29977,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>663821</v>
+<v>663943</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>75088</v>
+<v>75102</v>
 </b>
 <b>
 <a>3</a>
 <b>10738</b>
-<v>45110</v>
+<v>45118</v>
 </b>
 </bs>
 </hist>
@@ -29731,17 +30003,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>663821</v>
+<v>663943</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>75088</v>
+<v>75102</v>
 </b>
 <b>
 <a>3</a>
 <b>10738</b>
-<v>45110</v>
+<v>45118</v>
 </b>
 </bs>
 </hist>
@@ -29757,7 +30029,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1580013</v>
+<v>1580303</v>
 </b>
 </bs>
 </hist>
@@ -29773,7 +30045,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1580013</v>
+<v>1580303</v>
 </b>
 </bs>
 </hist>
@@ -29783,15 +30055,15 @@
 </relation>
 <relation>
 <name>commentbinding</name>
-<cardinality>713207</cardinality>
+<cardinality>713294</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>618261</v>
+<v>618419</v>
 </e>
 <e>
 <k>element</k>
-<v>684435</v>
+<v>684517</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -29805,17 +30077,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>556868</v>
+<v>557080</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>49079</v>
+<v>49044</v>
 </b>
 <b>
 <a>3</a>
 <b>97</b>
-<v>12313</v>
+<v>12294</v>
 </b>
 </bs>
 </hist>
@@ -29831,12 +30103,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>655663</v>
+<v>655739</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>28772</v>
+<v>28777</v>
 </b>
 </bs>
 </hist>
@@ -29899,22 +30171,22 @@
 </relation>
 <relation>
 <name>compgenerated</name>
-<cardinality>6707974</cardinality>
+<cardinality>6707689</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>6707974</v>
+<v>6707689</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>synthetic_destructor_call</name>
-<cardinality>59605</cardinality>
+<cardinality>59594</cardinality>
 <columnsizes>
 <e>
 <k>element</k>
-<v>46392</v>
+<v>46379</v>
 </e>
 <e>
 <k>i</k>
@@ -29922,7 +30194,7 @@
 </e>
 <e>
 <k>destructor_call</k>
-<v>49463</v>
+<v>49450</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -29936,12 +30208,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>36952</v>
+<v>36936</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6765</v>
+<v>6766</v>
 </b>
 <b>
 <a>3</a>
@@ -29962,12 +30234,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>36952</v>
+<v>36936</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>6765</v>
+<v>6766</v>
 </b>
 <b>
 <a>3</a>
@@ -30006,8 +30278,8 @@
 <v>21</v>
 </b>
 <b>
-<a>4231</a>
-<b>4232</b>
+<a>4229</a>
+<b>4230</b>
 <v>10</v>
 </b>
 </bs>
@@ -30042,8 +30314,8 @@
 <v>21</v>
 </b>
 <b>
-<a>3565</a>
-<b>3566</b>
+<a>3563</a>
+<b>3564</b>
 <v>10</v>
 </b>
 </bs>
@@ -30060,17 +30332,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>43618</v>
+<v>43604</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>3618</v>
+<v>3619</v>
 </b>
 <b>
 <a>3</a>
 <b>26</b>
-<v>2225</v>
+<v>2226</v>
 </b>
 </bs>
 </hist>
@@ -30086,7 +30358,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>49463</v>
+<v>49450</v>
 </b>
 </bs>
 </hist>
@@ -30096,15 +30368,15 @@
 </relation>
 <relation>
 <name>namespaces</name>
-<cardinality>7686</cardinality>
+<cardinality>7687</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>7686</v>
+<v>7687</v>
 </e>
 <e>
 <k>name</k>
-<v>4133</v>
+<v>4134</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -30118,7 +30390,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>7686</v>
+<v>7687</v>
 </b>
 </bs>
 </hist>
@@ -30134,7 +30406,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>3475</v>
+<v>3476</v>
 </b>
 <b>
 <a>2</a>
@@ -30165,15 +30437,15 @@
 </relation>
 <relation>
 <name>namespacembrs</name>
-<cardinality>1603040</cardinality>
+<cardinality>1603333</cardinality>
 <columnsizes>
 <e>
 <k>parentid</k>
-<v>7160</v>
+<v>7161</v>
 </e>
 <e>
 <k>memberid</k>
-<v>1603040</v>
+<v>1603333</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -30247,7 +30519,7 @@
 <b>
 <a>778</a>
 <b>39485</b>
-<v>317</v>
+<v>318</v>
 </b>
 </bs>
 </hist>
@@ -30263,7 +30535,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1603040</v>
+<v>1603333</v>
 </b>
 </bs>
 </hist>
@@ -30536,8 +30808,8 @@
 <v>1</v>
 </b>
 <b>
-<a>13857</a>
-<b>13858</b>
+<a>13714</a>
+<b>13715</b>
 <v>1</v>
 </b>
 <b>
@@ -30551,8 +30823,8 @@
 <v>1</v>
 </b>
 <b>
-<a>4155321</a>
-<b>4155322</b>
+<a>4155464</a>
+<b>4155465</b>
 <v>1</v>
 </b>
 </bs>
@@ -30563,11 +30835,11 @@
 </relation>
 <relation>
 <name>iscall</name>
-<cardinality>2320337</cardinality>
+<cardinality>2320159</cardinality>
 <columnsizes>
 <e>
 <k>caller</k>
-<v>2320337</v>
+<v>2320159</v>
 </e>
 <e>
 <k>kind</k>
@@ -30585,7 +30857,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>2320337</v>
+<v>2320159</v>
 </b>
 </bs>
 </hist>
@@ -30604,13 +30876,13 @@
 <v>10</v>
 </b>
 <b>
-<a>6429</a>
-<b>6430</b>
+<a>6428</a>
+<b>6429</b>
 <v>10</v>
 </b>
 <b>
-<a>203798</a>
-<b>203799</b>
+<a>203744</a>
+<b>203745</b>
 <v>10</v>
 </b>
 </bs>
@@ -30621,11 +30893,11 @@
 </relation>
 <relation>
 <name>numtemplatearguments</name>
-<cardinality>164694</cardinality>
+<cardinality>164713</cardinality>
 <columnsizes>
 <e>
 <k>expr_id</k>
-<v>164694</v>
+<v>164713</v>
 </e>
 <e>
 <k>num</k>
@@ -30643,7 +30915,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>164694</v>
+<v>164713</v>
 </b>
 </bs>
 </hist>
@@ -30672,8 +30944,8 @@
 <v>10</v>
 </b>
 <b>
-<a>14307</a>
-<b>14308</b>
+<a>14306</a>
+<b>14307</b>
 <v>10</v>
 </b>
 </bs>
@@ -31219,11 +31491,11 @@
 </relation>
 <relation>
 <name>expr_allocator</name>
-<cardinality>30329</cardinality>
+<cardinality>30334</cardinality>
 <columnsizes>
 <e>
 <k>expr</k>
-<v>30329</v>
+<v>30334</v>
 </e>
 <e>
 <k>func</k>
@@ -31245,7 +31517,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>30329</v>
+<v>30334</v>
 </b>
 </bs>
 </hist>
@@ -31261,7 +31533,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>30329</v>
+<v>30334</v>
 </b>
 </bs>
 </hist>
@@ -31370,11 +31642,11 @@
 </relation>
 <relation>
 <name>expr_deallocator</name>
-<cardinality>33300</cardinality>
+<cardinality>33306</cardinality>
 <columnsizes>
 <e>
 <k>expr</k>
-<v>33300</v>
+<v>33306</v>
 </e>
 <e>
 <k>func</k>
@@ -31396,7 +31668,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>33300</v>
+<v>33306</v>
 </b>
 </bs>
 </hist>
@@ -31412,7 +31684,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>33300</v>
+<v>33306</v>
 </b>
 </bs>
 </hist>
@@ -32598,15 +32870,15 @@
 </relation>
 <relation>
 <name>expr_ancestor</name>
-<cardinality>66086</cardinality>
+<cardinality>66076</cardinality>
 <columnsizes>
 <e>
 <k>exp</k>
-<v>65384</v>
+<v>65374</v>
 </e>
 <e>
 <k>ancestor</k>
-<v>47105</v>
+<v>47092</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -32620,12 +32892,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>64748</v>
+<v>64738</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>635</v>
+<v>636</v>
 </b>
 </bs>
 </hist>
@@ -32641,12 +32913,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>34945</v>
+<v>34929</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>9704</v>
+<v>9705</v>
 </b>
 <b>
 <a>3</a>
@@ -32927,15 +33199,15 @@
 </relation>
 <relation>
 <name>expr_types</name>
-<cardinality>18573218</cardinality>
+<cardinality>18573265</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>18430421</v>
+<v>18430420</v>
 </e>
 <e>
 <k>typeid</k>
-<v>1322281</v>
+<v>1322490</v>
 </e>
 <e>
 <k>value_category</k>
@@ -32953,12 +33225,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>18289082</v>
+<v>18289033</v>
 </b>
 <b>
 <a>2</a>
 <b>4</b>
-<v>141338</v>
+<v>141386</v>
 </b>
 </bs>
 </hist>
@@ -32974,7 +33246,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>18430421</v>
+<v>18430420</v>
 </b>
 </bs>
 </hist>
@@ -32990,42 +33262,42 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>513809</v>
+<v>513771</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>251899</v>
+<v>252054</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>108356</v>
+<v>108419</v>
 </b>
 <b>
 <a>4</a>
 <b>5</b>
-<v>86097</v>
+<v>86069</v>
 </b>
 <b>
 <a>5</a>
 <b>8</b>
-<v>114156</v>
+<v>114199</v>
 </b>
 <b>
 <a>8</a>
 <b>14</b>
-<v>106009</v>
+<v>106094</v>
 </b>
 <b>
 <a>14</a>
 <b>45</b>
-<v>99715</v>
+<v>99701</v>
 </b>
 <b>
 <a>45</a>
-<b>126320</b>
-<v>42237</v>
+<b>126299</b>
+<v>42179</v>
 </b>
 </bs>
 </hist>
@@ -33041,17 +33313,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1170755</v>
+<v>1170937</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>143126</v>
+<v>143152</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>8399</v>
+<v>8400</v>
 </b>
 </bs>
 </hist>
@@ -33070,13 +33342,13 @@
 <v>10</v>
 </b>
 <b>
-<a>370542</a>
-<b>370543</b>
+<a>370443</a>
+<b>370444</b>
 <v>10</v>
 </b>
 <b>
-<a>1304851</a>
-<b>1304852</b>
+<a>1304642</a>
+<b>1304643</b>
 <v>10</v>
 </b>
 </bs>
@@ -33101,8 +33373,8 @@
 <v>10</v>
 </b>
 <b>
-<a>102767</a>
-<b>102768</b>
+<a>102764</a>
+<b>102765</b>
 <v>10</v>
 </b>
 </bs>
@@ -33113,15 +33385,15 @@
 </relation>
 <relation>
 <name>new_allocated_type</name>
-<cardinality>32127</cardinality>
+<cardinality>32133</cardinality>
 <columnsizes>
 <e>
 <k>expr</k>
-<v>32127</v>
+<v>32133</v>
 </e>
 <e>
 <k>type_id</k>
-<v>16513</v>
+<v>16516</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -33135,7 +33407,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>32127</v>
+<v>32133</v>
 </b>
 </bs>
 </hist>
@@ -33151,7 +33423,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>10340</v>
+<v>10341</v>
 </b>
 <b>
 <a>2</a>
@@ -33776,15 +34048,15 @@
 </relation>
 <relation>
 <name>condition_decl_bind</name>
-<cardinality>7028</cardinality>
+<cardinality>7007</cardinality>
 <columnsizes>
 <e>
 <k>expr</k>
-<v>7028</v>
+<v>7007</v>
 </e>
 <e>
 <k>decl</k>
-<v>7028</v>
+<v>7007</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -33798,7 +34070,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>7028</v>
+<v>7007</v>
 </b>
 </bs>
 </hist>
@@ -33814,7 +34086,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>7028</v>
+<v>7007</v>
 </b>
 </bs>
 </hist>
@@ -33824,11 +34096,11 @@
 </relation>
 <relation>
 <name>typeid_bind</name>
-<cardinality>4418</cardinality>
+<cardinality>4419</cardinality>
 <columnsizes>
 <e>
 <k>expr</k>
-<v>4418</v>
+<v>4419</v>
 </e>
 <e>
 <k>type_id</k>
@@ -33846,7 +34118,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4418</v>
+<v>4419</v>
 </b>
 </bs>
 </hist>
@@ -35541,11 +35813,11 @@
 </relation>
 <relation>
 <name>stmts</name>
-<cardinality>4688625</cardinality>
+<cardinality>4688881</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>4688625</v>
+<v>4688881</v>
 </e>
 <e>
 <k>kind</k>
@@ -35553,7 +35825,7 @@
 </e>
 <e>
 <k>location</k>
-<v>1193858</v>
+<v>1194077</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -35567,7 +35839,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4688625</v>
+<v>4688881</v>
 </b>
 </bs>
 </hist>
@@ -35583,7 +35855,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>4688625</v>
+<v>4688881</v>
 </b>
 </bs>
 </hist>
@@ -35617,8 +35889,8 @@
 <v>10</v>
 </b>
 <b>
-<a>736</a>
-<b>737</b>
+<a>735</a>
+<b>736</b>
 <v>10</v>
 </b>
 <b>
@@ -35632,13 +35904,13 @@
 <v>10</v>
 </b>
 <b>
-<a>2237</a>
-<b>2238</b>
+<a>2235</a>
+<b>2236</b>
 <v>10</v>
 </b>
 <b>
-<a>2267</a>
-<b>2268</b>
+<a>2266</a>
+<b>2267</b>
 <v>10</v>
 </b>
 <b>
@@ -35647,13 +35919,13 @@
 <v>10</v>
 </b>
 <b>
-<a>2827</a>
-<b>2828</b>
+<a>2826</a>
+<b>2827</b>
 <v>10</v>
 </b>
 <b>
-<a>3121</a>
-<b>3122</b>
+<a>3119</a>
+<b>3120</b>
 <v>10</v>
 </b>
 <b>
@@ -35662,33 +35934,33 @@
 <v>10</v>
 </b>
 <b>
-<a>4775</a>
-<b>4776</b>
+<a>4772</a>
+<b>4773</b>
 <v>10</v>
 </b>
 <b>
-<a>30484</a>
-<b>30485</b>
+<a>30477</a>
+<b>30478</b>
 <v>10</v>
 </b>
 <b>
-<a>55911</a>
-<b>55912</b>
+<a>55902</a>
+<b>55903</b>
 <v>10</v>
 </b>
 <b>
-<a>90778</a>
-<b>90779</b>
+<a>90766</a>
+<b>90767</b>
 <v>10</v>
 </b>
 <b>
-<a>103056</a>
-<b>103057</b>
+<a>103053</a>
+<b>103054</b>
 <v>10</v>
 </b>
 <b>
-<a>120839</a>
-<b>120840</b>
+<a>120825</a>
+<b>120826</b>
 <v>10</v>
 </b>
 </bs>
@@ -35811,32 +36083,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>677440</v>
+<v>677991</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>181953</v>
+<v>181580</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>107851</v>
+<v>107904</v>
 </b>
 <b>
 <a>4</a>
 <b>6</b>
-<v>102117</v>
+<v>102102</v>
 </b>
 <b>
 <a>6</a>
 <b>22</b>
-<v>101535</v>
+<v>101532</v>
 </b>
 <b>
 <a>22</a>
 <b>5041</b>
-<v>22960</v>
+<v>22964</v>
 </b>
 </bs>
 </hist>
@@ -35852,12 +36124,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1170273</v>
+<v>1170487</v>
 </b>
 <b>
 <a>2</a>
 <b>9</b>
-<v>23585</v>
+<v>23590</v>
 </b>
 </bs>
 </hist>
@@ -36155,15 +36427,15 @@
 </relation>
 <relation>
 <name>while_body</name>
-<cardinality>30998</cardinality>
+<cardinality>30992</cardinality>
 <columnsizes>
 <e>
 <k>while_stmt</k>
-<v>30998</v>
+<v>30992</v>
 </e>
 <e>
 <k>body_id</k>
-<v>30998</v>
+<v>30992</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -36177,7 +36449,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>30998</v>
+<v>30992</v>
 </b>
 </bs>
 </hist>
@@ -36193,7 +36465,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>30998</v>
+<v>30992</v>
 </b>
 </bs>
 </hist>
@@ -37490,15 +37762,15 @@
 </relation>
 <relation>
 <name>blockscope</name>
-<cardinality>1324978</cardinality>
+<cardinality>1325067</cardinality>
 <columnsizes>
 <e>
 <k>block</k>
-<v>1324978</v>
+<v>1325067</v>
 </e>
 <e>
 <k>enclosing</k>
-<v>1186775</v>
+<v>1186916</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -37512,7 +37784,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1324978</v>
+<v>1325067</v>
 </b>
 </bs>
 </hist>
@@ -37528,12 +37800,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1106391</v>
+<v>1106571</v>
 </b>
 <b>
 <a>2</a>
 <b>509</b>
-<v>80384</v>
+<v>80344</v>
 </b>
 </bs>
 </hist>
@@ -37729,11 +38001,11 @@
 </relation>
 <relation>
 <name>preprocdirects</name>
-<cardinality>1323355</cardinality>
+<cardinality>1323598</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>1323355</v>
+<v>1323598</v>
 </e>
 <e>
 <k>kind</k>
@@ -37741,7 +38013,7 @@
 </e>
 <e>
 <k>location</k>
-<v>1317039</v>
+<v>1317281</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -37755,7 +38027,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1323355</v>
+<v>1323598</v>
 </b>
 </bs>
 </hist>
@@ -37771,7 +38043,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1323355</v>
+<v>1323598</v>
 </b>
 </bs>
 </hist>
@@ -37939,12 +38211,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1316710</v>
+<v>1316952</v>
 </b>
 <b>
 <a>2</a>
 <b>235</b>
-<v>328</v>
+<v>329</v>
 </b>
 </bs>
 </hist>
@@ -37960,7 +38232,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1317039</v>
+<v>1317281</v>
 </b>
 </bs>
 </hist>
@@ -37970,15 +38242,15 @@
 </relation>
 <relation>
 <name>preprocpair</name>
-<cardinality>378731</cardinality>
+<cardinality>378800</cardinality>
 <columnsizes>
 <e>
 <k>begin</k>
-<v>300452</v>
+<v>300507</v>
 </e>
 <e>
 <k>elseelifend</k>
-<v>378731</v>
+<v>378800</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -37992,17 +38264,17 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>238576</v>
+<v>238620</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>54539</v>
+<v>54549</v>
 </b>
 <b>
 <a>3</a>
 <b>53</b>
-<v>7335</v>
+<v>7336</v>
 </b>
 </bs>
 </hist>
@@ -38018,7 +38290,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>378731</v>
+<v>378800</v>
 </b>
 </bs>
 </hist>
@@ -38028,41 +38300,41 @@
 </relation>
 <relation>
 <name>preproctrue</name>
-<cardinality>166536</cardinality>
+<cardinality>166567</cardinality>
 <columnsizes>
 <e>
 <k>branch</k>
-<v>166536</v>
+<v>166567</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>preprocfalse</name>
-<cardinality>119101</cardinality>
+<cardinality>119123</cardinality>
 <columnsizes>
 <e>
 <k>branch</k>
-<v>119101</v>
+<v>119123</v>
 </e>
 </columnsizes>
 <dependencies/>
 </relation>
 <relation>
 <name>preproctext</name>
-<cardinality>965238</cardinality>
+<cardinality>965415</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>965238</v>
+<v>965415</v>
 </e>
 <e>
 <k>head</k>
-<v>463479</v>
+<v>463564</v>
 </e>
 <e>
 <k>body</k>
-<v>175549</v>
+<v>175581</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -38076,7 +38348,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>965238</v>
+<v>965415</v>
 </b>
 </bs>
 </hist>
@@ -38092,7 +38364,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>965238</v>
+<v>965415</v>
 </b>
 </bs>
 </hist>
@@ -38108,22 +38380,22 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>345902</v>
+<v>345965</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>78158</v>
+<v>78172</v>
 </b>
 <b>
 <a>3</a>
 <b>19</b>
-<v>34770</v>
+<v>34776</v>
 </b>
 <b>
 <a>19</a>
 <b>752</b>
-<v>4649</v>
+<v>4650</v>
 </b>
 </bs>
 </hist>
@@ -38139,12 +38411,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>441802</v>
+<v>441882</v>
 </b>
 <b>
 <a>2</a>
 <b>38</b>
-<v>21677</v>
+<v>21681</v>
 </b>
 </bs>
 </hist>
@@ -38160,12 +38432,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>164979</v>
+<v>165009</v>
 </b>
 <b>
 <a>2</a>
 <b>64816</b>
-<v>10570</v>
+<v>10572</v>
 </b>
 </bs>
 </hist>
@@ -38181,12 +38453,12 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>166459</v>
+<v>166490</v>
 </b>
 <b>
 <a>2</a>
 <b>21810</b>
-<v>9089</v>
+<v>9091</v>
 </b>
 </bs>
 </hist>
@@ -38196,15 +38468,15 @@
 </relation>
 <relation>
 <name>includes</name>
-<cardinality>290791</cardinality>
+<cardinality>290845</cardinality>
 <columnsizes>
 <e>
 <k>id</k>
-<v>290791</v>
+<v>290845</v>
 </e>
 <e>
 <k>included</k>
-<v>54594</v>
+<v>54604</v>
 </e>
 </columnsizes>
 <dependencies>
@@ -38218,7 +38490,7 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>290791</v>
+<v>290845</v>
 </b>
 </bs>
 </hist>
@@ -38234,37 +38506,37 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>26886</v>
+<v>26891</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>8958</v>
+<v>8960</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>4616</v>
+<v>4617</v>
 </b>
 <b>
 <a>4</a>
 <b>6</b>
-<v>4846</v>
+<v>4847</v>
 </b>
 <b>
 <a>6</a>
 <b>11</b>
-<v>4188</v>
+<v>4189</v>
 </b>
 <b>
 <a>11</a>
 <b>41</b>
-<v>4111</v>
+<v>4112</v>
 </b>
 <b>
 <a>41</a>
 <b>763</b>
-<v>986</v>
+<v>987</v>
 </b>
 </bs>
 </hist>
@@ -38322,11 +38594,11 @@
 </relation>
 <relation>
 <name>link_parent</name>
-<cardinality>18149980</cardinality>
+<cardinality>18153305</cardinality>
 <columnsizes>
 <e>
 <k>element</k>
-<v>4991698</v>
+<v>4992613</v>
 </e>
 <e>
 <k>link_target</k>
@@ -38344,32 +38616,32 @@
 <b>
 <a>1</a>
 <b>2</b>
-<v>1493159</v>
+<v>1493433</v>
 </b>
 <b>
 <a>2</a>
 <b>3</b>
-<v>1882856</v>
+<v>1883201</v>
 </b>
 <b>
 <a>3</a>
 <b>4</b>
-<v>718712</v>
+<v>718843</v>
 </b>
 <b>
 <a>4</a>
 <b>6</b>
-<v>400792</v>
+<v>400866</v>
 </b>
 <b>
 <a>6</a>
 <b>29</b>
-<v>398073</v>
+<v>398146</v>
 </b>
 <b>
 <a>29</a>
 <b>45</b>
-<v>98103</v>
+<v>98121</v>
 </b>
 </bs>
 </hist>
diff --git a/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/old.dbscheme b/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/old.dbscheme
new file mode 100644
index 00000000000..025827d85c3
--- /dev/null
+++ b/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/old.dbscheme
@@ -0,0 +1,2109 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The date of the snapshot.
+ */
+snapshotDate(unique date snapshotDate : date ref);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Data used by the 'duplicate code' detection.
+ */
+duplicateCode(
+    unique int id : @duplication,
+    string relativePath : string ref,
+    int equivClass : int ref
+);
+
+/**
+ * Data used by the 'similar code' detection.
+ */
+similarCode(
+    unique int id : @similarity,
+    string relativePath : string ref,
+    int equivClass : int ref
+);
+
+/**
+ * Data used by the 'duplicate code' and 'similar code' detection.
+ */
+@duplication_or_similarity = @duplication | @similarity
+
+/**
+ * Data used by the 'duplicate code' and 'similar code' detection.
+ */
+#keyset[id, offset]
+tokens(
+    int id : @duplication_or_similarity ref,
+    int offset : int ref,
+    int beginLine : int ref,
+    int beginColumn : int ref,
+    int endLine : int ref,
+    int endColumn : int ref
+);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://help.semmle.com/QL/learn-ql/ql/locations.html).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://help.semmle.com/QL/learn-ql/ql/locations.html).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://help.semmle.com/QL/learn-ql/ql/locations.html).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+/*
+  fromSource(0) = unknown,
+  fromSource(1) = from source,
+  fromSource(2) = from library
+*/
+files(
+    unique int id: @file,
+    string name: string ref,
+    string simple: string ref,
+    string ext: string ref,
+    int fromSource: int ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref,
+    string simple: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+/*
+  case @macroinvocations.kind of
+    1 = macro expansion
+  | 2 = other macro reference
+  ;
+*/
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+  case @function.kind of
+    1 = normal
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(int id: @function ref, unique int entry_point: @stmt ref);
+
+function_return_type(int id: @function ref, int return_type: @type ref);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+member_function_this_type(unique int id: @function ref, int this_type: @type ref);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(int new: @function ref, int old: @function ref);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/*
+  Built-in types are the fundamental types, e.g., integral, floating, and void.
+
+  case @builtintype.kind of
+    1 = error
+  | 2 = unknown
+  | 3 = void
+  | 4 = boolean
+  | 5 = char
+  | 6 = unsigned_char
+  | 7 = signed_char
+  | 8 = short
+  | 9 = unsigned_short
+  | 10 = signed_short
+  | 11 = int
+  | 12 = unsigned_int
+  | 13 = signed_int
+  | 14 = long
+  | 15 = unsigned_long
+  | 16 = signed_long
+  | 17 = long_long
+  | 18 = unsigned_long_long
+  | 19 = signed_long_long
+  | 20 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+decltypes(
+    unique int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+  case @usertype.kind of
+    1 = struct
+  | 2 = class
+  | 3 = union
+  | 4 = enum
+  | 5 = typedef                       // classic C: typedef typedef type name
+  | 6 = template
+  | 7 = template_parameter
+  | 8 = template_template_parameter
+  | 9 = proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+  | 13 = scoped_enum
+  | 14 = using_alias                  // a using name = type style typedef
+  ;
+*/
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    unique string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the EDG frontend.  See symbol_ref.h there.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(unique int caller: @funbindexpr ref, int kind: int ref);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // EDG internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+successors(
+    int from: @cfgnode ref,
+    int to: @cfgnode ref
+);
+
+truecond(
+    unique int from: @cfgnode ref,
+    int to: @cfgnode ref
+);
+
+falsecond(
+    unique int from: @cfgnode ref,
+    int to: @cfgnode ref
+);
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    unique int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/semmlecode.cpp.dbscheme b/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..098850d25c4
--- /dev/null
+++ b/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/semmlecode.cpp.dbscheme
@@ -0,0 +1,2110 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The date of the snapshot.
+ */
+snapshotDate(unique date snapshotDate : date ref);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Data used by the 'duplicate code' detection.
+ */
+duplicateCode(
+    unique int id : @duplication,
+    string relativePath : string ref,
+    int equivClass : int ref
+);
+
+/**
+ * Data used by the 'similar code' detection.
+ */
+similarCode(
+    unique int id : @similarity,
+    string relativePath : string ref,
+    int equivClass : int ref
+);
+
+/**
+ * Data used by the 'duplicate code' and 'similar code' detection.
+ */
+@duplication_or_similarity = @duplication | @similarity
+
+/**
+ * Data used by the 'duplicate code' and 'similar code' detection.
+ */
+#keyset[id, offset]
+tokens(
+    int id : @duplication_or_similarity ref,
+    int offset : int ref,
+    int beginLine : int ref,
+    int beginColumn : int ref,
+    int endLine : int ref,
+    int endColumn : int ref
+);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://help.semmle.com/QL/learn-ql/ql/locations.html).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://help.semmle.com/QL/learn-ql/ql/locations.html).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://help.semmle.com/QL/learn-ql/ql/locations.html).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+/*
+  fromSource(0) = unknown,
+  fromSource(1) = from source,
+  fromSource(2) = from library
+*/
+files(
+    unique int id: @file,
+    string name: string ref,
+    string simple: string ref,
+    string ext: string ref,
+    int fromSource: int ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref,
+    string simple: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+/*
+  case @macroinvocations.kind of
+    1 = macro expansion
+  | 2 = other macro reference
+  ;
+*/
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+  case @function.kind of
+    1 = normal
+  | 2 = constructor
+  | 3 = destructor
+  | 4 = conversion
+  | 5 = operator
+  | 6 = builtin     // GCC built-in functions, e.g. __builtin___memcpy_chk
+  ;
+*/
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(int id: @function ref, unique int entry_point: @stmt ref);
+
+function_return_type(int id: @function ref, int return_type: @type ref);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+member_function_this_type(unique int id: @function ref, int this_type: @type ref);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @functionorblock ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(int new: @function ref, int old: @function ref);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/*
+  Built-in types are the fundamental types, e.g., integral, floating, and void.
+
+  case @builtintype.kind of
+    1 = error
+  | 2 = unknown
+  | 3 = void
+  | 4 = boolean
+  | 5 = char
+  | 6 = unsigned_char
+  | 7 = signed_char
+  | 8 = short
+  | 9 = unsigned_short
+  | 10 = signed_short
+  | 11 = int
+  | 12 = unsigned_int
+  | 13 = signed_int
+  | 14 = long
+  | 15 = unsigned_long
+  | 16 = signed_long
+  | 17 = long_long
+  | 18 = unsigned_long_long
+  | 19 = signed_long_long
+  | 20 = __int8                 // Microsoft-specific
+  | 21 = __int16                // Microsoft-specific
+  | 22 = __int32                // Microsoft-specific
+  | 23 = __int64                // Microsoft-specific
+  | 24 = float
+  | 25 = double
+  | 26 = long_double
+  | 27 = _Complex_float         // C99-specific
+  | 28 = _Complex_double        // C99-specific
+  | 29 = _Complex_long double   // C99-specific
+  | 30 = _Imaginary_float       // C99-specific
+  | 31 = _Imaginary_double      // C99-specific
+  | 32 = _Imaginary_long_double // C99-specific
+  | 33 = wchar_t                // Microsoft-specific
+  | 34 = decltype_nullptr       // C++11
+  | 35 = __int128
+  | 36 = unsigned___int128
+  | 37 = signed___int128
+  | 38 = __float128
+  | 39 = _Complex___float128
+  | 40 = _Decimal32
+  | 41 = _Decimal64
+  | 42 = _Decimal128
+  | 43 = char16_t
+  | 44 = char32_t
+  | 45 = _Float32
+  | 46 = _Float32x
+  | 47 = _Float64
+  | 48 = _Float64x
+  | 49 = _Float128
+  | 50 = _Float128x
+  | 51 = char8_t
+  ;
+*/
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/*
+  Derived types are types that are directly derived from existing types and
+  point to, refer to, transform type data to return a new type.
+
+  case @derivedtype.kind of
+    1 = pointer
+  | 2 = reference
+  | 3 = type_with_specifiers
+  | 4 = array
+  | 5 = gnu_vector
+  | 6 = routineptr
+  | 7 = routinereference
+  | 8 = rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+  | 10 = block
+  ;
+*/
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+decltypes(
+    unique int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+  case @usertype.kind of
+    1 = struct
+  | 2 = class
+  | 3 = union
+  | 4 = enum
+  | 5 = typedef                       // classic C: typedef typedef type name
+  | 6 = template
+  | 7 = template_parameter
+  | 8 = template_template_parameter
+  | 9 = proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+  | 13 = scoped_enum
+  | 14 = using_alias                  // a using name = type style typedef
+  ;
+*/
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    unique string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the EDG frontend.  See symbol_ref.h there.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+/*
+  Fixed point types
+  precision(1) = short, precision(2) = default, precision(3) = long
+  is_unsigned(1) = unsigned is_unsigned(2) = signed
+  is_fract_type(1) = declared with _Fract
+  saturating(1) = declared with _Sat
+*/
+/* TODO
+fixedpointtypes(
+    unique int id: @fixedpointtype,
+    int precision: int ref,
+    int is_unsigned: int ref,
+    int is_fract_type: int ref,
+    int saturating: int ref);
+*/
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(unique int caller: @funbindexpr ref, int kind: int ref);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     | @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr | @assign_bitwise_expr
+
+@assign_expr = @assignexpr | @assign_op_expr
+
+/*
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 3 = size_and_alignment
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // EDG internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            ;
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union.
+ */
+#keyset[aggregate, field]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array.
+ */
+#keyset[aggregate, element_index]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+for_initialization(
+    unique int for_stmt: @stmt_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+successors(
+    int from: @cfgnode ref,
+    int to: @cfgnode ref
+);
+
+truecond(
+    unique int from: @cfgnode ref,
+    int to: @cfgnode ref
+);
+
+falsecond(
+    unique int from: @cfgnode ref,
+    int to: @cfgnode ref
+);
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@functionorblock = @function | @stmt_block;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @functionorblock ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    unique int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/static_asserts.ql b/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/static_asserts.ql
new file mode 100644
index 00000000000..e5ec84fd76e
--- /dev/null
+++ b/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/static_asserts.ql
@@ -0,0 +1,21 @@
+class StaticAssert extends @static_assert {
+  string toString() { none() }
+}
+
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+class NameSpace extends @namespace {
+  string toString() { none() }
+}
+
+from StaticAssert sa, Expr condition, string message, Location loc, NameSpace ns
+where
+  static_asserts(sa, condition, message, loc) and
+  namespaces(ns, "")
+select sa, condition, message, loc, ns
diff --git a/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/upgrade.properties b/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/upgrade.properties
new file mode 100644
index 00000000000..ca1074f5a4d
--- /dev/null
+++ b/cpp/upgrades/025827d85c3f44a7fd52d4fad636e9a4141f12dd/upgrade.properties
@@ -0,0 +1,4 @@
+description: Give static_assert's an enclosing element
+compatibility: partial
+static_asserts.rel: run static_asserts.qlo
+