diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 24253b0aeb5..23f1331ee6d 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -16,14 +16,14 @@
             <k>@svnentry</k>
             <v>575525</v>
         </e>
-        <e>
-            <k>@location_stmt</k>
-            <v>3813678</v>
-        </e>
         <e>
             <k>@location_default</k>
             <v>29769315</v>
         </e>
+        <e>
+            <k>@location_stmt</k>
+            <v>3813678</v>
+        </e>
         <e>
             <k>@location_expr</k>
             <v>13166528</v>
@@ -90,7 +90,7 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>581207</v>
+            <v>581199</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -276,10 +276,6 @@
             <k>@std_float128</k>
             <v>466</v>
         </e>
-        <e>
-            <k>@float128x</k>
-            <v>466</v>
-        </e>
         <e>
             <k>@char8_t</k>
             <v>466</v>
@@ -296,10 +292,6 @@
             <k>@pointer</k>
             <v>567483</v>
         </e>
-        <e>
-            <k>@reference</k>
-            <v>1747669</v>
-        </e>
         <e>
             <k>@type_with_specifiers</k>
             <v>1009066</v>
@@ -313,8 +305,8 @@
             <v>635462</v>
         </e>
         <e>
-            <k>@rvalue_reference</k>
-            <v>613493</v>
+            <k>@reference</k>
+            <v>1747669</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -324,6 +316,10 @@
             <k>@routinereference</k>
             <v>242</v>
         </e>
+        <e>
+            <k>@rvalue_reference</k>
+            <v>613493</v>
+        </e>
         <e>
             <k>@block</k>
             <v>10</v>
@@ -364,10 +360,6 @@
             <k>@stdattribute</k>
             <v>492036</v>
         </e>
-        <e>
-            <k>@alignas</k>
-            <v>9792</v>
-        </e>
         <e>
             <k>@declspec</k>
             <v>243716</v>
@@ -377,12 +369,12 @@
             <v>3</v>
         </e>
         <e>
-            <k>@attribute_arg_token</k>
-            <v>39168</v>
+            <k>@alignas</k>
+            <v>9792</v>
         </e>
         <e>
-            <k>@attribute_arg_type</k>
-            <v>466</v>
+            <k>@attribute_arg_token</k>
+            <v>39168</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
@@ -396,6 +388,10 @@
             <k>@attribute_arg_constant</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@attribute_arg_type</k>
+            <v>466</v>
+        </e>
         <e>
             <k>@derivation</k>
             <v>368257</v>
@@ -432,34 +428,18 @@
             <k>@lambdacapture</k>
             <v>27977</v>
         </e>
-        <e>
-            <k>@errorexpr</k>
-            <v>46892</v>
-        </e>
         <e>
             <k>@address_of</k>
             <v>438815</v>
         </e>
-        <e>
-            <k>@reference_to</k>
-            <v>1592467</v>
-        </e>
         <e>
             <k>@indirect</k>
             <v>292170</v>
         </e>
-        <e>
-            <k>@ref_indirect</k>
-            <v>1938672</v>
-        </e>
         <e>
             <k>@array_to_pointer</k>
             <v>1428626</v>
         </e>
-        <e>
-            <k>@vacuous_destructor_call</k>
-            <v>8150</v>
-        </e>
         <e>
             <k>@parexpr</k>
             <v>3581934</v>
@@ -468,6 +448,10 @@
             <k>@arithnegexpr</k>
             <v>650875</v>
         </e>
+        <e>
+            <k>@unaryplusexpr</k>
+            <v>2911</v>
+        </e>
         <e>
             <k>@complementexpr</k>
             <v>27792</v>
@@ -610,7 +594,7 @@
         </e>
         <e>
             <k>@assignorexpr</k>
-            <v>23831</v>
+            <v>23830</v>
         </e>
         <e>
             <k>@assignxorexpr</k>
@@ -620,6 +604,10 @@
             <k>@assignpaddexpr</k>
             <v>13606</v>
         </e>
+        <e>
+            <k>@assignpsubexpr</k>
+            <v>1151</v>
+        </e>
         <e>
             <k>@andlogicalexpr</k>
             <v>249546</v>
