diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 6ab07086478..3fc3d71e7a5 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -4,14 +4,14 @@
             <k>@compilation</k>
             <v>9948</v>
         </e>
-        <e>
-            <k>@external_package</k>
-            <v>4</v>
-        </e>
         <e>
             <k>@externalDataElement</k>
             <v>65</v>
         </e>
+        <e>
+            <k>@external_package</k>
+            <v>4</v>
+        </e>
         <e>
             <k>@svnentry</k>
             <v>575525</v>
@@ -20,6 +20,14 @@
             <k>@location_stmt</k>
             <v>3813503</v>
         </e>
+        <e>
+            <k>@location_default</k>
+            <v>29655056</v>
+        </e>
+        <e>
+            <k>@location_expr</k>
+            <v>13165921</v>
+        </e>
         <e>
             <k>@diagnostic</k>
             <v>72092</v>
@@ -32,17 +40,9 @@
             <k>@folder</k>
             <v>15274</v>
         </e>
-        <e>
-            <k>@location_default</k>
-            <v>29655056</v>
-        </e>
-        <e>
-            <k>@location_expr</k>
-            <v>13165921</v>
-        </e>
         <e>
             <k>@macroinvocation</k>
-            <v>33818017</v>
+            <v>33818123</v>
         </e>
         <e>
             <k>@function</k>
@@ -52,6 +52,10 @@
             <k>@fun_decl</k>
             <v>4995583</v>
         </e>
+        <e>
+            <k>@var_decl</k>
+            <v>8391080</v>
+        </e>
         <e>
             <k>@type_decl</k>
             <v>3240440</v>
@@ -68,10 +72,6 @@
             <k>@static_assert</k>
             <v>130562</v>
         </e>
-        <e>
-            <k>@var_decl</k>
-            <v>8391080</v>
-        </e>
         <e>
             <k>@parameter</k>
             <v>6536424</v>
@@ -86,7 +86,7 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>581169</v>
+            <v>581177</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -130,19 +130,19 @@
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>653549</v>
+            <v>680858</v>
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>468565</v>
+            <v>493039</v>
         </e>
         <e>
             <k>@alignas</k>
-            <v>8794</v>
+            <v>9719</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>239199</v>
+            <v>243695</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -150,7 +150,7 @@
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>24994</v>
+            <v>38879</v>
         </e>
         <e>
             <k>@attribute_arg_type</k>
@@ -158,7 +158,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>322609</v>
+            <v>367506</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -172,14 +172,14 @@
             <k>@derivation</k>
             <v>368264</v>
         </e>
-        <e>
-            <k>@frienddecl</k>
-            <v>716133</v>
-        </e>
         <e>
             <k>@comment</k>
             <v>8773472</v>
         </e>
+        <e>
+            <k>@frienddecl</k>
+            <v>716133</v>
+        </e>
         <e>
             <k>@namespace</k>
             <v>12497</v>
@@ -190,7 +190,7 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>1536058</v>
+            <v>1533107</v>
         </e>
         <e>
             <k>@value</k>
@@ -198,176 +198,12 @@
         </e>
         <e>
             <k>@initialiser</k>
-            <v>1733596</v>
+            <v>1699581</v>
         </e>
         <e>
             <k>@lambdacapture</k>
             <v>27771</v>
         </e>
-        <e>
-            <k>@stmt_expr</k>
-            <v>1483542</v>
-        </e>
-        <e>
-            <k>@stmt_if</k>
-            <v>724702</v>
-        </e>
-        <e>
-            <k>@stmt_while</k>
-            <v>30109</v>
-        </e>
-        <e>
-            <k>@stmt_label</k>
-            <v>53054</v>
-        </e>
-        <e>
-            <k>@stmt_return</k>
-            <v>1285345</v>
-        </e>
-        <e>
-            <k>@stmt_block</k>
-            <v>1423276</v>
-        </e>
-        <e>
-            <k>@stmt_end_test_while</k>
-            <v>148628</v>
-        </e>
-        <e>
-            <k>@stmt_for</k>
-            <v>61453</v>
-        </e>
-        <e>
-            <k>@stmt_switch_case</k>
-            <v>209699</v>
-        </e>
-        <e>
-            <k>@stmt_switch</k>
-            <v>20747</v>
-        </e>
-        <e>
-            <k>@stmt_try_block</k>
-            <v>46934</v>
-        </e>
-        <e>
-            <k>@stmt_decl</k>
-            <v>606536</v>
-        </e>
-        <e>
-            <k>@stmt_empty</k>
-            <v>193311</v>
-        </e>
-        <e>
-            <k>@stmt_continue</k>
-            <v>22525</v>
-        </e>
-        <e>
-            <k>@stmt_break</k>
-            <v>102345</v>
-        </e>
-        <e>
-            <k>@stmt_range_based_for</k>
-            <v>8331</v>
-        </e>
-        <e>
-            <k>@stmt_handler</k>
-            <v>65331</v>
-        </e>
-        <e>
-            <k>@stmt_constexpr_if</k>
-            <v>52504</v>
-        </e>
-        <e>
-            <k>@stmt_goto</k>
-            <v>110508</v>
-        </e>
-        <e>
-            <k>@stmt_asm</k>
-            <v>109773</v>
-        </e>
-        <e>
-            <k>@stmt_microsoft_try</k>
-            <v>163</v>
-        </e>
-        <e>
-            <k>@stmt_set_vla_size</k>
-            <v>26</v>
-        </e>
-        <e>
-            <k>@stmt_vla_decl</k>
-            <v>22</v>
-        </e>
-        <e>
-            <k>@stmt_assigned_goto</k>
-            <v>9060</v>
-        </e>
-        <e>
-            <k>@stmt_co_return</k>
-            <v>2</v>
-        </e>
-        <e>
-            <k>@delete_array_expr</k>
-            <v>1406</v>
-        </e>
-        <e>
-            <k>@new_array_expr</k>
-            <v>5104</v>
-        </e>
-        <e>
-            <k>@ctordirectinit</k>
-            <v>112980</v>
-        </e>
-        <e>
-            <k>@ctorvirtualinit</k>
-            <v>6512</v>
-        </e>
-        <e>
-            <k>@ctorfieldinit</k>
-            <v>201086</v>
-        </e>
-        <e>
-            <k>@ctordelegatinginit</k>
-            <v>3352</v>
-        </e>
-        <e>
-            <k>@dtordirectdestruct</k>
-            <v>41776</v>
-        </e>
-        <e>
-            <k>@dtorvirtualdestruct</k>
-            <v>4128</v>
-        </e>
-        <e>
-            <k>@dtorfielddestruct</k>
-            <v>41706</v>
-        </e>
-        <e>
-            <k>@static_cast</k>
-            <v>210928</v>
-        </e>
-        <e>
-            <k>@reinterpret_cast</k>
-            <v>30749</v>
-        </e>
-        <e>
-            <k>@const_cast</k>
-            <v>35247</v>
-        </e>
-        <e>
-            <k>@dynamic_cast</k>
-            <v>1037</v>
-        </e>
-        <e>
-            <k>@c_style_cast</k>
-            <v>4209396</v>
-        </e>
-        <e>
-            <k>@lambdaexpr</k>
-            <v>21291</v>
-        </e>
-        <e>
-            <k>@param_ref</k>
-            <v>244969</v>
-        </e>
         <e>
             <k>@errorexpr</k>
             <v>46893</v>
@@ -570,7 +406,7 @@
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>367580</v>
+            <v>367585</v>
         </e>
         <e>
             <k>@callexpr</k>
@@ -660,6 +496,70 @@
             <k>@aggregateliteral</k>
             <v>913874</v>
         </e>