@@ -634,7 +622,7 @@
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>367604</v>
+            <v>367599</v>
         </e>
         <e>
             <k>@callexpr</k>
@@ -644,6 +632,10 @@
             <k>@vastartexpr</k>
             <v>3706</v>
         </e>
+        <e>
+            <k>@vaargexpr</k>
+            <v>950</v>
+        </e>
         <e>
             <k>@vaendexpr</k>
             <v>2797</v>
@@ -656,34 +648,6 @@
             <k>@varaccess</k>
             <v>6019333</v>
         </e>
-        <e>
-            <k>@thisaccess</k>
-            <v>1127035</v>
-        </e>
-        <e>
-            <k>@new_expr</k>
-            <v>47668</v>
-        </e>
-        <e>
-            <k>@delete_expr</k>
-            <v>11749</v>
-        </e>
-        <e>
-            <k>@throw_expr</k>
-            <v>21695</v>
-        </e>
-        <e>
-            <k>@condition_decl</k>
-            <v>42427</v>
-        </e>
-        <e>
-            <k>@braced_init_list</k>
-            <v>1108</v>
-        </e>
-        <e>
-            <k>@type_id</k>
-            <v>36483</v>
-        </e>
         <e>
             <k>@runtime_sizeof</k>
             <v>295357</v>
@@ -693,8 +657,8 @@
             <v>49891</v>
         </e>
         <e>
-            <k>@sizeof_pack</k>
-            <v>5595</v>
+            <k>@expr_stmt</k>
+            <v>94234</v>
         </e>
         <e>
             <k>@routineexpr</k>
@@ -705,16 +669,12 @@
             <v>1126930</v>
         </e>
         <e>
-            <k>@isemptyexpr</k>
-            <v>1481</v>
+            <k>@offsetofexpr</k>
+            <v>19960</v>
         </e>
         <e>
-            <k>@ispodexpr</k>
-            <v>634</v>
-        </e>
-        <e>
-            <k>@hastrivialdestructor</k>
-            <v>466</v>
+            <k>@typescompexpr</k>
+            <v>562865</v>
         </e>
         <e>
             <k>@literal</k>
@@ -724,105 +684,33 @@
             <k>@aggregateliteral</k>
             <v>913874</v>
         </e>
-        <e>
-            <k>@delete_array_expr</k>
-            <v>1406</v>
-        </e>
-        <e>
-            <k>@new_array_expr</k>
-            <v>5103</v>
-        </e>
-        <e>
-            <k>@ctordirectinit</k>
-            <v>112978</v>
-        </e>
-        <e>
-            <k>@ctorvirtualinit</k>
-            <v>6513</v>
-        </e>
-        <e>
-            <k>@ctorfieldinit</k>
-            <v>201118</v>
-        </e>
-        <e>
-            <k>@ctordelegatinginit</k>
-            <v>3351</v>
-        </e>
-        <e>
-            <k>@dtordirectdestruct</k>
-            <v>41776</v>
-        </e>
-        <e>
-            <k>@dtorvirtualdestruct</k>
-            <v>4128</v>
-        </e>
-        <e>
-            <k>@dtorfielddestruct</k>
-            <v>41705</v>
-        </e>
-        <e>
-            <k>@static_cast</k>
-            <v>210934</v>
-        </e>
-        <e>
-            <k>@reinterpret_cast</k>
-            <v>30752</v>
-        </e>
-        <e>
-            <k>@const_cast</k>
-            <v>35250</v>
-        </e>
-        <e>
-            <k>@dynamic_cast</k>
-            <v>1037</v>
-        </e>
         <e>
             <k>@c_style_cast</k>
             <v>4209495</v>
         </e>
-        <e>
-            <k>@lambdaexpr</k>
-            <v>21449</v>
-        </e>
-        <e>
-            <k>@param_ref</k>
-            <v>245656</v>
-        </e>
-        <e>
-            <k>@istrivialexpr</k>
-            <v>932</v>
-        </e>
-        <e>
-            <k>@istriviallycopyableexpr</k>
-            <v>3730</v>
-        </e>
-        <e>
-            <k>@isconstructibleexpr</k>
-            <v>466</v>
-        </e>
-        <e>
-            <k>@isfinalexpr</k>
-            <v>1693</v>
-        </e>
-        <e>
-            <k>@noexceptexpr</k>
-            <v>25737</v>
-        </e>
-        <e>
-            <k>@builtinaddressof</k>
-            <v>13302</v>
-        </e>
         <e>
             <k>@temp_init</k>
             <v>826674</v>
         </e>
         <e>