+        <e>
+            <k>@delete_array_expr</k>
+            <v>1406</v>
+        </e>
+        <e>
+            <k>@new_array_expr</k>
+            <v>5104</v>
+        </e>
+        <e>
+            <k>@ctordirectinit</k>
+            <v>112980</v>
+        </e>
+        <e>
+            <k>@ctorvirtualinit</k>
+            <v>6512</v>
+        </e>
+        <e>
+            <k>@ctorfieldinit</k>
+            <v>201086</v>
+        </e>
+        <e>
+            <k>@ctordelegatinginit</k>
+            <v>3352</v>
+        </e>
+        <e>
+            <k>@dtordirectdestruct</k>
+            <v>41776</v>
+        </e>
+        <e>
+            <k>@dtorvirtualdestruct</k>
+            <v>4128</v>
+        </e>
+        <e>
+            <k>@dtorfielddestruct</k>
+            <v>41706</v>
+        </e>
+        <e>
+            <k>@static_cast</k>
+            <v>210928</v>
+        </e>
+        <e>
+            <k>@reinterpret_cast</k>
+            <v>30749</v>
+        </e>
+        <e>
+            <k>@const_cast</k>
+            <v>35247</v>
+        </e>
+        <e>
+            <k>@dynamic_cast</k>
+            <v>1037</v>
+        </e>
+        <e>
+            <k>@c_style_cast</k>
+            <v>4209396</v>
+        </e>
+        <e>
+            <k>@lambdaexpr</k>
+            <v>21291</v>
+        </e>
+        <e>
+            <k>@param_ref</k>
+            <v>244969</v>
+        </e>
         <e>
             <k>@istrivialexpr</k>
             <v>925</v>
@@ -980,6 +880,110 @@
             <k>@builtinshuffle</k>
             <v>1959</v>
         </e>
+        <e>
+            <k>@blockassignexpr</k>
+            <v>12</v>
+        </e>
+        <e>
+            <k>@stmt_expr</k>
+            <v>1483542</v>
+        </e>
+        <e>
+            <k>@stmt_if</k>
+            <v>724702</v>
+        </e>
+        <e>
+            <k>@stmt_while</k>
+            <v>30109</v>
+        </e>
+        <e>
+            <k>@stmt_label</k>
+            <v>53054</v>
+        </e>
+        <e>
+            <k>@stmt_return</k>
+            <v>1285345</v>
+        </e>
+        <e>
+            <k>@stmt_block</k>
+            <v>1423276</v>
+        </e>
+        <e>
+            <k>@stmt_end_test_while</k>
+            <v>148628</v>
+        </e>
+        <e>
+            <k>@stmt_for</k>
+            <v>61453</v>
+        </e>
+        <e>
+            <k>@stmt_switch_case</k>
+            <v>209699</v>
+        </e>
+        <e>
+            <k>@stmt_switch</k>
+            <v>20747</v>
+        </e>
+        <e>
+            <k>@stmt_try_block</k>
+            <v>46934</v>
+        </e>
+        <e>
+            <k>@stmt_decl</k>
+            <v>606538</v>
+        </e>
+        <e>
+            <k>@stmt_empty</k>
+            <v>193314</v>
+        </e>
+        <e>
+            <k>@stmt_continue</k>
+            <v>22525</v>
+        </e>
+        <e>
+            <k>@stmt_break</k>
+            <v>102345</v>
+        </e>
+        <e>
+            <k>@stmt_range_based_for</k>
+            <v>8331</v>
+        </e>
+        <e>
+            <k>@stmt_handler</k>
+            <v>65331</v>
+        </e>
+        <e>
+            <k>@stmt_constexpr_if</k>
+            <v>52504</v>
+        </e>
+        <e>
+            <k>@stmt_goto</k>
+            <v>110508</v>
+        </e>
+        <e>
+            <k>@stmt_asm</k>
+            <v>109773</v>
+        </e>
+        <e>
+            <k>@stmt_microsoft_try</k>
+            <v>163</v>
+        </e>
+        <e>
+            <k>@stmt_set_vla_size</k>
+            <v>26</v>
+        </e>
+        <e>
+            <k>@stmt_vla_decl</k>
+            <v>22</v>
+        </e>
+        <e>
+            <k>@stmt_assigned_goto</k>
+            <v>9060</v>
+        </e>
+        <e>
+            <k>@stmt_co_return</k>
+            <v>2</v>
+        </e>
         <e>
             <k>@ppd_if</k>
             <v>661418</v>