-            <k>@assume</k>
-            <v>3203</v>
+            <k>@errorexpr</k>
+            <v>46892</v>
         </e>
         <e>
-            <k>@unaryplusexpr</k>
-            <v>2911</v>
+            <k>@reference_to</k>
+            <v>1592467</v>
+        </e>
+        <e>
+            <k>@ref_indirect</k>
+            <v>1938672</v>
+        </e>
+        <e>
+            <k>@vacuous_destructor_call</k>
+            <v>8150</v>
+        </e>
+        <e>
+            <k>@assume</k>
+            <v>3203</v>
         </e>
         <e>
             <k>@conjugation</k>
@@ -868,25 +756,41 @@
             <k>@maxexpr</k>
             <v>1</v>
         </e>
-        <e>
-            <k>@assignpsubexpr</k>
-            <v>1151</v>
-        </e>
         <e>
             <k>@virtfunptrexpr</k>
             <v>1</v>
         </e>
         <e>
-            <k>@vaargexpr</k>
-            <v>950</v>
+            <k>@thisaccess</k>
+            <v>1127035</v>
         </e>
         <e>
-            <k>@expr_stmt</k>
-            <v>94234</v>
+            <k>@new_expr</k>
+            <v>47668</v>
         </e>
         <e>
-            <k>@offsetofexpr</k>
-            <v>19960</v>
+            <k>@delete_expr</k>
+            <v>11749</v>
+        </e>
+        <e>
+            <k>@throw_expr</k>
+            <v>21695</v>
+        </e>
+        <e>
+            <k>@condition_decl</k>
+            <v>42427</v>
+        </e>
+        <e>
+            <k>@braced_init_list</k>
+            <v>1108</v>
+        </e>
+        <e>
+            <k>@type_id</k>
+            <v>36483</v>
+        </e>
+        <e>
+            <k>@sizeof_pack</k>
+            <v>5595</v>
         </e>
         <e>
             <k>@hasassignexpr</k>
@@ -944,10 +848,18 @@
             <k>@isconvtoexpr</k>
             <v>104</v>
         </e>
+        <e>
+            <k>@isemptyexpr</k>
+            <v>1481</v>
+        </e>
         <e>
             <k>@isenumexpr</k>
             <v>522</v>
         </e>
+        <e>
+            <k>@ispodexpr</k>
+            <v>634</v>
+        </e>
         <e>
             <k>@ispolyexpr</k>
             <v>3</v>
@@ -956,22 +868,82 @@
             <k>@isunionexpr</k>
             <v>5</v>
         </e>
-        <e>
-            <k>@typescompexpr</k>
-            <v>562865</v>
-        </e>
         <e>
             <k>@intaddrexpr</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@hastrivialdestructor</k>
+            <v>466</v>
+        </e>
         <e>
             <k>@uuidof</k>
             <v>20120</v>
         </e>
+        <e>
+            <k>@delete_array_expr</k>
+            <v>1406</v>
+        </e>
+        <e>
+            <k>@new_array_expr</k>
+            <v>5103</v>
+        </e>
         <e>
             <k>@foldexpr</k>
             <v>4</v>
         </e>
+        <e>
+            <k>@ctordirectinit</k>
+            <v>112978</v>
+        </e>
+        <e>
+            <k>@ctorvirtualinit</k>
+            <v>6513</v>
+        </e>
+        <e>
+            <k>@ctorfieldinit</k>
+            <v>201118</v>
+        </e>
+        <e>
+            <k>@ctordelegatinginit</k>
+            <v>3351</v>
+        </e>
+        <e>
+            <k>@dtordirectdestruct</k>
+            <v>41776</v>
+        </e>
+        <e>
+            <k>@dtorvirtualdestruct</k>
+            <v>4128</v>
+        </e>
+        <e>
+            <k>@dtorfielddestruct</k>
+            <v>41705</v>
+        </e>
+        <e>
+            <k>@static_cast</k>
+            <v>210934</v>
+        </e>
+        <e>
+            <k>@reinterpret_cast</k>
+            <v>30752</v>
+        </e>
+        <e>
+            <k>@const_cast</k>
+            <v>35250</v>
+        </e>
+        <e>
+            <k>@dynamic_cast</k>
+            <v>1037</v>
+        </e>
+        <e>
+            <k>@lambdaexpr</k>
+            <v>21449</v>
+        </e>
+        <e>
+            <k>@param_ref</k>
+            <v>245656</v>
+        </e>
         <e>
             <k>@noopexpr</k>
             <v>37</v>