@@ -1026,7 +1030,7 @@
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>27755</v>
+            <v>27756</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1668,7 +1672,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>14239</v>
+                    <v>10051</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1749,35 +1753,35 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>279</v>
+                                    <v>717</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>717</v>
+                                    <v>279</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>9</b>
+                                    <a>5</a>
+                                    <b>8</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>8</a>
                                     <b>10</b>
-                                    <v>79</v>
+                                    <v>119</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>119</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>12</b>
+                                    <b>13</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
+                                    <a>15</a>
                                     <b>18</b>
                                     <v>159</v>
                                 </b>
@@ -1788,7 +1792,7 @@
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>124</b>
+                                    <b>94</b>
                                     <v>159</v>
                                 </b>
                             </bs>
@@ -1857,47 +1861,47 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>598</v>
+                                    <v>1156</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1156</v>
+                                    <v>598</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>199</v>
+                                    <v>279</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>319</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>199</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>159</v>
+                                    <v>199</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>12</b>
+                                    <b>18</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>41</b>
+                                    <a>23</a>
+                                    <b>47</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
-                                    <b>96</b>
-                                    <v>119</v>
+                                    <a>88</a>
+                                    <b>89</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1943,18 +1947,18 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>79</v>
                                 </b>
                                 <b>
-                                    <a>177</a>
-                                    <b>178</b>
+                                    <a>116</a>
+                                    <b>117</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>179</a>
-                                    <b>180</b>
+                                    <a>136</a>
+                                    <b>137</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -1971,22 +1975,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9373</v>
+                                    <v>5384</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3510</v>
+                                    <v>2153</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>1196</v>
+                                    <b>4</b>
+                                    <v>1515</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>46</b>
-                                    <v>159</v>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>757</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>42</b>
+                                    <v>239</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2002,23 +2011,33 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8735</v>
+                                    <v>4786</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3589</v>
+                                    <v>2233</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1116</v>
+                                    <v>1316</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>74</b>
+                                    <b>5</b>
+                                    <v>638</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
                                     <v>797</v>
                                 </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>63</b>
+                                    <v>279</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -2033,12 +2052,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14000</v>
+                                    <v>9851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>239</v>
+                                    <v>199</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2048,7 +2067,7 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>889095</cardinality>
+            <cardinality>889098</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
@@ -2417,7 +2436,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7688</v>
+                    <v>7769</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2472,12 +2491,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>853</v>
+                                    <v>1002</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>15</b>
-                                    <v>472</v>
+                                    <b>16</b>
+                                    <v>403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2493,12 +2512,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7123</v>
+                                    <v>7262</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>564</v>
+                                    <v>507</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2514,56 +2533,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23</v>
+                                    <v>34</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
                                     <v>11</v>
                                 </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>11</v>
+                                </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>47</b>
+                                    <a>53</a>
+                                    <b>54</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>135</a>
-                                    <b>136</b>
+                                    <a>145</a>
+                                    <b>146</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>158</a>
-                                    <b>159</b>
+                                    <a>154</a>
+                                    <b>155</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>232</a>
-                                    <b>233</b>
+                                    <a>226</a>
+                                    <b>227</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>237</a>
-                                    <b>238</b>
+                                    <a>228</a>
+                                    <b>229</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -2580,56 +2604,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23</v>
+                                    <v>34</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
                                     <v>11</v>
                                 </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>11</v>