@@ -1000,10 +972,18 @@
             <k>@isnothrowassignableexpr</k>
             <v>4183</v>
         </e>
+        <e>
+            <k>@istrivialexpr</k>
+            <v>932</v>
+        </e>
         <e>
             <k>@isstandardlayoutexpr</k>
             <v>2</v>
         </e>
+        <e>
+            <k>@istriviallycopyableexpr</k>
+            <v>3730</v>
+        </e>
         <e>
             <k>@isliteraltypeexpr</k>
             <v>2</v>
@@ -1020,6 +1000,10 @@
             <k>@hasnothrowmoveassignexpr</k>
             <v>4</v>
         </e>
+        <e>
+            <k>@isconstructibleexpr</k>
+            <v>466</v>
+        </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
             <v>14434</v>
@@ -1056,6 +1040,14 @@
             <k>@isvalueclassexpr</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@isfinalexpr</k>
+            <v>1693</v>
+        </e>
+        <e>
+            <k>@noexceptexpr</k>
+            <v>25737</v>
+        </e>
         <e>
             <k>@builtinshufflevector</k>
             <v>1</v>
@@ -1064,6 +1056,10 @@
             <k>@builtinchooseexpr</k>
             <v>9050</v>
         </e>
+        <e>
+            <k>@builtinaddressof</k>
+            <v>13302</v>
+        </e>
         <e>
             <k>@vec_fill</k>
             <v>1</v>
@@ -1232,6 +1228,10 @@
             <k>@stmt_while</k>
             <v>30110</v>
         </e>
+        <e>
+            <k>@stmt_goto</k>
+            <v>110511</v>
+        </e>
         <e>
             <k>@stmt_label</k>
             <v>53056</v>
@@ -1261,8 +1261,8 @@
             <v>20753</v>
         </e>
         <e>
-            <k>@stmt_try_block</k>
-            <v>46921</v>
+            <k>@stmt_asm</k>
+            <v>109804</v>
         </e>
         <e>
             <k>@stmt_decl</k>
@@ -1270,7 +1270,7 @@
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>193324</v>
+            <v>193321</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1281,24 +1281,8 @@
             <v>102331</v>
         </e>
         <e>
-            <k>@stmt_range_based_for</k>
-            <v>8393</v>
-        </e>
-        <e>
-            <k>@stmt_handler</k>
-            <v>65314</v>
-        </e>
-        <e>
-            <k>@stmt_constexpr_if</k>
-            <v>52508</v>
-        </e>
-        <e>
-            <k>@stmt_goto</k>
-            <v>110511</v>
-        </e>
-        <e>
-            <k>@stmt_asm</k>
-            <v>109804</v>
+            <k>@stmt_try_block</k>
+            <v>46921</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1316,6 +1300,18 @@
             <k>@stmt_assigned_goto</k>
             <v>9061</v>
         </e>
+        <e>
+            <k>@stmt_range_based_for</k>
+            <v>8393</v>
+        </e>
+        <e>
+            <k>@stmt_handler</k>
+            <v>65314</v>
+        </e>
+        <e>
+            <k>@stmt_constexpr_if</k>
+            <v>52508</v>
+        </e>
         <e>
             <k>@stmt_co_return</k>
             <v>2</v>
@@ -1356,10 +1352,6 @@
             <k>@ppd_undef</k>
             <v>258328</v>
         </e>
-        <e>
-            <k>@ppd_pragma</k>
-            <v>312020</v>
-        </e>
         <e>
             <k>@ppd_include_next</k>
             <v>1865</v>
@@ -1372,6 +1364,10 @@
             <k>@ppd_error</k>
             <v>46</v>
         </e>