+                                </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>46</b>
+                                    <a>52</a>
+                                    <b>53</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>110</a>
-                                    <b>111</b>
+                                    <a>109</a>
+                                    <b>110</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>122</a>
-                                    <b>123</b>
+                                    <a>128</a>
+                                    <b>129</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>162</a>
-                                    <b>163</b>
+                                    <a>170</a>
+                                    <b>171</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>222</a>
-                                    <b>223</b>
+                                    <a>202</a>
+                                    <b>203</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -11352,7 +11381,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5237857</cardinality>
+            <cardinality>5237874</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -11364,7 +11393,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>55930</v>
+                    <v>55931</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -11603,7 +11632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9048</v>
+                                    <v>9049</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11674,7 +11703,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55930</v>
+                                    <v>55931</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12001,7 +12030,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>543235</v>
+                                    <v>543239</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12036,7 +12065,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224493</v>
+                                    <v>224489</v>
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -12194,19 +12223,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>33818017</cardinality>
+            <cardinality>33818123</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33818017</v>
+                    <v>33818123</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>81175</v>
+                    <v>81176</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>776461</v>
+                    <v>776463</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12224,7 +12253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33818017</v>
+                                    <v>33818123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12240,7 +12269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33818017</v>
+                                    <v>33818123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12256,7 +12285,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33818017</v>
+                                    <v>33818123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12312,12 +12341,12 @@
                                 <b>
                                     <a>73</a>
                                     <b>257</b>
-                                    <v>6097</v>
+                                    <v>6098</v>
                                 </b>
                                 <b>
                                     <a>257</a>
                                     <b>5161</b>
-                                    <v>6097</v>
+                                    <v>6098</v>
                                 </b>
                                 <b>
                                     <a>5432</a>
@@ -12405,7 +12434,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320046</v>
+                                    <v>320047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12451,12 +12480,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>729337</v>
+                                    <v>729339</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>350</b>
-                                    <v>47123</v>
+                                    <v>47124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12472,7 +12501,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>776461</v>
+                                    <v>776463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12545,15 +12574,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>30368148</cardinality>
+            <cardinality>30368243</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30368148</v>
+                    <v>30368243</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>23632653</v>
+                    <v>23632727</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12567,7 +12596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30368148</v>
+                                    <v>30368243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12583,17 +12612,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18259095</v>
+                                    <v>18259152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4525350</v>
+                                    <v>4525364</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>88</b>
-                                    <v>848207</v>
+                                    <v>848210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12681,11 +12710,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>85909146</cardinality>
+            <cardinality>85909416</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26486648</v>
+                    <v>26486731</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12693,7 +12722,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>325037</v>
+                    <v>325038</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12707,22 +12736,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7413109</v>
+                                    <v>7413132</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10827242</v>
+                                    <v>10827276</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6239771</v>
+                                    <v>6239791</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2006525</v>
+                                    <v>2006531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12738,22 +12767,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7484094</v>
+                                    <v>7484118</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10976626</v>
+                                    <v>10976660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6070745</v>
+                                    <v>6070764</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1955182</v>
+                                    <v>1955188</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12826,7 +12855,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>65394</v>
+                                    <v>65395</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12866,7 +12895,7 @@
                                 <b>
                                     <a>43</a>
                                     <b>165</b>
-                                    <v>24391</v>
+                                    <v>24392</v>
                                 </b>
                                 <b>
                                     <a>165</a>
@@ -12887,12 +12916,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>235066</v>
+                                    <v>235067</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79469</v>
+                                    <v>79470</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12907,11 +12936,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>85909146</cardinality>
+            <cardinality>85909416</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26486648</v>
+                    <v>26486731</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12919,7 +12948,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>196979</v>
+                    <v>196980</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12933,22 +12962,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7413109</v>
+                                    <v>7413132</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10827242</v>
+                                    <v>10827276</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6239771</v>
+                                    <v>6239791</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2006525</v>
+                                    <v>2006531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12964,22 +12993,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10713329</v>
+                                    <v>10713362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9344510</v>
+                                    <v>9344539</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5293039</v>
+                                    <v>5293055</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1135769</v>
+                                    <v>1135773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13052,7 +13081,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>41025</v>
+                                    <v>41026</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13118,7 +13147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99688</v>
+                                    <v>99689</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13800,11 +13829,11 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>554460</cardinality>
+            <cardinality>553401</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>554460</v>
+                    <v>553401</v>
                 </e>
                 <e>
                     <k>this_type</k>