+        <e>
+            <k>@ppd_pragma</k>
+            <v>312020</v>
+        </e>
         <e>
             <k>@ppd_objc_import</k>
             <v>2</v>
@@ -2008,7 +2004,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>10051</v>
+                    <v>14798</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2089,12 +2085,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>678</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>319</v>
+                                    <v>757</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -2109,31 +2105,31 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>79</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>159</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>17</b>
                                     <v>119</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
+                                    <a>11</a>
+                                    <b>14</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>17</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
                                     <b>21</b>
                                     <v>159</v>
                                 </b>
                                 <b>
                                     <a>21</a>
-                                    <b>44</b>
+                                    <b>45</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>55</a>
-                                    <b>89</b>
+                                    <a>64</a>
+                                    <b>130</b>
                                     <v>79</v>
                                 </b>
                             </bs>
@@ -2202,37 +2198,47 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1236</v>
+                                    <v>398</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>518</v>
+                                    <v>1356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>159</v>
+                                    <v>199</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>558</v>
+                                    <v>239</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>9</b>
+                                    <b>8</b>
                                     <v>279</v>
                                 </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>39</v>
+                                </b>
                                 <b>
                                     <a>9</a>
-                                    <b>24</b>
+                                    <b>10</b>
+                                    <v>319</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>28</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>91</b>
-                                    <v>279</v>
+                                    <a>28</a>
+                                    <b>96</b>
+                                    <v>199</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2277,24 +2283,19 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>39</v>
-                                </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>182</a>
+                                    <b>183</b>
                                     <v>39</v>
                                 </b>
                                 <b>
-                                    <a>120</a>
-                                    <b>121</b>
-                                    <v>39</v>
-                                </b>
-                                <b>
-                                    <a>129</a>
-                                    <b>130</b>
+                                    <a>189</a>
+                                    <b>190</b>
                                     <v>39</v>
                                 </b>
                             </bs>
@@ -2311,27 +2312,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5823</v>
+                                    <v>10011</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2074</v>
+                                    <v>3549</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>917</v>
+                                    <b>5</b>
+                                    <v>1116</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>917</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>40</b>
-                                    <v>319</v>
+                                    <a>18</a>
+                                    <b>47</b>
+                                    <v>119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2347,32 +2343,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5065</v>
+                                    <v>9572</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1794</v>
+                                    <v>3470</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1236</v>
+                                    <v>1037</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>757</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>877</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>67</b>
-                                    <v>319</v>
+                                    <b>74</b>
+                                    <v>717</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2388,12 +2374,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9892</v>
+                                    <v>14518</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>159</v>
+                                    <b>4</b>
+                                    <v>279</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2762,11 +2748,11 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7838</v>
+                    <v>7389</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>161</v>
+                    <v>138</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2812,17 +2798,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6605</v>
+                                    <v>5948</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>853</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>12</b>
-                                    <v>380</v>
+                                    <b>15</b>
+                                    <v>461</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2838,12 +2824,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7354</v>
+                                    <v>6778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>484</v>
+                                    <v>610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2859,56 +2845,51 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
+                                    <v>34</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
-                                    <b>53</b>
+                                    <a>12</a>
+                                    <b>13</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>114</a>
-                                    <b>115</b>
+                                    <a>37</a>
+                                    <b>38</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>145</a>
-                                    <b>146</b>
+                                    <a>150</a>
+                                    <b>151</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>244</a>
-                                    <b>245</b>
+                                    <a>172</a>
+                                    <b>173</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>248</a>
-                                    <b>249</b>
+                                    <a>211</a>
+                                    <b>212</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>258</a>
+                                    <b>259</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -2925,56 +2906,51 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23</v>
+                                    <v>11</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
+                                    <v>34</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>26</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
+                                    <a>12</a>
+                                    <b>13</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>102</a>
-                                    <b>103</b>
+                                    <a>36</a>
+                                    <b>37</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>107</a>
-                                    <b>108</b>
+                                    <a>125</a>
+                                    <b>126</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>172</a>
-                                    <b>173</b>
+                                    <a>126</a>
+                                    <b>127</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>230</a>
-                                    <b>231</b>
+                                    <a>145</a>
+                                    <b>146</b>
+                                    <v>11</v>
+                                </b>
+                                <b>
+                                    <a>227</a>
+                                    <b>228</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -12311,7 +12287,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>543265</v>
+                                    <v>543264</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12346,7 +12322,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224500</v>
+                                    <v>224502</v>
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -18397,11 +18373,11 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>581207</cardinality>
+            <cardinality>581199</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>581207</v>
+                    <v>581199</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18409,7 +18385,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>91326</v>
+                    <v>91325</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18423,7 +18399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581207</v>
+                                    <v>581199</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18439,7 +18415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>581207</v>
+                                    <v>581199</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18532,7 +18508,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57522</v>
+                                    <v>57521</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18568,7 +18544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77150</v>
+                                    <v>77148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19606,19 +19582,19 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>22848</cardinality>
+            <cardinality>22382</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>22848</v>
+                    <v>22382</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>22848</v>
+                    <v>22382</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>22848</v>
+                    <v>22382</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -19644,7 +19620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19660,7 +19636,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19676,7 +19652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19692,7 +19668,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19708,7 +19684,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19724,7 +19700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19740,7 +19716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19756,7 +19732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19772,7 +19748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19788,7 +19764,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19804,7 +19780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19820,7 +19796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19836,7 +19812,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19852,7 +19828,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19868,7 +19844,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22848</v>
+                                    <v>22382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19887,8 +19863,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -19928,8 +19904,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -19969,8 +19945,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
+                                    <a>2</a>
+                                    <b>3</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -20057,8 +20033,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>32</b>
+                                    <a>30</a>
+                                    <b>31</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -20083,8 +20059,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>32</b>
+                                    <a>30</a>
+                                    <b>31</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -20109,8 +20085,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>32</b>
+                                    <a>30</a>
+                                    <b>31</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -20177,8 +20153,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -20213,8 +20189,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -20249,8 +20225,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -21468,7 +21444,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1348530</v>
+                    <v>1348063</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -21528,7 +21504,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>104916</v>
+                                    <v>104450</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -21559,12 +21535,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125900</v>
+                                    <v>124967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>14921</v>
+                                    <v>15387</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21689,8 +21665,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>740</a>
-                                    <b>741</b>
+                                    <a>739</a>
+                                    <b>740</b>
                                     <v>466</v>
                                 </b>
                                 <b>
@@ -26371,15 +26347,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>10137757</cardinality>
+            <cardinality>10137290</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>10137757</v>
+                    <v>10137290</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6813527</v>
+                    <v>6813061</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26393,7 +26369,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10137757</v>
+                                    <v>10137290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26409,7 +26385,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4583230</v>
+                                    <v>4582764</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28996,11 +28972,11 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>4981760</cardinality>
+            <cardinality>4981370</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>4981760</v>
+                    <v>4981370</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -31127,11 +31103,11 @@
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3387</v>
+                    <v>1163</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3592604</v>
+                    <v>8474327</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31176,68 +31152,73 @@
                             <bs>
                                 <b>
                                     <a>1</a>
-                                    <b>3</b>
-                                    <v>246</v>
+                                    <b>10</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>14</b>
-                                    <v>282</v>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>38</b>
-                                    <v>282</v>
+                                    <a>26</a>
+                                    <b>100</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>83</b>
-                                    <v>282</v>
+                                    <a>105</a>
+                                    <b>305</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>85</a>
-                                    <b>142</b>
-                                    <v>282</v>
+                                    <a>320</a>
+                                    <b>417</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>145</a>
-                                    <b>339</b>
-                                    <v>282</v>
+                                    <a>466</a>
+                                    <b>784</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>364</a>
-                                    <b>564</b>
-                                    <v>282</v>
+                                    <a>892</a>
+                                    <b>1647</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>653</a>
-                                    <b>832</b>
-                                    <v>282</v>
+                                    <a>1656</a>
+                                    <b>2402</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>973</a>
-                                    <b>1185</b>
-                                    <v>282</v>
+                                    <a>3130</a>
+                                    <b>4067</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>1329</a>
-                                    <b>2628</b>
-                                    <v>282</v>
+                                    <a>4297</a>
+                                    <b>4915</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>3015</a>
-                                    <b>6253</b>
-                                    <v>282</v>
+                                    <a>5184</a>
+                                    <b>20397</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>6592</a>
-                                    <b>78904</b>
-                                    <v>282</v>
+                                    <a>25254</a>
+                                    <b>49060</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>109469</a>
-                                    <b>109470</b>
-                                    <v>35</v>
+                                    <a>63119</a>
+                                    <b>136808</b>
+                                    <v>88</v>
+                                </b>
+                                <b>
+                                    <a>285063</a>
+                                    <b>285064</b>
+                                    <v>17</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31252,68 +31233,73 @@
                             <bs>
                                 <b>
                                     <a>1</a>