@@ -13822,7 +13851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>554460</v>
+                                    <v>553401</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16430,7 +16459,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>476668</cardinality>
+            <cardinality>476670</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -16438,7 +16467,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>302247</v>
+                    <v>302248</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16452,7 +16481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3365</v>
+                                    <v>3366</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18082,11 +18111,11 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>581169</cardinality>
+            <cardinality>581177</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>581169</v>
+                    <v>581177</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18094,7 +18123,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>91320</v>
+                    <v>91322</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18108,7 +18137,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581169</v>
+                                    <v>581177</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18124,7 +18153,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581169</v>
+                                    <v>581177</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18145,7 +18174,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5408</v>
+                                    <v>5412</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18155,7 +18184,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3409</v>
+                                    <v>3405</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18181,7 +18210,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26970</v>
+                                    <v>26975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18191,7 +18220,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2943</v>
+                                    <v>2939</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18217,12 +18246,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57518</v>
+                                    <v>57519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14406</v>
+                                    <v>14407</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18253,7 +18282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77144</v>
+                                    <v>77145</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20763,15 +20792,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1722225</cardinality>
+            <cardinality>1722230</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1722225</v>
+                    <v>1722230</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>809049</v>
+                    <v>809051</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20785,7 +20814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1722225</v>
+                                    <v>1722230</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20801,17 +20830,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629268</v>
+                                    <v>629270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>85025</v>
+                                    <v>85026</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63319</v>
+                                    <v>63320</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -21628,11 +21657,11 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>5184427</cardinality>
+            <cardinality>5182113</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5184427</v>
+                    <v>5182113</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
@@ -21650,7 +21679,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5184427</v>
+                                    <v>5182113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21701,11 +21730,11 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>534132</cardinality>
+            <cardinality>534134</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>534132</v>
+                    <v>534134</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -21745,11 +21774,11 @@
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1092104</cardinality>
+            <cardinality>1092107</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1090870</v>
+                    <v>1090874</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -21767,7 +21796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1089729</v>
+                                    <v>1089732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21838,11 +21867,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2918536</cardinality>
+            <cardinality>2918546</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1329545</v>
+                    <v>1329549</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21850,7 +21879,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>856542</v>
+                    <v>856544</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21864,17 +21893,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>544138</v>
+                                    <v>544140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>404518</v>
+                                    <v>404520</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>235642</v>
+                                    <v>235643</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21900,12 +21929,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>569833</v>
+                                    <v>569834</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>416288</v>
+                                    <v>416289</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22023,7 +22052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>533452</v>
+                                    <v>533454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22059,7 +22088,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>755723</v>
+                                    <v>755725</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22605,11 +22634,11 @@
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>907164</cardinality>
+            <cardinality>907058</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>907164</v>
+                    <v>907058</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -22627,7 +22656,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907164</v>
+                                    <v>907058</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24568,11 +24597,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>695736</cardinality>
+            <cardinality>737258</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>695736</v>
+                    <v>737258</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24602,7 +24631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>695736</v>
+                                    <v>737258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24618,7 +24647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>695736</v>
+                                    <v>737258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24634,7 +24663,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>695736</v>
+                                    <v>737258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24650,7 +24679,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>695736</v>
+                                    <v>737258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24664,18 +24693,18 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>5</a>
+                                    <b>6</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>2168</a>
-                                    <b>2169</b>
+                                    <a>2330</a>
+                                    <b>2331</b>
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>4480</a>
-                                    <b>4481</b>
+                                    <a>4714</a>
+                                    <b>4715</b>
                                     <v>104</v>
                                 </b>
                             </bs>
@@ -24775,16 +24804,16 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>209</v>
+                                    <v>104</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>104</v>
+                                    <v>209</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>104</v>
                                 </b>
                                 <b>
@@ -24818,8 +24847,8 @@
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>659</a>
-                                    <b>660</b>
+                                    <a>1053</a>
+                                    <b>1054</b>
                                     <v>104</v>
                                 </b>
                                 <b>
@@ -24962,8 +24991,8 @@
                                     <v>104</v>
                                 </b>
                                 <b>
-                                    <a>6629</a>
-                                    <b>6630</b>
+                                    <a>7026</a>
+                                    <b>7027</b>
                                     <v>104</v>
                                 </b>
                             </bs>