-                                    <b>2</b>
-                                    <v>282</v>
+                                    <b>9</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>176</v>
+                                    <a>9</a>
+                                    <b>15</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>282</v>
+                                    <a>17</a>
+                                    <b>96</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>13</b>
-                                    <v>282</v>
+                                    <a>99</a>
+                                    <b>222</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>26</b>
-                                    <v>282</v>
+                                    <a>260</a>
+                                    <b>383</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>62</b>
-                                    <v>246</v>
+                                    <a>408</a>
+                                    <b>577</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
-                                    <b>83</b>
-                                    <v>282</v>
+                                    <a>595</a>
+                                    <b>749</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>91</a>
-                                    <b>183</b>
-                                    <v>282</v>
+                                    <a>864</a>
+                                    <b>1774</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>206</a>
-                                    <b>342</b>
-                                    <v>282</v>
+                                    <a>1812</a>
+                                    <b>2545</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>353</a>
-                                    <b>448</b>
-                                    <v>282</v>
+                                    <a>2601</a>
+                                    <b>2910</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>469</a>
-                                    <b>1020</b>
-                                    <v>282</v>
+                                    <a>3419</a>
+                                    <b>4913</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>1051</a>
-                                    <b>14619</b>
-                                    <v>282</v>
+                                    <a>5471</a>
+                                    <b>21108</b>
+                                    <v>88</v>
                                 </b>
                                 <b>
-                                    <a>16978</a>
-                                    <b>32762</b>
-                                    <v>141</v>
+                                    <a>26251</a>
+                                    <b>76182</b>
+                                    <v>88</v>
+                                </b>
+                                <b>
+                                    <a>223904</a>
+                                    <b>223905</b>
+                                    <v>17</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31329,32 +31315,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1941777</v>
+                                    <v>7133647</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>838486</v>
+                                    <v>661870</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>247163</v>
+                                    <b>18</b>
+                                    <v>637071</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>284529</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>155</b>
-                                    <v>269533</v>
-                                </b>
-                                <b>
-                                    <a>155</a>
-                                    <b>53477</b>
-                                    <v>11114</v>
+                                    <a>18</a>
+                                    <b>71656</b>
+                                    <v>41738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31370,22 +31346,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2392776</v>
+                                    <v>7239544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>875922</v>
+                                    <v>617153</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>306969</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>25</b>
-                                    <v>16936</v>
+                                    <b>32</b>
+                                    <v>617629</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35621,11 +35592,11 @@
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>585138</cardinality>
+            <cardinality>585129</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>545022</v>
+                    <v>545014</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35633,7 +35604,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>585033</v>
+                    <v>585024</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35647,12 +35618,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524159</v>
+                                    <v>524152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>19</b>
-                                    <v>20862</v>
+                                    <v>20861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35668,12 +35639,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524159</v>
+                                    <v>524152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>19</b>
-                                    <v>20862</v>
+                                    <v>20861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35871,7 +35842,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>584995</v>
+                                    <v>584986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35892,7 +35863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>585033</v>
+                                    <v>585024</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35902,11 +35873,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>527594</cardinality>
+            <cardinality>527587</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>487781</v>
+                    <v>487773</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35914,7 +35885,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>527536</v>
+                    <v>527528</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35928,7 +35899,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>467183</v>
+                                    <v>467176</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35949,7 +35920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>467183</v>
+                                    <v>467176</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36152,7 +36123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527515</v>
+                                    <v>527507</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36173,7 +36144,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527536</v>
+                                    <v>527528</v>
                                 </b>
                             </bs>
                         </hist>