@@ -25043,17 +25072,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>442104</v>
+                                    <v>425055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>9</b>
-                                    <v>36815</v>
+                                    <b>3</b>
+                                    <v>37443</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>3</a>
                                     <b>201</b>
-                                    <v>4497</v>
+                                    <v>20918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25116,11 +25145,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>348066</cardinality>
+            <cardinality>406848</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348066</v>
+                    <v>406848</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -25128,7 +25157,7 @@
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>267529</v>
+                    <v>295763</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25150,7 +25179,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348066</v>
+                                    <v>406848</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25166,7 +25195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348066</v>
+                                    <v>406848</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25182,7 +25211,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348066</v>
+                                    <v>406848</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25198,7 +25227,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348066</v>
+                                    <v>406848</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25217,13 +25246,13 @@
                                     <v>462</v>
                                 </b>
                                 <b>
-                                    <a>54</a>
-                                    <b>55</b>
+                                    <a>84</a>
+                                    <b>85</b>
                                     <v>462</v>
                                 </b>
                                 <b>
-                                    <a>697</a>
-                                    <b>698</b>
+                                    <a>794</a>
+                                    <b>795</b>
                                     <v>462</v>
                                 </b>
                             </bs>
@@ -25243,13 +25272,13 @@
                                     <v>462</v>
                                 </b>
                                 <b>
-                                    <a>54</a>
-                                    <b>55</b>
+                                    <a>84</a>
+                                    <b>85</b>
                                     <v>462</v>
                                 </b>
                                 <b>
-                                    <a>545</a>
-                                    <b>546</b>
+                                    <a>606</a>
+                                    <b>607</b>
                                     <v>462</v>
                                 </b>
                             </bs>
@@ -25313,17 +25342,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202730</v>
+                                    <v>214301</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49062</v>
+                                    <v>51839</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15737</v>
+                                    <v>29622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25339,12 +25368,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>257346</v>
+                                    <v>271695</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10182</v>
+                                    <v>24068</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25360,17 +25389,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202730</v>
+                                    <v>214301</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49062</v>
+                                    <v>51839</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15737</v>
+                                    <v>29622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25386,17 +25415,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202730</v>
+                                    <v>214301</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49062</v>
+                                    <v>51839</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15737</v>
+                                    <v>29622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25410,18 +25439,18 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
+                                    <a>64</a>
+                                    <b>65</b>
                                     <v>462</v>
                                 </b>
                                 <b>
-                                    <a>140</a>
-                                    <b>141</b>
+                                    <a>176</a>
+                                    <b>177</b>
                                     <v>462</v>
                                 </b>
                                 <b>
-                                    <a>578</a>
-                                    <b>579</b>
+                                    <a>639</a>
+                                    <b>640</b>
                                     <v>462</v>
                                 </b>
                             </bs>
@@ -25457,18 +25486,18 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
+                                    <a>64</a>
+                                    <b>65</b>
                                     <v>462</v>
                                 </b>
                                 <b>
-                                    <a>140</a>
-                                    <b>141</b>
+                                    <a>176</a>
+                                    <b>177</b>
                                     <v>462</v>
                                 </b>
                                 <b>
-                                    <a>578</a>
-                                    <b>579</b>
+                                    <a>639</a>
+                                    <b>640</b>
                                     <v>462</v>
                                 </b>
                             </bs>
@@ -25511,12 +25540,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311037</v>
+                                    <v>276786</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>17</b>
-                                    <v>13885</v>
+                                    <b>3</b>
+                                    <v>23142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>24531</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25553,12 +25592,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311037</v>
+                                    <v>276786</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>17</b>
-                                    <v>13885</v>
+                                    <b>3</b>
+                                    <v>23142</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>9</b>
+                                    <v>24531</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>18</b>
+                                    <v>462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25584,11 +25633,11 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>24994</cardinality>
+            <cardinality>38879</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>24994</v>
+                    <v>38879</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -25606,7 +25655,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24994</v>
+                                    <v>38879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25626,7 +25675,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>16</b>
+                                    <b>34</b>
                                     <v>1388</v>
                                 </b>
                             </bs>
@@ -25786,7 +25835,7 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>62440</cardinality>
+            <cardinality>85973</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
@@ -25794,7 +25843,7 @@
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>62440</v>
+                    <v>85973</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25808,12 +25857,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61603</v>
+                                    <v>55014</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>418</v>
+                                    <v>5124</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>13</b>
+                                    <v>1882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25829,7 +25883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62440</v>
+                                    <v>85973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25839,7 +25893,7 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>629948</cardinality>
+            <cardinality>647729</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
@@ -25847,7 +25901,7 @@
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>629948</v>
+                    <v>647729</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25861,12 +25915,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>558408</v>
+                                    <v>554120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>33887</v>
+                                    <v>38175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25882,7 +25936,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>629948</v>
+                                    <v>647729</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25892,7 +25946,7 @@
         </relation>
         <relation>
             <name>varattributes</name>
-            <cardinality>371048</cardinality>
+            <cardinality>371880</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
@@ -25900,7 +25954,7 @@
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>371048</v>
+                    <v>371880</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25914,17 +25968,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>273482</v>
+                                    <v>273279</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>48762</v>
+                                    <v>48804</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>3</v>
+                                    <a>3</a>
+                                    <b>62</b>
+                                    <v>164</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25940,7 +25994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>371048</v>
+                                    <v>371880</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26357,11 +26411,11 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>121348</cardinality>
+            <cardinality>121349</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>121348</v>
+                    <v>121349</v>
                 </e>
                 <e>
                     <k>parent</k>
@@ -26379,7 +26433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>121348</v>
+                                    <v>121349</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28896,15 +28950,15 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>1536058</cardinality>
+            <cardinality>1533107</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1536058</v>
+                    <v>1533107</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>1536058</v>
+                    <v>1533107</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
@@ -28926,7 +28980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536058</v>
+                                    <v>1533107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28942,7 +28996,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536058</v>
+                                    <v>1533107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28958,7 +29012,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536058</v>
+                                    <v>1533107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28974,7 +29028,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536058</v>
+                                    <v>1533107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28990,7 +29044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536058</v>
+                                    <v>1533107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29006,7 +29060,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536058</v>
+                                    <v>1533107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29338,7 +29392,7 @@
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>533842</v>
+                    <v>533823</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29373,12 +29427,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>329787</v>
+                                    <v>329747</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82184</v>
+                                    <v>82204</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30396,11 +30450,11 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>1733596</cardinality>
+            <cardinality>1699581</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>1733596</v>
+                    <v>1699581</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -30408,7 +30462,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1733596</v>
+                    <v>1699581</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -30426,7 +30480,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1733596</v>
+                                    <v>1699581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30442,7 +30496,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1733596</v>
+                                    <v>1699581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30458,7 +30512,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1733596</v>
+                                    <v>1699581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30547,7 +30601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1733596</v>
+                                    <v>1699581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30563,7 +30617,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1733596</v>
+                                    <v>1699581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30579,7 +30633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1733596</v>
+                                    <v>1699581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34778,11 +34832,11 @@
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>585099</cardinality>
+            <cardinality>585107</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>544986</v>
+                    <v>544993</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -34790,7 +34844,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>584994</v>
+                    <v>585002</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34804,12 +34858,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524125</v>
+                                    <v>524132</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>19</b>
-                                    <v>20860</v>
+                                    <v>20861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34825,12 +34879,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524125</v>
+                                    <v>524132</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>19</b>
-                                    <v>20860</v>
+                                    <v>20861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35028,7 +35082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>584956</v>
+                                    <v>584964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35049,7 +35103,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>584994</v>
+                                    <v>585002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35059,11 +35113,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>527560</cardinality>
+            <cardinality>527567</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>487748</v>
+                    <v>487755</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35071,7 +35125,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>527501</v>
+                    <v>527508</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35085,7 +35139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>467152</v>
+                                    <v>467158</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35106,7 +35160,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>467152</v>
+                                    <v>467158</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35309,7 +35363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527480</v>
+                                    <v>527487</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35330,7 +35384,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527501</v>
+                                    <v>527508</v>
                                 </b>
                             </bs>
                         </hist>